mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-07 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use #if instead of #ifdef for wlroots config data

Browse source 
This prevents some annoying issues when e.g. not including wlr/config.h or
making a typo in the guard name.
This commit is contained in:
emersion 2018-11-12 10:12:46 +01:00
parent 3181c4bec0
commit 51bfdd620e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
25 changed files with 69 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rootston/desktop.c
View file

@ -619,7 +619,7 @@ static bool view_at(struct roots_view *view, double lx, double ly,
_surface = wlr_wl_shell_surface_surface_at(view->wl_shell_surface,
view_sx, view_sy, &_sx, &_sy);
break;
#ifdef WLR_HAS_XWAYLAND
#if WLR_HAS_XWAYLAND
case ROOTS_XWAYLAND_VIEW:
_surface = wlr_surface_surface_at(view->wlr_surface,
view_sx, view_sy, &_sx, &_sy);
@ -890,14 +890,14 @@ struct roots_desktop *desktop_create(struct roots_server *server,
desktop->tablet_v2 = wlr_tablet_v2_create(server->wl_display);
const char *cursor_theme = NULL;
#ifdef WLR_HAS_XWAYLAND
#if WLR_HAS_XWAYLAND
const char *cursor_default = ROOTS_XCURSOR_DEFAULT;
#endif
struct roots_cursor_config *cc =
roots_config_get_cursor(config, ROOTS_CONFIG_DEFAULT_SEAT_NAME);
if (cc != NULL) {
cursor_theme = cc->theme;
#ifdef WLR_HAS_XWAYLAND
#if WLR_HAS_XWAYLAND
if (cc->default_image != NULL) {
cursor_default = cc->default_image;
}
@ -912,7 +912,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
setenv("XCURSOR_THEME", cursor_theme, 1);
}
#ifdef WLR_HAS_XWAYLAND
#if WLR_HAS_XWAYLAND
desktop->xcursor_manager = wlr_xcursor_manager_create(cursor_theme,
ROOTS_XCURSOR_SIZE);
if (desktop->xcursor_manager == NULL) {