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

window: factor out surface attachment code

Browse Source
This commit is contained in:
Kristian Høgsberg 2009-12-16 14:43:37 -05:00
parent e4bf8844f6
commit 6a1b20102c
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
window.c
View File

@ -65,7 +65,7 @@ struct window {
uint32_t name; uint32_t name;
uint32_t modifiers; uint32_t modifiers;
cairo_surface_t *cairo_surface; cairo_surface_t *cairo_surface, *pending_surface;
window_resize_handler_t resize_handler; window_resize_handler_t resize_handler;
window_key_handler_t key_handler; window_key_handler_t key_handler;
@ -87,6 +87,26 @@ rounded_rect(cairo_t *cr, int x0, int y0, int x1, int y1, int radius)
cairo_close_path(cr); cairo_close_path(cr);
} }
static void
window_attach_surface(struct window *window)
{
struct wl_visual *visual;
visual = wl_display_get_premultiplied_argb_visual(window->display->display);
wl_surface_attach(window->surface,
cairo_drm_surface_get_name(window->cairo_surface),
window->allocation.width,
window->allocation.height,
cairo_drm_surface_get_stride(window->cairo_surface),
visual);
wl_surface_map(window->surface,
window->allocation.x - window->margin,
window->allocation.y - window->margin,
window->allocation.width,
window->allocation.height);
}
static void static void
window_draw_decorations(struct window *window) window_draw_decorations(struct window *window)
{ {
@ -94,7 +114,6 @@ window_draw_decorations(struct window *window)
int border = 2, radius = 5; int border = 2, radius = 5;
cairo_text_extents_t extents; cairo_text_extents_t extents;
cairo_pattern_t *gradient, *outline, *bright, *dim; cairo_pattern_t *gradient, *outline, *bright, *dim;
struct wl_visual *visual;
int width, height; int width, height;
int shadow_dx = 4, shadow_dy = 4; int shadow_dx = 4, shadow_dy = 4;
@ -186,45 +205,19 @@ window_draw_decorations(struct window *window)
} }
cairo_destroy(cr); cairo_destroy(cr);
visual = wl_display_get_premultiplied_argb_visual(window->display->display); window_attach_surface(window);
wl_surface_attach(window->surface,
cairo_drm_surface_get_name(window->cairo_surface),
window->allocation.width,
window->allocation.height,
cairo_drm_surface_get_stride(window->cairo_surface),
visual);
wl_surface_map(window->surface,
window->allocation.x - window->margin,
window->allocation.y - window->margin,
window->allocation.width,
window->allocation.height);
} }
static void static void
window_draw_fullscreen(struct window *window) window_draw_fullscreen(struct window *window)
{ {
struct wl_visual *visual;
window->cairo_surface = window->cairo_surface =
cairo_drm_surface_create(window->display->device, cairo_drm_surface_create(window->display->device,
CAIRO_CONTENT_COLOR_ALPHA, CAIRO_CONTENT_COLOR_ALPHA,
window->allocation.width, window->allocation.width,
window->allocation.height); window->allocation.height);
visual = wl_display_get_premultiplied_argb_visual(window->display->display); window_attach_surface(window);
wl_surface_attach(window->surface,
cairo_drm_surface_get_name(window->cairo_surface),
window->allocation.width,
window->allocation.height,
cairo_drm_surface_get_stride(window->cairo_surface),
visual);
wl_surface_map(window->surface,
window->allocation.x,
window->allocation.y,
window->allocation.width,
window->allocation.height);
} }
void void