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

window.c: Deal with visual changes

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-05-13 13:24:56 -04:00
parent 393d47aa6f
commit 8357cd61d8
2 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-client.c
+25 -2
View File
@@ -35,6 +35,7 @@
struct display { struct display {
struct wl_display *display; struct wl_display *display;
struct wl_visual *premultiplied_argb_visual;
struct wl_compositor *compositor; struct wl_compositor *compositor;
struct { struct {
EGLDisplay dpy; EGLDisplay dpy;
@@ -195,7 +196,7 @@ create_surface(struct window *window)
EGLBoolean ret; EGLBoolean ret;
window->surface = wl_compositor_create_surface(display->compositor); window->surface = wl_compositor_create_surface(display->compositor);
visual = wl_display_get_premultiplied_argb_visual(display->display); visual = display->premultiplied_argb_visual;
window->native = window->native =
wl_egl_window_create(window->surface, wl_egl_window_create(window->surface,
window->geometry.width, window->geometry.width,
@@ -271,14 +272,36 @@ redraw(struct wl_surface *surface, void *data, uint32_t time)
redraw, window); redraw, window);
} }
static void
compositor_handle_visual(void *data,
struct wl_compositor *compositor,
uint32_t id, uint32_t token)
{
struct display *d = data;
switch (token) {
case WL_COMPOSITOR_VISUAL_PREMULTIPLIED_ARGB32:
d->premultiplied_argb_visual =
wl_visual_create(d->display, id, 1);
break;
}
}
static const struct wl_compositor_listener compositor_listener = {
compositor_handle_visual,
};
static void static void
display_handle_global(struct wl_display *display, uint32_t id, display_handle_global(struct wl_display *display, uint32_t id,
const char *interface, uint32_t version, void *data) const char *interface, uint32_t version, void *data)
{ {
struct display *d = data; struct display *d = data;
if (strcmp(interface, "wl_compositor") == 0) if (strcmp(interface, "wl_compositor") == 0) {
d->compositor = wl_compositor_create(display, id, 1); d->compositor = wl_compositor_create(display, id, 1);
wl_compositor_add_listener(d->compositor,
&compositor_listener, d);
}
} }
static int static int
clients/window.c
+31 -3
View File
@@ -62,6 +62,7 @@ struct display {
struct wl_shell *shell; struct wl_shell *shell;
struct wl_shm *shm; struct wl_shm *shm;
struct wl_output *output; struct wl_output *output;
struct wl_visual *argb_visual, *premultiplied_argb_visual, *rgb_visual;
struct rectangle screen_allocation; struct rectangle screen_allocation;
int authenticated; int authenticated;
EGLDisplay dpy; EGLDisplay dpy;
@@ -224,7 +225,7 @@ display_create_egl_window_surface(struct display *display,
data->display = display; data->display = display;
data->surface = surface; data->surface = surface;
visual = wl_display_get_premultiplied_argb_visual(display->display); visual = display->premultiplied_argb_visual;
data->window = wl_egl_window_create(surface, data->window = wl_egl_window_create(surface,
rectangle->width, rectangle->width,
@@ -295,7 +296,7 @@ display_create_egl_image_surface(struct display *display,
data->display = display; data->display = display;
visual = wl_display_get_premultiplied_argb_visual(display->display); visual = display->premultiplied_argb_visual;
data->pixmap = wl_egl_pixmap_create(rectangle->width, data->pixmap = wl_egl_pixmap_create(rectangle->width,
rectangle->height, rectangle->height,
visual, 0); visual, 0);
@@ -471,7 +472,7 @@ display_create_shm_surface(struct display *display,
cairo_surface_set_user_data (surface, &surface_data_key, cairo_surface_set_user_data (surface, &surface_data_key,
data, shm_surface_data_destroy); data, shm_surface_data_destroy);
visual = wl_display_get_premultiplied_argb_visual(display->display); visual = display->premultiplied_argb_visual;
data->data.buffer = wl_shm_create_buffer(display->shm, data->data.buffer = wl_shm_create_buffer(display->shm,
fd, fd,
rectangle->width, rectangle->width,
@@ -1520,6 +1521,31 @@ window_set_buffer_type(struct window *window, enum window_buffer_type type)
window->buffer_type = type; window->buffer_type = type;
} }
static void
compositor_handle_visual(void *data,
struct wl_compositor *compositor,
uint32_t id, uint32_t token)
{
struct display *d = data;
switch (token) {
case WL_COMPOSITOR_VISUAL_ARGB32:
d->argb_visual = wl_visual_create(d->display, id, 1);
break;
case WL_COMPOSITOR_VISUAL_PREMULTIPLIED_ARGB32:
d->premultiplied_argb_visual =
wl_visual_create(d->display, id, 1);
break;
case WL_COMPOSITOR_VISUAL_XRGB32:
d->rgb_visual = wl_visual_create(d->display, id, 1);
break;
}
}
static const struct wl_compositor_listener compositor_listener = {
compositor_handle_visual,
};
static void static void
display_handle_geometry(void *data, display_handle_geometry(void *data,
struct wl_output *output, struct wl_output *output,
@@ -1672,6 +1698,8 @@ display_handle_global(struct wl_display *display, uint32_t id,
if (strcmp(interface, "wl_compositor") == 0) { if (strcmp(interface, "wl_compositor") == 0) {
d->compositor = wl_compositor_create(display, id, 1); d->compositor = wl_compositor_create(display, id, 1);
wl_compositor_add_listener(d->compositor,
&compositor_listener, d);
} else if (strcmp(interface, "wl_output") == 0) { } else if (strcmp(interface, "wl_output") == 0) {
d->output = wl_output_create(display, id, 1); d->output = wl_output_create(display, id, 1);
wl_output_add_listener(d->output, &output_listener, d); wl_output_add_listener(d->output, &output_listener, d);