diff options
| -rw-r--r-- | src/nested_input.c | 6 | ||||
| -rw-r--r-- | src/xlibclient.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/nested_input.c b/src/nested_input.c index 9d2e0d3..b674c35 100644 --- a/src/nested_input.c +++ b/src/nested_input.c @@ -194,8 +194,7 @@ _nested_input_init_buttons(DeviceIntPtr device) { map = calloc(NUM_MOUSE_BUTTONS, sizeof(CARD8)); - int i; - for (i = 0; i < NUM_MOUSE_BUTTONS; i++) + for (int i = 0; i < NUM_MOUSE_BUTTONS; i++) map[i] = i; if (!InitButtonClassDeviceStruct(device, NUM_MOUSE_BUTTONS, buttonLabels, map)) { @@ -218,8 +217,7 @@ _nested_input_init_axes(DeviceIntPtr device) { return BadAlloc; } - int i; - for (i = 0; i < NUM_MOUSE_AXES; i++) { + for (int i = 0; i < NUM_MOUSE_AXES; i++) { xf86InitValuatorAxisStruct(device, i, (Atom)0, -1, -1, 1, 1, 1, Absolute); xf86InitValuatorDefaults(device, i); } diff --git a/src/xlibclient.c b/src/xlibclient.c index 10ab970..7d5a66d 100644 --- a/src/xlibclient.c +++ b/src/xlibclient.c @@ -254,8 +254,9 @@ xf86DrvMsg(scrnIndex, X_INFO, "blu_mask: 0x%lx\n", pPriv->img->blue_mask); *retGreenMask = pPriv->img->green_mask; *retBlueMask = pPriv->img->blue_mask; - XEvent ev; while (1) { + XEvent ev; + XNextEvent(pPriv->display, &ev); if (ev.type == Expose) { break; |