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

launcher-util: Initialize kb_mode also when weston-launch sets up tty

Browse Source 
We need a valid kb_mode to restore to in case weston-launch dies and
weston has to clean up the tty.  We don't get a chance to read out the
kb mode before weston-launch changes it, but it's safe to assume that it's
always K_UNICODE.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77455
This commit is contained in:
Kristian Høgsberg
2014-04-30 10:40:39 -07:00
parent ef6a7e46eb
commit 9a14b8f4fa
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/launcher-util.c
+5
View File
@@ -390,6 +390,11 @@ weston_launcher_connect(struct weston_compositor *compositor, int tty,
launcher->fd = weston_environment_get_fd("WESTON_LAUNCHER_SOCK"); launcher->fd = weston_environment_get_fd("WESTON_LAUNCHER_SOCK");
if (launcher->fd != -1) { if (launcher->fd != -1) {
launcher->tty = weston_environment_get_fd("WESTON_TTY_FD"); launcher->tty = weston_environment_get_fd("WESTON_TTY_FD");
/* We don't get a chance to read out the original kb
* mode for the tty, so just hard code K_UNICODE here
* in case we have to clean if weston-launch dies. */
launcher->kb_mode = K_UNICODE;
loop = wl_display_get_event_loop(compositor->wl_display); loop = wl_display_get_event_loop(compositor->wl_display);
launcher->source = wl_event_loop_add_fd(loop, launcher->fd, launcher->source = wl_event_loop_add_fd(loop, launcher->fd,
WL_EVENT_READABLE, WL_EVENT_READABLE,