[mutter] Convert window menus to a compositor implementation
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Convert window menus to a compositor implementation
- Date: Sat, 17 May 2014 19:22:17 +0000 (UTC)
commit 8640982e682fe00de21b2ea7301969a7ea74deee
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Thu Mar 13 18:34:14 2014 -0400
Convert window menus to a compositor implementation
src/Makefile.am | 4 -
src/compositor/compositor.c | 7 +
src/compositor/meta-plugin-manager.c | 15 +
src/compositor/meta-plugin-manager.h | 4 +
src/core/core.c | 119 +--------
src/core/core.h | 7 -
src/core/display-private.h | 4 -
src/core/display.c | 3 -
src/core/keybindings.c | 15 +-
src/core/prefs.c | 37 ---
src/core/window-private.h | 6 +-
src/core/window.c | 276 +------------------
src/meta/common.h | 55 ----
src/meta/compositor.h | 2 +
src/meta/meta-plugin.h | 3 +
src/meta/prefs.h | 4 -
src/ui/frames.c | 30 +--
src/ui/menu.c | 516 ----------------------------------
src/ui/menu.h | 55 ----
src/ui/metaaccellabel.c | 451 -----------------------------
src/ui/metaaccellabel.h | 104 -------
src/ui/ui.c | 34 ---
src/ui/ui.h | 15 -
23 files changed, 41 insertions(+), 1725 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e2b342e..5e6b710 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -191,10 +191,6 @@ libmutter_la_SOURCES = \
ui/ui.h \
ui/frames.c \
ui/frames.h \
- ui/menu.c \
- ui/menu.h \
- ui/metaaccellabel.c \
- ui/metaaccellabel.h \
ui/resizepopup.c \
ui/resizepopup.h \
ui/theme-parser.c \
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index e5e7756..b5e3b8c 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -1356,3 +1356,10 @@ meta_compositor_hide_tile_preview (MetaCompositor *compositor)
{
meta_plugin_manager_hide_tile_preview (compositor->plugin_mgr);
}
+
+void
+meta_compositor_show_window_menu (MetaCompositor *compositor,
+ MetaWindow *window)
+{
+ meta_plugin_manager_show_window_menu (compositor->plugin_mgr, window);
+}
diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
index 8987e21..076f315 100644
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -356,3 +356,18 @@ meta_plugin_manager_hide_tile_preview (MetaPluginManager *plugin_mgr)
return FALSE;
}
+
+void
+meta_plugin_manager_show_window_menu (MetaPluginManager *plugin_mgr,
+ MetaWindow *window)
+{
+ MetaPlugin *plugin = plugin_mgr->plugin;
+ MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+ MetaDisplay *display = plugin_mgr->compositor->display;
+
+ if (display->display_opening)
+ return;
+
+ if (klass->show_window_menu)
+ klass->show_window_menu (plugin, window);
+}
diff --git a/src/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h
index d814ee6..224f353 100644
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.h
@@ -80,4 +80,8 @@ gboolean meta_plugin_manager_show_tile_preview (MetaPluginManager *mgr,
MetaRectangle *tile_rect,
int tile_monitor_number);
gboolean meta_plugin_manager_hide_tile_preview (MetaPluginManager *mgr);
+
+void meta_plugin_manager_show_window_menu (MetaPluginManager *mgr,
+ MetaWindow *window);
+
#endif
diff --git a/src/core/core.c b/src/core/core.c
index 303cd1e..e42947e 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -398,9 +398,6 @@ meta_core_change_workspace (Display *xdisplay,
void
meta_core_show_window_menu (Display *xdisplay,
Window frame_xwindow,
- int root_x,
- int root_y,
- int button,
guint32 timestamp)
{
MetaWindow *window = get_window (xdisplay, frame_xwindow);
@@ -409,121 +406,7 @@ meta_core_show_window_menu (Display *xdisplay,
meta_window_raise (window);
meta_window_focus (window, timestamp);
- meta_window_show_menu (window, root_x, root_y, button, timestamp);
-}
-
-void
-meta_core_get_menu_accelerator (MetaMenuOp menu_op,
- int workspace,
- unsigned int *keysym,
- MetaVirtualModifier *modifiers)
-{
- const char *name;
-
- name = NULL;
-
- switch (menu_op)
- {
- case META_MENU_OP_NONE:
- /* No keybinding for this one */
- break;
- case META_MENU_OP_DELETE:
- name = "close";
- break;
- case META_MENU_OP_MINIMIZE:
- name = "minimize";
- break;
- case META_MENU_OP_UNMAXIMIZE:
- name = "unmaximize";
- break;
- case META_MENU_OP_MAXIMIZE:
- name = "maximize";
- break;
- case META_MENU_OP_UNSHADE:
- case META_MENU_OP_SHADE:
- name = "toggle_shaded";
- break;
- case META_MENU_OP_UNSTICK:
- case META_MENU_OP_STICK:
- name = "toggle-on-all-workspaces";
- break;
- case META_MENU_OP_ABOVE:
- case META_MENU_OP_UNABOVE:
- name = "toggle-above";
- break;
- case META_MENU_OP_WORKSPACES:
- switch (workspace)
- {
- case 1:
- name = "move-to-workspace-1";
- break;
- case 2:
- name = "move-to-workspace-2";
- break;
- case 3:
- name = "move-to-workspace-3";
- break;
- case 4:
- name = "move-to-workspace-4";
- break;
- case 5:
- name = "move-to-workspace-5";
- break;
- case 6:
- name = "move-to-workspace-6";
- break;
- case 7:
- name = "move-to-workspace-7";
- break;
- case 8:
- name = "move-to-workspace-8";
- break;
- case 9:
- name = "move-to-workspace-9";
- break;
- case 10:
- name = "move-to-workspace-10";
- break;
- case 11:
- name = "move-to-workspace-11";
- break;
- case 12:
- name = "move-to-workspace-12";
- break;
- }
- break;
- case META_MENU_OP_MOVE:
- name = "begin-move";
- break;
- case META_MENU_OP_RESIZE:
- name = "begin-resize";
- break;
- case META_MENU_OP_MOVE_LEFT:
- name = "move-to-workspace-left";
- break;
- case META_MENU_OP_MOVE_RIGHT:
- name = "move-to-workspace-right";
- break;
- case META_MENU_OP_MOVE_UP:
- name = "move-to-workspace-up";
- break;
- case META_MENU_OP_MOVE_DOWN:
- name = "move-to-workspace-down";
- break;
- case META_MENU_OP_RECOVER:
- /* No keybinding for this one */
- break;
- }
-
- if (name)
- {
- meta_prefs_get_window_binding (name, keysym, modifiers);
- }
- else
- {
- *keysym = 0;
- *modifiers = 0;
- }
+ meta_window_show_menu (window);
}
const char*
diff --git a/src/core/core.h b/src/core/core.h
index cd08233..97a4881 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -142,15 +142,8 @@ const char* meta_core_get_workspace_name_with_index (Display *xdisplay,
void meta_core_show_window_menu (Display *xdisplay,
Window frame_xwindow,
- int root_x,
- int root_y,
- int button,
guint32 timestamp);
-void meta_core_get_menu_accelerator (MetaMenuOp menu_op,
- int workspace,
- unsigned int *keysym,
- MetaVirtualModifier *modifiers);
gboolean meta_core_begin_grab_op (Display *xdisplay,
Window frame_xwindow,
diff --git a/src/core/display-private.h b/src/core/display-private.h
index 451f94a..b63ca0d 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -247,10 +247,6 @@ struct _MetaDisplay
/* Managed by group.c */
GHashTable *groups_by_leader;
- /* currently-active window menu if any */
- MetaWindowMenu *window_menu;
- MetaWindow *window_with_menu;
-
/* Managed by window-props.c */
MetaWindowPropHooks *prop_hooks_table;
GHashTable *prop_hooks;
diff --git a/src/core/display.c b/src/core/display.c
index f740779..1935672 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -518,9 +518,6 @@ meta_display_open (void)
the_display->groups_by_leader = NULL;
- the_display->window_with_menu = NULL;
- the_display->window_menu = NULL;
-
the_display->screen = NULL;
#ifdef HAVE_STARTUP_NOTIFICATION
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index abf5cd8..01d310a 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2732,20 +2732,7 @@ handle_activate_window_menu (MetaDisplay *display,
gpointer dummy)
{
if (display->focus_window)
- {
- int x, y;
-
- meta_window_get_position (display->focus_window,
- &x, &y);
-
- if (meta_ui_get_direction() == META_UI_DIRECTION_RTL)
- x += display->focus_window->rect.width;
-
- meta_window_show_menu (display->focus_window,
- x, y,
- 0,
- event->time);
- }
+ meta_window_show_menu (display->focus_window);
}
static void
diff --git a/src/core/prefs.c b/src/core/prefs.c
index ac76130..4847de6 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -2262,43 +2262,6 @@ meta_prefs_get_keybinding_action (const char *name)
: META_KEYBINDING_ACTION_NONE;
}
-/* This is used by the menu system to decide what key binding
- * to display next to an option. We return the first non-disabled
- * binding, if any.
- */
-void
-meta_prefs_get_window_binding (const char *name,
- unsigned int *keysym,
- MetaVirtualModifier *modifiers)
-{
- MetaKeyPref *pref = g_hash_table_lookup (key_bindings, name);
-
- if (pref->per_window)
- {
- GSList *s = pref->combos;
-
- while (s)
- {
- MetaKeyCombo *c = s->data;
-
- if (c->keysym != 0 || c->modifiers != 0)
- {
- *keysym = c->keysym;
- *modifiers = c->modifiers;
- return;
- }
-
- s = s->next;
- }
-
- /* Not found; return the disabled value */
- *keysym = *modifiers = 0;
- return;
- }
-
- g_assert_not_reached ();
-}
-
gint
meta_prefs_get_mouse_button_resize (void)
{
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 77b8c39..d6c82a6 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -622,11 +622,7 @@ void meta_window_set_current_workspace_hint (MetaWindow *window);
unsigned long meta_window_get_net_wm_desktop (MetaWindow *window);
-void meta_window_show_menu (MetaWindow *window,
- int root_x,
- int root_y,
- int button,
- guint32 timestamp);
+void meta_window_show_menu (MetaWindow *window);
gboolean meta_window_handle_mouse_grab_op_event (MetaWindow *window,
const ClutterEvent *event);
diff --git a/src/core/window.c b/src/core/window.c
index 5ead253..47b9ceb 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1305,13 +1305,6 @@ meta_window_unmanage (MetaWindow *window,
meta_compositor_remove_window (window->display->compositor, window);
window->known_to_compositor = FALSE;
- if (window->display->window_with_menu == window)
- {
- meta_ui_window_menu_free (window->display->window_menu);
- window->display->window_menu = NULL;
- window->display->window_with_menu = NULL;
- }
-
if (destroying_windows_disallowed > 0)
meta_bug ("Tried to destroy window %s while destruction was not allowed\n",
window->desc);
@@ -5495,268 +5488,11 @@ meta_window_recalc_features (MetaWindow *window)
*/
}
-static void
-menu_callback (MetaWindowMenu *menu,
- Display *xdisplay,
- Window client_xwindow,
- guint32 timestamp,
- MetaMenuOp op,
- int workspace_index,
- gpointer data)
-{
- MetaDisplay *display;
- MetaWindow *window;
- MetaWorkspace *workspace;
-
- display = meta_display_for_x_display (xdisplay);
- window = meta_display_lookup_x_window (display, client_xwindow);
- workspace = NULL;
-
- if (window != NULL) /* window can be NULL */
- {
- meta_verbose ("Menu op %u on %s\n", op, window->desc);
-
- switch (op)
- {
- case META_MENU_OP_NONE:
- /* nothing */
- break;
-
- case META_MENU_OP_DELETE:
- meta_window_delete (window, timestamp);
- break;
-
- case META_MENU_OP_MINIMIZE:
- meta_window_minimize (window);
- break;
-
- case META_MENU_OP_UNMAXIMIZE:
- meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
- break;
-
- case META_MENU_OP_MAXIMIZE:
- meta_window_maximize (window, META_MAXIMIZE_BOTH);
- break;
-
- case META_MENU_OP_UNSHADE:
- meta_window_unshade (window, timestamp);
- break;
-
- case META_MENU_OP_SHADE:
- meta_window_shade (window, timestamp);
- break;
-
- case META_MENU_OP_MOVE_LEFT:
- workspace = meta_workspace_get_neighbor (window->screen->active_workspace,
- META_MOTION_LEFT);
- break;
-
- case META_MENU_OP_MOVE_RIGHT:
- workspace = meta_workspace_get_neighbor (window->screen->active_workspace,
- META_MOTION_RIGHT);
- break;
-
- case META_MENU_OP_MOVE_UP:
- workspace = meta_workspace_get_neighbor (window->screen->active_workspace,
- META_MOTION_UP);
- break;
-
- case META_MENU_OP_MOVE_DOWN:
- workspace = meta_workspace_get_neighbor (window->screen->active_workspace,
- META_MOTION_DOWN);
- break;
-
- case META_MENU_OP_WORKSPACES:
- workspace = meta_screen_get_workspace_by_index (window->screen,
- workspace_index);
- break;
-
- case META_MENU_OP_STICK:
- meta_window_stick (window);
- break;
-
- case META_MENU_OP_UNSTICK:
- meta_window_unstick (window);
- break;
-
- case META_MENU_OP_ABOVE:
- case META_MENU_OP_UNABOVE:
- if (window->wm_state_above == FALSE)
- meta_window_make_above (window);
- else
- meta_window_unmake_above (window);
- break;
-
- case META_MENU_OP_MOVE:
- meta_window_begin_grab_op (window,
- META_GRAB_OP_KEYBOARD_MOVING,
- FALSE,
- timestamp);
- break;
-
- case META_MENU_OP_RESIZE:
- meta_window_begin_grab_op (window,
- META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN,
- FALSE,
- timestamp);
- break;
-
- case META_MENU_OP_RECOVER:
- meta_window_shove_titlebar_onscreen (window);
- break;
-
- default:
- meta_warning (G_STRLOC": Unknown window op\n");
- break;
- }
-
- if (workspace)
- {
- meta_window_change_workspace (window,
- workspace);
- }
- }
- else
- {
- meta_verbose ("Menu callback on nonexistent window\n");
- }
-
- if (display->window_menu == menu)
- {
- display->window_menu = NULL;
- display->window_with_menu = NULL;
- }
-
- meta_ui_window_menu_free (menu);
-}
-
void
-meta_window_show_menu (MetaWindow *window,
- int root_x,
- int root_y,
- int button,
- guint32 timestamp)
-{
- MetaMenuOp ops;
- MetaMenuOp insensitive;
- MetaWindowMenu *menu;
- MetaWorkspaceLayout layout;
- int n_workspaces;
- gboolean ltr;
-
+meta_window_show_menu (MetaWindow *window)
+{
g_return_if_fail (!window->override_redirect);
-
- if (window->display->window_menu)
- {
- meta_ui_window_menu_free (window->display->window_menu);
- window->display->window_menu = NULL;
- window->display->window_with_menu = NULL;
- }
-
- ops = META_MENU_OP_NONE;
- insensitive = META_MENU_OP_NONE;
-
- ops |= (META_MENU_OP_DELETE | META_MENU_OP_MINIMIZE | META_MENU_OP_MOVE | META_MENU_OP_RESIZE);
-
- if (!meta_window_titlebar_is_onscreen (window) &&
- window->type != META_WINDOW_DOCK &&
- window->type != META_WINDOW_DESKTOP)
- ops |= META_MENU_OP_RECOVER;
-
- if (!meta_prefs_get_workspaces_only_on_primary () ||
- meta_window_is_on_primary_monitor (window))
- {
- n_workspaces = meta_screen_get_n_workspaces (window->screen);
-
- if (n_workspaces > 1)
- ops |= META_MENU_OP_WORKSPACES;
-
- meta_screen_calc_workspace_layout (window->screen,
- n_workspaces,
- meta_workspace_index ( window->screen->active_workspace),
- &layout);
-
- if (!window->on_all_workspaces)
- {
- ltr = meta_ui_get_direction() == META_UI_DIRECTION_LTR;
-
- if (layout.current_col > 0)
- ops |= ltr ? META_MENU_OP_MOVE_LEFT : META_MENU_OP_MOVE_RIGHT;
- if ((layout.current_col < layout.cols - 1) &&
- (layout.current_row * layout.cols + (layout.current_col + 1) < n_workspaces))
- ops |= ltr ? META_MENU_OP_MOVE_RIGHT : META_MENU_OP_MOVE_LEFT;
- if (layout.current_row > 0)
- ops |= META_MENU_OP_MOVE_UP;
- if ((layout.current_row < layout.rows - 1) &&
- ((layout.current_row + 1) * layout.cols + layout.current_col < n_workspaces))
- ops |= META_MENU_OP_MOVE_DOWN;
- }
-
- meta_screen_free_workspace_layout (&layout);
-
- ops |= META_MENU_OP_UNSTICK;
- ops |= META_MENU_OP_STICK;
- }
-
- if (META_WINDOW_MAXIMIZED (window))
- ops |= META_MENU_OP_UNMAXIMIZE;
- else
- ops |= META_MENU_OP_MAXIMIZE;
-
- if (window->wm_state_above)
- ops |= META_MENU_OP_UNABOVE;
- else
- ops |= META_MENU_OP_ABOVE;
-
- if (!window->has_maximize_func)
- insensitive |= META_MENU_OP_UNMAXIMIZE | META_MENU_OP_MAXIMIZE;
-
- if (!window->has_minimize_func)
- insensitive |= META_MENU_OP_MINIMIZE;
-
- if (!window->has_close_func)
- insensitive |= META_MENU_OP_DELETE;
-
- if (!window->has_shade_func)
- insensitive |= META_MENU_OP_SHADE | META_MENU_OP_UNSHADE;
-
- if (!META_WINDOW_ALLOWS_MOVE (window))
- insensitive |= META_MENU_OP_MOVE;
-
- if (!META_WINDOW_ALLOWS_RESIZE (window))
- insensitive |= META_MENU_OP_RESIZE;
-
- if (window->always_sticky)
- insensitive |= META_MENU_OP_STICK | META_MENU_OP_UNSTICK | META_MENU_OP_WORKSPACES;
-
- if ((window->type == META_WINDOW_DESKTOP) ||
- (window->type == META_WINDOW_DOCK) ||
- (window->type == META_WINDOW_SPLASHSCREEN ||
- META_WINDOW_MAXIMIZED (window)))
- insensitive |= META_MENU_OP_ABOVE | META_MENU_OP_UNABOVE;
-
- /* If all operations are disabled, just quit without showing the menu.
- * This is the case, for example, with META_WINDOW_DESKTOP windows.
- */
- if ((ops & ~insensitive) == 0)
- return;
-
- menu =
- meta_ui_window_menu_new (window->screen->ui,
- window->xwindow,
- ops,
- insensitive,
- meta_window_get_net_wm_desktop (window),
- meta_screen_get_n_workspaces (window->screen),
- menu_callback,
- NULL);
-
- window->display->window_menu = menu;
- window->display->window_with_menu = window;
-
- meta_verbose ("Popping up window menu for %s\n", window->desc);
-
- meta_ui_window_menu_popup (menu, root_x, root_y, button, timestamp);
+ meta_compositor_show_window_menu (window->display->compositor, window);
}
void
@@ -8373,11 +8109,7 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
{
if (meta_prefs_get_raise_on_click ())
meta_window_raise (window);
- meta_window_show_menu (window,
- event->button.x,
- event->button.y,
- event->button.button,
- event->any.time);
+ meta_window_show_menu (window);
return TRUE;
}
else if (fully_modified && (int) event->button.button == 1)
diff --git a/src/meta/common.h b/src/meta/common.h
index 0b58678..bbfa77e 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -87,61 +87,6 @@ typedef enum
} MetaFrameFlags;
/**
- * MetaMenuOp:
- * @META_MENU_OP_NONE: No menu operation
- * @META_MENU_OP_DELETE: Menu operation delete
- * @META_MENU_OP_MINIMIZE: Menu operation minimize
- * @META_MENU_OP_UNMAXIMIZE: Menu operation unmaximize
- * @META_MENU_OP_MAXIMIZE: Menu operation maximize
- * @META_MENU_OP_UNSHADE: Menu operation unshade
- * @META_MENU_OP_SHADE: Menu operation shade
- * @META_MENU_OP_UNSTICK: Menu operation unstick
- * @META_MENU_OP_STICK: Menu operation stick
- * @META_MENU_OP_WORKSPACES: Menu operation workspaces
- * @META_MENU_OP_MOVE: Menu operation move
- * @META_MENU_OP_RESIZE: Menu operation resize
- * @META_MENU_OP_ABOVE: Menu operation above
- * @META_MENU_OP_UNABOVE: Menu operation unabove
- * @META_MENU_OP_MOVE_LEFT: Menu operation left
- * @META_MENU_OP_MOVE_RIGHT: Menu operation right
- * @META_MENU_OP_MOVE_UP: Menu operation up
- * @META_MENU_OP_MOVE_DOWN: Menu operation down
- * @META_MENU_OP_RECOVER: Menu operation recover
- */
-typedef enum
-{
- META_MENU_OP_NONE = 0,
- META_MENU_OP_DELETE = 1 << 0,
- META_MENU_OP_MINIMIZE = 1 << 1,
- META_MENU_OP_UNMAXIMIZE = 1 << 2,
- META_MENU_OP_MAXIMIZE = 1 << 3,
- META_MENU_OP_UNSHADE = 1 << 4,
- META_MENU_OP_SHADE = 1 << 5,
- META_MENU_OP_UNSTICK = 1 << 6,
- META_MENU_OP_STICK = 1 << 7,
- META_MENU_OP_WORKSPACES = 1 << 8,
- META_MENU_OP_MOVE = 1 << 9,
- META_MENU_OP_RESIZE = 1 << 10,
- META_MENU_OP_ABOVE = 1 << 11,
- META_MENU_OP_UNABOVE = 1 << 12,
- META_MENU_OP_MOVE_LEFT = 1 << 13,
- META_MENU_OP_MOVE_RIGHT = 1 << 14,
- META_MENU_OP_MOVE_UP = 1 << 15,
- META_MENU_OP_MOVE_DOWN = 1 << 16,
- META_MENU_OP_RECOVER = 1 << 17
-} MetaMenuOp;
-
-typedef struct _MetaWindowMenu MetaWindowMenu;
-
-typedef void (* MetaWindowMenuFunc) (MetaWindowMenu *menu,
- Display *xdisplay,
- Window client_xwindow,
- guint32 timestamp,
- MetaMenuOp op,
- int workspace,
- gpointer user_data);
-
-/**
* MetaGrabOp:
* @META_GRAB_OP_NONE: None
* @META_GRAB_OP_MOVING: Moving with pointer
diff --git a/src/meta/compositor.h b/src/meta/compositor.h
index 57be80a..b5d7a54 100644
--- a/src/meta/compositor.h
+++ b/src/meta/compositor.h
@@ -122,5 +122,7 @@ void meta_compositor_show_tile_preview (MetaCompositor *compositor,
MetaRectangle *tile_rect,
int tile_monitor_number);
void meta_compositor_hide_tile_preview (MetaCompositor *compositor);
+void meta_compositor_show_window_menu (MetaCompositor *compositor,
+ MetaWindow *window);
#endif /* META_COMPOSITOR_H */
diff --git a/src/meta/meta-plugin.h b/src/meta/meta-plugin.h
index 983db7a..a2666d0 100644
--- a/src/meta/meta-plugin.h
+++ b/src/meta/meta-plugin.h
@@ -164,6 +164,9 @@ struct _MetaPluginClass
int tile_monitor_number);
void (*hide_tile_preview) (MetaPlugin *plugin);
+ void (*show_window_menu) (MetaPlugin *plugin,
+ MetaWindow *window);
+
/**
* MetaPluginClass::kill_window_effects:
* @actor: a #MetaWindowActor
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index ced3ddd..0db03d0 100644
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -399,10 +399,6 @@ GType meta_key_binding_get_type (void);
MetaKeyBindingAction meta_prefs_get_keybinding_action (const char *name);
-void meta_prefs_get_window_binding (const char *name,
- unsigned int *keysym,
- MetaVirtualModifier *modifiers);
-
gboolean meta_prefs_get_visual_bell (void);
gboolean meta_prefs_bell_is_audible (void);
GDesktopVisualBellType meta_prefs_get_visual_bell_type (void);
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 55e005a..3ba21dd 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -1102,9 +1102,6 @@ meta_frame_titlebar_event (MetaUIFrame *frame,
case G_DESKTOP_TITLEBAR_ACTION_MENU:
meta_core_show_window_menu (display,
frame->xwindow,
- event->x_root,
- event->y_root,
- event->button,
event->time);
break;
}
@@ -1214,30 +1211,9 @@ meta_frames_button_press_event (GtkWidget *widget,
redraw_control (frames, frame, control);
if (control == META_FRAME_CONTROL_MENU)
- {
- MetaFrameGeometry fgeom;
- GdkRectangle *rect;
- int dx, dy;
-
- meta_frames_calc_geometry (frames, frame, &fgeom);
-
- rect = control_rect (META_FRAME_CONTROL_MENU, &fgeom);
-
- /* get delta to convert to root coords */
- dx = event->x_root - event->x;
- dy = event->y_root - event->y;
-
- /* Align to the right end of the menu rectangle if RTL */
- if (meta_ui_get_direction() == META_UI_DIRECTION_RTL)
- dx += rect->width;
-
- meta_core_show_window_menu (display,
- frame->xwindow,
- rect->x + dx,
- rect->y + rect->height + dy,
- event->button,
- event->time);
- }
+ meta_core_show_window_menu (display,
+ frame->xwindow,
+ event->time);
}
else if (event->button == 1 &&
(control == META_FRAME_CONTROL_RESIZE_SE ||
diff --git a/src/ui/ui.c b/src/ui/ui.c
index a412602..b030051 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -487,40 +487,6 @@ meta_ui_set_frame_title (MetaUI *ui,
meta_frames_set_title (ui->frames, xwindow, title);
}
-MetaWindowMenu*
-meta_ui_window_menu_new (MetaUI *ui,
- Window client_xwindow,
- MetaMenuOp ops,
- MetaMenuOp insensitive,
- unsigned long active_workspace,
- int n_workspaces,
- MetaWindowMenuFunc func,
- gpointer data)
-{
- return meta_window_menu_new (ui->frames,
- ops, insensitive,
- client_xwindow,
- active_workspace,
- n_workspaces,
- func, data);
-}
-
-void
-meta_ui_window_menu_popup (MetaWindowMenu *menu,
- int root_x,
- int root_y,
- int button,
- guint32 timestamp)
-{
- meta_window_menu_popup (menu, root_x, root_y, button, timestamp);
-}
-
-void
-meta_ui_window_menu_free (MetaWindowMenu *menu)
-{
- meta_window_menu_free (menu);
-}
-
GdkPixbuf*
meta_gdk_pixbuf_get_from_pixmap (Pixmap xpixmap,
int src_x,
diff --git a/src/ui/ui.h b/src/ui/ui.h
index a79bc0f..af0e72a 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -113,21 +113,6 @@ void meta_ui_update_frame_style (MetaUI *ui,
void meta_ui_repaint_frame (MetaUI *ui,
Window xwindow);
-MetaWindowMenu* meta_ui_window_menu_new (MetaUI *ui,
- Window client_xwindow,
- MetaMenuOp ops,
- MetaMenuOp insensitive,
- unsigned long active_workspace,
- int n_workspaces,
- MetaWindowMenuFunc func,
- gpointer data);
-void meta_ui_window_menu_popup (MetaWindowMenu *menu,
- int root_x,
- int root_y,
- int button,
- guint32 timestamp);
-void meta_ui_window_menu_free (MetaWindowMenu *menu);
-
/* FIXME these lack a display arg */
GdkPixbuf* meta_gdk_pixbuf_get_from_pixmap (Pixmap xpixmap,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
