diff options
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 4e9cebc..843b978 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx 7659 2010-07-01 13:21:32Z manolo $" +// "$Id: Fl_x.cxx 7779 2010-10-30 19:56:20Z matt $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -350,19 +350,19 @@ void fl_new_ic() #if USE_XFT #if defined(__GNUC__) -#warning XFT support here +// FIXME: warning XFT support here #endif /*__GNUC__*/ if (!fs) { fnt = NULL;//fl_get_font_xfld(0, 14); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); } #else if (!fs) { fnt = fl_get_font_xfld(0, 14); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); } @@ -465,16 +465,16 @@ void fl_set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win) #if USE_XFT #if defined(__GNUC__) -#warning XFT support here +// FIXME: warning XFT support here #endif /*__GNUC__*/ fnt = NULL; // fl_get_font_xfld(font, size); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); #else fnt = fl_get_font_xfld(font, size); - if (!fnt) {fnt = "-misc-fixed-*";must_free_fnt=false;} + if (!fnt) {fnt = (char*)"-misc-fixed-*";must_free_fnt=false;} fs = XCreateFontSet(fl_display, fnt, &missing_list, &missing_count, &def_string); #endif @@ -1254,6 +1254,10 @@ int fl_handle(const XEvent& thisevent) Fl::e_original_keysym = (int)keysym; } Fl::e_keysym = int(keysym); + + // replace XK_ISO_Left_Tab (Shift-TAB) with FL_Tab (modifier flags are set correctly by X11) + if (Fl::e_keysym == 0xfe20) Fl::e_keysym = FL_Tab; + set_event_xy(); Fl::e_is_click = 0; break;} @@ -1725,7 +1729,7 @@ void Fl_Window::label(const char *name,const char *iname) { // contents are restored to the area, but this assumes the area // is cleared to background color. So this is disabled in this version. // Fl_Window *fl_boxcheat; -static inline int can_boxcheat(uchar b) {return (b==1 || (b&2) && b<=15);} +static inline int can_boxcheat(uchar b) {return (b==1 || ((b&2) && b<=15));} void Fl_Window::show() { image(Fl::scheme_bg_); @@ -1829,5 +1833,5 @@ void preparePrintFront(void) #endif // -// End of "$Id: Fl_x.cxx 7659 2010-07-01 13:21:32Z manolo $". +// End of "$Id: Fl_x.cxx 7779 2010-10-30 19:56:20Z matt $". // |