mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Track objects client side using a hash too.

Browse source 
This leads up to using the demarshal machinery for decoding events
in the client library.
This commit is contained in:
Kristian Høgsberg 2008-12-22 18:06:49 -05:00
parent 12ea62e211
commit fabd4395ba
5 changed files with 79 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

75
wayland-client.c
View file

@ -48,8 +48,7 @@ struct wl_global {
}; };
struct wl_proxy { struct wl_proxy {
const struct wl_interface *interface; struct wl_object base;
uint32_t id;
struct wl_display *display; struct wl_display *display;
}; };
@ -59,6 +58,7 @@ struct wl_display {
int fd; int fd;
uint32_t id, id_count, next_range; uint32_t id, id_count, next_range;
uint32_t mask; uint32_t mask;
struct wl_hash *objects;
struct wl_list global_list; struct wl_list global_list;
struct wl_list visual_list; struct wl_list visual_list;
@ -119,10 +119,12 @@ add_visual(struct wl_display *display, struct wl_global *global)
if (visual == NULL) if (visual == NULL)
return; return;
visual->proxy.interface = &wl_visual_interface; visual->proxy.base.interface = &wl_visual_interface;
visual->proxy.id = global->id; visual->proxy.base.id = global->id;
visual->proxy.base.implementation = NULL;
visual->proxy.display = display; visual->proxy.display = display;
wl_list_insert(display->visual_list.prev, &visual->link); wl_list_insert(display->visual_list.prev, &visual->link);
wl_hash_insert(display->objects, &visual->proxy.base);
} }
WL_EXPORT struct wl_visual * WL_EXPORT struct wl_visual *
@ -177,12 +179,15 @@ wl_display_create(const char *name, size_t name_size)
return NULL; return NULL;
} }
display->objects = wl_hash_create();
wl_list_init(&display->global_list); wl_list_init(&display->global_list);
wl_list_init(&display->visual_list); wl_list_init(&display->visual_list);
display->proxy.interface = &wl_display_interface; display->proxy.base.interface = &wl_display_interface;
display->proxy.id = wl_display_get_object_id(display, "display", 1); display->proxy.base.implementation = NULL;
display->proxy.base.id = 1;
display->proxy.display = display; display->proxy.display = display;
wl_hash_insert(display->objects, &display->proxy.base);
display->connection = wl_connection_create(display->fd, display->connection = wl_connection_create(display->fd,
connection_update, connection_update,
@ -234,6 +239,24 @@ wl_display_get_fd(struct wl_display *display,
return display->fd; return display->fd;
} }
struct wl_output_listener {
void (*geometry)(struct wl_display *display,
struct wl_output *output,
int32_t width, int32_t height);
};
static void
handle_geometry(struct wl_display *display,
struct wl_output *output, int32_t width, int32_t height)
{
output->width = width;
output->height = height;
}
static const struct wl_output_listener output_listener = {
handle_geometry
};
static void static void
add_output(struct wl_display *display, struct wl_global *global) add_output(struct wl_display *display, struct wl_global *global)
{ {
@ -243,10 +266,12 @@ add_output(struct wl_display *display, struct wl_global *global)
if (output == NULL) if (output == NULL)
return; return;
output->proxy.interface = &wl_output_interface; output->proxy.base.interface = &wl_output_interface;
output->proxy.id = global->id; output->proxy.base.implementation = (void(**)(void)) &output_listener;
output->proxy.base.id = global->id;
output->proxy.display = display; output->proxy.display = display;
display->output = output; display->output = output;
wl_hash_insert(display->objects, &output->proxy.base);
} }
static void static void
@ -303,25 +328,27 @@ handle_output_event(struct wl_display *display,
{ {
switch (opcode) { switch (opcode) {
case WL_OUTPUT_GEOMETRY: case WL_OUTPUT_GEOMETRY:
display->output->width = p[0]; handle_geometry(display, display->output, p[0], p[1]);
display->output->height = p[1];
break; break;
} }
} }
static void static void
handle_event(struct wl_display *display, handle_event(struct wl_display *display,
uint32_t object, uint32_t opcode, uint32_t size) uint32_t id, uint32_t opcode, uint32_t size)
{ {
uint32_t p[32]; uint32_t p[32];
struct wl_object *object;
wl_connection_copy(display->connection, p, size); wl_connection_copy(display->connection, p, size);
if (object == 1) { object = wl_hash_lookup(display->objects, id);
if (object == &display->proxy.base)
handle_display_event(display, opcode, p + 2, size); handle_display_event(display, opcode, p + 2, size);
} else if (object == display->output->proxy.id) { else if (object == &display->output->proxy.base && opcode == 0)
handle_output_event(display, opcode, p + 2, size); handle_output_event(display, opcode, p + 2, size);
} else if (display->event_handler != NULL) else if (display->event_handler != NULL)
display->event_handler(display, object, opcode, size, p + 2, display->event_handler(display, id, opcode, size, p + 2,
display->event_handler_data); display->event_handler_data);
wl_connection_consume(display->connection, size); wl_connection_consume(display->connection, size);
} }
@ -394,8 +421,8 @@ wl_display_get_compositor(struct wl_display *display)
return NULL; return NULL;
compositor = malloc(sizeof *compositor); compositor = malloc(sizeof *compositor);
compositor->proxy.interface = &wl_compositor_interface; compositor->proxy.base.interface = &wl_compositor_interface;
compositor->proxy.id = id; compositor->proxy.base.id = id;
compositor->proxy.display = display; compositor->proxy.display = display;
return compositor; return compositor;
@ -404,12 +431,12 @@ wl_display_get_compositor(struct wl_display *display)
static void static void
wl_proxy_vmarshal(struct wl_proxy *target, uint32_t opcode, va_list ap) wl_proxy_vmarshal(struct wl_proxy *target, uint32_t opcode, va_list ap)
{ {
struct wl_proxy *proxy; struct wl_object *object;
uint32_t args[32], length, *p, size; uint32_t args[32], length, *p, size;
const char *s, *signature; const char *s, *signature;
int i, count; int i, count;
signature = target->interface->methods[opcode].signature; signature = target->base.interface->methods[opcode].signature;
count = strlen(signature); count = strlen(signature);
/* FIXME: Make sure we don't overwrite args array. */ /* FIXME: Make sure we don't overwrite args array. */
@ -429,8 +456,8 @@ wl_proxy_vmarshal(struct wl_proxy *target, uint32_t opcode, va_list ap)
break; break;
case 'n': case 'n':
case 'o': case 'o':
proxy = va_arg(ap, struct wl_proxy *); object = va_arg(ap, struct wl_object *);
*p++ = proxy->id; *p++ = object->id;
break; break;
default: default:
assert(0); assert(0);
@ -439,7 +466,7 @@ wl_proxy_vmarshal(struct wl_proxy *target, uint32_t opcode, va_list ap)
} }
size = (p - args) * sizeof *p; size = (p - args) * sizeof *p;
args[0] = target->id; args[0] = target->base.id;
args[1] = opcode | (size << 16); args[1] = opcode | (size << 16);
wl_connection_write(target->display->connection, args, size); wl_connection_write(target->display->connection, args, size);
} }
@ -463,8 +490,8 @@ wl_compositor_create_surface(struct wl_compositor *compositor)
if (surface == NULL) if (surface == NULL)
return NULL; return NULL;
surface->proxy.interface = &wl_surface_interface; surface->proxy.base.interface = &wl_surface_interface;
surface->proxy.id = wl_display_allocate_id(compositor->proxy.display); surface->proxy.base.id = wl_display_allocate_id(compositor->proxy.display);
surface->proxy.display = compositor->proxy.display; surface->proxy.display = compositor->proxy.display;
wl_proxy_marshal(&compositor->proxy, wl_proxy_marshal(&compositor->proxy,
WL_COMPOSITOR_CREATE_SURFACE, surface); WL_COMPOSITOR_CREATE_SURFACE, surface);

20
wayland-protocol.h
View file

@ -25,26 +25,6 @@
#include <stdint.h> #include <stdint.h>
struct wl_argument {
uint32_t type;
void *data;
};
struct wl_message {
const char *name;
const char *signature;
const void **types;
};
struct wl_interface {
const char *name;
int version;
int method_count;
const struct wl_message *methods;
int event_count;
const struct wl_message *events;
};
#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

3
wayland-util.c
View file

@ -21,8 +21,9 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#include "wayland.h" #include "wayland-util.h"
struct wl_hash { struct wl_hash {
struct wl_object **objects; struct wl_object **objects;

27
wayland-util.h
View file

@ -38,7 +38,32 @@
const typeof( ((type *)0)->member ) *__mptr = (ptr); \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );}) (type *)( (char *)__mptr - offsetof(type,member) );})
struct wl_object; struct wl_argument {
uint32_t type;
void *data;
};
struct wl_message {
const char *name;
const char *signature;
const void **types;
};
struct wl_interface {
const char *name;
int version;
int method_count;
const struct wl_message *methods;
int event_count;
const struct wl_message *events;
};
struct wl_object {
const struct wl_interface *interface;
void (**implementation)(void);
uint32_t id;
};
struct wl_hash; struct wl_hash;
struct wl_hash *wl_hash_create(void); struct wl_hash *wl_hash_create(void);
void wl_hash_destroy(struct wl_hash *hash); void wl_hash_destroy(struct wl_hash *hash);

6
wayland.h
View file

@ -66,12 +66,6 @@ struct wl_event_source *wl_event_loop_add_idle(struct wl_event_loop *loop,
struct wl_client; struct wl_client;
struct wl_object {
const struct wl_interface *interface;
void (**implementation)(void);
uint32_t id;
};
struct wl_display; struct wl_display;
struct wl_input_device; struct wl_input_device;