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.)
diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index f7782d8..36d7ae0 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -741,15 +741,6 @@
weston_launcher_restore(compositor->launcher);
}
-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);
-}
-
static struct fbdev_backend *
fbdev_backend_create(struct weston_compositor *compositor, int *argc, char *argv[],
struct weston_config *config,
@@ -757,7 +748,6 @@
{
struct fbdev_backend *backend;
const char *seat_id = default_seat;
- uint32_t key;
weston_log("initializing fbdev backend\n");
@@ -794,11 +784,8 @@
backend->prev_state = WESTON_COMPOSITOR_ACTIVE;
backend->use_pixman = !param->use_gl;
- 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);
+
if (backend->use_pixman) {
if (pixman_renderer_init(compositor) < 0)
goto out_launcher;