commit fffe652

Michael Forney  ·  2014-02-13 02:34:48 +0000 UTC
parent a950bc6 
window: Rename WITHDRAWN -> NONE, TOPLEVEL -> NORMAL
5 files changed,  +7, -7
M example/wm.c
M libswc/shell_surface.c
M libswc/swc.h
M libswc/window.c
M libswc/xwm.c
M example/wm.c
+2, -2 
 1@@ -189,9 +189,9 @@ static void window_event(struct wl_listener * listener, void * data)
 2             free(window);
 3             break;
 4         case SWC_WINDOW_STATE_CHANGED:
 5-            /* When the window changes state to TOPLEVEL, we can add it to the
 6+            /* When the window changes state to NORMAL, we can add it to the
 7              * current screen and then rearrange the windows on that screen. */
 8-            if (window->swc->state == SWC_WINDOW_STATE_TOPLEVEL)
 9+            if (window->swc->state == SWC_WINDOW_STATE_NORMAL)
10             {
11                 screen_add_window(active_screen, window);
12                 focus(window);
M libswc/shell_surface.c
+1, -1 
1@@ -75,7 +75,7 @@ static void set_toplevel(struct wl_client * client,
2         return;
3 
4     shell_surface->type = SHELL_SURFACE_TYPE_TOPLEVEL;
5-    window_set_state(&shell_surface->window, SWC_WINDOW_STATE_TOPLEVEL);
6+    window_set_state(&shell_surface->window, SWC_WINDOW_STATE_NORMAL);
7 }
8 
9 static void set_transient(struct wl_client * client,
M libswc/swc.h
+2, -2 
 1@@ -95,8 +95,8 @@ struct swc_window
 2 
 3     enum
 4     {
 5-        SWC_WINDOW_STATE_WITHDRAWN,
 6-        SWC_WINDOW_STATE_TOPLEVEL
 7+        SWC_WINDOW_STATE_NONE,
 8+        SWC_WINDOW_STATE_NORMAL
 9     } state;
10 
11     struct swc_window * parent;
M libswc/window.c
+1, -1 
1@@ -119,7 +119,7 @@ bool window_initialize(struct window * window, const struct window_impl * impl,
2 
3     window->base.title = NULL;
4     window->base.class = NULL;
5-    window->base.state = SWC_WINDOW_STATE_WITHDRAWN;
6+    window->base.state = SWC_WINDOW_STATE_NONE;
7     window->base.parent = NULL;
8     wl_signal_init(&window->base.event_signal);
9     window->surface = surface;
M libswc/xwm.c
+1, -1 
1@@ -362,7 +362,7 @@ void swc_xwm_manage_window(xcb_window_t id, struct swc_surface * surface)
2         xcb_configure_window(xwm.connection, id, mask, values);
3         update_name(xwl_window);
4 
5-        window_set_state(&xwl_window->window, SWC_WINDOW_STATE_TOPLEVEL);
6+        window_set_state(&xwl_window->window, SWC_WINDOW_STATE_NORMAL);
7     }
8 }
9