frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jason Gerecke 2016-06-17 08:44:39 -07:00 committed by Peter Hutterer
parent 2d6230e773
commit dab5b3922c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwayland/xwayland-glamor.c
View File

@ -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); xwl_screen->drm_fd = open(xwl_screen->device_name, O_RDWR | O_CLOEXEC);
if (xwl_screen->drm_fd == -1) { if (xwl_screen->drm_fd == -1) {
ErrorF("wayland-egl: could not open %s (%s)\n", ErrorF("wayland-egl: could not open %s (%s)\n",
xwl_screen->device_name, strerror(errno)); xwl_screen->device_name, strerror(errno));
return; return;
} }

14
hw/xwayland/xwayland-input.c
View File

@ -591,8 +591,8 @@ keyboard_handle_repeat_info (void *data, struct wl_keyboard *keyboard,
XkbControlsPtr ctrl; XkbControlsPtr ctrl;
if (rate < 0 || delay < 0) { if (rate < 0 || delay < 0) {
ErrorF("Wrong rate/delay: %d, %d\n", rate, delay); ErrorF("Wrong rate/delay: %d, %d\n", rate, delay);
return; return;
} }
for (dev = inputInfo.devices; dev; dev = dev->next) { 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)) dev != GetMaster(xwl_seat->keyboard, MASTER_KEYBOARD))
continue; continue;
if (rate != 0) { if (rate != 0) {
ctrl = dev->key->xkbInfo->desc->ctrls; ctrl = dev->key->xkbInfo->desc->ctrls;
ctrl->repeat_delay = delay; ctrl->repeat_delay = delay;
/* rate is number of keys per second */ /* rate is number of keys per second */
ctrl->repeat_interval = 1000 / rate; ctrl->repeat_interval = 1000 / rate;
XkbSetRepeatKeys(dev, -1, AutoRepeatModeOn); XkbSetRepeatKeys(dev, -1, AutoRepeatModeOn);
} else } else
XkbSetRepeatKeys(dev, -1, AutoRepeatModeOff); XkbSetRepeatKeys(dev, -1, AutoRepeatModeOff);
} }
} }
@ -843,7 +843,7 @@ seat_handle_capabilities(void *data, struct wl_seat *seat,
static void static void
seat_handle_name(void *data, struct wl_seat *seat, seat_handle_name(void *data, struct wl_seat *seat,
const char *name) const char *name)
{ {
} }

2
hw/xwayland/xwayland-output.c
View File

@ -122,7 +122,7 @@ output_handle_mode(void *data, struct wl_output *wl_output, uint32_t flags,
static inline void static inline void
output_get_new_size(struct xwl_output *xwl_output, 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) if (*width < xwl_output->x + xwl_output->width)
*width = xwl_output->x + xwl_output->width; *width = xwl_output->x + xwl_output->width;