mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ivi-shell: add exit binding

Browse Source 
Let's me easily exit ivi-shell when testing with the DRM-backend.
Only available in ivi-shell developer mode.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2015-02-19 17:12:19 +02:00
parent e35b223342
commit 6c7a1c7b07
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivi-shell/ivi-shell.c
+17 -1
View File
@@ -36,6 +36,7 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <limits.h> #include <limits.h>
#include <assert.h> #include <assert.h>
#include <linux/input.h>
#include "ivi-shell.h" #include "ivi-shell.h"
#include "ivi-application-server-protocol.h" #include "ivi-application-server-protocol.h"
@@ -354,6 +355,15 @@ shell_destroy(struct wl_listener *listener, void *data)
free(shell); free(shell);
} }
static void
terminate_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
void *data)
{
struct weston_compositor *compositor = data;
wl_display_terminate(compositor->wl_display);
}
static void static void
init_ivi_shell(struct weston_compositor *compositor, struct ivi_shell *shell, init_ivi_shell(struct weston_compositor *compositor, struct ivi_shell *shell,
const struct ivi_shell_setting *setting) const struct ivi_shell_setting *setting)
@@ -364,8 +374,14 @@ init_ivi_shell(struct weston_compositor *compositor, struct ivi_shell *shell,
weston_layer_init(&shell->input_panel_layer, NULL); weston_layer_init(&shell->input_panel_layer, NULL);
if (setting->developermode) if (setting->developermode) {
weston_install_debug_key_binding(compositor, MODIFIER_SUPER); weston_install_debug_key_binding(compositor, MODIFIER_SUPER);
weston_compositor_add_key_binding(compositor, KEY_BACKSPACE,
MODIFIER_CTRL | MODIFIER_ALT,
terminate_binding,
compositor);
}
} }
static int static int