commit 0e1c116
Michael Forney
·
2013-11-20 00:51:32 +0000 UTC
parent d806569
swc_window_manager -> swc_manager
4 files changed,
+12,
-12
+2,
-2
1@@ -24,11 +24,11 @@
2 #ifndef SWC_PRIVATE_H
3 #define SWC_PRIVATE_H
4
5+struct swc_manager;
6 struct swc_compositor;
7-struct swc_window_manager;
8
9+extern const struct swc_manager * swc_manager;
10 extern struct swc_compositor * compositor;
11-extern const struct swc_window_manager * window_manager;
12
13 #endif
14
+3,
-3
1@@ -32,12 +32,12 @@ static struct
2 } swc;
3
4 struct swc_compositor * compositor = &swc.compositor;
5-const struct swc_window_manager * window_manager;
6+const struct swc_manager * swc_manager;
7
8 bool swc_initialize(struct wl_display * display,
9- const struct swc_window_manager * wm)
10+ const struct swc_manager * manager)
11 {
12- window_manager = wm;
13+ swc_manager = manager;
14
15 if (!swc_bindings_initialize())
16 {
+6,
-6
1@@ -53,11 +53,6 @@ struct swc_window
2 } state;
3 };
4
5-struct swc_window_manager
6-{
7- void (* new_window)(struct swc_window * window);
8-};
9-
10 void swc_window_show(struct swc_window * window);
11 void swc_window_hide(struct swc_window * window);
12 void swc_window_focus(struct swc_window * window);
13@@ -97,8 +92,13 @@ struct swc_event
14 };
15 /* }}} */
16
17+struct swc_manager
18+{
19+ void (* new_window)(struct swc_window * window);
20+};
21+
22 bool swc_initialize(struct wl_display * display,
23- const struct swc_window_manager * window_manager);
24+ const struct swc_manager * manager);
25 void swc_finalize();
26
27 #endif
+1,
-1
1@@ -97,7 +97,7 @@ bool swc_window_initialize(struct swc_window * window,
2 (surface->resource, &INTERNAL(window)->surface_destroy_listener);
3 swc_surface_set_class(surface, &compositor->compositor_class);
4
5- window_manager->new_window(window);
6+ swc_manager->new_window(window);
7
8 return true;
9 }