mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'output-hotplug' of git://people.freedesktop.org/~bnf/wayland-demos

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-04-10 13:05:11 -04:00
parent bad4297380 78db848196
commit 38f0c14af3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+8 -2
View File
@@ -2224,8 +2224,12 @@ weston_shader_init(struct weston_shader *shader,
WL_EXPORT void WL_EXPORT void
weston_output_destroy(struct weston_output *output) weston_output_destroy(struct weston_output *output)
{ {
struct weston_compositor *c = output->compositor;
pixman_region32_fini(&output->region); pixman_region32_fini(&output->region);
pixman_region32_fini(&output->previous_damage); pixman_region32_fini(&output->previous_damage);
wl_display_remove_global(c->wl_display, output->global);
} }
WL_EXPORT void WL_EXPORT void
@@ -2310,11 +2314,13 @@ weston_output_init(struct weston_output *output, struct weston_compositor *c,
output->flags = flags; output->flags = flags;
weston_output_move(output, x, y); weston_output_move(output, x, y);
weston_output_damage(output);
wl_list_init(&output->frame_callback_list); wl_list_init(&output->frame_callback_list);
wl_display_add_global(c->wl_display, output->global =
&wl_output_interface, output, bind_output); wl_display_add_global(c->wl_display, &wl_output_interface,
output, bind_output);
} }
static void static void
src/compositor.h
+1
View File
@@ -73,6 +73,7 @@ enum dpms_enum {
struct weston_output { struct weston_output {
struct wl_list link; struct wl_list link;
struct wl_global *global;
struct weston_compositor *compositor; struct weston_compositor *compositor;
struct weston_matrix matrix; struct weston_matrix matrix;
struct wl_list frame_callback_list; struct wl_list frame_callback_list;