diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Screen_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 12 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H index 0be756852..fef6aaafe 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.H @@ -39,7 +39,7 @@ private: static bool insertion_point_location_is_valid; public: // type definitions - typedef enum {unspecified, MUTTER, WESTON, KDE, OWL} compositor_name; + typedef enum {unspecified, MUTTER, WESTON, KWIN, OWL} compositor_name; struct seat { struct wl_seat *wl_seat; struct wl_pointer *wl_pointer; diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index 437cb940f..496308044 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -51,16 +51,16 @@ struct pointer_output { struct wl_list link; }; -/* Implementation note about support of 3 Wayland compositors: Mutter, Weston, KDE. +/* Implementation note about support of 3 Wayland compositors: Mutter, Weston, KWin. - About CSD and SSD : * Mutter and Weston use CSD (client-side decoration) which means that libdecor.so draws all window titlebars and responds to resize, minimization and maximization events. - * KDE uses SSD (server-side decoration) which means the OS draws titlebars according to its own rules + * KWin uses SSD (server-side decoration) which means the OS draws titlebars according to its own rules and triggers resize, minimization and maximization events. - Function registry_handle_global() runs within fl_open_display() and sets public static variable - Fl_Wayland_Screen_Driver::compositor to either Fl_Wayland_Screen_Driver::MUTTER, ::WESTON, or ::KDE. + Fl_Wayland_Screen_Driver::compositor to either Fl_Wayland_Screen_Driver::MUTTER, ::WESTON, or ::KWIN. - Specific operations for WESTON: * When a libdecor-framed window is minimized under Weston, the frame remains on display. To avoid @@ -85,7 +85,7 @@ struct pointer_output { - Support of Fl_Window::border(int) : FLTK uses libdecor_frame_set_visibility() to show or hide a toplevel window's frame. This doesn't work - with KDE which uses Server-Side Decoration. In that case, FLTK hides and re-shows the window to toggle + with KWin which uses Server-Side Decoration. In that case, FLTK hides and re-shows the window to toggle between presence and absence of a window's frame. */ @@ -1107,8 +1107,8 @@ static void registry_handle_global(void *user_data, struct wl_registry *wl_regis Fl_Wayland_Screen_Driver::compositor = Fl_Wayland_Screen_Driver::WESTON; //fprintf(stderr, "Running the Weston compositor\n"); } else if (strcmp(interface, "org_kde_plasma_shell") == 0) { - Fl_Wayland_Screen_Driver::compositor = Fl_Wayland_Screen_Driver::KDE; - //fprintf(stderr, "Running the KDE compositor\n"); + Fl_Wayland_Screen_Driver::compositor = Fl_Wayland_Screen_Driver::KWIN; + //fprintf(stderr, "Running the KWin compositor\n"); } else if (strncmp(interface, "zowl_mach_ipc", 13) == 0) { Fl_Wayland_Screen_Driver::compositor = Fl_Wayland_Screen_Driver::OWL; //fprintf(stderr, "Running the Owl compositor\n"); diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 94314162d..93c89e6f2 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -354,7 +354,7 @@ void Fl_Wayland_Window_Driver::make_current() { } ((Fl_Wayland_Graphics_Driver*)fl_graphics_driver)->set_buffer(window->buffer, f * wld_s); int *poffset = Fl_Window_Driver::menu_offset_y(pWindow); - if (poffset) { // for tall menu windows under KDE to offset drawing inside window + if (poffset) { // for tall menu windows under KWIN to offset drawing inside window cairo_translate(window->buffer->cairo_, 0, *poffset); } cairo_rectangle_int_t *extents = subRect(); @@ -799,7 +799,7 @@ static void handle_configure(struct libdecor_frame *frame, } window->state = window_state; - // Weston, KDE, and some versions of Mutter, on purpose, don't set the + // Weston, KWin, and some versions of Mutter, on purpose, don't set the // window width x height when xdg_toplevel_configure runs twice // during resizable window creation (see https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/6). // Consequently, libdecor_configuration_get_content_size() may return false twice. @@ -1037,7 +1037,7 @@ static void popup_configure(void *data, struct xdg_popup *xdg_popup, int32_t x, int HH; Fl_Window_Driver::menu_parent(&HH); if (window->fl_win->h() > HH && y != win_pos->y) { // A menu taller than the display - // Under KDE, height is set to the display height or less: we ignore that. + // Under KWin, height is set to the display height or less: we ignore that. window->state = (y - win_pos->y); // make selected item visible, if there's one Fl_Window_Driver::scroll_to_selected_item(window->fl_win); @@ -1551,7 +1551,7 @@ void Fl_Wayland_Window_Driver::use_border() { if (!shown() || pWindow->parent()) return; pWindow->wait_for_expose(); // useful for border(0) just after show() struct libdecor_frame *frame = fl_wl_xid(pWindow)->frame; - if (frame && Fl_Wayland_Screen_Driver::compositor != Fl_Wayland_Screen_Driver::KDE) { + if (frame && Fl_Wayland_Screen_Driver::compositor != Fl_Wayland_Screen_Driver::KWIN) { if (fl_wl_xid(pWindow)->kind == DECORATED) { libdecor_frame_set_visibility(frame, pWindow->border()); } else { @@ -1832,8 +1832,8 @@ void Fl_Wayland_Window_Driver::subRect(cairo_rectangle_int_t *r) { void Fl_Wayland_Window_Driver::reposition_menu_window(int x, int y) { if (y == pWindow->y()) return; - if (Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::KDE) { - // The KDE compositor refuses to position a popup such that it extends above + if (Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::KWIN) { + // The KWin compositor refuses to position a popup such that it extends above // the top of the screen. Therefore, instead of sliding the popup window // on the display, we slide the drawing inside the fixed popup via // member variable offset_y of the menuwindow class, and we redraw the popup |
