mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-03-06 01:41:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include the currently pressed keys in keyboard focus event.

Browse source
This commit is contained in:
Kristian Høgsberg 2009-02-23 22:30:29 -05:00
parent 7e3e860031
commit 3c38fa0c3e
7 changed files with 106 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
connection.c
View file

@ -229,6 +229,7 @@ wl_connection_vmarshal(struct wl_connection *connection,
{
struct wl_object *object;
uint32_t args[32], length, *p, size;
struct wl_array *array;
const char *s;
int i, count;
@ -254,6 +255,16 @@ wl_connection_vmarshal(struct wl_connection *connection,
object = va_arg(ap, struct wl_object *);
*p++ = object ? object->id : 0;
break;
case 'a':
array = va_arg(ap, struct wl_array *);
if (array == NULL || array->size == 0) {
*p++ = 0;
break;
}
*p++ = array->size;
memcpy(p, array->data, array->size);
p = (void *) p + array->size;
break;
default:
assert(0);
break;
@ -283,6 +294,7 @@ wl_connection_demarshal(struct wl_connection *connection,
char *string;
void *object;
uint32_t new_id;
struct wl_array *array;
} values[20];
void *args[20];
struct wl_object *object;
@ -344,6 +356,20 @@ wl_connection_demarshal(struct wl_connection *connection,
printf("object already exists (%d)\n", *p);
p++;
break;
case 'a':
types[i] = &ffi_type_pointer;
length = *p++;
values[i].array = malloc(length + sizeof *values[i].array);
if (values[i].array == NULL) {
/* FIXME: Send NO_MEMORY */
return;
}
values[i].array->size = length;
values[i].array->alloc = 0;
values[i].array->data = values[i].array + 1;
memcpy(values[i].array->data, p, length);
p += DIV_ROUNDUP(length, sizeof *p);
break;
default:
printf("unknown type\n");
break;
@ -359,6 +385,9 @@ wl_connection_demarshal(struct wl_connection *connection,
case 's':
free(values[i].string);
break;
case 'a':
free(values[i].array);
break;
}
}
}