Author: ianmacarthur
Date: 2010-04-05 03:00:41 -0700 (Mon, 05 Apr 2010)
New Revision: 7426
Log:
Add a few win32 compilation tweaks after Matt's last round of mods.
Now builds the libfltk.a again, though forms etc. currently broken.
Tetsing with Msys/mingw on winXP.
Modified:
branches/branch-3.0/fltk3/Enumerations.H
branches/branch-3.0/fltk3/run.h
branches/branch-3.0/src/Fl_get_key_win32.cxx
branches/branch-3.0/src/Fl_win32.cxx
branches/branch-3.0/src/fl_shortcut.cxx
Modified: branches/branch-3.0/fltk3/Enumerations.H
===================================================================
--- branches/branch-3.0/fltk3/Enumerations.H 2010-04-05 09:10:50 UTC (rev
7425)
+++ branches/branch-3.0/fltk3/Enumerations.H 2010-04-05 10:00:41 UTC (rev
7426)
@@ -3,7 +3,7 @@
//
// Enumerations for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -39,7 +39,7 @@
FLTK defines some constants to help the programmer to
find out, for which FLTK version a program is compiled.
-
+
The following constants are defined:
*/
/*...@{*/
@@ -92,12 +92,12 @@
* or presses a key, an event is generated and sent to your
* application. Events can also come from other programs like the
* window manager.
- *
- * Events are identified by the integer argument passed to the
- * fltk3::Widget::handle() virtual method. Other information about the
- * most recent event is stored in static locations and acquired by
- * calling the fltk3::event_*() methods. This static information remains
- * valid until the next event is read from the window system, so it
+ *
+ * Events are identified by the integer argument passed to the
+ * fltk3::Widget::handle() virtual method. Other information about the
+ * most recent event is stored in static locations and acquired by
+ * calling the fltk3::event_*() methods. This static information remains
+ * valid until the next event is read from the window system, so it
* is ok to look at it outside of the handle() method.
*
* \sa fltk3::event_text(), fltk3::event_key()
@@ -107,22 +107,22 @@
NO_EVENT = 0,
/** A mouse button has gone down with the mouse pointing at this
- * widget. You can find out what button by calling fltk3::event_button().
+ * widget. You can find out what button by calling fltk3::event_button().
* You find out the mouse position by calling fltk3::event_x() and
* fltk3::event_y().
*
- * A widget indicates that it "wants" the mouse click by returning non-zero
- * from its fltk3::Widget::handle() method. It will then become the
- * fltk3::pushed() widget and will get DRAG and the matching RELEASE
events.
- * If fltk3::Widget::handle() returns zero then FLTK will try sending the
PUSH
- * to another widget.
+ * A widget indicates that it "wants" the mouse click by returning non-zero
+ * from its fltk3::Widget::handle() method. It will then become the
+ * fltk3::pushed() widget and will get DRAG and the matching RELEASE events.
+ * If fltk3::Widget::handle() returns zero then FLTK will try sending the
PUSH
+ * to another widget.
*/
PUSH = 1,
- /** A mouse button has been released. You can find out what button by
+ /** A mouse button has been released. You can find out what button by
* calling fltk3::event_button().
*
- * In order to receive the RELEASE event, the widget must return
+ * In order to receive the RELEASE event, the widget must return
* non-zero when handling PUSH.
*/
RELEASE = 2,
@@ -131,62 +131,62 @@
* be used for highlighting feedback. If a widget wants to
* highlight or otherwise track the mouse, it indicates this by
* returning non-zero from its handle() method. It then
- * becomes the fltk3::belowmouse() widget and will receive
+ * becomes the fltk3::belowmouse() widget and will receive
* MOVE and LEAVE events.
*/
ENTER = 3,
/** The mouse has moved out of the widget.
- * In order to receive the LEAVE event, the widget must
+ * In order to receive the LEAVE event, the widget must
* return non-zero when handling ENTER.
*/
LEAVE = 4,
- /** The mouse has moved with a button held down. The current button state
- * is in fltk3::event_state(). The mouse position is in fltk3::event_x()
and
+ /** The mouse has moved with a button held down. The current button state
+ * is in fltk3::event_state(). The mouse position is in fltk3::event_x() and
* fltk3::event_y().
*
- * In order to receive DRAG events, the widget must return non-zero
+ * In order to receive DRAG events, the widget must return non-zero
* when handling PUSH.
*/
DRAG = 5,
/** This indicates an <I>attempt</I> to give a widget the keyboard focus.
*
- * If a widget wants the focus, it should change itself to display the
+ * If a widget wants the focus, it should change itself to display the
* fact that it has the focus, and return non-zero from its handle() method.
- * It then becomes the fltk3::focus() widget and gets KEYDOWN, KEYUP,
+ * It then becomes the fltk3::focus() widget and gets KEYDOWN, KEYUP,
* and UNFOCUS events.
*
- * The focus will change either because the window manager changed which
- * window gets the focus, or because the user tried to navigate using tab,
- * arrows, or other keys. You can check fltk3::event_key() to figure out
why
- * it moved. For navigation it will be the key pressed and interaction
+ * The focus will change either because the window manager changed which
+ * window gets the focus, or because the user tried to navigate using tab,
+ * arrows, or other keys. You can check fltk3::event_key() to figure out why
+ * it moved. For navigation it will be the key pressed and interaction
* with the window manager it will be zero.
*/
FOCUS = 6,
-
- /** This event is sent to the previous fltk3::focus() widget when another
+
+ /** This event is sent to the previous fltk3::focus() widget when another
* widget gets the focus or the window loses focus.
*/
UNFOCUS = 7,
/** A key was pressed or released. The key can be found in
fltk3::event_key().
- * The text that the key should insert can be found with
fltk3::event_text()
+ * The text that the key should insert can be found with fltk3::event_text()
* and its length is in fltk3::event_length(). If you use the key handle()
- * should return 1. If you return zero then FLTK assumes you ignored the
- * key and will then attempt to send it to a parent widget. If none of
+ * should return 1. If you return zero then FLTK assumes you ignored the
+ * key and will then attempt to send it to a parent widget. If none of
* them want it, it will change the event into a SHORTCUT event.
*
* To receive KEYBOARD events you must also respond to the FOCUS
* and UNFOCUS events.
*
- * If you are writing a text-editing widget you may also want to call
- * the fltk3::compose() function to translate individual keystrokes into
+ * If you are writing a text-editing widget you may also want to call
+ * the fltk3::compose() function to translate individual keystrokes into
* foreign characters.
*
- * KEYUP events are sent to the widget that currently has focus. This
- * is not necessarily the same widget that received the corresponding
+ * KEYUP events are sent to the widget that currently has focus. This
+ * is not necessarily the same widget that received the corresponding
* KEYDOWN event because focus may have changed between events.
*/
KEY = 8,
@@ -198,70 +198,70 @@
/** The user clicked the close button of a window.
* This event is used internally only to trigger the callback of
- * fltk3::Window derived classed. The default callback closes the
+ * fltk3::Window derived classed. The default callback closes the
* window calling fltk3::Window::hide().
*/
CLOSE = 10,
- /** The mouse has moved without any mouse buttons held down.
+ /** The mouse has moved without any mouse buttons held down.
* This event is sent to the fltk3::belowmouse() widget.
*
- * In order to receive MOVE events, the widget must return
+ * In order to receive MOVE events, the widget must return
* non-zero when handling ENTER.
*/
MOVE = 11,
/** If the fltk3::focus() widget is zero or ignores an KEYBOARD
- * event then FLTK tries sending this event to every widget it
- * can, until one of them returns non-zero. SHORTCUT is first
- * sent to the fltk3::belowmouse() widget, then its parents and siblings,
- * and eventually to every widget in the window, trying to find an
- * object that returns non-zero. FLTK tries really hard to not to ignore
+ * event then FLTK tries sending this event to every widget it
+ * can, until one of them returns non-zero. SHORTCUT is first
+ * sent to the fltk3::belowmouse() widget, then its parents and siblings,
+ * and eventually to every widget in the window, trying to find an
+ * object that returns non-zero. FLTK tries really hard to not to ignore
* any keystrokes!
*
- * You can also make "global" shortcuts by using fltk3::add_handler(). A
- * global shortcut will work no matter what windows are displayed or
+ * You can also make "global" shortcuts by using fltk3::add_handler(). A
+ * global shortcut will work no matter what windows are displayed or
* which one has the focus.
*/
SHORTCUT = 12,
- /** This widget is no longer active, due to fltk3::Widget::deactivate()
- * being called on it or one of its parents. fltk3::Widget::active() may
+ /** This widget is no longer active, due to fltk3::Widget::deactivate()
+ * being called on it or one of its parents. fltk3::Widget::active() may
* still be true after this, the widget is only active if
fltk3::Widget::active()
* is true on it and all its parents (use fltk3::Widget::active_r() to
check this).
*/
DEACTIVATE = 13,
- /** This widget is now active, due to fltk3::Widget::activate() being
+ /** This widget is now active, due to fltk3::Widget::activate() being
* called on it or one of its parents.
*/
ACTIVATE = 14,
- /** This widget is no longer visible, due to fltk3::Widget::hide() being
- * called on it or one of its parents, or due to a parent window being
- * minimized. fltk3::Widget::visible() may still be true after this, but
the
- * widget is visible only if visible() is true for it and all its
+ /** This widget is no longer visible, due to fltk3::Widget::hide() being
+ * called on it or one of its parents, or due to a parent window being
+ * minimized. fltk3::Widget::visible() may still be true after this, but
the
+ * widget is visible only if visible() is true for it and all its
* parents (use fltk3::Widget::visible_r() to check this).
*/
HIDE = 15,
- /** This widget is visible again, due to fltk3::Widget::show() being called
on
- * it or one of its parents, or due to a parent window being restored.
- * Child Fl_Windows respond to this by actually creating the window if not
- * done already, so if you subclass a window, be sure to pass SHOW
+ /** This widget is visible again, due to fltk3::Widget::show() being called
on
+ * it or one of its parents, or due to a parent window being restored.
+ * Child Fl_Windows respond to this by actually creating the window if not
+ * done already, so if you subclass a window, be sure to pass SHOW
* to the base class fltk3::Widget::handle() method!
*/
SHOW = 16,
- /** You should get this event some time after you call fltk3::paste().
- * The contents of fltk3::event_text() is the text to insert and the number
+ /** You should get this event some time after you call fltk3::paste().
+ * The contents of fltk3::event_text() is the text to insert and the number
* of characters is in fltk3::event_length().
*/
PASTE = 17,
- /** The fltk3::selection_owner() will get this event before the selection is
- * moved to another widget. This indicates that some other widget or
program
- * has claimed the selection. Motif programs used this to clear the
selection
+ /** The fltk3::selection_owner() will get this event before the selection is
+ * moved to another widget. This indicates that some other widget or program
+ * has claimed the selection. Motif programs used this to clear the
selection
* indication. Most modern programs ignore this. THIS VALUE IS NOT USED!
*/
SELECTIONCLEAR = 18,
@@ -271,14 +271,14 @@
*/
MOUSEWHEEL = 19,
- /** The mouse has been moved to point at this widget. A widget that is
- * interested in receiving drag'n'drop data must return 1 to receive
+ /** The mouse has been moved to point at this widget. A widget that is
+ * interested in receiving drag'n'drop data must return 1 to receive
* DND_DRAG, DND_LEAVE and DND_RELEASE events.
*/
DND_ENTER = 20,
- /** The mouse has been moved inside a widget while dragging data. A
- * widget that is interested in receiving drag'n'drop data should
+ /** The mouse has been moved inside a widget while dragging data. A
+ * widget that is interested in receiving drag'n'drop data should
* indicate the possible drop position.
*/
DND_DRAG = 21,
@@ -287,18 +287,18 @@
*/
DND_LEAVE = 22,
- /** The user has released the mouse button dropping data into the widget.
- * If the widget returns 1, it will receive the data in the immediately
+ /** The user has released the mouse button dropping data into the widget.
+ * If the widget returns 1, it will receive the data in the immediately
* following PASTE event.
*/
DND_RELEASE = 23,
-
+
/* added in FLTK2 */
TOOLTIP = 24,
FOCUS_CHANGE, /* 10 */
TIMEOUT /* 18 */
};
-
+
/** \name When Conditions */
/*...@{*/
/** These constants determine when a callback is performed.
@@ -327,7 +327,7 @@
\todo fltk3::MouseButton and FL_key... constants could be structured
better
(use an enum or some doxygen grouping ?)
-
+
\sa fltk3::event_key() and fltk3::get_key(int) (use ascii letters
for all other keys):
*/
@@ -339,7 +339,7 @@
MouseButton = 0xfee8, ///< A mouse button; use fltk3::MouseButton + n
for mouse button n.
BackSpaceKey = 0xff08, ///< The backspace key.
TabKey = 0xff09, ///< The tab key.
- EnterKey = 0xff0d, ///< The enter key.
+ EnterKey = 0xff0d, ///< The enter key.
PauseKey = 0xff13, ///< The pause key.
ScrollLockKey = 0xff14, ///< The scroll lock key.
EscapeKey = 0xff1b, ///< The escape key.
@@ -352,7 +352,7 @@
PageDownKey = 0xff56, ///< The page-down key.
EndKey = 0xff57, ///< The end key.
PrintKey = 0xff61, ///< The print (or print-screen) key.
- InsertKey = 0xff63, ///< The insert key.
+ InsertKey = 0xff63, ///< The insert key.
MenuKey = 0xff67, ///< The menu key.
HelpKey = 0xff68, ///< The 'help' key on Mac keyboards
NumLockKey = 0xff7f, ///< The num lock key.
@@ -392,16 +392,16 @@
LeftMetaKey = 0xffe7, ///< The left meta/Windows key.
RightMetaKey = 0xffe8, ///< The right meta/Windows key.
LeftAltKey = 0xffe9, ///< The left alt key.
- RightAltKey = 0xffea, ///< The right alt key.
+ RightAltKey = 0xffea, ///< The right alt key.
DeleteKey = 0xffff ///< The delete key.
};
-
+
/*...@}*/ // group: Mouse and Keyboard Events
/** \name Mouse Buttons
These constants define the button numbers for fltk3::PUSH and
fltk3::RELEASE events.
-
+
\sa fltk3::event_button()
*/
@@ -441,15 +441,15 @@
COMMAND = CTRL, ///< An alias for fltk3::CTRL on WIN32 and X11, or
fltk3::META on MacOS X
CONTROL = META, ///< An alias for fltk3::META on WIN32 and X11, or
fltk3::META on MacOS X
#endif // __APPLE__
-
+
BUTTON1 = 0x01000000, ///< Mouse button 1 is pushed
BUTTON2 = 0x02000000, ///< Mouse button 2 is pushed
BUTTON3 = 0x04000000, ///< Mouse button 3 is pushed
BUTTONS = 0x7f000000, ///< Any mouse button is pushed
- KEY_MASK = 0x0000ffff ///< All keys are 16 bit for now
+ KEY_MASK = 0x0000ffff ///< All keys are 16 bit for now
// FIXME: Unicode needs 24 bits!
};
-
+
inline unsigned int BUTTON(unsigned int n) { return 0x00800000<<(n); }
///< Mouse button n (n > 0) is pushed
@@ -459,14 +459,14 @@
/** \name Box Types
\brief FLTK standard box types
-
+
This enum defines the standard box types included with FLTK.
-
- fltk3::NO_BOX means nothing is drawn at all, so whatever is already
- on the screen remains. The FL_..._FRAME types only draw their edges,
- leaving the interior unchanged. The blue color in Figure 1
+
+ fltk3::NO_BOX means nothing is drawn at all, so whatever is already
+ on the screen remains. The FL_..._FRAME types only draw their edges,
+ leaving the interior unchanged. The blue color in Figure 1
is the area that is not drawn by the frame types.
-
+
\image html boxtypes.gif "Figure 1: FLTK standard box types"
\image latex boxtypes.eps "FLTK standard box types" width=10cm
\todo Description of boxtypes is incomplete.
@@ -525,10 +525,10 @@
GTK_ROUND_DOWN_BOX, ///< gtk+ version of ROUND_DOWN_BOX
FREE_BOXTYPE ///< the first free box type for creation of new box
types
};
-
+
}
-
+
// conversions of box types to other boxtypes:
/**
Get the filled version of a frame.
@@ -561,9 +561,9 @@
/**
The labeltype() method sets the type of the label.
-
+
The following standard label types are included:
-
+
\todo The doxygen comments are incomplete.
*/
enum Labeltype { // labeltypes:
@@ -577,12 +577,12 @@
IMAGE_LABEL, ///< ?
FREE_LABELTYPE ///< first free labeltype to use for creating own
labeltypes
};
-
+
/** \name Alignment Flags */
/*...@{*/
-/** Flags to control the label alignment.
- * This controls how the label is displayed next to or inside the widget.
+/** Flags to control the label alignment.
+ * This controls how the label is displayed next to or inside the widget.
* The default value is ALIGN_CENTER for most widgets, which centers the label
* inside the widget.
*
@@ -625,7 +625,7 @@
/*...@}*/
}
-
+
/** \name Font Numbers */
/*...@{*/
/** A font number is an index into the internal font table.
@@ -642,7 +642,7 @@
const Fl_Font HELVETICA_ITALIC = 2; ///< Helvetica (or Arial)
oblique
const Fl_Font HELVETICA_BOLD_ITALIC = 3; ///< Helvetica (or Arial)
bold-oblique
const Fl_Font COURIER = 4; ///< Courier normal
-const Fl_Font COURIER_BOLD = 5; ///< Courier bold
+const Fl_Font COURIER_BOLD = 5; ///< Courier bold
const Fl_Font COURIER_ITALIC = 6; ///< Courier italic
const Fl_Font COURIER_BOLD_ITALIC = 7; ///< Courier bold-italic
const Fl_Font TIMES = 8; ///< Times roman
@@ -670,17 +670,17 @@
namespace fltk3 {
-
+
/** \name Colors */
/*...@{*/
/** The fltk3::Color type holds an FLTK color value.
Colors are either 8-bit indexes into a virtual colormap
or 24-bit RGB color values.
-
+
Color indices occupy the lower 8 bits of the value, while
RGB colors occupy the upper 24 bits, for a byte organization of RGBI.
-
+
<pre>
fltk3::Color => 0xrrggbbii
| | | |
@@ -689,10 +689,10 @@
| +------- green component (8 bit)
+--------- red component (8 bit)
</pre>
-
- A color can have either an index or an rgb value. Colors with rgb set
+
+ A color can have either an index or an rgb value. Colors with rgb set
and an index >0 are reserved for special use.
-
+
*/
typedef unsigned int Color;
@@ -746,7 +746,7 @@
const unsigned int NUM_BLUE = 5;
}
-
+
FL_EXPORT fltk3::Color fl_inactive(fltk3::Color c);
FL_EXPORT fltk3::Color fl_contrast(fltk3::Color fg, fltk3::Color bg);
@@ -779,10 +779,10 @@
/** \name Cursors
The following constants define the mouse cursors that are available in
FLTK.
-
+
The double-headed arrows are bitmaps provided by FLTK on X, the others
are provided by system-defined cursors.
-
+
\todo enum Fl_Cursor needs some more comments for values
(and maybe an image), see fltk3/Enumerations.H
*/
Modified: branches/branch-3.0/fltk3/run.h
===================================================================
--- branches/branch-3.0/fltk3/run.h 2010-04-05 09:10:50 UTC (rev 7425)
+++ branches/branch-3.0/fltk3/run.h 2010-04-05 10:00:41 UTC (rev 7426)
@@ -3,7 +3,7 @@
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -112,7 +112,7 @@
state information and global methods for the current application.
*/
namespace fltk3 {
-
+
#ifndef FL_DOXYGEN
extern int e_number;
extern int e_x;
@@ -145,7 +145,7 @@
/**
The currently executing idle callback function: DO NOT USE THIS DIRECTLY!
-
+
This is now used as part of a higher level system allowing multiple
idle callback functions to be called.
\see add_idle(), remove_idle()
@@ -207,10 +207,10 @@
extern int scheme(const char*);
/** See void scheme(const char *name) */
inline const char* scheme() {return scheme_;}
- /**
- Called by scheme according to scheme name.
- Loads or reloads the current scheme selection.
- See void scheme(const char *name)
+ /**
+ Called by scheme according to scheme name.
+ Loads or reloads the current scheme selection.
+ See void scheme(const char *name)
*/
extern int reload_scheme(); // platform dependent
extern int scrollbar_size();
@@ -227,22 +227,22 @@
Adds a one-shot timeout callback. The function will be called by
fltk3::wait() at <i>t</i> seconds after this function is called.
The optional void* argument is passed to the callback.
-
+
You can have multiple timeout callbacks. To remove a timeout
callback use fltk3::remove_timeout().
-
+
If you need more accurate, repeated timeouts, use fltk3::repeat_timeout() to
reschedule the subsequent timeouts.
-
+
The following code will print "TICK" each second on
stdout with a fair degree of accuracy:
-
+
\code
void callback(void*) {
puts("TICK");
fltk3::repeat_timeout(1.0, callback);
}
-
+
int main() {
fltk3::add_timeout(1.0, callback);
return fltk3::run();
@@ -254,16 +254,16 @@
Repeats a timeout callback from the expiration of the
previous timeout, allowing for more accurate timing. You may only call
this method inside a timeout callback.
-
+
The following code will print "TICK" each second on
stdout with a fair degree of accuracy:
-
+
\code
void callback(void*) {
puts("TICK");
fltk3::repeat_timeout(1.0, callback);
}
-
+
int main() {
fltk3::add_timeout(1.0, callback);
return fltk3::run();
@@ -278,19 +278,19 @@
extern void remove_check(Fl_Timeout_Handler, void* = 0);
/**
Adds file descriptor fd to listen to.
-
+
When the fd becomes ready for reading fltk3::wait() will call the
callback and then return. The callback is passed the fd and the
arbitrary void* argument.
-
+
The second version takes a when bitfield, with the bits
FL_READ, FL_WRITE, and FL_EXCEPT defined,
to indicate when the callback should be done.
-
- There can only be one callback of each type for a file descriptor.
+
+ There can only be one callback of each type for a file descriptor.
fltk3::remove_fd() gets rid of <I>all</I> the callbacks for a given
file descriptor.
-
+
Under UNIX <I>any</I> file descriptor can be monitored (files,
devices, pipes, sockets, etc.). Due to limitations in Microsoft Windows,
WIN32 applications can only monitor sockets.
@@ -314,7 +314,7 @@
@{ */
/**
FLTK calls fltk3::warning() to output a warning message.
-
+
The default version on Windows returns \e without printing a warning
message, because Windows programs normally don't have stderr (a console
window) enabled.
@@ -332,7 +332,7 @@
extern void (*warning)(const char*, ...);
/**
FLTK calls fltk3::error() to output a normal error message.
-
+
The default version on Windows displays the error message in a MessageBox
window.
The default version on all other platforms prints the error message to
stderr.
@@ -346,11 +346,11 @@
extern void (*error)(const char*, ...);
/**
FLTK calls fltk3::fatal() to output a fatal error message.
-
+
The default version on Windows displays the error message in a MessageBox
window.
The default version on all other platforms prints the error message to
stderr.
-
+
You can override the behavior by setting the function pointer to your
own routine.
@@ -381,7 +381,7 @@
inline fltk3::Window* modal() {return modal_;}
/**
This is used when pop-up menu systems are active.
-
+
Send all events to the passed window no matter where the pointer or
focus is (including in other programs). The window <I>does not have
to be shown()</I> , this lets the handle() method of a
@@ -389,18 +389,18 @@
map and unmap a complex set of windows (under both X and WIN32
<I>some</I> window must be mapped because the system interface needs a
window id).
-
+
If grab() is on it will also affect show() of windows by doing
system-specific operations (on X it turns on override-redirect).
These are designed to make menus popup reliably
and faster on the system.
-
+
To turn off grabbing do fltk3::grab(0).
-
+
<I>Be careful that your program does not enter an infinite loop
while grab() is on. On X this will lock up your screen!</I>
- To avoid this potential lockup, all newer operating systems seem to
- limit mouse pointer grabbing to the time during which a mouse button
+ To avoid this potential lockup, all newer operating systems seem to
+ limit mouse pointer grabbing to the time during which a mouse button
is held down. Some OS's may not support grabbing at all.
*/
inline fltk3::Window* grab() {return grab_;}
@@ -432,14 +432,14 @@
/**
Returns the mouse position on the screen of the event. To find the
absolute position of an fltk3::Window on the screen, use the
- difference between event_x_root(),event_y_root() and
+ difference between event_x_root(),event_y_root() and
event_x(),event_y().
*/
inline int event_x_root() {return e_x_root;}
/**
Returns the mouse position on the screen of the event. To find the
absolute position of an fltk3::Window on the screen, use the
- difference between event_x_root(),event_y_root() and
+ difference between event_x_root(),event_y_root() and
event_x(),event_y().
*/
inline int event_y_root() {return e_y_root;}
@@ -455,7 +455,7 @@
inline int event_dy() {return e_dy;}
/**
Return where the mouse is on the screen by doing a round-trip query to
- the server. You should use fltk3::event_x_root() and
+ the server. You should use fltk3::event_x_root() and
fltk3::event_y_root() if possible, but this is necessary if you are
not sure if a mouse event has been processed recently (such as to
position your first window). If the display is not open, this will
@@ -464,15 +464,15 @@
extern void get_mouse(int &,int &); // platform dependent
/**
Returns non zero if we had a double click event.
- \retval Non-zero if the most recent fltk3::PUSH or fltk3::KEY was a
"double click".
- \retval N-1 for N clicks.
+ \retval Non-zero if the most recent fltk3::PUSH or fltk3::KEY was a
"double click".
+ \retval N-1 for N clicks.
A double click is counted if the same button is pressed
again while event_is_click() is true.
-
+
*/
inline int event_clicks() {return e_clicks;}
/**
- Manually sets the number returned by fltk3::event_clicks().
+ Manually sets the number returned by fltk3::event_clicks().
This can be used to set it to zero so that
later code does not think an item was double-clicked.
\param[in] i corresponds to no double-click if 0, i+1 mouse clicks
otherwise
@@ -481,7 +481,7 @@
inline void event_clicks(int i) {e_clicks = i;}
/**
The first form returns non-zero if the mouse has not moved far enough
- and not enough time has passed since the last fltk3::PUSH or
+ and not enough time has passed since the last fltk3::PUSH or
fltk3::KEY event for it to be considered a "drag" rather than a
"click". You can test this on fltk3::DRAG, fltk3::RELEASE,
and fltk3::MOVE events. The second form clears the value returned
@@ -491,11 +491,11 @@
*/
inline int event_is_click() {return e_is_click;}
/**
- Only i=0 works! See int event_is_click().
+ Only i=0 works! See int event_is_click().
*/
inline void event_is_click(int i) {e_is_click = i;}
/**
- Gets which particular mouse button caused the current event.
+ Gets which particular mouse button caused the current event.
This returns garbage if the most recent event was not a fltk3::PUSH or
fltk3::RELEASE event.
\retval fltk3::LEFT_MOUSE \retval fltk3::MIDDLE_MOUSE \retval
fltk3::RIGHT_MOUSE.
\see fltk3::event_buttons()
@@ -506,7 +506,7 @@
were held down during the most recent event. The second version
returns non-zero if any of the passed bits are turned on.
The legal bits are:
-
+
\li fltk3::SHIFT
\li fltk3::CAPS_LOCK
\li fltk3::CTRL
@@ -517,7 +517,7 @@
\li fltk3::BUTTON1
\li fltk3::BUTTON2
\li fltk3::BUTTON3
-
+
X servers do not agree on shift states, and fltk3::NUM_LOCK, fltk3::META,
and
FL_SCROLL_LOCK may not work. The values were selected to match the
XFree86 server on Linux. In addition there is a bug in the way X works
@@ -531,36 +531,36 @@
Gets which key on the keyboard was last pushed.
The returned integer 'key code' is not necessarily a text
- equivalent for the keystroke. For instance: if someone presses '5' on the
+ equivalent for the keystroke. For instance: if someone presses '5' on the
numeric keypad with numlock on, fltk3::event_key() may return the 'key
code'
for this key, and NOT the character '5'. To always get the '5', use
fltk3::event_text() instead.
-
+
\returns an integer 'key code', or 0 if the last event was not a key press
or release.
\see int event_key(int), event_text(), compose(int&).
*/
inline int event_key() {return e_keysym;}
/**
Returns the keycode of the last key event, regardless of the NumLock state.
-
- If NumLock is deactivated, FLTK translates events from the
- numeric keypad into the corresponding arrow key events.
+
+ If NumLock is deactivated, FLTK translates events from the
+ numeric keypad into the corresponding arrow key events.
event_key() returns the translated key code, whereas
event_original_key() returns the keycode before NumLock translation.
*/
inline int event_original_key(){return e_original_keysym;}
- /**
+ /**
Returns true if the given \p key was held
down (or pressed) <I>during</I> the last event. This is constant until
the next event is read from the server.
-
+
fltk3::get_key(int) returns true if the given key is held down <I>now</I>.
Under X this requires a round-trip to the server and is <I>much</I>
slower than fltk3::event_key(int).
-
+
Keys are identified by the <I>unshifted</I> values. FLTK defines a
set of symbols that should work on most modern machines for every key
on the keyboard:
-
+
\li All keys on the main keyboard producing a printable ASCII
character use the value of that ASCII character (as though shift,
ctrl, and caps lock were not on). The space bar is 32.
@@ -568,7 +568,7 @@
character use the value of that ASCII character plus fltk3::Keypad.
The highest possible value is fltk3::Keypad_Last so you can
range-check to see if something is on the keypad.
- \li All numbered function keys use the number on the function key plus
+ \li All numbered function keys use the number on the function key plus
fltk3::FKey. The highest possible number is FL_F_Last, so you
can range-check a value.
\li Buttons on the mouse are considered keys, and use the button
@@ -583,22 +583,22 @@
symbols used by fltk3::event_state().
On X fltk3::get_key(fltk3::MouseButton+n) does not work.
-
+
On WIN32 fltk3::get_key(fltk3::Keypad_Enter) and
fltk3::event_key(fltk3::Keypad_Enter) do not work.
*/
extern int event_key(int key);
- /**
- Returns true if the given \p key is held down <I>now</I>.
+ /**
+ Returns true if the given \p key is held down <I>now</I>.
Under X this requires a round-trip to the server and is <I>much</I>
slower than fltk3::event_key(int). \see event_key(int)
*/
extern int get_key(int key); // platform dependent
- /**
+ /**
Returns the text associated with the current event, including fltk3::PASTE
or fltk3::DND_RELEASE events.
This can be used in response to fltk3::KEYUP, fltk3::KEY, fltk3::PASTE,
fltk3::DND_RELEASE.
When responding to fltk3::KEYUP/fltk3::KEY, use this function instead of
fltk3::event_key()
- to get the text equivalent of keystrokes suitable for inserting into
strings
+ to get the text equivalent of keystrokes suitable for inserting into
strings
and text widgets.
The returned string is guaranteed to be be NULL terminated.
@@ -630,7 +630,7 @@
// event destinations:
extern int handle(int, fltk3::Window*);
- /** Gets the widget that is below the mouse.
+ /** Gets the widget that is below the mouse.
\see belowmouse(fltk3::Widget*) */
inline fltk3::Widget* belowmouse() {return belowmouse_;}
extern void belowmouse(fltk3::Widget*);
@@ -657,9 +657,9 @@
*/
extern void copy(const char* stuff, int len, int clipboard = 0); // platform
dependent
/**
- Pastes the data from the selection (0) or primary (1) clipboard into
receiver.
- The selection clipboard is used for middle-mouse pastes and for
- drag-and-drop selections. The primary clipboard is used for
+ Pastes the data from the selection (0) or primary (1) clipboard into
receiver.
+ The selection clipboard is used for middle-mouse pastes and for
+ drag-and-drop selections. The primary clipboard is used for
traditional copy/cut/paste operations.
*/
extern void paste(fltk3::Widget &receiver, int clipboard /*=0*/); //
platform dependent
@@ -672,7 +672,7 @@
extern int dnd(); // platform dependent
// These are for back-compatibility only:
- /** back-compatibility only: Gets the widget owning the current selection
+ /** back-compatibility only: Gets the widget owning the current selection
\see fltk3::Widget* selection_owner(fltk3::Widget*) */
inline fltk3::Widget* selection_owner() {return selection_owner_;}
extern void selection_owner(fltk3::Widget*);
@@ -694,23 +694,23 @@
// multi-head support:
extern int screen_count();
- /**
+ /**
Gets the bounding box of a screen that contains the mouse pointer.
\param[out] X,Y,W,H the corresponding screen bounding box
- \see void screen_xywh(int &x, int &y, int &w, int &h, int mx, int my)
+ \see void screen_xywh(int &x, int &y, int &w, int &h, int mx, int my)
*/
extern void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my);
extern void screen_xywh(int &X, int &Y, int &W, int &H, int n);
inline void screen_xywh(int &X, int &Y, int &W, int &H) {
screen_xywh(X, Y, W, H, e_x_root, e_y_root);
}
-
+
/** @} */
/** \defgroup fl_attributes Color & Font functions
fl global color, font functions
@{ */
-
+
// color map:
extern void set_color(fltk3::Color, uchar, uchar, uchar);
/**
@@ -734,9 +734,9 @@
is useful if you are presenting a choice to the user. There is no
guarantee that each face has a different name. The return value points
to a static buffer that is overwritten each call.
-
+
The integer pointed to by \p attributes (if the pointer is not
- zero) is set to zero, fltk3::BOLD or fltk3::ITALIC or
+ zero) is set to zero, fltk3::BOLD or fltk3::ITALIC or
fltk3::BOLD | fltk3::ITALIC. To locate a "family" of fonts, search
forward and back for a set with non-zero attributes, these faces along
with the face with a zero attribute before them constitute a family.
@@ -761,7 +761,7 @@
face table. It will attempt to put "families" of faces together, so
that the normal one is first, followed by bold, italic, and bold
italic.
-
+
The optional argument is a string to describe the set of fonts to
add. Passing NULL will select only fonts that have the
ISO8859-1 character set (and are thus usable by normal text). Passing
@@ -771,7 +771,7 @@
values may be useful but are system dependent. With WIN32 NULL
selects fonts with ISO8859-1 encoding and non-NULL selects
all fonts.
-
+
The return value is how many faces are in the table after this is done.
*/
extern Fl_Font set_fonts(const char* = 0); // platform dependent
@@ -799,7 +799,7 @@
extern int draw_box_active();
// back compatibility:
- /** \addtogroup fl_windows
+ /** \addtogroup fl_windows
@{ */
/** For back compatibility, sets the void fltk3::fatal handler callback */
inline void set_abort(Fl_Abort_Handler f) {fatal = f;}
@@ -811,7 +811,7 @@
inline void set_atclose(Fl_Atclose_Handler f) {atclose = f;}
/** @} */
- /** \addtogroup fl_events
+ /** \addtogroup fl_events
@{ */
/** Returns non-zero if the Shift key is pressed. */
inline int event_shift() {return e_state&fltk3::SHIFT;}
@@ -823,9 +823,9 @@
inline int event_alt() {return e_state&fltk3::ALT;}
/**
Returns the mouse buttons state bits; if non-zero, then at least one
- button is pressed now. This function returns the button state at the
- time of the event. During an fltk3::RELEASE event, the state
- of the released button will be 0. To find out, which button
+ button is pressed now. This function returns the button state at the
+ time of the event. During an fltk3::RELEASE event, the state
+ of the released button will be 0. To find out, which button
caused an fltk3::RELEASE event, you can use fltk3::event_button() instead.
\return a bit mask value like { [fltk3::BUTTON1] | [fltk3::BUTTON2] |
[fltk3::BUTTON3] }
*/
@@ -902,7 +902,7 @@
/**
The thread_message() method returns the last message
that was sent from a child by the awake() method.
-
+
See also: multithreading
*/
extern void* thread_message(); // platform dependent
@@ -946,32 +946,32 @@
/** @} */
#ifdef HAVE_CAIRO
- /** \defgroup group_cairo Cairo support functions and classes
- @{
+ /** \defgroup group_cairo Cairo support functions and classes
+ @{
*/
/* public: */
// Cairo support API
extern cairo_t * cairo_make_current(fltk3::Window* w);
- /** when HAVE_CAIRO is defined and cairo_autolink_context() is true,
+ /** when HAVE_CAIRO is defined and cairo_autolink_context() is true,
any current window dc is linked to a current context.
This is not the default, because it may not be necessary
to add cairo support to all fltk supported windows.
When you wish to associate a cairo context in this mode,
you need to call explicitly in your draw() overridden method,
FL::cairo_make_current(fltk3::Window*). This will create a cairo context
- but only for this Window.
- Still in custom cairo application it is possible to handle
+ but only for this Window.
+ Still in custom cairo application it is possible to handle
completely this process automatically by setting \p alink to true.
In this last case, you don't need anymore to call
fltk3::cairo_make_current().
You can use fltk3::cairo_cc() to get the current cairo context anytime.
\note Only available when configure has the --enable-cairo option
*/
inline void cairo_autolink_context(bool alink)
{cairo_state_.autolink(alink);}
- /**
+ /**
Gets the current autolink mode for cairo support.
- \retval false if no cairo context autolink is made for each window.
- \retval true if any fltk window is attached a cairo context when it
- is current. \see void cairo_autolink_context(bool alink)
+ \retval false if no cairo context autolink is made for each window.
+ \retval true if any fltk window is attached a cairo context when it
+ is current. \see void cairo_autolink_context(bool alink)
\note Only available when configure has the --enable-cairo option
*/
inline bool cairo_autolink_context() {return cairo_state_.autolink();}
@@ -981,14 +981,14 @@
Set \p own to true if you want fltk to handle this cc deletion.
\note Only available when configure has the --enable-cairo option
*/
- inline void cairo_cc(cairo_t * c, bool own=false){ cairo_state_.cc(c, own);
}
+ inline void cairo_cc(cairo_t * c, bool own=false){ cairo_state_.cc(c, own); }
/* private: */
extern cairo_t * cairo_make_current(void* gc);
extern cairo_t * cairo_make_current(void* gc, int W, int H);
extern Fl_Cairo_State cairo_state_;
/* public: */
- /** @} */
+ /** @} */
#endif // HAVE_CAIRO
@@ -1009,7 +1009,7 @@
such that the automatic destructor is called when the object's
scope is left. This ensures that no stale widget pointers are
left in the widget watch list (see example below).
-
+
You can also create Fl_Widget_Tracker objects with \c new, but then it
is your responsibility to delete the object (and thus remove the
widget pointer from the watch list) when it is not needed any more.
Modified: branches/branch-3.0/src/Fl_get_key_win32.cxx
===================================================================
--- branches/branch-3.0/src/Fl_get_key_win32.cxx 2010-04-05 09:10:50 UTC
(rev 7425)
+++ branches/branch-3.0/src/Fl_get_key_win32.cxx 2010-04-05 10:00:41 UTC
(rev 7426)
@@ -87,7 +87,7 @@
{VK_NEXT, fltk3::PageDownKey},
{VK_END, fltk3::EndKey},
{VK_SNAPSHOT, fltk3::PrintKey},
- {VK_INSERT, FL_Insert},
+ {VK_INSERT, fltk3::InsertKey},
{VK_APPS, fltk3::MenuKey},
{VK_NUMLOCK, fltk3::NumLockKey},
//{VK_???, fltk3::Keypad_Enter},
Modified: branches/branch-3.0/src/Fl_win32.cxx
===================================================================
--- branches/branch-3.0/src/Fl_win32.cxx 2010-04-05 09:10:50 UTC (rev
7425)
+++ branches/branch-3.0/src/Fl_win32.cxx 2010-04-05 10:00:41 UTC (rev
7426)
@@ -719,7 +719,7 @@
{VK_BACK, fltk3::BackSpaceKey},
{VK_TAB, fltk3::TabKey},
{VK_CLEAR, fltk3::Keypad+'5', 0xff0b/*XK_Clear*/},
- {VK_RETURN, fltk3::EnterKey, fltk3::Keypad_Enter},
+ {VK_RETURN, fltk3::EnterKey, fltk3::KeypadEnter},
{VK_SHIFT, fltk3::LeftShiftKey, fltk3::RightShiftKey},
{VK_CONTROL, fltk3::LeftControlKey, fltk3::RightControlKey},
{VK_MENU, fltk3::LeftAltKey, fltk3::RightAltKey},
@@ -736,7 +736,7 @@
{VK_RIGHT, fltk3::Keypad+'6', fltk3::RightKey},
{VK_DOWN, fltk3::Keypad+'2', fltk3::DownKey},
{VK_SNAPSHOT, fltk3::PrintKey}, // does not work on NT
- {VK_INSERT, fltk3::Keypad+'0', FL_Insert},
+ {VK_INSERT, fltk3::Keypad+'0', fltk3::InsertKey},
{VK_DELETE, fltk3::Keypad+'.', fltk3::DeleteKey},
{VK_LWIN, fltk3::LeftMetaKey},
{VK_RWIN, fltk3::RightMetaKey},
@@ -958,7 +958,7 @@
ulong state = 0;
if (GetAsyncKeyState(VK_CAPITAL)) state |= fltk3::CAPS_LOCK;
if (GetAsyncKeyState(VK_NUMLOCK)) state |= fltk3::NUM_LOCK;
- if (GetAsyncKeyState(VK_SCROLL)) state |= FL_SCROLL_LOCK;
+ if (GetAsyncKeyState(VK_SCROLL)) state |= fltk3::SCROLL_LOCK;
if (GetAsyncKeyState(VK_CONTROL)&~1) state |= fltk3::CTRL;
if (GetAsyncKeyState(VK_SHIFT)&~1) state |= fltk3::SHIFT;
if (GetAsyncKeyState(VK_MENU)) state |= fltk3::ALT;
@@ -1014,7 +1014,7 @@
if ((GetAsyncKeyState(VK_LWIN)|GetAsyncKeyState(VK_RWIN))&~1)
state |= fltk3::META;
}
- if (GetKeyState(VK_SCROLL)) state |= FL_SCROLL_LOCK;
+ if (GetKeyState(VK_SCROLL)) state |= fltk3::SCROLL_LOCK;
fltk3::e_state = state;
static char buffer[1024];
if (uMsg == WM_CHAR || uMsg == WM_SYSCHAR) {
@@ -1025,7 +1025,7 @@
buffer[fltk3::e_length] = 0;
- } else if (fltk3::e_keysym >= fltk3::Keypad && fltk3::e_keysym <=
fltk3::Keypad_Last) {
+ } else if (fltk3::e_keysym >= fltk3::Keypad && fltk3::e_keysym <=
fltk3::KeypadLast) {
if (state & fltk3::NUM_LOCK) {
// Convert to regular keypress...
buffer[0] = fltk3::e_keysym-fltk3::Keypad;
@@ -1036,7 +1036,7 @@
fltk3::e_length = 0;
switch (fltk3::e_keysym) {
case fltk3::Keypad + '0' :
- fltk3::e_keysym = FL_Insert;
+ fltk3::e_keysym = fltk3::InsertKey;
break;
case fltk3::Keypad + '1' :
fltk3::e_keysym = fltk3::EndKey;
Modified: branches/branch-3.0/src/fl_shortcut.cxx
===================================================================
--- branches/branch-3.0/src/fl_shortcut.cxx 2010-04-05 09:10:50 UTC (rev
7425)
+++ branches/branch-3.0/src/fl_shortcut.cxx 2010-04-05 10:00:41 UTC (rev
7426)
@@ -3,7 +3,7 @@
//
// Shortcut support routines for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2009 by Bill Spitzak and others.
+// Copyright 1998-2010 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -52,10 +52,10 @@
#endif
/**
- Test the current event, which must be an fltk3::KEY or
- fltk3::SHORTCUT, against a shortcut value (described in
+ Test the current event, which must be an fltk3::KEY or
+ fltk3::SHORTCUT, against a shortcut value (described in
fltk3::Button). Returns non-zero if there is a match. Not to
- be confused with
+ be confused with
fltk3::Widget::test_shortcut().
*/
int fltk3::test_shortcut(unsigned int shortcut) {
@@ -110,10 +110,10 @@
{fltk3::PageDownKey,"Page_Down"}, // X says "Next"
{fltk3::EndKey, "End"},
{fltk3::PrintKey, "Print"},
- {FL_Insert, "Insert"},
+ {fltk3::InsertKey, "Insert"},
{fltk3::MenuKey, "Menu"},
{fltk3::NumLockKey, "Num_Lock"},
- {fltk3::Keypad_Enter, "KP_Enter"},
+ {fltk3::KeypadEnter, "KP_Enter"},
{fltk3::LeftShiftKey, "Shift_L"},
{fltk3::RightShiftKey, "Shift_R"},
{fltk3::LeftControlKey,"Control_L"},
@@ -125,7 +125,7 @@
{fltk3::RightAltKey, "Alt_R"},
{fltk3::DeleteKey, "Delete"}
};
-#elif defined(__APPLE__)
+#elif defined(__APPLE__)
static Keyname table[] = {
// v - this column contains utf8 characters
{' ', "Space"},
@@ -178,7 +178,7 @@
return fl_shortcut_label(shortcut, 0L);
}
-/**
+/**
Get a human-readable string from a shortcut value.
\param [in] shortcut the integer value containing the ascii charcter or
extended keystroke plus modifiers
@@ -223,7 +223,7 @@
int c = (a+b)/2;
if (table[c].key == key) {
if (p > buf) {
- strcpy(p,table[c].name);
+ strcpy(p,table[c].name);
return buf;
} else {
const char *sp = table[c].name;
@@ -240,7 +240,7 @@
*p++ = uchar(key & 127);
} else {
// if none found, use the keystroke as a match:
- p += fl_utf8encode(fl_toupper(key), p);
+ p += fl_utf8encode(fl_toupper(key), p);
}
}
*p = 0;
@@ -251,12 +251,12 @@
else if (key > 32 && key < 0x100) q = 0;
else q = XKeysymToString(key);
if (!q) {
- p += fl_utf8encode(fl_toupper(key), p);
- *p = 0;
+ p += fl_utf8encode(fl_toupper(key), p);
+ *p = 0;
return buf;
}
if (p > buf) {
- strcpy(p,q);
+ strcpy(p,q);
return buf;
} else {
if (eom) *eom = q;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
