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/Posix | |
| 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/Posix')
| -rw-r--r-- | src/drivers/Posix/Fl_Posix_System_Driver.H | 3 | ||||
| -rw-r--r-- | src/drivers/Posix/Fl_Posix_System_Driver.cxx | 18 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H index c1f9988f5..9551f5867 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.H +++ b/src/drivers/Posix/Fl_Posix_System_Driver.H @@ -47,9 +47,6 @@ class Fl_Posix_System_Driver : public Fl_System_Driver public: virtual void display_arg(const char *arg); virtual int XParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*); - virtual int compose(int &del); - virtual void compose_reset(); - virtual int dnd(int unused); virtual int mkdir(const char* f, int mode) {return ::mkdir(f, mode);} virtual int open(const char* f, int oflags, int pmode) { return pmode == -1 ? ::open(f, oflags) : ::open(f, oflags, pmode); diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.cxx b/src/drivers/Posix/Fl_Posix_System_Driver.cxx index c6ca65585..5d42330f6 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_System_Driver.cxx @@ -47,24 +47,6 @@ int Fl_Posix_System_Driver::XParseGeometry(const char* string, int* x, int* y, return ::XParseGeometry(string, x, y, width, height); } -int Fl_Posix_System_Driver::compose(int& del) { - int condition; - unsigned char ascii = (unsigned char)Fl::e_text[0]; - condition = (Fl::e_state & (FL_ALT | FL_META | FL_CTRL)) && !(ascii & 128) ; - if (condition) { del = 0; return 0;} // this stuff is to be treated as a function key - del = Fl::compose_state; - Fl::compose_state = 0; - // Only insert non-control characters: - if ( (!Fl::compose_state) && ! (ascii & ~31 && ascii!=127)) { return 0; } - return 1; -} - -void Fl_Posix_System_Driver::compose_reset() -{ - Fl::compose_state = 0; - if (fl_xim_ic) XmbResetIC(fl_xim_ic); -} - int Fl_Posix_System_Driver::clocale_printf(FILE *output, const char *format, va_list args) { char *saved_locale = setlocale(LC_NUMERIC, NULL); setlocale(LC_NUMERIC, "C"); |
