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

Don't track globals in the client lib, just send out events

Browse Source 
Users of the client library must install an global handler to get access
to globals.
dev
Kristian Høgsberg 14 years ago
parent ccb75867ac
commit 4fe1a3ed3a
6 changed files with 108 additions and 234 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. 3
      TODO
  2. 65
      clients/screenshot.c
  3. 31
      clients/window.c
  4. 45
      scanner.c
  5. 149
      wayland-client.c
  6. 49
      wayland-client.h

3
TODO
Unescape View File

@ -3,9 +3,6 @@ Core wayland protocol
- generate pointer_focus on raise/lower, move windows, all kinds of - generate pointer_focus on raise/lower, move windows, all kinds of
changes in surface stacking. changes in surface stacking.
- don't store globals on client side, require global_handler like
everything else.
- glyph cache - glyph cache
- dnd, figure out large object transfer: through wayland protocol or - dnd, figure out large object transfer: through wayland protocol or

65
clients/screenshot.c
Unescape View File

@ -36,45 +36,36 @@
static const char socket_name[] = "\0wayland"; static const char socket_name[] = "\0wayland";
struct screenshooter { #define SCREENSHOOTER_SHOOT 0
uint32_t id;
struct wl_display *display;
};
static struct screenshooter *
screenshooter_create(struct wl_display *display)
{
struct screenshooter *screenshooter;
uint32_t id;
id = wl_display_get_object_id(display, "screenshooter", 1); struct screenshooter;
if (id == 0) {
fprintf(stderr, "server doesn't support screenshooter interface\n");
return NULL;
}
screenshooter = malloc(sizeof screenshooter); static const struct wl_message screenshooter_requests[] = {
if (screenshooter == NULL) { "shoot", "" },
return NULL; };
screenshooter->id = id; static const struct wl_interface screenshooter_interface = {
screenshooter->display = display; "screenshooter", 1,
ARRAY_LENGTH(screenshooter_requests), screenshooter_requests,
0, NULL
};
return screenshooter; static inline void
screenshooter_shoot(struct screenshooter *shooter)
{
wl_proxy_marshal((struct wl_proxy *) shooter, SCREENSHOOTER_SHOOT);
} }
#define SCREENSHOOTER_SHOOT 0
static void static void
screenshooter_shoot(struct screenshooter *screenshooter) handle_global(struct wl_display *display, uint32_t id,
const char *interface, uint32_t version, void *data)
{ {
uint32_t request[2]; struct screenshooter **screenshooter = data;
request[0] = screenshooter->id;
request[1] = SCREENSHOOTER_SHOOT | ((sizeof request) << 16);
wl_display_write(screenshooter->display, if (strcmp(interface, "screenshooter") == 0)
request, sizeof request); *screenshooter = (struct screenshooter *)
wl_proxy_create_for_id(display,
&screenshooter_interface, id);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -82,7 +73,7 @@ int main(int argc, char *argv[])
struct wl_display *display; struct wl_display *display;
GMainLoop *loop; GMainLoop *loop;
GSource *source; GSource *source;
struct screenshooter *s; struct screenshooter *screenshooter;
display = wl_display_create(socket_name, sizeof socket_name); display = wl_display_create(socket_name, sizeof socket_name);
if (display == NULL) { if (display == NULL) {
@ -90,16 +81,20 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
screenshooter = NULL;
wl_display_add_global_listener(display, handle_global, &screenshooter);
wl_display_iterate(display, WL_DISPLAY_READABLE); wl_display_iterate(display, WL_DISPLAY_READABLE);
if (screenshooter == NULL) {
fprintf(stderr, "display doesn't support screenshooter\n");
return -1;
}
loop = g_main_loop_new(NULL, FALSE); loop = g_main_loop_new(NULL, FALSE);
source = wl_glib_source_new(display); source = wl_glib_source_new(display);
g_source_attach(source, NULL); g_source_attach(source, NULL);
s = screenshooter_create(display); screenshooter_shoot(screenshooter);
if (s == NULL)
exit(-1);
screenshooter_shoot(s);
g_idle_add((GSourceFunc) g_main_loop_quit, loop); g_idle_add((GSourceFunc) g_main_loop_quit, loop);
g_main_loop_run(loop); g_main_loop_run(loop);

31
clients/window.c
Unescape View File

@ -766,7 +766,7 @@ static const struct wl_output_listener output_listener = {
}; };
static void static void
display_add_input(struct display *d, struct wl_object *object) display_add_input(struct display *d, uint32_t id)
{ {
struct input *input; struct input *input;
@ -776,7 +776,7 @@ display_add_input(struct display *d, struct wl_object *object)
memset(input, 0, sizeof *input); memset(input, 0, sizeof *input);
input->display = d; input->display = d;
input->input_device = (struct wl_input_device *) object; input->input_device = wl_input_device_create(d->display, id);
input->pointer_focus = NULL; input->pointer_focus = NULL;
input->keyboard_focus = NULL; input->keyboard_focus = NULL;
wl_list_insert(d->input_list.prev, &input->link); wl_list_insert(d->input_list.prev, &input->link);
@ -786,24 +786,25 @@ display_add_input(struct display *d, struct wl_object *object)
} }
static void static void
display_handle_global(struct wl_display *display, display_handle_global(struct wl_display *display, uint32_t id,
struct wl_object *object, void *data) const char *interface, uint32_t version, void *data)
{ {
struct display *d = data; struct display *d = data;
if (wl_object_implements(object, "compositor", 1)) { if (strcmp(interface, "compositor") == 0) {
d->compositor = (struct wl_compositor *) object; d->compositor = wl_compositor_create(display, id);
wl_compositor_add_listener(d->compositor, &compositor_listener, d); wl_compositor_add_listener(d->compositor,
} else if (wl_object_implements(object, "output", 1)) { &compositor_listener, d);
d->output = (struct wl_output *) object; } else if (strcmp(interface, "output") == 0) {
d->output = wl_output_create(display, id);
wl_output_add_listener(d->output, &output_listener, d); wl_output_add_listener(d->output, &output_listener, d);
} else if (wl_object_implements(object, "input_device", 1)) { } else if (strcmp(interface, "input_device") == 0) {
display_add_input(d, object); display_add_input(d, id);
} else if (wl_object_implements(object, "shell", 1)) { } else if (strcmp(interface, "shell") == 0) {
d->shell = (struct wl_shell *) object; d->shell = wl_shell_create(display, id);
wl_shell_add_listener(d->shell, &shell_listener, d); wl_shell_add_listener(d->shell, &shell_listener, d);
} else if (wl_object_implements(object, "drm", 1)) { } else if (strcmp(interface, "drm") == 0) {
d->drm = (struct wl_drm *) object; d->drm = wl_drm_create(display, id);
wl_drm_add_listener(d->drm, &drm_listener, d); wl_drm_add_listener(d->drm, &drm_listener, d);
} }
} }

45
scanner.c
Unescape View File

@ -260,6 +260,19 @@ emit_stubs(struct wl_list *message_list, struct interface *interface)
struct message *m; struct message *m;
struct arg *a, *ret; struct arg *a, *ret;
/* We provide a hand written constructor for the display object */
if (strcmp(interface->name, "display") != 0)
printf("static inline struct wl_%s *\n"
"wl_%s_create(struct wl_display *display, uint32_t id)\n"
"{\n"
"\treturn (struct wl_%s *)\n"
"\t\twl_proxy_create_for_id(display, &wl_%s_interface, id);\n"
"}\n\n",
interface->name,
interface->name,
interface->name,
interface->name);
if (wl_list_empty(message_list)) if (wl_list_empty(message_list))
return; return;
@ -395,6 +408,24 @@ emit_structs(struct wl_list *message_list, struct interface *interface)
} }
} }
static const char client_prototypes[] =
"struct wl_proxy;\n\n"
"extern void\n"
"wl_proxy_marshal(struct wl_proxy *p, uint32_t opcode, ...);\n"
"extern struct wl_proxy *\n"
"wl_proxy_create(struct wl_proxy *factory,\n"
"\t\tconst struct wl_interface *interface);\n"
"extern struct wl_proxy *\n"
"wl_proxy_create_for_id(struct wl_display *display,\n"
"\t\t const struct wl_interface *interface, uint32_t id);\n"
"extern int\n"
"wl_proxy_add_listener(struct wl_proxy *proxy,\n"
"\t\t void (**implementation)(void), void *data);\n\n";
static void static void
emit_header(struct protocol *protocol, int server) emit_header(struct protocol *protocol, int server)
{ {
@ -417,19 +448,7 @@ emit_header(struct protocol *protocol, int server)
printf("\n"); printf("\n");
if (!server) if (!server)
printf("struct wl_proxy;\n\n" printf(client_prototypes);
"extern void\n"
"wl_proxy_marshal(struct wl_proxy *p, "
"uint32_t opcode, ...);\n"
"extern struct wl_proxy *\n"
"wl_proxy_create(struct wl_proxy *factory,\n"
"\t\tconst struct wl_interface *interface);\n"
"extern int\n"
"wl_proxy_add_listener(struct wl_proxy *proxy,\n"
"\t\t void (**implementation)(void), "
"void *data);\n\n");
wl_list_for_each(i, &protocol->interface_list, link) { wl_list_for_each(i, &protocol->interface_list, link) {
printf("extern const struct wl_interface " printf("extern const struct wl_interface "

149
wayland-client.c
Unescape View File

@ -40,14 +40,6 @@
static const char socket_name[] = "\0wayland"; static const char socket_name[] = "\0wayland";
struct wl_global {
uint32_t id;
char *interface;
uint32_t version;
struct wl_proxy *proxy;
struct wl_list link;
};
struct wl_global_listener { struct wl_global_listener {
wl_display_global_func_t handler; wl_display_global_func_t handler;
void *data; void *data;
@ -67,18 +59,6 @@ struct wl_proxy {
void *user_data; void *user_data;
}; };
struct wl_compositor {
struct wl_proxy proxy;
};
struct wl_surface {
struct wl_proxy proxy;
};
struct wl_visual {
struct wl_proxy proxy;
};
struct wl_display { struct wl_display {
struct wl_proxy proxy; struct wl_proxy proxy;
struct wl_connection *connection; struct wl_connection *connection;
@ -86,7 +66,6 @@ struct wl_display {
uint32_t id, id_count, next_range; uint32_t id, id_count, next_range;
uint32_t mask; uint32_t mask;
struct wl_hash_table *objects; struct wl_hash_table *objects;
struct wl_list global_list;
struct wl_listener listener; struct wl_listener listener;
struct wl_list global_listener_list; struct wl_list global_listener_list;
@ -99,8 +78,6 @@ struct wl_display {
wl_display_global_func_t global_handler; wl_display_global_func_t global_handler;
void *global_handler_data; void *global_handler_data;
struct wl_compositor *compositor;
}; };
static int static int
@ -117,20 +94,11 @@ connection_update(struct wl_connection *connection,
return 0; return 0;
} }
WL_EXPORT int
wl_object_implements(struct wl_object *object,
const char *interface, int version)
{
return strcmp(object->interface->name, interface) == 0 &&
object->interface->version >= version;
}
WL_EXPORT struct wl_global_listener * WL_EXPORT struct wl_global_listener *
wl_display_add_global_listener(struct wl_display *display, wl_display_add_global_listener(struct wl_display *display,
wl_display_global_func_t handler, void *data) wl_display_global_func_t handler, void *data)
{ {
struct wl_global_listener *listener; struct wl_global_listener *listener;
struct wl_global *global;
listener = malloc(sizeof *listener); listener = malloc(sizeof *listener);
if (listener == NULL) if (listener == NULL)
@ -140,12 +108,6 @@ wl_display_add_global_listener(struct wl_display *display,
listener->data = data; listener->data = data;
wl_list_insert(display->global_listener_list.prev, &listener->link); wl_list_insert(display->global_listener_list.prev, &listener->link);
/* FIXME: Need a destructor for void *data? */
wl_list_for_each(global, &display->global_list, link)
if (global->proxy != NULL)
(*handler)(display, &global->proxy->base, data);
return listener; return listener;
} }
@ -157,50 +119,36 @@ wl_display_remove_global_listener(struct wl_display *display,
free(listener); free(listener);
} }
static struct wl_proxy * WL_EXPORT struct wl_proxy *
wl_proxy_create_for_global(struct wl_display *display, wl_proxy_create_for_id(struct wl_display *display,
struct wl_global *global, const struct wl_interface *interface, uint32_t id)
const struct wl_interface *interface)
{ {
struct wl_proxy *proxy; struct wl_proxy *proxy;
struct wl_global_listener *listener;
proxy = malloc(sizeof *proxy); proxy = malloc(sizeof *proxy);
if (proxy == NULL) if (proxy == NULL)
return NULL; return NULL;
proxy->base.interface = interface; proxy->base.interface = interface;
proxy->base.id = global->id; proxy->base.id = id;
proxy->display = display; proxy->display = display;
global->proxy = proxy;
wl_list_init(&proxy->listener_list); wl_list_init(&proxy->listener_list);
wl_hash_table_insert(display->objects, proxy->base.id, proxy); wl_hash_table_insert(display->objects, proxy->base.id, proxy);
wl_list_for_each(listener, &display->global_listener_list, link)
(*listener->handler)(display, &proxy->base, listener->data);
return proxy; return proxy;
} }
WL_EXPORT struct wl_proxy * WL_EXPORT struct wl_proxy *
wl_proxy_create(struct wl_proxy *factory, const struct wl_interface *interface) wl_proxy_create(struct wl_proxy *factory,
const struct wl_interface *interface)
{ {
struct wl_proxy *proxy; return wl_proxy_create_for_id(factory->display, interface,
wl_display_allocate_id(factory->display));
proxy = malloc(sizeof *proxy);
if (proxy == NULL)
return NULL;
proxy->base.interface = interface;
proxy->base.id = wl_display_allocate_id(factory->display);
proxy->display = factory->display;
wl_hash_table_insert(factory->display->objects, proxy->base.id, proxy);
return proxy;
} }
WL_EXPORT int WL_EXPORT int
wl_proxy_add_listener(struct wl_proxy *proxy, void (**implementation)(void), void *data) wl_proxy_add_listener(struct wl_proxy *proxy,
void (**implementation)(void), void *data)
{ {
struct wl_listener *listener; struct wl_listener *listener;
@ -228,13 +176,12 @@ wl_proxy_marshal(struct wl_proxy *proxy, uint32_t opcode, ...)
} }
static void static void
add_visual(struct wl_display *display, struct wl_global *global) add_visual(struct wl_display *display, uint32_t id)
{ {
struct wl_visual *visual; struct wl_visual *visual;
visual = (struct wl_visual *) visual = (struct wl_visual *)
wl_proxy_create_for_global(display, global, wl_proxy_create_for_id(display, &wl_visual_interface, id);
&wl_visual_interface);
if (display->argb_visual == NULL) if (display->argb_visual == NULL)
display->argb_visual = visual; display->argb_visual = visual;
else if (display->premultiplied_argb_visual == NULL) else if (display->premultiplied_argb_visual == NULL)
@ -291,38 +238,17 @@ display_handle_global(void *data,
struct wl_display *display, struct wl_display *display,
uint32_t id, const char *interface, uint32_t version) uint32_t id, const char *interface, uint32_t version)
{ {
struct wl_global *global; struct wl_global_listener *listener;
global = malloc(sizeof *global);
if (global == NULL)
return;
global->id = id;
global->interface = strdup(interface);
global->version = version;
wl_list_insert(display->global_list.prev, &global->link);
if (strcmp(global->interface, "display") == 0) if (strcmp(interface, "display") == 0)
wl_hash_table_insert(display->objects, wl_hash_table_insert(display->objects,
id, &display->proxy.base); id, &display->proxy.base);
else if (strcmp(global->interface, "compositor") == 0) else if (strcmp(interface, "visual") == 0)
display->compositor = (struct wl_compositor *) add_visual(display, id);
wl_proxy_create_for_global(display, global,
&wl_compositor_interface); wl_list_for_each(listener, &display->global_listener_list, link)
else if (strcmp(global->interface, "visual") == 0) (*listener->handler)(display,
add_visual(display, global); id, interface, version, listener->data);
else if (strcmp(global->interface, "output") == 0)
wl_proxy_create_for_global(display, global,
&wl_output_interface);
else if (strcmp(global->interface, "input_device") == 0)
wl_proxy_create_for_global(display, global,
&wl_input_device_interface);
else if (strcmp(global->interface, "shell") == 0)
wl_proxy_create_for_global(display, global,
&wl_shell_interface);
else if (strcmp(global->interface, "drm") == 0)
wl_proxy_create_for_global(display, global,
&wl_drm_interface);
} }
static void static void
@ -370,7 +296,6 @@ wl_display_create(const char *name, size_t name_size)
} }
display->objects = wl_hash_table_create(); display->objects = wl_hash_table_create();
wl_list_init(&display->global_list);
wl_list_init(&display->global_listener_list); wl_list_init(&display->global_listener_list);
display->proxy.base.interface = &wl_display_interface; display->proxy.base.interface = &wl_display_interface;
@ -396,20 +321,6 @@ wl_display_destroy(struct wl_display *display)
free(display); free(display);
} }
WL_EXPORT uint32_t
wl_display_get_object_id(struct wl_display *display,
const char *interface, uint32_t version)
{
struct wl_global *global;
wl_list_for_each(global, &display->global_list, link)
if (strcmp(global->interface, interface) == 0 &&
global->version >= version)
return global->id;
return 0;
}
WL_EXPORT int WL_EXPORT int
wl_display_get_fd(struct wl_display *display, wl_display_get_fd(struct wl_display *display,
wl_display_update_func_t update, void *data) wl_display_update_func_t update, void *data)
@ -498,26 +409,18 @@ wl_display_allocate_id(struct wl_display *display)
return display->id++; return display->id++;
} }
WL_EXPORT void
wl_display_write(struct wl_display *display, const void *data, size_t count)
{
wl_connection_write(display->connection, data, count);
}
WL_EXPORT struct wl_compositor *
wl_display_get_compositor(struct wl_display *display)
{
return display->compositor;
}
WL_EXPORT void WL_EXPORT void
wl_surface_set_user_data(struct wl_surface *surface, void *user_data) wl_surface_set_user_data(struct wl_surface *surface, void *user_data)
{ {
surface->proxy.user_data = user_data; struct wl_proxy *proxy = (struct wl_proxy *) surface;
proxy->user_data = user_data;
} }
WL_EXPORT void * WL_EXPORT void *
wl_surface_get_user_data(struct wl_surface *surface) wl_surface_get_user_data(struct wl_surface *surface)
{ {
return surface->proxy.user_data; struct wl_proxy *proxy = (struct wl_proxy *) surface;
return proxy->user_data;
} }

49
wayland-client.h
Unescape View File

@ -33,22 +33,20 @@ extern "C" {
#define WL_DISPLAY_READABLE 0x01 #define WL_DISPLAY_READABLE 0x01
#define WL_DISPLAY_WRITABLE 0x02 #define WL_DISPLAY_WRITABLE 0x02
int
wl_object_implements(struct wl_object *object,
const char *interface, int version);
typedef int (*wl_display_update_func_t)(uint32_t mask, void *data); typedef int (*wl_display_update_func_t)(uint32_t mask, void *data);
struct wl_display *wl_display_create(const char *name, size_t name_size); struct wl_display *wl_display_create(const char *name, size_t name_size);
void wl_display_destroy(struct wl_display *display); void wl_display_destroy(struct wl_display *display);
int wl_display_get_fd(struct wl_display *display, int wl_display_get_fd(struct wl_display *display,
wl_display_update_func_t update, void *data); wl_display_update_func_t update, void *data);
uint32_t wl_display_allocate_id(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);
struct wl_global_listener; struct wl_global_listener;
typedef void (*wl_display_global_func_t)(struct wl_display *display, typedef void (*wl_display_global_func_t)(struct wl_display *display,
struct wl_object *object, uint32_t id,
const char *interface,
uint32_t version,
void *data); void *data);
void void
wl_display_remove_global_listener(struct wl_display *display, wl_display_remove_global_listener(struct wl_display *display,
@ -57,8 +55,6 @@ wl_display_remove_global_listener(struct wl_display *display,
struct wl_global_listener * struct wl_global_listener *
wl_display_add_global_listener(struct wl_display *display, wl_display_add_global_listener(struct wl_display *display,
wl_display_global_func_t handler, void *data); wl_display_global_func_t handler, void *data);
struct wl_compositor *
wl_display_get_compositor(struct wl_display *display);
struct wl_visual * struct wl_visual *
wl_display_get_argb_visual(struct wl_display *display); wl_display_get_argb_visual(struct wl_display *display);
struct wl_visual * struct wl_visual *
@ -66,46 +62,9 @@ wl_display_get_premultiplied_argb_visual(struct wl_display *display);
struct wl_visual * struct wl_visual *
wl_display_get_rgb_visual(struct wl_display *display); wl_display_get_rgb_visual(struct wl_display *display);
int
wl_compositor_add_listener(struct wl_compositor *compostior,
const struct wl_compositor_listener *listener,
void *data);
int
wl_shell_add_listener(struct wl_shell *shell,
const struct wl_shell_listener *listener,
void *data);
int
wl_drm_add_listener(struct wl_drm *drm,
const struct wl_drm_listener *listener,
void *data);
void wl_surface_set_user_data(struct wl_surface *surface, void *user_data); void wl_surface_set_user_data(struct wl_surface *surface, void *user_data);
void *wl_surface_get_user_data(struct wl_surface *surface); void *wl_surface_get_user_data(struct wl_surface *surface);
int
wl_output_add_listener(struct wl_output *output,
const struct wl_output_listener *listener,
void *data);
int
wl_input_device_add_listener(struct wl_input_device *input_device,
const struct wl_input_device_listener *listener,
void *data);
/* These entry points are for client side implementation of custom
* objects. */
uint32_t wl_display_get_object_id(struct wl_display *display,
const char *interface, uint32_t version);
uint32_t wl_display_allocate_id(struct wl_display *display);
void wl_display_write(struct wl_display *display,
const void *data,
size_t count);
void wl_display_advertise_global(struct wl_display *display,
struct wl_object *object);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

Write Preview
Loading…
Cancel
Save