isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/keyboard: Naming and coding style fixes

Browse Source 
Some very long lines that stood out were shortened, and an old naming
convention from weston was removed.

https://bugzilla.gnome.org/show_bug.cgi?id=771646
This commit is contained in:
Jonas Ådahl 2016-09-20 16:53:36 +08:00
parent c2217373df
commit 56e8f98c13
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/wayland/meta-wayland-keyboard.c
View File

@ -252,7 +252,8 @@ on_keymap_layout_group_changed (MetaBackend *backend,
static void static void
keyboard_handle_focus_surface_destroy (struct wl_listener *listener, void *data) keyboard_handle_focus_surface_destroy (struct wl_listener *listener, void *data)
{ {
MetaWaylandKeyboard *keyboard = wl_container_of (listener, keyboard, focus_surface_listener); MetaWaylandKeyboard *keyboard = wl_container_of (listener, keyboard,
focus_surface_listener);
meta_wayland_keyboard_set_focus (keyboard, NULL); meta_wayland_keyboard_set_focus (keyboard, NULL);
} }
@ -841,10 +842,12 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
wl_resource_for_each (resource, &keyboard->focus_resource_list) wl_resource_for_each (resource, &keyboard->focus_resource_list)
{ {
wl_keyboard_send_leave (resource, serial, keyboard->focus_surface->resource); wl_keyboard_send_leave (resource, serial,
keyboard->focus_surface->resource);
} }
move_resources (&keyboard->resource_list, &keyboard->focus_resource_list); move_resources (&keyboard->resource_list,
&keyboard->focus_resource_list);
} }
wl_list_remove (&keyboard->focus_surface_listener.link); wl_list_remove (&keyboard->focus_surface_listener.link);
@ -856,11 +859,13 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
struct wl_resource *focus_surface_resource; struct wl_resource *focus_surface_resource;
keyboard->focus_surface = surface; keyboard->focus_surface = surface;
wl_resource_add_destroy_listener (keyboard->focus_surface->resource, &keyboard->focus_surface_listener); focus_surface_resource = keyboard->focus_surface->resource;
wl_resource_add_destroy_listener (focus_surface_resource,
&keyboard->focus_surface_listener);
move_resources_for_client (&keyboard->focus_resource_list, move_resources_for_client (&keyboard->focus_resource_list,
&keyboard->resource_list, &keyboard->resource_list,
wl_resource_get_client (keyboard->focus_surface->resource)); wl_resource_get_client (focus_surface_resource));
if (!wl_list_empty (&keyboard->focus_resource_list)) if (!wl_list_empty (&keyboard->focus_resource_list))
{ {
@ -903,26 +908,31 @@ meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
struct wl_resource *seat_resource, struct wl_resource *seat_resource,
uint32_t id) uint32_t id)
{ {
struct wl_resource *cr; struct wl_resource *resource;
cr = wl_resource_create (client, &wl_keyboard_interface, wl_resource_get_version (seat_resource), id); resource = wl_resource_create (client, &wl_keyboard_interface,
wl_resource_set_implementation (cr, &keyboard_interface, keyboard, unbind_resource); wl_resource_get_version (seat_resource), id);
wl_resource_set_implementation (resource, &keyboard_interface,
keyboard, unbind_resource);
wl_keyboard_send_keymap (cr, wl_keyboard_send_keymap (resource,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
keyboard->xkb_info.keymap_fd, keyboard->xkb_info.keymap_fd,
keyboard->xkb_info.keymap_size); keyboard->xkb_info.keymap_size);
notify_key_repeat_for_resource (keyboard, cr); notify_key_repeat_for_resource (keyboard, resource);
if (keyboard->focus_surface && wl_resource_get_client (keyboard->focus_surface->resource) == client) if (keyboard->focus_surface &&
wl_resource_get_client (keyboard->focus_surface->resource) == client)
{ {
wl_list_insert (&keyboard->focus_resource_list, wl_resource_get_link (cr)); wl_list_insert (&keyboard->focus_resource_list,
broadcast_focus (keyboard, cr); wl_resource_get_link (resource));
broadcast_focus (keyboard, resource);
} }
else else
{ {
wl_list_insert (&keyboard->resource_list, wl_resource_get_link (cr)); wl_list_insert (&keyboard->resource_list,
wl_resource_get_link (resource));
} }
} }