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

Add commit request + ack event to wayland core.

Browse Source 
Use in window.c to manage life cycle of buffer correctly.
dev
Kristian Høgsberg 16 years ago
parent 961a04cef0
commit 4097923a64
4 changed files with 165 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      wayland-client.c
  2. 6
      wayland-client.h
  3. 23
      wayland.c
  4. 191
      window.c

26
wayland-client.c
Unescape View File

@ -165,13 +165,14 @@ wl_display_get_fd(struct wl_display *display,
} }
static void static void
handle_event(struct wl_display *display, uint32_t opcode, uint32_t size) handle_event(struct wl_display *display,
uint32_t object, uint32_t opcode, uint32_t size)
{ {
uint32_t p[4]; uint32_t p[10];
wl_connection_copy(display->connection, p, size); wl_connection_copy(display->connection, p, size);
if (display->event_handler != NULL) if (display->event_handler != NULL)
display->event_handler(display, opcode, p[2], p[3], display->event_handler(display, object, opcode, size, p + 2,
display->event_handler_data); display->event_handler_data);
wl_connection_consume(display->connection, size); wl_connection_consume(display->connection, size);
} }
@ -179,7 +180,7 @@ handle_event(struct wl_display *display, uint32_t opcode, uint32_t size)
WL_EXPORT void WL_EXPORT void
wl_display_iterate(struct wl_display *display, uint32_t mask) wl_display_iterate(struct wl_display *display, uint32_t mask)
{ {
uint32_t p[2], opcode, size; uint32_t p[2], object, opcode, size;
int len; int len;
len = wl_connection_data(display->connection, mask); len = wl_connection_data(display->connection, mask);
@ -188,12 +189,13 @@ wl_display_iterate(struct wl_display *display, uint32_t mask)
break; break;
wl_connection_copy(display->connection, p, sizeof p); wl_connection_copy(display->connection, p, sizeof p);
object = p[0];
opcode = p[1] & 0xffff; opcode = p[1] & 0xffff;
size = p[1] >> 16; size = p[1] >> 16;
if (len < size) if (len < size)
break; break;
handle_event(display, opcode, size); handle_event(display, object, opcode, size);
len -= size; len -= size;
} }
@ -225,7 +227,8 @@ wl_display_write(struct wl_display *display, const void *data, size_t count)
wl_connection_write(display->connection, data, count); wl_connection_write(display->connection, data, count);
} }
#define WL_DISPLAY_CREATE_SURFACE 0 #define WL_DISPLAY_CREATE_SURFACE 0
#define WL_DISPLAY_COMMIT 1
WL_EXPORT struct wl_surface * WL_EXPORT struct wl_surface *
wl_display_create_surface(struct wl_display *display) wl_display_create_surface(struct wl_display *display)
@ -248,6 +251,17 @@ wl_display_create_surface(struct wl_display *display)
return surface; return surface;
} }
WL_EXPORT void
wl_display_commit(struct wl_display *display, uint32_t key)
{
uint32_t request[3];
request[0] = display->proxy.id;
request[1] = WL_DISPLAY_COMMIT | ((sizeof request) << 16);
request[2] = key;
wl_connection_write(display->connection, request, sizeof request);
}
#define WL_SURFACE_DESTROY 0 #define WL_SURFACE_DESTROY 0
#define WL_SURFACE_ATTACH 1 #define WL_SURFACE_ATTACH 1
#define WL_SURFACE_MAP 2 #define WL_SURFACE_MAP 2

6
wayland-client.h
Unescape View File

@ -24,8 +24,10 @@ int wl_display_get_fd(struct wl_display *display,
void wl_display_iterate(struct wl_display *display, uint32_t mask); void wl_display_iterate(struct wl_display *display, uint32_t mask);
typedef void (*wl_display_event_func_t)(struct wl_display *display, typedef void (*wl_display_event_func_t)(struct wl_display *display,
uint32_t object,
uint32_t opcode, uint32_t opcode,
uint32_t arg1, uint32_t arg2, uint32_t size,
uint32_t *p,
void *data); void *data);
void wl_display_set_event_handler(struct wl_display *display, void wl_display_set_event_handler(struct wl_display *display,
@ -34,6 +36,8 @@ void wl_display_set_event_handler(struct wl_display *display,
struct wl_surface * struct wl_surface *
wl_display_create_surface(struct wl_display *display); wl_display_create_surface(struct wl_display *display);
void
wl_display_commit(struct wl_display *display, uint32_t key);
void wl_surface_destroy(struct wl_surface *surface); void wl_surface_destroy(struct wl_surface *surface);
void wl_surface_attach(struct wl_surface *surface, void wl_surface_attach(struct wl_surface *surface,

23
wayland.c
Unescape View File

@ -315,6 +315,7 @@ wl_client_event(struct wl_client *client, struct wl_object *object, uint32_t eve
#define WL_DISPLAY_INVALID_OBJECT 0 #define WL_DISPLAY_INVALID_OBJECT 0
#define WL_DISPLAY_INVALID_METHOD 1 #define WL_DISPLAY_INVALID_METHOD 1
#define WL_DISPLAY_NO_MEMORY 2 #define WL_DISPLAY_NO_MEMORY 2
#define WL_DISPLAY_ACKNOWLEDGE 3
static void static void
wl_client_connection_data(int fd, uint32_t mask, void *data) wl_client_connection_data(int fd, uint32_t mask, void *data)
@ -495,14 +496,36 @@ static const struct wl_argument create_surface_arguments[] = {
{ WL_ARGUMENT_NEW_ID } { WL_ARGUMENT_NEW_ID }
}; };
static int
wl_display_commit(struct wl_client *client,
struct wl_display *display, uint32_t key)
{
uint32_t event[3];
event[0] = display->base.id;
event[1] = WL_DISPLAY_ACKNOWLEDGE | ((sizeof event) << 16);
event[2] = key;
wl_connection_write(client->connection, event, sizeof event);
return 0;
}
static const struct wl_argument commit_arguments[] = {
{ WL_ARGUMENT_UINT32 }
};
static const struct wl_method display_methods[] = { static const struct wl_method display_methods[] = {
{ "create_surface", wl_display_create_surface, { "create_surface", wl_display_create_surface,
ARRAY_LENGTH(create_surface_arguments), create_surface_arguments }, ARRAY_LENGTH(create_surface_arguments), create_surface_arguments },
{ "commit", wl_display_commit,
ARRAY_LENGTH(commit_arguments), commit_arguments },
}; };
static const struct wl_event display_events[] = { static const struct wl_event display_events[] = {
{ "invalid_object" }, { "invalid_object" },
{ "invalid_method" }, { "invalid_method" },
{ "no_memory" },
{ "acknowledge" },
}; };
static const struct wl_interface display_interface = { static const struct wl_interface display_interface = {

191
window.c
Unescape View File

@ -28,13 +28,16 @@ static void die(const char *msg)
} }
struct window { struct window {
struct wl_display *display;
struct wl_surface *surface; struct wl_surface *surface;
int x, y, width, height; int x, y, width, height;
int margin;
int drag_x, drag_y, last_x, last_y; int drag_x, drag_y, last_x, last_y;
int state; int state;
uint32_t name; uint32_t name;
int fd; int fd;
int redraw_scheduled; int redraw_scheduled;
int resized;
cairo_pattern_t *background; cairo_pattern_t *background;
struct buffer *buffer; struct buffer *buffer;
@ -42,7 +45,7 @@ struct window {
GLfloat gears_angle; GLfloat gears_angle;
struct gears *gears; struct gears *gears;
EGLDisplay display; EGLDisplay egl_display;
EGLContext context; EGLContext context;
EGLConfig config; EGLConfig config;
EGLSurface egl_surface; EGLSurface egl_surface;
@ -68,15 +71,16 @@ draw_window(void *data)
struct window *window = data; struct window *window = data;
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_t *cr; cairo_t *cr;
int border = 2, radius = 5, shadow = 16; 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 buffer *buffer;
const static char title[] = "Wayland First Post"; const static char title[] = "Wayland First Post";
struct buffer *buffer;
int width, height; int width, height;
surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
window->width + 32, window->height + 32); window->width + window->margin * 2,
window->height + window->margin * 2);
outline = cairo_pattern_create_rgb(0.1, 0.1, 0.1); outline = cairo_pattern_create_rgb(0.1, 0.1, 0.1);
bright = cairo_pattern_create_rgb(0.8, 0.8, 0.8); bright = cairo_pattern_create_rgb(0.8, 0.8, 0.8);
@ -84,14 +88,13 @@ draw_window(void *data)
cr = cairo_create(surface); cr = cairo_create(surface);
cairo_translate(cr, shadow + 7, shadow + 5); cairo_translate(cr, window->margin + 7, window->margin + 5);
cairo_set_line_width (cr, border); cairo_set_line_width (cr, border);
cairo_set_source_rgba(cr, 0, 0, 0, 0.7); cairo_set_source_rgba(cr, 0, 0, 0, 0.7);
rounded_rect(cr, 0, 0, window->width, window->height, radius); rounded_rect(cr, 0, 0, window->width, window->height, radius);
cairo_fill(cr); cairo_fill(cr);
blur_surface(surface, 24 + radius); blur_surface(surface, 24 + radius);
#if 1
cairo_translate(cr, -7, -5); cairo_translate(cr, -7, -5);
cairo_set_line_width (cr, border); cairo_set_line_width (cr, border);
rounded_rect(cr, 1, 1, window->width - 1, window->height - 1, radius); rounded_rect(cr, 1, 1, window->width - 1, window->height - 1, radius);
@ -141,33 +144,32 @@ draw_window(void *data)
cairo_stroke_preserve(cr); cairo_stroke_preserve(cr);
cairo_set_source_rgb(cr, 1, 1, 1); cairo_set_source_rgb(cr, 1, 1, 1);
cairo_fill(cr); cairo_fill(cr);
#endif
cairo_destroy(cr); cairo_destroy(cr);
if (window->buffer != NULL)
buffer_destroy(window->buffer, window->fd);
buffer = buffer_create_from_cairo_surface(window->fd, surface);
window->buffer = buffer;
window->buffer = buffer_create_from_cairo_surface(window->fd, surface);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);
wl_surface_attach(window->surface, buffer->name, wl_surface_attach(window->surface,
buffer->width, buffer->height, buffer->stride); window->buffer->name,
window->buffer->width,
wl_surface_map(window->surface, window->buffer->height,
window->x, window->y, window->buffer->stride);
buffer->width, buffer->height);
/* FIXME: Free window->buffer when we receive the ack event. */ wl_surface_map(window->surface,
window->x - window->margin,
window->y - window->margin,
window->buffer->width,
window->buffer->height);
width = window->width - 20; width = window->width - 20;
height = window->height - 60; height = window->height - 60;
buffer = buffer_create(window->fd, width, height, (width * 4 + 15) & ~15); buffer = buffer_create(window->fd, width, height, (width * 4 + 15) & ~15);
window->egl_buffer = buffer; window->egl_buffer = buffer;
window->egl_surface = eglCreateSurfaceForName(window->display, window->egl_surface = eglCreateSurfaceForName(window->egl_display,
window->config, buffer->name, window->config, buffer->name,
buffer->width, buffer->height, buffer->width, buffer->height,
buffer->stride, NULL); buffer->stride, NULL);
if (!eglMakeCurrent(window->display, if (!eglMakeCurrent(window->egl_display,
window->egl_surface, window->egl_surface, window->context)) window->egl_surface, window->egl_surface, window->context))
die("failed to make context current\n"); die("failed to make context current\n");
@ -177,10 +179,13 @@ draw_window(void *data)
window->gears = gears_create(0, 0, 0, 0.92); window->gears = gears_create(0, 0, 0, 0.92);
gears_draw(window->gears, window->gears_angle); gears_draw(window->gears, window->gears_angle);
wl_surface_copy(window->surface, 10 + shadow, 50 + shadow, wl_surface_copy(window->surface,
10 + window->margin, 50 + window->margin,
buffer->name, buffer->stride, buffer->name, buffer->stride,
0, 0, buffer->width, buffer->height); 0, 0, buffer->width, buffer->height);
wl_display_commit(window->display, 0);
window->redraw_scheduled = 0; window->redraw_scheduled = 0;
return FALSE; return FALSE;
@ -206,69 +211,107 @@ enum location {
static void static void
event_handler(struct wl_display *display, event_handler(struct wl_display *display,
uint32_t opcode, uint32_t arg1, uint32_t arg2, void *data) uint32_t object, uint32_t opcode,
uint32_t size, uint32_t *p, void *data)
{ {
struct window *window = data; struct window *window = data;
int location, border = 4; int location;
int grip_size = 16; int grip_size = 16;
if (opcode == 0) { /* FIXME: Object ID 1 is the display, for anything else we
window->last_x = arg1; * assume it's an input device. */
window->last_y = arg2; if (object == 1 && opcode == 3) {
int key = p[0];
/* The acknowledge event means that the server
* processed our last comit request and we can now
* safely free the buffer. key == 0 means it's an
* acknowledge event for the drawing in draw_buffer,
* key == 1 is from animating the gears, which we
* ignore. If the window was resized in the meantime,
* schedule another redraw. */
if (key == 0) {
if (window->resized)
g_idle_add(draw_window, window);
buffer_destroy(window->buffer, window->fd);
window->buffer = NULL;
window->resized = 0;
}
} else if (opcode == 0) {
int x = p[0], y = p[1];
window->last_x = x;
window->last_y = y;
switch (window->state) { switch (window->state) {
case WINDOW_MOVING: case WINDOW_MOVING:
window->x = window->drag_x + arg1; window->x = window->drag_x + x;
window->y = window->drag_y + arg2; window->y = window->drag_y + y;
wl_surface_map(window->surface, window->x, window->y, wl_surface_map(window->surface,
window->buffer->width, window->buffer->height); window->x - window->margin,
window->y - window->margin,
window->width + 2 * window->margin,
window->height + 2 * window->margin);
break; break;
case WINDOW_RESIZING_LOWER_RIGHT: case WINDOW_RESIZING_LOWER_RIGHT:
window->width = window->drag_x + arg1; window->width = window->drag_x + x;
window->height = window->drag_y + arg2; window->height = window->drag_y + y;
if (window->width < 400) if (window->width < 400)
window->width = 400; window->width = 400;
if (window->height < 400) if (window->height < 400)
window->height = 400; window->height = 400;
if (!window->redraw_scheduled) { if (!window->redraw_scheduled) {
/* If window->buffer is NULL, it means
* we got the ack for the previous
* resize, so we can just schedule a
* redraw from idle. Otherwise, we're
* still expecting an ack and we'll
* notice that the size changed in the
* ack handler and schedule a redraw
* there. */
if (window->buffer == NULL)
g_idle_add(draw_window, window);
else
window->resized = 1;
window->redraw_scheduled = 1; window->redraw_scheduled = 1;
g_idle_add(draw_window, window);
} }
break; break;
} }
} } else if (opcode == 1) {
int button = p[0], state = p[1];
if (window->x + window->width - grip_size <= window->last_x &&
window->last_x < window->x + window->width && if (window->x + window->width - grip_size <= window->last_x &&
window->y + window->height - grip_size <= window->last_y && window->last_x < window->x + window->width &&
window->last_y < window->y + window->height) { window->y + window->height - grip_size <= window->last_y &&
location = LOCATION_LOWER_RIGHT; window->last_y < window->y + window->height) {
} else if (window->x + border <= window->last_x && location = LOCATION_LOWER_RIGHT;
window->last_x < window->x + window->width - border && } else if (window->x <= window->last_x &&
window->y + border <= window->last_y && window->last_x < window->x + window->width &&
window->last_y < window->y + window->height - border) { window->y <= window->last_y &&
location = LOCATION_INTERIOR; window->last_y < window->y + window->height) {
} else { location = LOCATION_INTERIOR;
location = LOCATION_OUTSIDE; } else {
} location = LOCATION_OUTSIDE;
}
if (opcode == 1 && arg1 == 0 && arg2 == 1) { if (button == 0 && state == 1) {
switch (location) { switch (location) {
case LOCATION_INTERIOR: case LOCATION_INTERIOR:
window->drag_x = window->x - window->last_x; window->drag_x = window->x - window->last_x;
window->drag_y = window->y - window->last_y; window->drag_y = window->y - window->last_y;
window->state = WINDOW_MOVING; window->state = WINDOW_MOVING;
break; break;
case LOCATION_LOWER_RIGHT: case LOCATION_LOWER_RIGHT:
window->drag_x = window->width - window->last_x; window->drag_x = window->width - window->last_x;
window->drag_y = window->height - window->last_y; window->drag_y = window->height - window->last_y;
window->state = WINDOW_RESIZING_LOWER_RIGHT; window->state = WINDOW_RESIZING_LOWER_RIGHT;
break; break;
default: default:
window->state = WINDOW_STABLE;
break;
}
} else if (button == 0 && state == 0) {
window->state = WINDOW_STABLE; window->state = WINDOW_STABLE;
break;
} }
} else if (opcode == 1 && arg1 == 0 && arg2 == 0) {
window->state = WINDOW_STABLE;
} }
} }
@ -285,27 +328,29 @@ window_create(struct wl_display *display, int fd)
return NULL; return NULL;
memset(window, 0, sizeof *window); memset(window, 0, sizeof *window);
window->display = display;
window->surface = wl_display_create_surface(display); window->surface = wl_display_create_surface(display);
window->x = 200; window->x = 200;
window->y = 200; window->y = 200;
window->width = 450; window->width = 450;
window->height = 500; window->height = 500;
window->margin = 16;
window->state = WINDOW_STABLE; window->state = WINDOW_STABLE;
window->fd = fd; window->fd = fd;
window->background = cairo_pattern_create_rgba (red, green, blue, alpha); window->background = cairo_pattern_create_rgba (red, green, blue, alpha);
window->display = eglCreateDisplayNative("/dev/dri/card0", "i965"); window->egl_display = eglCreateDisplayNative("/dev/dri/card0", "i965");
if (window->display == NULL) if (window->egl_display == NULL)
die("failed to create display\n"); die("failed to create egl display\n");
if (!eglInitialize(window->display, &major, &minor)) if (!eglInitialize(window->egl_display, &major, &minor))
die("failed to initialize display\n"); die("failed to initialize display\n");
if (!eglGetConfigs(window->display, configs, 64, &count)) if (!eglGetConfigs(window->egl_display, configs, 64, &count))
die("failed to get configs\n"); die("failed to get configs\n");
window->config = configs[24]; window->config = configs[24];
window->context = eglCreateContext(window->display, window->config, NULL, NULL); window->context = eglCreateContext(window->egl_display, window->config, NULL, NULL);
if (window->context == NULL) if (window->context == NULL)
die("failed to create context\n"); die("failed to create context\n");
@ -319,16 +364,16 @@ draw(gpointer data)
{ {
struct window *window = data; struct window *window = data;
struct buffer *buffer; struct buffer *buffer;
int shadow = 16;
if (!window->redraw_scheduled) { if (!window->redraw_scheduled) {
gears_draw(window->gears, window->gears_angle); gears_draw(window->gears, window->gears_angle);
buffer = window->egl_buffer; buffer = window->egl_buffer;
wl_surface_copy(window->surface, wl_surface_copy(window->surface,
10 + shadow, 50 + shadow, 10 + window->margin, 50 + window->margin,
buffer->name, buffer->stride, buffer->name, buffer->stride,
0, 0, buffer->width, buffer->height); 0, 0, buffer->width, buffer->height);
wl_display_commit(window->display, 1);
} }
window->gears_angle += 1; window->gears_angle += 1;
@ -362,8 +407,6 @@ int main(int argc, char *argv[])
window = window_create(display, fd); window = window_create(display, fd);
draw_window(window);
wl_display_set_event_handler(display, event_handler, window); wl_display_set_event_handler(display, event_handler, window);
g_timeout_add(50, draw, window); g_timeout_add(50, draw, window);

Write Preview
Loading…
Cancel
Save