From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/test/xi2/protocol-xiquerydevice.c | 339 +++++++++++++------------- 1 file changed, 167 insertions(+), 172 deletions(-) (limited to 'xorg-server/test/xi2/protocol-xiquerydevice.c') diff --git a/xorg-server/test/xi2/protocol-xiquerydevice.c b/xorg-server/test/xi2/protocol-xiquerydevice.c index 569aea93a..5e59e8084 100644 --- a/xorg-server/test/xi2/protocol-xiquerydevice.c +++ b/xorg-server/test/xi2/protocol-xiquerydevice.c @@ -53,17 +53,19 @@ struct test_data { int num_devices_in_reply; }; -static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void *userdata); -static void reply_XIQueryDevice(ClientPtr client, int len, char* data, void *userdata); +static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, + void *userdata); +static void reply_XIQueryDevice(ClientPtr client, int len, char *data, + void *userdata); /* reply handling for the first bytes that constitute the reply */ -static void reply_XIQueryDevice(ClientPtr client, int len, char* data, void *userdata) +static void +reply_XIQueryDevice(ClientPtr client, int len, char *data, void *userdata) { - xXIQueryDeviceReply *rep = (xXIQueryDeviceReply*)data; - struct test_data *querydata = (struct test_data*)userdata; + xXIQueryDeviceReply *rep = (xXIQueryDeviceReply *) data; + struct test_data *querydata = (struct test_data *) userdata; - if (client->swapped) - { + if (client->swapped) { swapl(&rep->length); swaps(&rep->sequenceNumber); swaps(&rep->num_devices); @@ -83,19 +85,18 @@ static void reply_XIQueryDevice(ClientPtr client, int len, char* data, void *use } /* reply handling for the trailing bytes that constitute the device info */ -static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void *userdata) +static void +reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void *userdata) { int i, j; - struct test_data *querydata = (struct test_data*)userdata; + struct test_data *querydata = (struct test_data *) userdata; DeviceIntPtr dev; - xXIDeviceInfo *info = (xXIDeviceInfo*)data; + xXIDeviceInfo *info = (xXIDeviceInfo *) data; xXIAnyInfo *any; - for (i = 0; i < querydata->num_devices_in_reply; i++) - { - if (client->swapped) - { + for (i = 0; i < querydata->num_devices_in_reply; i++) { + if (client->swapped) { swaps(&info->deviceid); swaps(&info->attachment); swaps(&info->use); @@ -106,179 +107,173 @@ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, void if (querydata->which_device > XIAllMasterDevices) assert(info->deviceid == querydata->which_device); - assert(info->deviceid >= 2); /* 0 and 1 is reserved */ - - - switch(info->deviceid) - { - case 2: /* VCP */ - dev = devices.vcp; - assert(info->use == XIMasterPointer); - assert(info->attachment == devices.vck->id); - assert(info->num_classes == 3); /* 2 axes + button */ - break; - case 3: /* VCK */ - dev = devices.vck; - assert(info->use == XIMasterKeyboard); - assert(info->attachment == devices.vcp->id); - assert(info->num_classes == 1); - break; - case 4: /* mouse */ - dev = devices.mouse; - assert(info->use == XISlavePointer); - assert(info->attachment == devices.vcp->id); - assert(info->num_classes == 7); /* 4 axes + button + 2 scroll*/ - break; - case 5: /* keyboard */ - dev = devices.kbd; - assert(info->use == XISlaveKeyboard); - assert(info->attachment == devices.vck->id); - assert(info->num_classes == 1); - break; - - default: - /* We shouldn't get here */ - assert(0); - break; + assert(info->deviceid >= 2); /* 0 and 1 is reserved */ + + switch (info->deviceid) { + case 2: /* VCP */ + dev = devices.vcp; + assert(info->use == XIMasterPointer); + assert(info->attachment == devices.vck->id); + assert(info->num_classes == 3); /* 2 axes + button */ + break; + case 3: /* VCK */ + dev = devices.vck; + assert(info->use == XIMasterKeyboard); + assert(info->attachment == devices.vcp->id); + assert(info->num_classes == 1); + break; + case 4: /* mouse */ + dev = devices.mouse; + assert(info->use == XISlavePointer); + assert(info->attachment == devices.vcp->id); + assert(info->num_classes == 7); /* 4 axes + button + 2 scroll */ + break; + case 5: /* keyboard */ + dev = devices.kbd; + assert(info->use == XISlaveKeyboard); + assert(info->attachment == devices.vck->id); + assert(info->num_classes == 1); + break; + + default: + /* We shouldn't get here */ + assert(0); + break; } assert(info->enabled == dev->enabled); assert(info->name_len == strlen(dev->name)); - assert(strncmp((char*)&info[1], dev->name, info->name_len) == 0); + assert(strncmp((char *) &info[1], dev->name, info->name_len) == 0); - any = (xXIAnyInfo*)((char*)&info[1] + ((info->name_len + 3)/4) * 4); - for (j = 0; j < info->num_classes; j++) - { - if (client->swapped) - { + any = + (xXIAnyInfo *) ((char *) &info[1] + ((info->name_len + 3) / 4) * 4); + for (j = 0; j < info->num_classes; j++) { + if (client->swapped) { swaps(&any->type); swaps(&any->length); swaps(&any->sourceid); } - switch(info->deviceid) + switch (info->deviceid) { + case 3: /* VCK and kbd have the same properties */ + case 5: + { + int k; + xXIKeyInfo *ki = (xXIKeyInfo *) any; + XkbDescPtr xkb = devices.vck->key->xkbInfo->desc; + uint32_t *kc; + + if (client->swapped) + swaps(&ki->num_keycodes); + + assert(any->type == XIKeyClass); + assert(ki->num_keycodes == + (xkb->max_key_code - xkb->min_key_code + 1)); + assert(any->length == (2 + ki->num_keycodes)); + + kc = (uint32_t *) & ki[1]; + for (k = 0; k < ki->num_keycodes; k++, kc++) { + if (client->swapped) + swapl(kc); + + assert(*kc >= xkb->min_key_code); + assert(*kc <= xkb->max_key_code); + } + break; + } + case 4: { - case 3: /* VCK and kbd have the same properties */ - case 5: - { - int k; - xXIKeyInfo *ki = (xXIKeyInfo*)any; - XkbDescPtr xkb = devices.vck->key->xkbInfo->desc; - uint32_t *kc; - - if (client->swapped) - swaps(&ki->num_keycodes); - - assert(any->type == XIKeyClass); - assert(ki->num_keycodes == (xkb->max_key_code - xkb->min_key_code + 1)); - assert(any->length == (2 + ki->num_keycodes)); - - kc = (uint32_t*)&ki[1]; - for (k = 0; k < ki->num_keycodes; k++, kc++) - { - if (client->swapped) - swapl(kc); - - assert(*kc >= xkb->min_key_code); - assert(*kc <= xkb->max_key_code); - } - break; + assert(any->type == XIButtonClass || + any->type == XIValuatorClass || + any->type == XIScrollClass); + + if (any->type == XIScrollClass) { + xXIScrollInfo *si = (xXIScrollInfo *) any; + + if (client->swapped) { + swaps(&si->number); + swaps(&si->scroll_type); + swapl(&si->increment.integral); + swapl(&si->increment.frac); } - case 4: - { - assert(any->type == XIButtonClass || - any->type == XIValuatorClass || - any->type == XIScrollClass); - - if (any->type == XIScrollClass) - { - xXIScrollInfo *si = (xXIScrollInfo*)any; - - if (client->swapped) - { - swaps(&si->number); - swaps(&si->scroll_type); - swapl(&si->increment.integral); - swapl(&si->increment.frac); - } - assert(si->length == 6); - assert(si->number == 2 || si->number == 3); - if (si->number == 2) { - assert(si->scroll_type == XIScrollTypeVertical); - assert(!si->flags); - } - if (si->number == 3) { - assert(si->scroll_type == XIScrollTypeHorizontal); - assert(si->flags & XIScrollFlagPreferred); - assert(!(si->flags & ~XIScrollFlagPreferred)); - } - - assert(si->increment.integral == si->number); - /* protocol-common.c sets up increments of 2.4 and 3.5 */ - assert(si->increment.frac > 0.3 * (1ULL << 32)); - assert(si->increment.frac < 0.6 * (1ULL << 32)); - } - + assert(si->length == 6); + assert(si->number == 2 || si->number == 3); + if (si->number == 2) { + assert(si->scroll_type == XIScrollTypeVertical); + assert(!si->flags); } - /* fall through */ - case 2: /* VCP and mouse have the same properties except for scroll */ - { - if (info->deviceid == 2 ) /* VCP */ - assert(any->type == XIButtonClass || - any->type == XIValuatorClass); - - if (any->type == XIButtonClass) - { - int len; - xXIButtonInfo *bi = (xXIButtonInfo*)any; - - if (client->swapped) - swaps(&bi->num_buttons); - - assert(bi->num_buttons == devices.vcp->button->numButtons); - - len = 2 + bi->num_buttons + bytes_to_int32(bits_to_bytes(bi->num_buttons)); - assert(bi->length == len); - } else if (any->type == XIValuatorClass) - { - xXIValuatorInfo *vi = (xXIValuatorInfo*)any; - - if (client->swapped) - { - swaps(&vi->number); - swapl(&vi->label); - swapl(&vi->min.integral); - swapl(&vi->min.frac); - swapl(&vi->max.integral); - swapl(&vi->max.frac); - swapl(&vi->resolution); - } - - assert(vi->length == 11); - assert(vi->number >= 0 && vi->number < 4); - if (info->deviceid == 2) /* VCP */ - assert(vi->number < 2); - - assert(vi->mode == XIModeRelative); - /* device was set up as relative, so standard - * values here. */ - assert(vi->min.integral == -1); - assert(vi->min.frac == 0); - assert(vi->max.integral == -1); - assert(vi->max.frac == 0); - assert(vi->resolution == 0); - } + if (si->number == 3) { + assert(si->scroll_type == XIScrollTypeHorizontal); + assert(si->flags & XIScrollFlagPreferred); + assert(!(si->flags & ~XIScrollFlagPreferred)); } - break; + + assert(si->increment.integral == si->number); + /* protocol-common.c sets up increments of 2.4 and 3.5 */ + assert(si->increment.frac > 0.3 * (1ULL << 32)); + assert(si->increment.frac < 0.6 * (1ULL << 32)); + } + } - any = (xXIAnyInfo*)(((char*)any) + any->length * 4); + /* fall through */ + case 2: /* VCP and mouse have the same properties except for scroll */ + { + if (info->deviceid == 2) /* VCP */ + assert(any->type == XIButtonClass || + any->type == XIValuatorClass); + + if (any->type == XIButtonClass) { + int len; + xXIButtonInfo *bi = (xXIButtonInfo *) any; + + if (client->swapped) + swaps(&bi->num_buttons); + + assert(bi->num_buttons == devices.vcp->button->numButtons); + + len = + 2 + bi->num_buttons + + bytes_to_int32(bits_to_bytes(bi->num_buttons)); + assert(bi->length == len); + } + else if (any->type == XIValuatorClass) { + xXIValuatorInfo *vi = (xXIValuatorInfo *) any; + + if (client->swapped) { + swaps(&vi->number); + swapl(&vi->label); + swapl(&vi->min.integral); + swapl(&vi->min.frac); + swapl(&vi->max.integral); + swapl(&vi->max.frac); + swapl(&vi->resolution); + } + + assert(vi->length == 11); + assert(vi->number >= 0 && vi->number < 4); + if (info->deviceid == 2) /* VCP */ + assert(vi->number < 2); + + assert(vi->mode == XIModeRelative); + /* device was set up as relative, so standard + * values here. */ + assert(vi->min.integral == -1); + assert(vi->min.frac == 0); + assert(vi->max.integral == -1); + assert(vi->max.frac == 0); + assert(vi->resolution == 0); + } + } + break; + } + any = (xXIAnyInfo *) (((char *) any) + any->length * 4); } - info = (xXIDeviceInfo*)any; + info = (xXIDeviceInfo *) any; } } -static void request_XIQueryDevice(struct test_data *querydata, - int deviceid, int error) +static void +request_XIQueryDevice(struct test_data *querydata, int deviceid, int error) { int rc; ClientRec client; @@ -309,7 +304,8 @@ static void request_XIQueryDevice(struct test_data *querydata, assert(client.errorValue == deviceid); } -static void test_XIQueryDevice(void) +static void +test_XIQueryDevice(void) { int i; xXIQueryDeviceReq request; @@ -332,12 +328,12 @@ static void test_XIQueryDevice(void) for (i = 6; i <= 0xFFFF; i++) request_XIQueryDevice(&data, i, BadDevice); - reply_handler = NULL; } -int main(int argc, char** argv) +int +main(int argc, char **argv) { init_simple(); @@ -345,4 +341,3 @@ int main(int argc, char** argv) return 0; } - -- cgit v1.2.3