diff options
| -rw-r--r-- | backend/wayland/wl_seat.c | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | xcursor/xcursor.c | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index c4098987..b654197a 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -203,7 +203,7 @@ static void keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t time = get_current_time_msec(); - uint32_t pressed[dev->keyboard->num_keycodes]; + uint32_t pressed[dev->keyboard->num_keycodes + 1]; memcpy(pressed, dev->keyboard->keycodes, dev->keyboard->num_keycodes * sizeof(uint32_t)); diff --git a/meson.build b/meson.build index 3d96d052..df1dbb84 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'wlroots', 'c', - version: '0.1.0', + version: '0.2.0', license: 'MIT', meson_version: '>=0.48.0', default_options: [ diff --git a/xcursor/xcursor.c b/xcursor/xcursor.c index 6690da1a..5b20fc56 100644 --- a/xcursor/xcursor.c +++ b/xcursor/xcursor.c @@ -618,7 +618,7 @@ XcursorFileLoadImages (FILE *file, int size) #endif #ifndef XCURSORPATH -#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:~/.cursors:/usr/share/cursors/xorg-x11:"ICONDIR +#define XCURSORPATH "~/.local/share/icons:~/.icons:/usr/share/icons:/usr/share/pixmaps:"ICONDIR #endif static const char * @@ -839,7 +839,12 @@ XcursorScanTheme (const char *theme, const char *name) * Recurse to scan inherited themes */ for (i = inherits; i && f == NULL; i = _XcursorNextPath (i)) - f = XcursorScanTheme (i, name); + { + if (strcmp(i, theme) != 0) + f = XcursorScanTheme (i, name); + else + printf("Not calling XcursorScanTheme because of circular dependency: %s. %s", i, name); + } if (inherits != NULL) free (inherits); return f; |