diff options
| author | Bob Ham <bob.ham@collabora.com> | 2016-01-12 10:21:47 +0000 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2016-01-12 09:21:28 -0600 |
| commit | 91880f1e9e612eecfeb192343378da24088fc694 (patch) | |
| tree | 8c98236530aed355e89d3e848a628a8147e7620a /src/compositor-drm.c | |
| parent | 5d43af3e8888f18a4982d980b8c760d9726a9a92 (diff) | |
| download | weston-91880f1e9e612eecfeb192343378da24088fc694.tar.gz | |
compositor-{drm, fbdev, rpi}: Make VT switching configurable
Add a new boolean weston.ini option, "vt-switching" to enable or
disable Ctrl-Alt-Fn key combinations.
Signed-off-by: Bob Ham <bob.ham@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
(Derek Foreman changed the prototype for switch_vt_binding to
have a weston_keyboard * instead of weston_seat *. The pointer
wasn't used, so this is just a warning fix.)
Diffstat (limited to 'src/compositor-drm.c')
| -rw-r--r-- | src/compositor-drm.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/compositor-drm.c b/src/compositor-drm.c index ea6f3cdf..8b9882e6 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -2815,15 +2815,6 @@ session_notify(struct wl_listener *listener, void *data) }; } -static void -switch_vt_binding(struct weston_keyboard *keyboard, uint32_t time, - uint32_t key, void *data) -{ - struct weston_compositor *compositor = data; - - weston_launcher_activate_vt(compositor->launcher, key - KEY_F1 + 1); -} - /* * Find primary GPU * Some systems may have multiple DRM devices attached to a single seat. This @@ -3076,7 +3067,6 @@ drm_backend_create(struct weston_compositor *compositor, struct udev_device *drm_device; struct wl_event_loop *loop; const char *path; - uint32_t key; weston_log("initializing drm backend\n"); @@ -3152,10 +3142,7 @@ drm_backend_create(struct weston_compositor *compositor, b->prev_state = WESTON_COMPOSITOR_ACTIVE; - for (key = KEY_F1; key < KEY_F9; key++) - weston_compositor_add_key_binding(compositor, key, - MODIFIER_CTRL | MODIFIER_ALT, - switch_vt_binding, compositor); + weston_setup_vt_switch_bindings(compositor); wl_list_init(&b->sprite_list); create_sprites(b); |