Reorder the xdg_shell implementations to fit the spec'd order

diff --git a/clients/window.c b/clients/window.c
index 9e36f20..3ea5027 100644 (file)
--- a/clients/window.c
+++ b/clients/window.c
@@ -3837,45 +3837,45 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface,
 }
 
 static void
-handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
+handle_surface_request_set_maximized(void *data, struct xdg_surface *xdg_surface)
 {
        struct window *window = data;
-       window->focused = 1;
+       window_set_maximized(window, 1);
 }
 
 static void
-handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
+handle_surface_request_unset_maximized(void *data, struct xdg_surface *xdg_surface)
 {
        struct window *window = data;
-       window->focused = 0;
+       window_set_maximized(window, 0);
 }
 
 static void
-handle_surface_request_set_maximized(void *data, struct xdg_surface *xdg_surface)
+handle_surface_request_set_fullscreen(void *data, struct xdg_surface *xdg_surface)
 {
        struct window *window = data;
-       window_set_maximized(window, 1);
+       window_set_fullscreen(window, 1);
 }
 
 static void
-handle_surface_request_unset_maximized(void *data, struct xdg_surface *xdg_surface)
+handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surface)
 {
        struct window *window = data;
-       window_set_maximized(window, 0);
+       window_set_fullscreen(window, 0);
 }
 
 static void
-handle_surface_request_set_fullscreen(void *data, struct xdg_surface *xdg_surface)
+handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
 {
        struct window *window = data;
-       window_set_fullscreen(window, 1);
+       window->focused = 1;
 }
 
 static void
-handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surface)
+handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
 {
        struct window *window = data;
-       window_set_fullscreen(window, 0);
+       window->focused = 0;
 }
 
 static void

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index e8abeb5..dcf2520 100644 (file)
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -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)
 {
@@ -3180,6 +3164,22 @@ xdg_surface_destroy(struct wl_client *client,
 }
 
 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,
                             int32_t left,