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

Represent event and method metadata with struct wl_message.

Browse Source
This commit is contained in:
Kristian Høgsberg 2008-12-21 21:54:51 -05:00
parent fe831a7494
commit fb6d68ddbe
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wayland-protocol.c
View File

@ -25,7 +25,7 @@
#include "wayland-util.h"
#include "wayland-protocol.h"
static const struct wl_event display_events[] = {
static const struct wl_message display_events[] = {
{ "invalid_object", "u" },
{ "invalid_method", "uu" },
{ "no_memory", "" },
@ -39,12 +39,12 @@ WL_EXPORT const struct wl_interface wl_display_interface = {
};
static const struct wl_method compositor_methods[] = {
static const struct wl_message compositor_methods[] = {
{ "create_surface", "n" },
{ "commit", "u" }
};
static const struct wl_event compositor_events[] = {
static const struct wl_message compositor_events[] = {
{ "acknowledge", "uu" },
{ "frame", "uu" }
};
@ -56,7 +56,7 @@ WL_EXPORT const struct wl_interface wl_compositor_interface = {
};
static const struct wl_method surface_methods[] = {
static const struct wl_message surface_methods[] = {
{ "destroy", "" },
{ "attach", "uuuuo" },
{ "map", "iiii" },
@ -71,7 +71,7 @@ WL_EXPORT const struct wl_interface wl_surface_interface = {
};
static const struct wl_event input_device_events[] = {
static const struct wl_message input_device_events[] = {
{ "motion", "iiii" },
{ "button", "uuiiii" },
{ "key", "uu" },

11
wayland-protocol.h
View File

@ -30,24 +30,19 @@ struct wl_argument {
void *data;
};
struct wl_method {
struct wl_message {
const char *name;
const char *signature;
const void **types;
};
struct wl_event {
const char *name;
const char *signature;
};
struct wl_interface {
const char *name;
int version;
int method_count;
const struct wl_method *methods;
const struct wl_message *methods;
int event_count;
const struct wl_event *events;
const struct wl_message *events;
};
#define WL_DISPLAY_INVALID_OBJECT 0

2
wayland-system-compositor.c
View File

@ -145,7 +145,7 @@ screenshooter_shoot(struct wl_client *client, struct screenshooter *shooter)
gdk_pixbuf_save(pixbuf, filename, "png", &error, NULL);
}
static const struct wl_method screenshooter_methods[] = {
static const struct wl_message screenshooter_methods[] = {
{ "shoot", "", NULL }
};

4
wayland.c
View File

@ -70,7 +70,7 @@ static void
wl_client_vmarshal(struct wl_client *client, struct wl_object *sender,
uint32_t opcode, va_list ap)
{
const struct wl_event *event;
const struct wl_message *event;
struct wl_object *object;
uint32_t args[32], length, *p, size;
const char *s;
@ -125,7 +125,7 @@ static void
wl_client_demarshal(struct wl_client *client, struct wl_object *target,
uint32_t opcode, size_t size)
{
const struct wl_method *method;
const struct wl_message *method;
ffi_type *types[20];
ffi_cif cif;
uint32_t *p, result;