blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check for multi backend before using it

This commit is contained in:
Drew DeVault 2017-08-05 23:08:35 -04:00
parent f1a069d50d
commit 5bf61ca7ed
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/multi/backend.c
View File

@ -66,6 +66,10 @@ struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session,
return backend; return backend;
} }
bool wlr_backend_is_multi(struct wlr_backend *b) {
return b->impl == &backend_impl;
}
static void input_add_reemit(struct wl_listener *listener, void *data) { static void input_add_reemit(struct wl_listener *listener, void *data) {
struct subbackend_state *state = wl_container_of(listener, struct subbackend_state *state = wl_container_of(listener,
state, input_add); state, input_add);

10
examples/shared.c
View File

@ -48,10 +48,12 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
} else if (key_state == WLR_KEY_PRESSED && } else if (key_state == WLR_KEY_PRESSED &&
sym >= XKB_KEY_XF86Switch_VT_1 && sym >= XKB_KEY_XF86Switch_VT_1 &&
sym <= XKB_KEY_XF86Switch_VT_12) { sym <= XKB_KEY_XF86Switch_VT_12) {
struct wlr_session *session = if (wlr_backend_is_multi(kbstate->compositor->backend)) {
wlr_multi_get_session(kbstate->compositor->backend); struct wlr_session *session =
if (session) { wlr_multi_get_session(kbstate->compositor->backend);
wlr_session_change_vt(session, sym - XKB_KEY_XF86Switch_VT_1 + 1); if (session) {
wlr_session_change_vt(session, sym - XKB_KEY_XF86Switch_VT_1 + 1);
}
} }
} }
} }

2
include/wlr/backend/multi.h
View File

@ -10,6 +10,8 @@ struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session,
void wlr_multi_backend_add(struct wlr_backend *multi, void wlr_multi_backend_add(struct wlr_backend *multi,
struct wlr_backend *backend); struct wlr_backend *backend);
bool wlr_backend_is_multi(struct wlr_backend *backend);
struct wlr_session *wlr_multi_get_session(struct wlr_backend *base); struct wlr_session *wlr_multi_get_session(struct wlr_backend *base);
#endif #endif