isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-05-06 15:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Make event handlers take a const ClutterEvent

Browse Source 
This avoids discarding the const qualifier.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2628>
This commit is contained in:
Jonas Ådahl 2022-04-13 11:38:08 +02:00 committed by Carlos Garnacho
parent a2bdce2c8e
commit f9b18d90c6
4 changed files with 227 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,9 +263,9 @@ void meta_display_queue_autoraise_callback (MetaDisplay *display,
void meta_display_remove_autoraise_callback (MetaDisplay *display); void meta_display_remove_autoraise_callback (MetaDisplay *display);
void meta_display_overlay_key_activate (MetaDisplay *display); void meta_display_overlay_key_activate (MetaDisplay *display);
void meta_display_accelerator_activate (MetaDisplay *display, void meta_display_accelerator_activate (MetaDisplay *display,
guint action, guint action,
ClutterKeyEvent *event); const ClutterKeyEvent *event);
gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display); gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
void meta_display_sync_wayland_input_focus (MetaDisplay *display); void meta_display_sync_wayland_input_focus (MetaDisplay *display);

8
src/core/display.c
View File

@ -2409,13 +2409,13 @@ meta_display_overlay_key_activate (MetaDisplay *display)
} }
void void
meta_display_accelerator_activate (MetaDisplay *display, meta_display_accelerator_activate (MetaDisplay *display,
guint action, guint action,
ClutterKeyEvent *event) const ClutterKeyEvent *event)
{ {
g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED], 0, g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED], 0,
action, action,
clutter_event_get_source_device ((ClutterEvent *) event), clutter_event_get_source_device ((const ClutterEvent *) event),
event->time); event->time);
} }

430
src/core/keybindings.c
View File

@ -1648,11 +1648,11 @@ meta_window_ungrab_keys (MetaWindow *window)
} }
static void static void
handle_external_grab (MetaDisplay *display, handle_external_grab (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer user_data) gpointer user_data)
{ {
MetaKeyBindingManager *keys = &display->key_binding_manager; MetaKeyBindingManager *keys = &display->key_binding_manager;
guint action = get_keybinding_action (keys, &binding->resolved_combo); guint action = get_keybinding_action (keys, &binding->resolved_combo);
@ -1868,11 +1868,11 @@ meta_display_unfreeze_keyboard (MetaDisplay *display, guint32 timestamp)
} }
static void static void
invoke_handler (MetaDisplay *display, invoke_handler (MetaDisplay *display,
MetaKeyHandler *handler, MetaKeyHandler *handler,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding) MetaKeyBinding *binding)
{ {
if (handler->func) if (handler->func)
(* handler->func) (display, (* handler->func) (display,
@ -2244,11 +2244,11 @@ meta_keybindings_process_event (MetaDisplay *display,
} }
static void static void
handle_switch_to_last_workspace (MetaDisplay *display, handle_switch_to_last_workspace (MetaDisplay *display,
MetaWindow *event_window, MetaWindow *event_window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaWorkspaceManager *workspace_manager = display->workspace_manager; MetaWorkspaceManager *workspace_manager = display->workspace_manager;
gint target = meta_workspace_manager_get_n_workspaces (workspace_manager) - 1; gint target = meta_workspace_manager_get_n_workspaces (workspace_manager) - 1;
@ -2257,11 +2257,11 @@ handle_switch_to_last_workspace (MetaDisplay *display,
} }
static void static void
handle_switch_to_workspace (MetaDisplay *display, handle_switch_to_workspace (MetaDisplay *display,
MetaWindow *event_window, MetaWindow *event_window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
gint which = binding->handler->data; gint which = binding->handler->data;
MetaWorkspaceManager *workspace_manager = display->workspace_manager; MetaWorkspaceManager *workspace_manager = display->workspace_manager;
@ -2293,11 +2293,11 @@ handle_switch_to_workspace (MetaDisplay *display,
static void static void
handle_maximize_vertically (MetaDisplay *display, handle_maximize_vertically (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -2309,11 +2309,11 @@ handle_maximize_vertically (MetaDisplay *display,
} }
static void static void
handle_maximize_horizontally (MetaDisplay *display, handle_maximize_horizontally (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -2325,11 +2325,11 @@ handle_maximize_horizontally (MetaDisplay *display,
} }
static void static void
handle_always_on_top (MetaDisplay *display, handle_always_on_top (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->wm_state_above == FALSE) if (window->wm_state_above == FALSE)
meta_window_make_above (window); meta_window_make_above (window);
@ -2399,91 +2399,91 @@ handle_move_to_corner_backend (MetaDisplay *display,
} }
static void static void
handle_move_to_corner_nw (MetaDisplay *display, handle_move_to_corner_nw (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_NORTH_WEST); handle_move_to_corner_backend (display, window, META_GRAVITY_NORTH_WEST);
} }
static void static void
handle_move_to_corner_ne (MetaDisplay *display, handle_move_to_corner_ne (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_NORTH_EAST); handle_move_to_corner_backend (display, window, META_GRAVITY_NORTH_EAST);
} }
static void static void
handle_move_to_corner_sw (MetaDisplay *display, handle_move_to_corner_sw (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_SOUTH_WEST); handle_move_to_corner_backend (display, window, META_GRAVITY_SOUTH_WEST);
} }
static void static void
handle_move_to_corner_se (MetaDisplay *display, handle_move_to_corner_se (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_SOUTH_EAST); handle_move_to_corner_backend (display, window, META_GRAVITY_SOUTH_EAST);
} }
static void static void
handle_move_to_side_n (MetaDisplay *display, handle_move_to_side_n (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_NORTH); handle_move_to_corner_backend (display, window, META_GRAVITY_NORTH);
} }
static void static void
handle_move_to_side_s (MetaDisplay *display, handle_move_to_side_s (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_SOUTH); handle_move_to_corner_backend (display, window, META_GRAVITY_SOUTH);
} }
static void static void
handle_move_to_side_e (MetaDisplay *display, handle_move_to_side_e (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_EAST); handle_move_to_corner_backend (display, window, META_GRAVITY_EAST);
} }
static void static void
handle_move_to_side_w (MetaDisplay *display, handle_move_to_side_w (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
handle_move_to_corner_backend (display, window, META_GRAVITY_WEST); handle_move_to_corner_backend (display, window, META_GRAVITY_WEST);
} }
static void static void
handle_move_to_center (MetaDisplay *display, handle_move_to_center (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaRectangle work_area; MetaRectangle work_area;
MetaRectangle frame_rect; MetaRectangle frame_rect;
@ -2498,11 +2498,11 @@ handle_move_to_center (MetaDisplay *display,
} }
static void static void
handle_show_desktop (MetaDisplay *display, handle_show_desktop (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaWorkspaceManager *workspace_manager = display->workspace_manager; MetaWorkspaceManager *workspace_manager = display->workspace_manager;
@ -2518,11 +2518,11 @@ handle_show_desktop (MetaDisplay *display,
} }
static void static void
handle_activate_window_menu (MetaDisplay *display, handle_activate_window_menu (MetaDisplay *display,
MetaWindow *event_window, MetaWindow *event_window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (display->focus_window) if (display->focus_window)
{ {
@ -2543,11 +2543,11 @@ handle_activate_window_menu (MetaDisplay *display,
} }
static void static void
do_choose_window (MetaDisplay *display, do_choose_window (MetaDisplay *display,
MetaWindow *event_window, MetaWindow *event_window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gboolean backward) gboolean backward)
{ {
MetaWorkspaceManager *workspace_manager = display->workspace_manager; MetaWorkspaceManager *workspace_manager = display->workspace_manager;
MetaTabList type = binding->handler->data; MetaTabList type = binding->handler->data;
@ -2567,33 +2567,33 @@ do_choose_window (MetaDisplay *display,
} }
static void static void
handle_switch (MetaDisplay *display, handle_switch (MetaDisplay *display,
MetaWindow *event_window, MetaWindow *event_window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
gboolean backwards = meta_key_binding_is_reversed (binding); gboolean backwards = meta_key_binding_is_reversed (binding);
do_choose_window (display, event_window, event, binding, backwards); do_choose_window (display, event_window, event, binding, backwards);
} }
static void static void
handle_cycle (MetaDisplay *display, handle_cycle (MetaDisplay *display,
MetaWindow *event_window, MetaWindow *event_window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
gboolean backwards = meta_key_binding_is_reversed (binding); gboolean backwards = meta_key_binding_is_reversed (binding);
do_choose_window (display, event_window, event, binding, backwards); do_choose_window (display, event_window, event, binding, backwards);
} }
static void static void
handle_toggle_fullscreen (MetaDisplay *display, handle_toggle_fullscreen (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->fullscreen) if (window->fullscreen)
meta_window_unmake_fullscreen (window); meta_window_unmake_fullscreen (window);
@ -2602,11 +2602,11 @@ handle_toggle_fullscreen (MetaDisplay *display,
} }
static void static void
handle_toggle_above (MetaDisplay *display, handle_toggle_above (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->wm_state_above) if (window->wm_state_above)
meta_window_unmake_above (window); meta_window_unmake_above (window);
@ -2615,11 +2615,11 @@ handle_toggle_above (MetaDisplay *display,
} }
static void static void
handle_toggle_tiled (MetaDisplay *display, handle_toggle_tiled (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaTileMode mode = binding->handler->data; MetaTileMode mode = binding->handler->data;
@ -2643,11 +2643,11 @@ handle_toggle_tiled (MetaDisplay *display,
} }
static void static void
handle_toggle_maximized (MetaDisplay *display, handle_toggle_maximized (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (META_WINDOW_MAXIMIZED (window)) if (META_WINDOW_MAXIMIZED (window))
meta_window_unmaximize (window, META_MAXIMIZE_BOTH); meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
@ -2656,55 +2656,55 @@ handle_toggle_maximized (MetaDisplay *display,
} }
static void static void
handle_maximize (MetaDisplay *display, handle_maximize (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_maximize_func) if (window->has_maximize_func)
meta_window_maximize (window, META_MAXIMIZE_BOTH); meta_window_maximize (window, META_MAXIMIZE_BOTH);
} }
static void static void
handle_unmaximize (MetaDisplay *display, handle_unmaximize (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->maximized_vertically || window->maximized_horizontally) if (window->maximized_vertically || window->maximized_horizontally)
meta_window_unmaximize (window, META_MAXIMIZE_BOTH); meta_window_unmaximize (window, META_MAXIMIZE_BOTH);
} }
static void static void
handle_close (MetaDisplay *display, handle_close (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_close_func) if (window->has_close_func)
meta_window_delete (window, event->time); meta_window_delete (window, event->time);
} }
static void static void
handle_minimize (MetaDisplay *display, handle_minimize (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_minimize_func) if (window->has_minimize_func)
meta_window_minimize (window); meta_window_minimize (window);
} }
static void static void
handle_begin_move (MetaDisplay *display, handle_begin_move (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_move_func) if (window->has_move_func)
{ {
@ -2724,11 +2724,11 @@ handle_begin_move (MetaDisplay *display,
} }
static void static void
handle_begin_resize (MetaDisplay *display, handle_begin_resize (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->has_resize_func) if (window->has_resize_func)
{ {
@ -2748,11 +2748,11 @@ handle_begin_resize (MetaDisplay *display,
} }
static void static void
handle_toggle_on_all_workspaces (MetaDisplay *display, handle_toggle_on_all_workspaces (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
if (window->on_all_workspaces_requested) if (window->on_all_workspaces_requested)
meta_window_unstick (window); meta_window_unstick (window);
@ -2761,11 +2761,11 @@ handle_toggle_on_all_workspaces (MetaDisplay *display,
} }
static void static void
handle_move_to_workspace_last (MetaDisplay *display, handle_move_to_workspace_last (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaWorkspaceManager *workspace_manager = display->workspace_manager; MetaWorkspaceManager *workspace_manager = display->workspace_manager;
gint which; gint which;
@ -2781,11 +2781,11 @@ handle_move_to_workspace_last (MetaDisplay *display,
static void static void
handle_move_to_workspace (MetaDisplay *display, handle_move_to_workspace (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaWorkspaceManager *workspace_manager = display->workspace_manager; MetaWorkspaceManager *workspace_manager = display->workspace_manager;
gint which = binding->handler->data; gint which = binding->handler->data;
@ -2836,11 +2836,11 @@ handle_move_to_workspace (MetaDisplay *display,
} }
static void static void
handle_move_to_monitor (MetaDisplay *display, handle_move_to_monitor (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaContext *context = meta_display_get_context (display); MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context); MetaBackend *backend = meta_context_get_backend (context);
@ -2860,11 +2860,11 @@ handle_move_to_monitor (MetaDisplay *display,
} }
static void static void
handle_raise_or_lower (MetaDisplay *display, handle_raise_or_lower (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
/* Get window at pointer */ /* Get window at pointer */
@ -2906,42 +2906,42 @@ handle_raise_or_lower (MetaDisplay *display,
} }
static void static void
handle_raise (MetaDisplay *display, handle_raise (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
meta_window_raise (window); meta_window_raise (window);
} }
static void static void
handle_lower (MetaDisplay *display, handle_lower (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
meta_window_lower (window); meta_window_lower (window);
} }
static void static void
handle_set_spew_mark (MetaDisplay *display, handle_set_spew_mark (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
meta_verbose ("-- MARK MARK MARK MARK --"); meta_verbose ("-- MARK MARK MARK MARK --");
} }
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
static void static void
handle_switch_vt (MetaDisplay *display, handle_switch_vt (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaContext *context = meta_display_get_context (display); MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context); MetaBackend *backend = meta_context_get_backend (context);
@ -2958,11 +2958,11 @@ handle_switch_vt (MetaDisplay *display,
#endif /* HAVE_NATIVE_BACKEND */ #endif /* HAVE_NATIVE_BACKEND */
static void static void
handle_switch_monitor (MetaDisplay *display, handle_switch_monitor (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaContext *context = meta_display_get_context (display); MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context); MetaBackend *backend = meta_context_get_backend (context);
@ -2979,11 +2979,11 @@ handle_switch_monitor (MetaDisplay *display,
} }
static void static void
handle_rotate_monitor (MetaDisplay *display, handle_rotate_monitor (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
MetaContext *context = meta_display_get_context (display); MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context); MetaBackend *backend = meta_context_get_backend (context);
@ -2994,11 +2994,11 @@ handle_rotate_monitor (MetaDisplay *display,
} }
static void static void
handle_restore_shortcuts (MetaDisplay *display, handle_restore_shortcuts (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer dummy) gpointer user_data)
{ {
ClutterInputDevice *source; ClutterInputDevice *source;

10
src/meta/prefs.h
View File

@ -451,11 +451,11 @@ typedef enum
* @user_data: data passed to the function * @user_data: data passed to the function
* *
*/ */
typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display, typedef void (* MetaKeyHandlerFunc) (MetaDisplay *display,
MetaWindow *window, MetaWindow *window,
ClutterKeyEvent *event, const ClutterKeyEvent *event,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer user_data); gpointer user_data);
META_EXPORT META_EXPORT
GType meta_key_binding_get_type (void); GType meta_key_binding_get_type (void);