diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 10 | ||||
| -rw-r--r-- | src/fl_font_mac.cxx | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 00ecaf788..06a819cea 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -89,6 +89,8 @@ int Fl::damage_, char *Fl::e_text = (char *)""; int Fl::e_length; +Fl_Event_Dispatch Fl::e_dispatch = 0; + unsigned char Fl::options_[] = { 0, 0 }; unsigned char Fl::options_read_ = 0; @@ -727,7 +729,7 @@ static handler_link *handlers = 0; them returns non zero then the event is ignored. Events that cause this to be called are: - - FL_SHORTCUT events that are not recognized by any widget. + - FL_SHORTCUT events that are not recognized by any widget. This lets you provide global shortcut keys. - System events that FLTK does not recognize. See fl_xevent. - \e Some other events when the widget FLTK selected returns @@ -978,6 +980,12 @@ int Fl::handle(int e, Fl_Window* window) widget uses the event. */ { + if (e_dispatch) { + int ret = e_dispatch(e, window); + if (ret) + return ret; + } + e_number = e; if (fl_local_grab) return fl_local_grab(e); diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx index 222cc6a98..6002bc10a 100644 --- a/src/fl_font_mac.cxx +++ b/src/fl_font_mac.cxx @@ -312,7 +312,7 @@ if (fl_mac_os_version >= 0x1050) { i++; // because a pair of UniChar's represent a single character continue; } - unsigned int r = uni >> 7; // index of the character block containing uni + unsigned int r = uni >> 9; // index of the character block containing uni if (!fl_fontsize->width[r]) { // this character block has not been hit yet //fprintf(stderr,"r=%d size=%d name=%s\n",r,fl_fontsize->size, fl_fontsize->q_name); // allocate memory to hold width of each character in the block |