From 84785951fd0ce4e7b1f69a2b21460e19f6158b68 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 9 Sep 2022 16:15:48 +0200 Subject: [PATCH] x11: Remove MetaX11WindowControl These interfaces are no longer used, in favor of CSD-alike messaging between the frames client and Mutter. Part-of: --- src/meson.build | 2 - src/x11/meta-x11-window-control.c | 214 ------------------------------ src/x11/meta-x11-window-control.h | 81 ----------- 3 files changed, 297 deletions(-) delete mode 100644 src/x11/meta-x11-window-control.c delete mode 100644 src/x11/meta-x11-window-control.h diff --git a/src/meson.build b/src/meson.build index a97201367..0cddcf457 100644 --- a/src/meson.build +++ b/src/meson.build @@ -473,8 +473,6 @@ if have_x11_client 'x11/meta-x11-selection-output-stream-private.h', 'x11/meta-x11-stack.c', 'x11/meta-x11-stack-private.h', - 'x11/meta-x11-window-control.c', - 'x11/meta-x11-window-control.h', 'x11/mutter-Xatomtype.h', 'x11/session.c', 'x11/session.h', diff --git a/src/x11/meta-x11-window-control.c b/src/x11/meta-x11-window-control.c deleted file mode 100644 index 778855086..000000000 --- a/src/x11/meta-x11-window-control.c +++ /dev/null @@ -1,214 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -/* Mutter interface used by GTK+ UI to talk to core */ - -/* - * Copyright (C) 2001 Havoc Pennington - * Copyright (C) 2003 Rob Adams - * Copyright (C) 2004-2006 Elijah Newren - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "config.h" - -#include "x11/meta-x11-window-control.h" - -#include "core/frame.h" -#include "core/meta-workspace-manager-private.h" -#include "core/util-private.h" -#include "core/workspace-private.h" -#include "meta/meta-x11-errors.h" -#include "meta/prefs.h" -#include "x11/meta-x11-display-private.h" -#include "x11/window-x11-private.h" -#include "x11/window-x11.h" - -static MetaWindow * -window_from_frame (MetaX11Display *x11_display, - Window frame_xwindow) -{ - MetaWindow *window; - - window = meta_x11_display_lookup_x_window (x11_display, frame_xwindow); - if (!window || !window->frame) - { - meta_bug ("No such frame window 0x%lx!", frame_xwindow); - return NULL; - } - - return window; -} - -void -meta_x11_wm_queue_frame_resize (MetaX11Display *x11_display, - Window frame_xwindow) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - meta_window_queue (window, META_QUEUE_MOVE_RESIZE); - meta_window_frame_size_changed (window); -} - -void -meta_x11_wm_user_lower_and_unfocus (MetaX11Display *x11_display, - Window frame_xwindow, - uint32_t timestamp) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - meta_window_lower_with_transients (window, timestamp); -} - -void -meta_x11_wm_toggle_maximize_vertically (MetaX11Display *x11_display, - Window frame_xwindow) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - if (meta_prefs_get_raise_on_click ()) - meta_window_raise (window); - - if (META_WINDOW_MAXIMIZED_VERTICALLY (window)) - meta_window_unmaximize (window, META_MAXIMIZE_VERTICAL); - else - meta_window_maximize (window, META_MAXIMIZE_VERTICAL); -} - -void -meta_x11_wm_toggle_maximize_horizontally (MetaX11Display *x11_display, - Window frame_xwindow) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - if (meta_prefs_get_raise_on_click ()) - meta_window_raise (window); - - if (META_WINDOW_MAXIMIZED_HORIZONTALLY (window)) - meta_window_unmaximize (window, META_MAXIMIZE_HORIZONTAL); - else - meta_window_maximize (window, META_MAXIMIZE_HORIZONTAL); -} - -void -meta_x11_wm_toggle_maximize (MetaX11Display *x11_display, - Window frame_xwindow) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - if (meta_prefs_get_raise_on_click ()) - meta_window_raise (window); - - if (META_WINDOW_MAXIMIZED (window)) - meta_window_unmaximize (window, META_MAXIMIZE_BOTH); - else - meta_window_maximize (window, META_MAXIMIZE_BOTH); -} - -void -meta_x11_wm_show_window_menu (MetaX11Display *x11_display, - Window frame_xwindow, - MetaWindowMenuType menu, - int root_x, - int root_y, - uint32_t timestamp) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - if (meta_prefs_get_raise_on_click ()) - meta_window_raise (window); - meta_window_focus (window, timestamp); - - meta_window_show_menu (window, menu, root_x, root_y); -} - -void -meta_x11_wm_show_window_menu_for_rect (MetaX11Display *x11_display, - Window frame_xwindow, - MetaWindowMenuType menu, - MetaRectangle *rect, - uint32_t timestamp) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - - if (meta_prefs_get_raise_on_click ()) - meta_window_raise (window); - meta_window_focus (window, timestamp); - - meta_window_show_menu_for_rect (window, menu, rect); -} - -gboolean -meta_x11_wm_begin_grab_op (MetaX11Display *x11_display, - Window frame_xwindow, - MetaGrabOp op, - gboolean pointer_already_grabbed, - gboolean frame_action, - int button, - gulong modmask, - uint32_t timestamp, - int root_x, - int root_y) -{ - MetaWindow *window = window_from_frame (x11_display, frame_xwindow); - MetaDisplay *display; - - display = meta_x11_display_get_display (x11_display); - - return meta_display_begin_grab_op (display, window, - op, pointer_already_grabbed, - frame_action, - button, modmask, - timestamp, root_x, root_y); -} - -void -meta_x11_wm_end_grab_op (MetaX11Display *x11_display, - uint32_t timestamp) -{ - MetaDisplay *display; - - display = meta_x11_display_get_display (x11_display); - - meta_display_end_grab_op (display, timestamp); -} - -MetaGrabOp -meta_x11_wm_get_grab_op (MetaX11Display *x11_display) -{ - MetaDisplay *display; - - display = meta_x11_display_get_display (x11_display); - - return display->grab_op; -} - -void -meta_x11_wm_grab_buttons (MetaX11Display *x11_display, - Window frame_xwindow) -{ - MetaDisplay *display; - - display = meta_x11_display_get_display (x11_display); - - meta_verbose ("Grabbing buttons on frame 0x%lx", frame_xwindow); - meta_display_grab_window_buttons (display, frame_xwindow); -} - -void -meta_x11_wm_set_screen_cursor (MetaX11Display *x11_display, - Window frame_on_screen, - MetaCursor cursor) -{ -} diff --git a/src/x11/meta-x11-window-control.h b/src/x11/meta-x11-window-control.h deleted file mode 100644 index dfb66f262..000000000 --- a/src/x11/meta-x11-window-control.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - -/* Mutter interface used by GTK+ UI to talk to core */ - -/* - * Copyright (C) 2001 Havoc Pennington - * Copyright (C) 2005 Elijah Newren - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#ifndef META_X11_WINDOW__CONTROL_H -#define META_X11_WINDOW__CONTROL_H - -#include - -#include "meta/boxes.h" -#include "meta/common.h" -#include "x11/meta-x11-display-private.h" - -void meta_x11_wm_queue_frame_resize (MetaX11Display *x11_display, - Window frame_xwindow); - -void meta_x11_wm_user_lower_and_unfocus (MetaX11Display *x11_display, - Window frame_xwindow, - uint32_t timestamp); - -void meta_x11_wm_toggle_maximize (MetaX11Display *x11_display, - Window frame_xwindow); -void meta_x11_wm_toggle_maximize_horizontally (MetaX11Display *xdisplay, - Window frame_xwindow); -void meta_x11_wm_toggle_maximize_vertically (MetaX11Display *x11_display, - Window frame_xwindow); - -void meta_x11_wm_show_window_menu (MetaX11Display *x11_xdisplay, - Window frame_xwindow, - MetaWindowMenuType menu, - int root_x, - int root_y, - uint32_t timestamp); - -void meta_x11_wm_show_window_menu_for_rect (MetaX11Display *x11_display, - Window frame_xwindow, - MetaWindowMenuType menu, - MetaRectangle *rect, - uint32_t timestamp); - -gboolean meta_x11_wm_begin_grab_op (MetaX11Display *x11_display, - Window frame_xwindow, - MetaGrabOp op, - gboolean pointer_already_grabbed, - gboolean frame_action, - int button, - gulong modmask, - uint32_t timestamp, - int root_x, - int root_y); -void meta_x11_wm_end_grab_op (MetaX11Display *x11_display, - uint32_t timestamp); -MetaGrabOp meta_x11_wm_get_grab_op (MetaX11Display *x11_display); - - -void meta_x11_wm_grab_buttons (MetaX11Display *x11_display, - Window frame_xwindow); - -void meta_x11_wm_set_screen_cursor (MetaX11Display *x11_display, - Window frame_on_screen, - MetaCursor cursor); - -#endif /* META_X11_WINDOW_CONTROL_H */