brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose keybindings data types; add user_data parameter the handler signature.

Browse Source
This commit is contained in:
Tomas Frydrych 2009-01-29 14:53:03 +00:00
parent 813acae961
commit 23bed522ab
5 changed files with 163 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/display-private.h
View File

@ -37,6 +37,7 @@
#include "common.h" #include "common.h"
#include "boxes.h" #include "boxes.h"
#include "display.h" #include "display.h"
#include "keybindings-private.h"
#ifdef HAVE_STARTUP_NOTIFICATION #ifdef HAVE_STARTUP_NOTIFICATION
#include <libsn/sn.h> #include <libsn/sn.h>
@ -46,7 +47,6 @@
#include <X11/extensions/sync.h> #include <X11/extensions/sync.h>
#endif #endif
typedef struct _MetaKeyBinding MetaKeyBinding;
typedef struct _MetaStack MetaStack; typedef struct _MetaStack MetaStack;
typedef struct _MetaUISlave MetaUISlave; typedef struct _MetaUISlave MetaUISlave;

7
src/core/keybindings-private.h
View File

@ -26,11 +26,10 @@
* 02111-1307, USA. * 02111-1307, USA.
*/ */
#ifndef META_KEYBINDINGS_H #ifndef META_KEYBINDINGS_PRIVATE_H
#define META_KEYBINDINGS_H #define META_KEYBINDINGS_PRIVATE_H
#include "display-private.h" #include "keybindings.h"
#include "window.h"
void meta_display_init_keys (MetaDisplay *display); void meta_display_init_keys (MetaDisplay *display);
void meta_display_shutdown_keys (MetaDisplay *display); void meta_display_shutdown_keys (MetaDisplay *display);

165
src/core/keybindings.c
View File

@ -49,12 +49,6 @@
static gboolean all_bindings_disabled = FALSE; static gboolean all_bindings_disabled = FALSE;
typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,
MetaScreen *screen,
MetaWindow *window,
XEvent *event,
MetaKeyBinding *binding);
/* Prototypes for handlers */ /* Prototypes for handlers */
#define keybind(name, handler, param, flags, stroke, description) \ #define keybind(name, handler, param, flags, stroke, description) \
static void \ static void \
@ -62,7 +56,8 @@ handler (MetaDisplay *display,\
MetaScreen *screen,\ MetaScreen *screen,\
MetaWindow *window,\ MetaWindow *window,\
XEvent *event,\ XEvent *event,\
MetaKeyBinding *binding); MetaKeyBinding *binding, \
gpointer user_data);
#include "all-keybindings.h" #include "all-keybindings.h"
#undef keybind #undef keybind
@ -75,7 +70,8 @@ static void handle_workspace_switch (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding); MetaKeyBinding *binding,
gpointer dummy);
static gboolean process_mouse_move_resize_grab (MetaDisplay *display, static gboolean process_mouse_move_resize_grab (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
@ -107,28 +103,12 @@ static gboolean process_workspace_switch_grab (MetaDisplay *display,
static void regrab_key_bindings (MetaDisplay *display); static void regrab_key_bindings (MetaDisplay *display);
typedef struct
{
const char *name;
MetaKeyHandlerFunc func;
gint data, flags;
} MetaKeyHandler;
struct _MetaKeyBinding
{
const char *name;
KeySym keysym;
KeyCode keycode;
unsigned int mask;
MetaVirtualModifier modifiers;
const MetaKeyHandler *handler;
};
#define keybind(name, handler, param, flags, stroke, description) \ #define keybind(name, handler, param, flags, stroke, description) \
{ #name, handler, param, flags }, { #name, handler, param, flags, NULL, NULL },
static const MetaKeyHandler key_handlers[] = { static const MetaKeyHandler key_handlers[] = {
#include "all-keybindings.h" #include "all-keybindings.h"
{ NULL, NULL, 0, 0 } { NULL, NULL, 0, 0, NULL, NULL }
}; };
#undef keybind #undef keybind
@ -1219,7 +1199,8 @@ process_event (MetaKeyBinding *bindings,
(* handler->func) (display, screen, (* handler->func) (display, screen,
bindings[i].handler->flags & BINDING_PER_WINDOW? window: NULL, bindings[i].handler->flags & BINDING_PER_WINDOW? window: NULL,
event, event,
&bindings[i]); &bindings[i],
handler->user_data);
return TRUE; return TRUE;
} }
@ -2234,7 +2215,8 @@ handle_switch_to_workspace (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *event_window, MetaWindow *event_window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
gint which = binding->handler->data; gint which = binding->handler->data;
MetaWorkspace *workspace; MetaWorkspace *workspace;
@ -2251,7 +2233,8 @@ handle_switch_to_workspace (MetaDisplay *display,
* Note that we're the only caller of that function, so perhaps * Note that we're the only caller of that function, so perhaps
* we should merge with it. * we should merge with it.
*/ */
handle_workspace_switch (display, screen, event_window, event, binding); handle_workspace_switch (display, screen, event_window, event, binding,
dummy);
return; return;
} }
@ -2363,7 +2346,8 @@ handle_run_command (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
gint which = binding->handler->data; gint which = binding->handler->data;
const char *command; const char *command;
@ -2402,7 +2386,8 @@ handle_maximize_vertically (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -2418,7 +2403,8 @@ handle_maximize_horizontally (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -2442,7 +2428,8 @@ handle_move_to_corner_backend (MetaDisplay *display,
gboolean xchange, gboolean xchange,
gboolean ychange, gboolean ychange,
gboolean to_right, gboolean to_right,
gboolean to_bottom) gboolean to_bottom,
gpointer dummy)
{ {
MetaRectangle work_area; MetaRectangle work_area;
MetaRectangle outer; MetaRectangle outer;
@ -2486,9 +2473,10 @@ handle_move_to_corner_nw (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, FALSE); handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, FALSE, dummy);
} }
static void static void
@ -2496,9 +2484,10 @@ handle_move_to_corner_ne (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, FALSE); handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, FALSE, dummy);
} }
static void static void
@ -2506,9 +2495,10 @@ handle_move_to_corner_sw (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, TRUE); handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, FALSE, TRUE, dummy);
} }
static void static void
@ -2516,9 +2506,10 @@ handle_move_to_corner_se (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, TRUE); handle_move_to_corner_backend (display, screen, window, TRUE, TRUE, TRUE, TRUE, dummy);
} }
static void static void
@ -2526,9 +2517,10 @@ handle_move_to_side_n (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, FALSE); handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, FALSE, dummy);
} }
static void static void
@ -2536,9 +2528,10 @@ handle_move_to_side_s (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, TRUE); handle_move_to_corner_backend (display, screen, window, FALSE, TRUE, FALSE, TRUE, dummy);
} }
static void static void
@ -2546,9 +2539,10 @@ handle_move_to_side_e (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, TRUE, FALSE); handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, TRUE, FALSE, dummy);
} }
static void static void
@ -2556,9 +2550,10 @@ handle_move_to_side_w (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, FALSE, FALSE); handle_move_to_corner_backend (display, screen, window, TRUE, FALSE, FALSE, FALSE, dummy);
} }
static void static void
@ -2566,7 +2561,8 @@ handle_move_to_center (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
MetaRectangle work_area; MetaRectangle work_area;
MetaRectangle outer; MetaRectangle outer;
@ -2714,7 +2710,8 @@ handle_show_desktop (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (screen->active_workspace->showing_desktop) if (screen->active_workspace->showing_desktop)
{ {
@ -2732,7 +2729,8 @@ handle_panel (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
MetaKeyBindingAction action = binding->handler->data; MetaKeyBindingAction action = binding->handler->data;
Atom action_atom; Atom action_atom;
@ -2783,7 +2781,8 @@ handle_activate_window_menu (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *event_window, MetaWindow *event_window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (display->focus_window) if (display->focus_window)
{ {
@ -2942,7 +2941,8 @@ handle_switch (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *event_window, MetaWindow *event_window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
gint backwards = binding->handler->flags & BINDING_IS_REVERSED; gint backwards = binding->handler->flags & BINDING_IS_REVERSED;
@ -2955,7 +2955,8 @@ handle_cycle (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *event_window, MetaWindow *event_window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
gint backwards = binding->handler->flags & BINDING_IS_REVERSED; gint backwards = binding->handler->flags & BINDING_IS_REVERSED;
@ -2969,7 +2970,8 @@ handle_toggle_fullscreen (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->fullscreen) if (window->fullscreen)
meta_window_unmake_fullscreen (window); meta_window_unmake_fullscreen (window);
@ -2982,7 +2984,8 @@ handle_toggle_above (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->wm_state_above) if (window->wm_state_above)
meta_window_unmake_above (window); meta_window_unmake_above (window);
@ -2995,7 +2998,8 @@ handle_toggle_maximized (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (META_WINDOW_MAXIMIZED (window)) if (META_WINDOW_MAXIMIZED (window))
meta_window_unmaximize (window, meta_window_unmaximize (window,
@ -3012,7 +3016,8 @@ handle_maximize (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_maximize_func) if (window->has_maximize_func)
meta_window_maximize (window, meta_window_maximize (window,
@ -3025,7 +3030,8 @@ handle_unmaximize (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->maximized_vertically || window->maximized_horizontally) if (window->maximized_vertically || window->maximized_horizontally)
meta_window_unmaximize (window, meta_window_unmaximize (window,
@ -3038,7 +3044,8 @@ handle_toggle_shaded (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->shaded) if (window->shaded)
meta_window_unshade (window, event->xkey.time); meta_window_unshade (window, event->xkey.time);
@ -3051,7 +3058,8 @@ handle_close (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_close_func) if (window->has_close_func)
meta_window_delete (window, event->xkey.time); meta_window_delete (window, event->xkey.time);
@ -3062,7 +3070,8 @@ handle_minimize (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_minimize_func) if (window->has_minimize_func)
meta_window_minimize (window); meta_window_minimize (window);
@ -3073,7 +3082,8 @@ handle_begin_move (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_move_func) if (window->has_move_func)
{ {
@ -3089,7 +3099,8 @@ handle_begin_resize (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -3105,7 +3116,8 @@ handle_toggle_on_all_workspaces (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
if (window->on_all_workspaces) if (window->on_all_workspaces)
meta_window_unstick (window); meta_window_unstick (window);
@ -3118,7 +3130,8 @@ handle_move_to_workspace (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
gint which = binding->handler->data; gint which = binding->handler->data;
gboolean flip = (which < 0); gboolean flip = (which < 0);
@ -3172,7 +3185,8 @@ handle_raise_or_lower (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
/* Get window at pointer */ /* Get window at pointer */
@ -3218,7 +3232,8 @@ handle_raise (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
meta_window_raise (window); meta_window_raise (window);
} }
@ -3228,7 +3243,8 @@ handle_lower (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
meta_window_lower (window); meta_window_lower (window);
} }
@ -3238,7 +3254,8 @@ handle_workspace_switch (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
gint motion = binding->handler->data; gint motion = binding->handler->data;
unsigned int grab_mask; unsigned int grab_mask;
@ -3300,7 +3317,8 @@ handle_set_spew_mark (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
meta_verbose ("-- MARK MARK MARK MARK --\n"); meta_verbose ("-- MARK MARK MARK MARK --\n");
} }
@ -3318,7 +3336,8 @@ handle_run_terminal (MetaDisplay *display,
MetaScreen *screen, MetaScreen *screen,
MetaWindow *window, MetaWindow *window,
XEvent *event, XEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding,
gpointer dummy)
{ {
const char *command; const char *command;
GError *err; GError *err;

60
src/include/keybindings.h Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright (C) 2009 Intel Corporation.
*
* 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
#ifndef META_KEYBINDINGS_H
#define META_KEYBINDINGS_H
#include "display.h"
#include "common.h"
typedef void (* MetaKeyHandlerDataFreeFunc) (gpointer user_data);
typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,
MetaScreen *screen,
MetaWindow *window,
XEvent *event,
MetaKeyBinding *binding,
gpointer user_data);
typedef struct
{
const char *name;
MetaKeyHandlerFunc func;
gint data, flags;
gpointer user_data;
MetaKeyHandlerDataFreeFunc user_data_free_func;
} MetaKeyHandler;
struct _MetaKeyBinding
{
const char *name;
KeySym keysym;
KeyCode keycode;
unsigned int mask;
MetaVirtualModifier modifiers;
const MetaKeyHandler *handler;
};
void
meta_keybindings_set_custom_hander (const gchar *name,
MetaKeyHandlerFunc handler,
gpointer user_data,
MetaKeyHandlerDataFreeFunc free_data);
#endif

1
src/include/types.h
View File

@ -29,5 +29,6 @@ typedef struct _MetaScreen MetaScreen;
typedef struct _MetaWindow MetaWindow; typedef struct _MetaWindow MetaWindow;
typedef struct _MetaWorkspace MetaWorkspace; typedef struct _MetaWorkspace MetaWorkspace;
typedef struct _MetaGroup MetaGroup; typedef struct _MetaGroup MetaGroup;
typedef struct _MetaKeyBinding MetaKeyBinding;
#endif #endif