diff options
| author | Manolo Gouy <Manolo> | 2016-03-31 19:55:03 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-31 19:55:03 +0000 |
| commit | 519673a7761f0e43d926ea5dac43cda305fb089e (patch) | |
| tree | e3d18b6b7916a09c9a224cfea9694641d68cabfe /src/drivers/Cocoa | |
| parent | 5d12ea5ab12d3b911777bb8cbdeb70c3d183267c (diff) | |
Move dnd and character-composition related functions from Fl_System_Driver to Fl_Screen_Driver
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11489 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Cocoa')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index 60e2355d8..0c0d64566 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -83,6 +83,8 @@ public: virtual void reset_marked_text(); virtual void insertion_point_location(int x, int y, int height); int insertion_point_location(int *px, int *py, int *pheight); + virtual int dnd(int use_selection); + virtual int compose(int &del); }; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index 3ca490153..470aa2c77 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx @@ -264,6 +264,18 @@ void Fl_Cocoa_Screen_Driver::insertion_point_location(int x, int y, int height) insertion_point_height = height; } +int Fl_Cocoa_Screen_Driver::compose(int &del) { + int condition; + int has_text_key = Fl::compose_state || Fl::e_keysym <= '~' || Fl::e_keysym == FL_Iso_Key || + (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last && Fl::e_keysym != FL_KP_Enter); + condition = Fl::e_state&(FL_META | FL_CTRL) || + (Fl::e_keysym >= FL_Shift_L && Fl::e_keysym <= FL_Alt_R) || // called from flagsChanged + !has_text_key ; + if (condition) { del = 0; return 0;} // this stuff is to be treated as a function key + del = Fl::compose_state; + Fl::compose_state = Fl_X::next_marked_length; + return 1; +} // // End of "$Id$". |