From b75d7526fde03a9a831fd21afa38efeaa5d55a24 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Thu, 1 Sep 2022 11:55:41 +0200 Subject: Simplify Fl_Window_Driver::screen_num() member functions. --- src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H | 3 --- src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 9 --------- src/drivers/Wayland/Fl_Wayland_Window_Driver.H | 3 --- src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 8 -------- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H | 3 --- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 11 ----------- src/drivers/X11/Fl_X11_Window_Driver.H | 3 --- src/drivers/X11/Fl_X11_Window_Driver.cxx | 8 -------- 8 files changed, 48 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H index 63b26ed79..ce3b15629 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H @@ -85,7 +85,6 @@ private: // stores 3 binary flags: whether window is mapped to retina display; whether resolution just changed; // whether window's view received the [FLView view_did_resize] message unsigned window_flags_; - int screen_num_; // number of screen where window is mapped public: Fl_Cocoa_Window_Driver(Fl_Window*); ~Fl_Cocoa_Window_Driver(); @@ -134,8 +133,6 @@ public: virtual void size_range(); virtual void iconize(); virtual void decoration_sizes(int *top, int *left, int *right, int *bottom); - virtual int screen_num(); - virtual void screen_num(int n); // --- window cursor stuff virtual int set_cursor(Fl_Cursor); virtual int set_cursor(const Fl_RGB_Image*, int, int); diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index 019e2b7f5..2acde8694 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -330,15 +330,6 @@ void Fl_Cocoa_Window_Driver::capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl CGContextRelease(auxgc); } -void Fl_Cocoa_Window_Driver::screen_num(int n) { - screen_num_ = n; -} - -int Fl_Cocoa_Window_Driver::screen_num() { - if (pWindow->parent()) return pWindow->top_window()->screen_num(); - else return screen_num_; -} - FLWindow *fl_mac_xid(const Fl_Window *win) { return (FLWindow*)Fl_Window_Driver::xid(win); diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H index a419fa54b..5bd73ab04 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.H @@ -74,8 +74,6 @@ public: bool busy; }; static type_for_resize_window_between_screens data_for_resize_window_between_screens_; - int screen_num_; - void screen_num(int n) { screen_num_ = n; } void decorated_win_size(int &w, int &h); void shape_bitmap_(Fl_Image* b); void shape_alpha_(Fl_Image* img, int offset); @@ -88,7 +86,6 @@ public: static void redraw(struct wld_window *window); static inline Fl_Wayland_Window_Driver* driver(const Fl_Window *w) {return (Fl_Wayland_Window_Driver*)Fl_Window_Driver::driver(w);} - virtual int screen_num(); static void resize_after_screen_change(void *data); // --- window data diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 96985c10b..4f3c3cd04 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1123,14 +1123,6 @@ void Fl_Wayland_Window_Driver::resize_after_screen_change(void *data) { } -int Fl_Wayland_Window_Driver::screen_num() { - if (pWindow->parent()) { - screen_num_ = Fl_Window_Driver::driver(pWindow->top_window())->screen_num(); - } - return screen_num_ >= 0 ? screen_num_ : 0; -} - - int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver(); diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H index 2e6946471..afc8cc39b 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H @@ -58,7 +58,6 @@ class Fl_WinAPI_Window_Driver : public Fl_Window_Driver Fl_Image* shape_; ///< shape image Fl_Bitmap *effective_bitmap_; ///< auxiliary bitmap image } *shape_data_; - int screen_num_; private: void shape_bitmap_(Fl_Image* b); void shape_alpha_(Fl_Image* img, int offset); @@ -68,8 +67,6 @@ public: static inline Fl_WinAPI_Window_Driver* driver(const Fl_Window *w) {return (Fl_WinAPI_Window_Driver*)Fl_Window_Driver::driver(w);} HDC private_dc; // used for OpenGL RECT border_width_title_bar_height(int &bx, int &by, int &bt); - virtual void screen_num(int n); - virtual int screen_num(); struct icon_data *icon_; HCURSOR cursor; diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index 5f8c40d8d..45e5cb39e 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -55,20 +55,9 @@ Fl_WinAPI_Window_Driver::~Fl_WinAPI_Window_Driver() delete icon_; } -int Fl_WinAPI_Window_Driver::screen_num() { - if (pWindow->parent()) { - screen_num_ = Fl_Window_Driver::driver(pWindow->top_window())->screen_num(); - } - return screen_num_ >= 0 ? screen_num_ : 0; -} //FILE*LOG=fopen("log.log","w"); -void Fl_WinAPI_Window_Driver::screen_num(int n) { -//fprintf(LOG, "screen_num setter old=%d new=%d\n",screen_num_, n);fflush(LOG); - screen_num_ = n; -} - RECT // frame of the decorated window in screen coordinates Fl_WinAPI_Window_Driver::border_width_title_bar_height( diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index 13c1cf900..a2a19d12c 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -73,8 +73,6 @@ private: bool busy; }; static type_for_resize_window_between_screens data_for_resize_window_between_screens_; - int screen_num_; - void screen_num(int n) { screen_num_ = n; } #endif // USE_XFT #if FLTK_USE_CAIRO cairo_t *cairo_; @@ -92,7 +90,6 @@ public: virtual ~Fl_X11_Window_Driver(); static inline Fl_X11_Window_Driver* driver(const Fl_Window *w) {return (Fl_X11_Window_Driver*)Fl_Window_Driver::driver(w);} #if USE_XFT - virtual int screen_num(); static void resize_after_screen_change(void *data); #endif // USE_XFT diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index a5302904f..3fb10cb74 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -572,14 +572,6 @@ void Fl_X11_Window_Driver::resize_after_screen_change(void *data) { data_for_resize_window_between_screens_.busy = false; } - -int Fl_X11_Window_Driver::screen_num() { - if (pWindow->parent()) { - screen_num_ = Fl_Window_Driver::driver(pWindow->top_window())->screen_num(); - } - return screen_num_ >= 0 ? screen_num_ : 0; -} - #endif // USE_XFT fl_uintptr_t Fl_X11_Window_Driver::os_id() { -- cgit v1.2.3