commit b8123be
Michael Forney
·
2014-02-01 07:30:03 +0000 UTC
parent 452e492
screen: Reserve swc_ prefix for public API
12 files changed,
+62,
-65
+14,
-14
1@@ -156,7 +156,7 @@ static void handle_screen_event(struct wl_listener * listener, void * data)
2 }
3 }
4
5-static struct target * target_get(struct swc_screen_internal * screen)
6+static struct target * target_get(struct screen * screen)
7 {
8 struct wl_listener * listener
9 = wl_signal_get(&screen->base.event_signal, &handle_screen_event);
10@@ -175,7 +175,7 @@ static void handle_screen_view_event(struct wl_listener * listener, void * data)
11 {
12 case SWC_VIEW_EVENT_FRAME:
13 {
14- struct swc_screen_internal * screen = CONTAINER_OF
15+ struct screen * screen = CONTAINER_OF
16 (event_data->view, typeof(*screen), planes.framebuffer.view);
17 struct target * target;
18 struct view * view;
19@@ -183,11 +183,11 @@ static void handle_screen_view_event(struct wl_listener * listener, void * data)
20 if (!(target = target_get(screen)))
21 return;
22
23- compositor.pending_flips &= ~swc_screen_mask(screen);
24+ compositor.pending_flips &= ~screen_mask(screen);
25
26 wl_list_for_each(view, &compositor.views, link)
27 {
28- if (view->base.screens & swc_screen_mask(screen))
29+ if (view->base.screens & screen_mask(screen))
30 swc_view_frame(&view->base, event_data->frame.time);
31 }
32
33@@ -221,7 +221,7 @@ static bool target_swap_buffers(struct target * target)
34 return true;
35 }
36
37-static struct target * target_new(struct swc_screen_internal * screen)
38+static struct target * target_new(struct screen * screen)
39 {
40 struct target * target;
41
42@@ -241,7 +241,7 @@ static struct target * target_new(struct swc_screen_internal * screen)
43 target->view_listener.notify = &handle_screen_view_event;
44 wl_signal_add(&target->view->event_signal, &target->view_listener);
45 target->current_buffer = NULL;
46- target->mask = swc_screen_mask(screen);
47+ target->mask = screen_mask(screen);
48 target_swap_buffers(target);
49
50 target->screen_listener.notify = &handle_screen_event;
51@@ -441,11 +441,11 @@ static void schedule_updates(uint32_t screens)
52
53 if (screens == -1)
54 {
55- struct swc_screen_internal * screen;
56+ struct screen * screen;
57
58 screens = 0;
59 wl_list_for_each(screen, &swc.screens, link)
60- screens |= swc_screen_mask(screen);
61+ screens |= screen_mask(screen);
62 }
63
64 compositor.scheduled_updates |= screens;
65@@ -718,13 +718,13 @@ static void calculate_damage()
66 pixman_region32_fini(&surface_opaque);
67 }
68
69-static void update_screen(struct swc_screen_internal * screen)
70+static void update_screen(struct screen * screen)
71 {
72 struct target * target;
73 const struct swc_rectangle * geometry = &screen->base.geometry;
74 pixman_region32_t damage;
75
76- if (!(compositor.scheduled_updates & swc_screen_mask(screen)))
77+ if (!(compositor.scheduled_updates & screen_mask(screen)))
78 return;
79
80 if (!(target = target_get(screen)))
81@@ -740,7 +740,7 @@ static void update_screen(struct swc_screen_internal * screen)
82 pixman_region32_fini(&damage);
83
84 /* Don't repaint the screen if it is waiting for a page flip. */
85- if (compositor.pending_flips & swc_screen_mask(screen))
86+ if (compositor.pending_flips & screen_mask(screen))
87 return;
88
89 pixman_region32_t * total_damage, base_damage;
90@@ -757,7 +757,7 @@ static void update_screen(struct swc_screen_internal * screen)
91
92 static void perform_update(void * data)
93 {
94- struct swc_screen_internal * screen;
95+ struct screen * screen;
96 uint32_t updates = compositor.scheduled_updates
97 & ~compositor.pending_flips;
98
99@@ -823,7 +823,7 @@ static void handle_switch_vt(uint32_t time, uint32_t value, void * data)
100 static void handle_launch_event(struct wl_listener * listener, void * data)
101 {
102 struct swc_event * event = data;
103- struct swc_screen_internal * screen;
104+ struct screen * screen;
105
106 switch (event->type)
107 {
108@@ -892,7 +892,7 @@ static void bind_compositor(struct wl_client * client, void * data,
109
110 bool swc_compositor_initialize()
111 {
112- struct swc_screen_internal * screen;
113+ struct screen * screen;
114 uint32_t keysym;
115
116 compositor.global = wl_global_create
+1,
-2
1@@ -416,8 +416,7 @@ bool swc_drm_create_screens(struct wl_list * screens)
2 if (!(output = swc_output_new(connector)))
3 continue;
4
5- output->screen = swc_screen_new(resources->crtcs[crtc_index],
6- output);
7+ output->screen = screen_new(resources->crtcs[crtc_index], output);
8 output->screen->id = id;
9
10 taken_crtcs |= 1 << crtc_index;
+1,
-1
1@@ -15,7 +15,7 @@ static void bind_output(struct wl_client * client, void * data,
2 uint32_t version, uint32_t id)
3 {
4 struct swc_output * output = data;
5- struct swc_screen_internal * screen = output->screen;
6+ struct screen * screen = output->screen;
7 struct swc_mode * mode;
8 struct wl_resource * resource;
9 uint32_t flags;
+1,
-1
1@@ -10,7 +10,7 @@ struct wl_display;
2
3 struct swc_output
4 {
5- struct swc_screen_internal * screen;
6+ struct screen * screen;
7
8 /* The physical dimensions (in mm) of this output */
9 uint32_t physical_width, physical_height;
+6,
-7
1@@ -73,9 +73,8 @@ static void dock(struct wl_client * client, struct wl_resource * resource,
2 struct swc_panel * panel = wl_resource_get_user_data(resource);
3 struct swc_output * output = output_resource
4 ? wl_resource_get_user_data(output_resource) : NULL;
5- struct swc_screen_internal * screen = output
6- ? output->screen : CONTAINER_OF(swc.screens.next,
7- struct swc_screen_internal, link);
8+ struct screen * screen = output
9+ ? output->screen : CONTAINER_OF(swc.screens.next, struct screen, link);
10 bool screen_changed = screen != panel->screen;
11 uint32_t length;
12
13@@ -98,7 +97,7 @@ static void dock(struct wl_client * client, struct wl_resource * resource,
14 if (panel->screen && screen_changed)
15 {
16 wl_list_remove(&panel->modifier.link);
17- swc_screen_update_usable_geometry(panel->screen);
18+ screen_update_usable_geometry(panel->screen);
19 }
20
21 panel->screen = screen;
22@@ -136,7 +135,7 @@ static void set_strut(struct wl_client * client, struct wl_resource * resource,
23 panel->strut_size = size;
24
25 if (panel->docked)
26- swc_screen_update_usable_geometry(panel->screen);
27+ screen_update_usable_geometry(panel->screen);
28 }
29
30 static const struct swc_panel_interface panel_implementation = {
31@@ -145,7 +144,7 @@ static const struct swc_panel_interface panel_implementation = {
32 .set_strut = &set_strut
33 };
34
35-static void modify(struct swc_screen_modifier * modifier,
36+static void modify(struct screen_modifier * modifier,
37 const struct swc_rectangle * geometry,
38 pixman_region32_t * usable)
39 {
40@@ -193,7 +192,7 @@ static void destroy_panel(struct wl_resource * resource)
41 {
42 wl_list_remove(&panel->view_listener.link);
43 wl_list_remove(&panel->modifier.link);
44- swc_screen_update_usable_geometry(panel->screen);
45+ screen_update_usable_geometry(panel->screen);
46 swc_compositor_remove_surface(panel->surface);
47 }
48
+2,
-2
1@@ -36,8 +36,8 @@ struct swc_panel
2 struct swc_surface * surface;
3 struct wl_listener surface_destroy_listener;
4 struct wl_listener view_listener;
5- struct swc_screen_internal * screen;
6- struct swc_screen_modifier modifier;
7+ struct screen * screen;
8+ struct screen_modifier modifier;
9 uint32_t edge;
10 uint32_t offset, strut_size;
11 bool docked;
+6,
-6
1@@ -130,14 +130,14 @@ static void handle_view_event(struct wl_listener * listener, void * data)
2 {
3 case SWC_VIEW_EVENT_MOVED:
4 {
5- struct swc_screen_internal * screen;
6+ struct screen * screen;
7
8 wl_list_for_each(screen, &swc.screens, link)
9 {
10 swc_view_move(&screen->planes.cursor.view,
11 view->geometry.x, view->geometry.y);
12
13- if (view->screens & swc_screen_mask(screen))
14+ if (view->screens & screen_mask(screen))
15 {
16 struct swc_pointer * pointer
17 = CONTAINER_OF(view, typeof(*pointer), cursor.view);
18@@ -155,18 +155,18 @@ static void handle_view_event(struct wl_listener * listener, void * data)
19 }
20 case SWC_VIEW_EVENT_SCREENS_CHANGED:
21 {
22- struct swc_screen_internal * screen;
23+ struct screen * screen;
24 uint32_t entered = event_data->screens_changed.entered,
25 left = event_data->screens_changed.left;
26
27 wl_list_for_each(screen, &swc.screens, link)
28 {
29- if (entered & swc_screen_mask(screen))
30+ if (entered & screen_mask(screen))
31 {
32 swc_view_attach(&screen->planes.cursor.view,
33 &pointer->cursor.buffer);
34 }
35- else if (left & swc_screen_mask(screen))
36+ else if (left & screen_mask(screen))
37 swc_view_attach(&screen->planes.cursor.view, NULL);
38 }
39 break;
40@@ -208,7 +208,7 @@ void swc_pointer_set_cursor(struct swc_pointer * pointer, uint32_t id)
41 bool swc_pointer_initialize(struct swc_pointer * pointer)
42 {
43 struct wld_buffer * buffer;
44- struct swc_screen_internal * screen;
45+ struct screen * screen;
46
47 /* Center cursor in the geometry of the first screen. */
48 screen = CONTAINER_OF(swc.screens.next, typeof(*screen), link);
+11,
-12
1@@ -32,9 +32,9 @@
2 #include <stdlib.h>
3 #include <sys/param.h>
4
5-#define INTERNAL(screen) ((struct swc_screen_internal *) (screen))
6+#define INTERNAL(s) ((struct screen *) (s))
7
8-bool swc_screens_initialize()
9+bool screens_initialize()
10 {
11 wl_list_init(&swc.screens);
12
13@@ -47,18 +47,17 @@ bool swc_screens_initialize()
14 return true;
15 }
16
17-void swc_screens_finalize()
18+void screens_finalize()
19 {
20- struct swc_screen_internal * screen, * tmp;
21+ struct screen * screen, * tmp;
22
23 wl_list_for_each_safe(screen, tmp, &swc.screens, link)
24- swc_screen_destroy(screen);
25+ screen_destroy(screen);
26 }
27
28-struct swc_screen_internal * swc_screen_new(uint32_t crtc,
29- struct swc_output * output)
30+struct screen * screen_new(uint32_t crtc, struct swc_output * output)
31 {
32- struct swc_screen_internal * screen;
33+ struct screen * screen;
34 int32_t x = 0;
35
36 /* Simple heuristic for initial screen positioning. */
37@@ -70,7 +69,7 @@ struct swc_screen_internal * swc_screen_new(uint32_t crtc,
38
39 wl_signal_init(&screen->base.event_signal);
40 wl_list_init(&screen->outputs);
41- wl_list_insert(&INTERNAL(screen)->outputs, &output->link);
42+ wl_list_insert(&screen->outputs, &output->link);
43 wl_list_init(&screen->modifiers);
44
45 if (!swc_framebuffer_plane_initialize(&screen->planes.framebuffer, crtc,
46@@ -106,7 +105,7 @@ struct swc_screen_internal * swc_screen_new(uint32_t crtc,
47 return NULL;
48 }
49
50-void swc_screen_destroy(struct swc_screen_internal * screen)
51+void screen_destroy(struct screen * screen)
52 {
53 struct swc_output * output, * next;
54
55@@ -117,11 +116,11 @@ void swc_screen_destroy(struct swc_screen_internal * screen)
56 free(screen);
57 }
58
59-void swc_screen_update_usable_geometry(struct swc_screen_internal * screen)
60+void screen_update_usable_geometry(struct screen * screen)
61 {
62 pixman_region32_t total_usable, usable;
63 pixman_box32_t * extents;
64- struct swc_screen_modifier * modifier;
65+ struct screen_modifier * modifier;
66
67 DEBUG("Updating usable geometry\n");
68
+10,
-10
1@@ -33,15 +33,15 @@
2 struct swc_output;
3 struct pixman_region32;
4
5-struct swc_screen_modifier
6+struct screen_modifier
7 {
8- void (* modify)(struct swc_screen_modifier * modifier,
9+ void (* modify)(struct screen_modifier * modifier,
10 const struct swc_rectangle * geometry,
11 struct pixman_region32 * usable);
12 struct wl_list link;
13 };
14
15-struct swc_screen_internal
16+struct screen
17 {
18 struct swc_screen base;
19
20@@ -58,18 +58,18 @@ struct swc_screen_internal
21 struct wl_list link;
22 };
23
24-bool swc_screens_initialize();
25-void swc_screens_finalize();
26+bool screens_initialize();
27+void screens_finalize();
28
29-struct swc_screen_internal * swc_screen_new(uint32_t crtc,
30- struct swc_output * output);
31-void swc_screen_destroy(struct swc_screen_internal * screen);
32-static inline uint32_t swc_screen_mask(struct swc_screen_internal * screen)
33+struct screen * screen_new(uint32_t crtc, struct swc_output * output);
34+void screen_destroy(struct screen * screen);
35+
36+static inline uint32_t screen_mask(struct screen * screen)
37 {
38 return 1 << screen->id;
39 }
40
41-void swc_screen_update_usable_geometry(struct swc_screen_internal * screen);
42+void screen_update_usable_geometry(struct screen * screen);
43
44 #endif
45
+4,
-4
1@@ -316,7 +316,7 @@ static void handle_view_event(struct wl_listener * listener, void * data)
2 }
3 case SWC_VIEW_EVENT_SCREENS_CHANGED:
4 {
5- struct swc_screen_internal * screen;
6+ struct screen * screen;
7 struct swc_output * output;
8 struct wl_client * client;
9 struct wl_resource * resource;
10@@ -327,7 +327,7 @@ static void handle_view_event(struct wl_listener * listener, void * data)
11
12 wl_list_for_each(screen, &swc.screens, link)
13 {
14- if (!((entered | left) & swc_screen_mask(screen)))
15+ if (!((entered | left) & screen_mask(screen)))
16 continue;
17
18 wl_list_for_each(output, &screen->outputs, link)
19@@ -337,9 +337,9 @@ static void handle_view_event(struct wl_listener * listener, void * data)
20
21 if (resource)
22 {
23- if (entered & swc_screen_mask(screen))
24+ if (entered & screen_mask(screen))
25 wl_surface_send_enter(surface->resource, resource);
26- else if (left & swc_screen_mask(screen))
27+ else if (left & screen_mask(screen))
28 wl_surface_send_leave(surface->resource, resource);
29 }
30 }
+4,
-4
1@@ -60,7 +60,7 @@ struct swc swc = {
2 static void setup_compositor()
3 {
4 pixman_region32_t pointer_region;
5- struct swc_screen_internal * screen;
6+ struct screen * screen;
7 struct swc_rectangle * geometry;
8
9 wl_list_insert(&swc.seat->keyboard->handlers,
10@@ -118,7 +118,7 @@ bool swc_initialize(struct wl_display * display,
11 goto error3;
12 }
13
14- if (!swc_screens_initialize())
15+ if (!screens_initialize())
16 {
17 ERROR("Could not initialize screens\n");
18 goto error4;
19@@ -179,7 +179,7 @@ bool swc_initialize(struct wl_display * display,
20 error6:
21 swc_compositor_finalize();
22 error5:
23- swc_screens_finalize();
24+ screens_finalize();
25 error4:
26 swc_bindings_finalize();
27 error3:
28@@ -203,7 +203,7 @@ void swc_finalize()
29 swc_seat_finalize();
30 swc_data_device_manager_finalize();
31 swc_compositor_finalize();
32- swc_screens_finalize();
33+ screens_finalize();
34 swc_bindings_finalize();
35 swc_shm_finalize();
36 swc_drm_finalize();
+2,
-2
1@@ -34,14 +34,14 @@ static void update_screens(struct swc_view * view)
2 {
3 struct swc_view_event_data data = { .view = view };
4 uint32_t old = view->screens, new = 0;
5- struct swc_screen_internal * screen;
6+ struct screen * screen;
7
8 if (view->visible)
9 {
10 wl_list_for_each(screen, &swc.screens, link)
11 {
12 if (swc_rectangle_overlap(&screen->base.geometry, &view->geometry))
13- new |= swc_screen_mask(screen);
14+ new |= screen_mask(screen);
15 }
16 }
17