swc

commit 0e1c116e2941cf247a70b6cbe4118c58cf332877
parent d80656905fc2f70a194b9541ffb640b3a0bd5bd7
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 19 Nov 2013 16:51:32 -0800

swc_window_manager -> swc_manager

Diffstat:
M
libswc/private.h
 | 
4
++--
M
libswc/swc.c
 | 
6
+++---
M
libswc/swc.h
 | 
12
++++++------
M
libswc/window.c
 | 
2
+-

4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libswc/private.h b/libswc/private.h
@@ -24,11 +24,11 @@
 #ifndef SWC_PRIVATE_H
 #define SWC_PRIVATE_H
 
+struct swc_manager;
 struct swc_compositor;
-struct swc_window_manager;
 
+extern const struct swc_manager * swc_manager;
 extern struct swc_compositor * compositor;
-extern const struct swc_window_manager * window_manager;
 
 #endif
 
diff --git a/libswc/swc.c b/libswc/swc.c
@@ -32,12 +32,12 @@ static struct
 } swc;
 
 struct swc_compositor * compositor = &swc.compositor;
-const struct swc_window_manager * window_manager;
+const struct swc_manager * swc_manager;
 
 bool swc_initialize(struct wl_display * display,
-                    const struct swc_window_manager * wm)
+                    const struct swc_manager * manager)
 {
-    window_manager = wm;
+    swc_manager = manager;
 
     if (!swc_bindings_initialize())
     {
diff --git a/libswc/swc.h b/libswc/swc.h
@@ -53,11 +53,6 @@ struct swc_window
     } state;
 };
 
-struct swc_window_manager
-{
-    void (* new_window)(struct swc_window * window);
-};
-
 void swc_window_show(struct swc_window * window);
 void swc_window_hide(struct swc_window * window);
 void swc_window_focus(struct swc_window * window);
@@ -97,8 +92,13 @@ struct swc_event
 };
 /* }}} */
 
+struct swc_manager
+{
+    void (* new_window)(struct swc_window * window);
+};
+
 bool swc_initialize(struct wl_display * display,
-                    const struct swc_window_manager * window_manager);
+                    const struct swc_manager * manager);
 void swc_finalize();
 
 #endif
diff --git a/libswc/window.c b/libswc/window.c
@@ -97,7 +97,7 @@ bool swc_window_initialize(struct swc_window * window,
         (surface->resource, &INTERNAL(window)->surface_destroy_listener);
     swc_surface_set_class(surface, &compositor->compositor_class);
 
-    window_manager->new_window(window);
+    swc_manager->new_window(window);
 
     return true;
 }