diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.H | 3 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.cxx | 11 |
4 files changed, 3 insertions, 15 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index e64d394f4..c13c5ed05 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -90,7 +90,7 @@ public: virtual int compose(int &del); virtual uchar *read_image(uchar *p, int x, int y, int w, int h, int alpha); virtual int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input); - virtual void get_mouse(int &x, int &y); + virtual int get_mouse(int &x, int &y); virtual void enable_im(); virtual void disable_im(); virtual void open_display_platform(); diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H index 2916beb73..503eb308d 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H @@ -74,7 +74,7 @@ public: virtual int dnd(int unused); virtual int compose(int &del); virtual Fl_RGB_Image *read_win_rectangle(uchar *p, int X, int Y, int w, int h, int alpha); - virtual void get_mouse(int &x, int &y); + virtual int get_mouse(int &x, int &y); virtual void enable_im(); virtual void disable_im(); virtual void open_display_platform(); diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H index ac03a42ca..db986b33c 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.H +++ b/src/drivers/X11/Fl_X11_Screen_Driver.H @@ -57,7 +57,6 @@ public: virtual float desktop_scale_factor(); int screen_num_unscaled(int x, int y); int screen_num_unscaled(int x, int y, int w, int h); - virtual void screen_xywh(int &X, int &Y, int &W, int &H); #endif static int ewmh_supported(); @@ -96,7 +95,7 @@ public: virtual void compose_reset(); virtual int text_display_can_leak(); virtual Fl_RGB_Image *read_win_rectangle(uchar *p, int X, int Y, int w, int h, int alpha); - virtual void get_mouse(int &x, int &y); + virtual int get_mouse(int &x, int &y); virtual void enable_im(); virtual void disable_im(); virtual void open_display_platform(); diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 1e1f8a265..d1390e862 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -1215,17 +1215,6 @@ int Fl_X11_Screen_Driver::screen_num_unscaled(int x, int y, int w, int h) #endif #if USE_XFT -void Fl_X11_Screen_Driver::screen_xywh(int &X, int &Y, int &W, int &H) -{ - int xx, yy; - int ns = get_mouse_unscaled(xx,yy); - float s = screens[ns].scale; - X = screens[ns].x_org / s; - Y = screens[ns].y_org / s; - W = screens[ns].width / s; - H = screens[ns].height / s; -} - #if HAVE_DLSYM && HAVE_DLFCN_H |
