Author: matt
Date: 2011-01-26 11:14:38 -0800 (Wed, 26 Jan 2011)
New Revision: 8318
Log:
Slightly changed the event dispatch functions to allow for exception handling.
Modified:
branches/branch-1.3/FL/Fl.H
branches/branch-1.3/src/Fl.cxx
Modified: branches/branch-1.3/FL/Fl.H
===================================================================
--- branches/branch-1.3/FL/Fl.H 2011-01-26 15:16:17 UTC (rev 8317)
+++ branches/branch-1.3/FL/Fl.H 2011-01-26 19:14:38 UTC (rev 8318)
@@ -687,6 +687,7 @@
// event destinations:
static int handle(int, Fl_Window*);
+ static int handle_(int, Fl_Window*);
/** Gets the widget that is below the mouse.
\see belowmouse(Fl_Widget*) */
static Fl_Widget* belowmouse() {return belowmouse_;}
@@ -700,14 +701,8 @@
static void focus(Fl_Widget*);
static void add_handler(Fl_Event_Handler h);
static void remove_handler(Fl_Event_Handler h);
- /** Set a new event dispatch function.
- The event dispatch function is called after native events are converted to
- FLTK events, but before they are handled by FLTK. If the dispatch function
- returns a value other than 0, FLTK will not handle the event any further.
- \param d new dispatch function, can be NULL */
- static void event_dispatch(Fl_Event_Dispatch d) { e_dispatch = d; }
- /** Return the current event dispatch function. */
- static Fl_Event_Dispatch event_dispatch() { return e_dispatch; }
+ static void event_dispatch(Fl_Event_Dispatch d);
+ static Fl_Event_Dispatch event_dispatch();
/** @} */
/** \defgroup fl_clipboard Selection & Clipboard functions
Modified: branches/branch-1.3/src/Fl.cxx
===================================================================
--- branches/branch-1.3/src/Fl.cxx 2011-01-26 15:16:17 UTC (rev 8317)
+++ branches/branch-1.3/src/Fl.cxx 2011-01-26 19:14:38 UTC (rev 8318)
@@ -585,13 +585,13 @@
\code
while (!calculation_done()) {
- calculate();
- if (Fl::ready()) {
- do_expensive_cleanup();
- Fl::check();
- if (user_hit_abort_button()) break;
+ calculate();
+ if (Fl::ready()) {
+ do_expensive_cleanup();
+ Fl::check();
+ if (user_hit_abort_button()) break;
+ }
}
- }
\endcode
*/
int Fl::ready() {
@@ -712,16 +712,20 @@
#endif
}
+
////////////////////////////////////////////////////////////////
// Event handlers:
+
struct handler_link {
int (*handle)(int);
handler_link *next;
};
+
static handler_link *handlers = 0;
+
/**
Install a function to parse unrecognized events. If FLTK cannot
figure out what to do with an event, it calls each of these functions
@@ -735,6 +739,10 @@
- \e Some other events when the widget FLTK selected returns
zero from its handle() method. Exactly which ones may change
in future versions, however.
+
+ \see Fl::remove_handler(Fl_Event_Handler)
+ \see Fl::event_dispatch(Fl_Event_Dispatch d)
+ \see Fl::handle(int, Fl_Window*)
*/
void Fl::add_handler(Fl_Event_Handler ha) {
handler_link *l = new handler_link;
@@ -743,8 +751,10 @@
handlers = l;
}
+
/**
- Removes a previously added event handler.
+ Removes a previously added event handler.
+ \see Fl::handle(int, Fl_Window*)
*/
void Fl::remove_handler(Fl_Event_Handler ha) {
handler_link *l, *p;
@@ -974,18 +984,92 @@
return ret;
}
+
+/**
+ \brief Set a new event dispatch function.
+
+ The event dispatch function is called after native events are converted to
+ FLTK events, but before they are handled by FLTK. If the dispatch pointer
+ is set, it is up to the dispatch function to call
+ Fl::handle_(int, Fl_Window*).
+
+ The event dispatch can be used to handle exceptions in FLTK events and
+ callbacks before they reach the native event handler:
+
+ \code
+ int myHandler(int e, Fl_Window *w) {
+ try {
+ Fl::handle_(e, w);
+ } catch () {
+ ...
+ }
+ }
+
+ main() {
+ Fl::event_dispatch(myHandler);
+ ...
+ Fl::run();
+ }
+ \endcode
+
+ \param d new dispatch function, or NULL
+ \see Fl::add_handler(Fl_Event_Handler)
+ \see Fl::handle(int, Fl_Window*)
+ \see Fl::handle_(int, Fl_Window*)
+ */
+void Fl::event_dispatch(Fl_Event_Dispatch d)
+{
+ e_dispatch = d;
+}
+
+
+/**
+ \brief Return the current event dispatch function.
+ */
+Fl_Event_Dispatch Fl::event_dispatch()
+{
+ return e_dispatch;
+}
+
+
+/**
+ \brief Handle events from the window system.
+
+ This is called from the native event dispatch after native events have been
+ converted to FLTK notation. This functin calls Fl::handle_(int, Fl_Window*)
+ unless the user sets a dispatch function. If a user dispatch function is set,
+ the user must make sure that Fl::handle_() is called.
+
+ \param e the event type (Fl::event_number() is not yet set)
+ \param window the window that cause this event
+ \return 0 if the event was handled
+
+ \sa Fl::add_handler(Fl_Event_Handler)
+ \sa Fl::event_dispatch(Fl_Event_Dispatch)
+ */
int Fl::handle(int e, Fl_Window* window)
-/**
- Sends the event to a window for processing. Returns non-zero if any
- widget uses the event.
-*/
{
if (e_dispatch) {
- int ret = e_dispatch(e, window);
- if (ret)
- return ret;
+ return e_dispatch(e, window);
+ } else {
+ return handle_(e, window);
}
-
+}
+
+
+/**
+ \brief Handle events from the window system.
+
+ This function is called form the native event dispatch, unless the user sets
+ another dispatch function. In that case, the user dispatch function must
+ decide when to call Fl::handle_(int, Fl_Window*)
+
+ \param e the event type (Fl::event_number() is not yet set)
+ \param window the window that cause this event
+ \return 0 if the event was handled
+ */
+int Fl::handle_(int e, Fl_Window* window)
+{
e_number = e;
if (fl_local_grab) return fl_local_grab(e);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
