system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-21 10:44:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorder the xdg_shell implementations to fit the spec'd order

Browse source
This commit is contained in:
Jasper St. Pierre 2014-02-01 18:35:15 -05:00
parent 63a1410348
commit 63a9c336f3
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
clients/window.c
View file

@ -3836,20 +3836,6 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface,
window_schedule_resize(window, width, height);
}
static void
handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window->focused = 1;
}
static void
handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window->focused = 0;
}
static void
handle_surface_request_set_maximized(void *data, struct xdg_surface *xdg_surface)
{
@ -3878,6 +3864,20 @@ handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surf
window_set_fullscreen(window, 0);
}
static void
handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window->focused = 1;
}
static void
handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window->focused = 0;
}
static void
handle_surface_delete(void *data, struct xdg_surface *xdg_surface)
{

32
desktop-shell/shell.c
View file

@ -1979,22 +1979,6 @@ create_keyboard_focus_listener(struct weston_seat *seat)
wl_signal_add(&seat->keyboard->focus_signal, listener);
}
static void
xdg_surface_set_transient_for(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *parent_resource)
{
struct shell_surface *shsurf = wl_resource_get_user_data(resource);
struct weston_surface *parent;
if (parent_resource)
parent = wl_resource_get_user_data(parent_resource);
else
parent = NULL;
shell_surface_set_parent(shsurf, parent);
}
static struct shell_client *
get_shell_client(struct wl_client *client)
{
@ -3179,6 +3163,22 @@ xdg_surface_destroy(struct wl_client *client,
wl_resource_destroy(resource);
}
static void
xdg_surface_set_transient_for(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *parent_resource)
{
struct shell_surface *shsurf = wl_resource_get_user_data(resource);
struct weston_surface *parent;
if (parent_resource)
parent = wl_resource_get_user_data(parent_resource);
else
parent = NULL;
shell_surface_set_parent(shsurf, parent);
}
static void
xdg_surface_set_margin(struct wl_client *client,
struct wl_resource *resource,