xserver: Branch 'master' - 3 commits

[Peter Hutterer]

 hw/xwayland/xwayland-glamor.c |    2 +-
 hw/xwayland/xwayland-input.c  |   18 +++++++++---------
 hw/xwayland/xwayland-output.c |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 6f2a5b8cdf7b1e913a1e0581e65195dd10f04ca3
Author: Jason Gerecke <killertofu at gmail.com>
Date:   Fri Jun 17 08:44:41 2016 -0700

    xwayland: Expose all NBUTTONS buttons on the pointer
    
    The call to 'InitButtonClassDeviceStruct' which initializes the pointer
    buttons only results in the first three buttons being created due to a
    hardcoded '3'. In order to expose all the buttons defined in the
    btn_labels array, we subtitute 'NBUTTONS' in its place.
    
    Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index fbb6b6b..45acf0c 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -103,7 +103,7 @@ xwl_pointer_proc(DeviceIntPtr device, int what)
         if (!InitPtrFeedbackClassDeviceStruct(device, xwl_pointer_control))
             return BadValue;
 
-        if (!InitButtonClassDeviceStruct(device, 3, btn_labels, map))
+        if (!InitButtonClassDeviceStruct(device, NBUTTONS, btn_labels, map))
             return BadValue;
 
         return Success;
commit 72df6e2a3a5020696902b70fe940934ef0a681c4
Author: Jason Gerecke <killertofu at gmail.com>
Date:   Fri Jun 17 08:44:40 2016 -0700

    xwayland: Use correct labels when initializing pointer valuators
    
    Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
    Reviewed-by: Olivier Fourdan <ofourdan at redhat.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 68c97d1..fbb6b6b 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -83,7 +83,7 @@ xwl_pointer_proc(DeviceIntPtr device, int what)
         axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_HWHEEL);
         axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_WHEEL);
 
-        if (!InitValuatorClassDeviceStruct(device, NAXES, btn_labels,
+        if (!InitValuatorClassDeviceStruct(device, NAXES, axes_labels,
                                            GetMotionHistorySize(), Absolute))
             return BadValue;
 
commit dab5b3922c50f73712a8ea0cb9742c4bc7d7ab1d
Author: Jason Gerecke <killertofu at gmail.com>
Date:   Fri Jun 17 08:44:39 2016 -0700

    xwayland: Fix whitespace errors
    
    Substitute a few errant tab characters with eight spaces to conform to the
    prevailing style.
    
    Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 73ccd71..068c224 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -347,7 +347,7 @@ xwl_drm_handle_device(void *data, struct wl_drm *drm, const char *device)
    xwl_screen->drm_fd = open(xwl_screen->device_name, O_RDWR | O_CLOEXEC);
    if (xwl_screen->drm_fd == -1) {
        ErrorF("wayland-egl: could not open %s (%s)\n",
-	      xwl_screen->device_name, strerror(errno));
+              xwl_screen->device_name, strerror(errno));
        return;
    }
 
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 0735d43..68c97d1 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -591,8 +591,8 @@ keyboard_handle_repeat_info (void *data, struct wl_keyboard *keyboard,
     XkbControlsPtr ctrl;
 
     if (rate < 0 || delay < 0) {
-	ErrorF("Wrong rate/delay: %d, %d\n", rate, delay);
-	return;
+        ErrorF("Wrong rate/delay: %d, %d\n", rate, delay);
+        return;
     }
 
     for (dev = inputInfo.devices; dev; dev = dev->next) {
@@ -600,15 +600,15 @@ keyboard_handle_repeat_info (void *data, struct wl_keyboard *keyboard,
             dev != GetMaster(xwl_seat->keyboard, MASTER_KEYBOARD))
             continue;
 
-	if (rate != 0) {
+        if (rate != 0) {
             ctrl = dev->key->xkbInfo->desc->ctrls;
             ctrl->repeat_delay = delay;
             /* rate is number of keys per second */
             ctrl->repeat_interval = 1000 / rate;
 
-	    XkbSetRepeatKeys(dev, -1, AutoRepeatModeOn);
-	} else
-	    XkbSetRepeatKeys(dev, -1, AutoRepeatModeOff);
+            XkbSetRepeatKeys(dev, -1, AutoRepeatModeOn);
+        } else
+            XkbSetRepeatKeys(dev, -1, AutoRepeatModeOff);
     }
 }
 
@@ -843,7 +843,7 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
 
 static void
 seat_handle_name(void *data, struct wl_seat *seat,
-		 const char *name)
+                 const char *name)
 {
 
 }
diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
index 4903062..130b31d 100644
--- a/hw/xwayland/xwayland-output.c
+++ b/hw/xwayland/xwayland-output.c
@@ -122,7 +122,7 @@ output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags,
 
 static inline void
 output_get_new_size(struct xwl_output *xwl_output,
-		    int *height, int *width)
+                    int *height, int *width)
 {
     if (*width < xwl_output->x + xwl_output->width)
         *width = xwl_output->x + xwl_output->width;