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

xdg-shell: Update to latest renames for focused_set / focused_unset

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-02-09 11:41:40 -05:00
parent cc13f8f65e
commit 00c8d3c897
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
protocol/xdg-shell.xml
View File

@ -249,12 +249,6 @@
ignore it if it doesn't resize, pick a smaller size (to ignore it if it doesn't resize, pick a smaller size (to
satisfy aspect ratio or resize in steps of NxM pixels). satisfy aspect ratio or resize in steps of NxM pixels).
The edges parameter provides a hint about how the surface
was resized. The client may use this information to decide
how to adjust its content to the new size (e.g. a scrolling
area might adjust its content position to leave the viewable
content unmoved). Valid edge values are from resize_edge enum.
The client is free to dismiss all but the last configure The client is free to dismiss all but the last configure
event it received. event it received.
@ -391,18 +385,25 @@
</description> </description>
</request> </request>
<event name="focused_set"> <event name="activated">
<description summary="surface was focused"> <description summary="surface was activated">
The focused_set event is sent when this surface has been The activated_set event is sent when this surface has been
activated. Window decorations should be updated accordingly. activated, which means that the surface has user attention.
Window decorations should be updated accordingly. You should
not use this event for anything but the style of decorations
you display, use wl_keyboard.enter and wl_keyboard.leave for
determining keyboard focus.
</description> </description>
</event> </event>
<event name="focused_unset"> <event name="deactivated">
<description summary="surface was unfocused"> <description summary="surface was deactivated">
The focused_unset event is sent when this surface has been The deactivate event is sent when this surface has been
deactivated, because another surface has been activated. Window deactivated, which means that the surface lost user attention.
decorations should be updated accordingly. Window decorations should be updated accordingly. You should
not use this event for anything but the style of decorations
you display, use wl_keyboard.enter and wl_keyboard.leave for
determining keyboard focus.
</description> </description>
</event> </event>

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

@ -543,7 +543,7 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
serial = wl_display_next_serial (display); serial = wl_display_next_serial (display);
wl_keyboard_send_leave (resource, serial, keyboard->focus_surface->resource); wl_keyboard_send_leave (resource, serial, keyboard->focus_surface->resource);
meta_wayland_surface_focused_unset (keyboard->focus_surface); meta_wayland_surface_deactivated (keyboard->focus_surface);
} }
wl_list_remove (&keyboard->focus_resource_listener.link); wl_list_remove (&keyboard->focus_resource_listener.link);
@ -584,7 +584,7 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
&keyboard->keys); &keyboard->keys);
} }
meta_wayland_surface_focused_set (surface); meta_wayland_surface_activated (surface);
keyboard->focus_resource = resource; keyboard->focus_resource = resource;
keyboard->focus_surface = surface; keyboard->focus_surface = surface;

8
src/wayland/meta-wayland-surface.c
View File

@ -1508,17 +1508,17 @@ meta_wayland_surface_configure_notify (MetaWaylandSurface *surface,
} }
void void
meta_wayland_surface_focused_set (MetaWaylandSurface *surface) meta_wayland_surface_activated (MetaWaylandSurface *surface)
{ {
if (surface->xdg_surface.resource) if (surface->xdg_surface.resource)
xdg_surface_send_focused_set (surface->xdg_surface.resource); xdg_surface_send_activated (surface->xdg_surface.resource);
} }
void void
meta_wayland_surface_focused_unset (MetaWaylandSurface *surface) meta_wayland_surface_deactivated (MetaWaylandSurface *surface)
{ {
if (surface->xdg_surface.resource) if (surface->xdg_surface.resource)
xdg_surface_send_focused_unset (surface->xdg_surface.resource); xdg_surface_send_deactivated (surface->xdg_surface.resource);
} }
void void

4
src/wayland/meta-wayland-surface.h
View File

@ -125,8 +125,8 @@ void meta_wayland_surface_configure_notify (MetaWaylandSurface *s
int width, int width,
int height); int height);
void meta_wayland_surface_focused_set (MetaWaylandSurface *surface); void meta_wayland_surface_activated (MetaWaylandSurface *surface);
void meta_wayland_surface_focused_unset (MetaWaylandSurface *surface); void meta_wayland_surface_deactivated (MetaWaylandSurface *surface);
void meta_wayland_surface_ping (MetaWaylandSurface *surface, void meta_wayland_surface_ping (MetaWaylandSurface *surface,
guint32 serial); guint32 serial);