clients/keyboard.c

@@ -60,6 +60,7 @@ struct virtual_keyboard {
 	uint32_t surrounding_cursor;
 	struct keyboard *keyboard;
 	bool toplevel;
+	bool overlay;
 	struct zwp_input_panel_surface_v1 *ips;
 };
 
@@ -970,15 +971,38 @@ set_toplevel(struct output *output, struct virtual_keyboard *virtual_keyboard)
 						ZWP_INPUT_PANEL_SURFACE_V1_POSITION_CENTER_BOTTOM);
 
 	virtual_keyboard->toplevel = true;
+	virtual_keyboard->overlay = false;
+	virtual_keyboard->ips = ips;
+}
+
+static void
+set_overlay(struct output *output, struct virtual_keyboard *virtual_keyboard)
+{
+	struct zwp_input_panel_surface_v1 *ips;
+	struct keyboard *keyboard = virtual_keyboard->keyboard;
+
+	ips = zwp_input_panel_v1_get_input_panel_surface(virtual_keyboard->input_panel,
+							 window_get_wl_surface(keyboard->window));
+
+	zwp_input_panel_surface_v1_set_overlay_panel(ips);
+
+	virtual_keyboard->toplevel = false;
+	virtual_keyboard->overlay = true;
 	virtual_keyboard->ips = ips;
 }
 
 static void
 display_output_handler(struct output *output, void *data) {
 	struct virtual_keyboard *keyboard = data;
+	const char *type = getenv("WESTON_KEYBOARD_SURFACE_TYPE");
 
-	if (!keyboard->toplevel)
-		set_toplevel(output, keyboard);
+	if (type && strcasecmp("overlay", type) == 0) {
+		if (!keyboard->overlay)
+			set_overlay(output, keyboard);
+	} else {
+		if (!keyboard->toplevel)
+			set_toplevel(output, keyboard);
+	}
 }
 
 static void

compositor/text-backend.c

@@ -103,6 +103,7 @@ struct text_backend {
 
 	struct {
 		char *path;
+		bool overlay_keyboard;
 		struct wl_client *client;
 
 		unsigned deathcount;
@@ -993,6 +994,9 @@ launch_input_method(struct text_backend *text_backend)
 	if (strcmp(text_backend->input_method.path, "") == 0)
 		return;
 
+	if (text_backend->input_method.overlay_keyboard)
+		setenv("WESTON_KEYBOARD_SURFACE_TYPE", "overlay", 1);
+
 	text_backend->input_method.client =
 		weston_client_start(text_backend->compositor,
 				    text_backend->input_method.path);
@@ -1060,6 +1064,9 @@ text_backend_configuration(struct text_backend *text_backend)
 	weston_config_section_get_string(section, "path",
 					 &text_backend->input_method.path,
 					 client);
+	weston_config_section_get_bool(section, "overlay-keyboard",
+				       &text_backend->input_method.overlay_keyboard,
+				       false);
 	free(client);
 }
 

desktop-shell/input-panel.c

@@ -59,6 +59,23 @@ input_panel_slide_done(struct weston_view_animation *animation, void *data)
 	ipsurf->anim = NULL;
 }
 
+static int
+calc_input_panel_position(struct input_panel_surface *ip_surface, float *x, float*y)
+{
+	struct desktop_shell *shell = ip_surface->shell;
+	if (ip_surface->panel) {
+		struct weston_view *view = get_default_view(shell->text_input.surface);
+		if (view == NULL)
+			return -1;
+		*x = view->geometry.x + shell->text_input.cursor_rectangle.x2;
+		*y = view->geometry.y + shell->text_input.cursor_rectangle.y2;
+	} else {
+		*x = ip_surface->output->x + (ip_surface->output->width - ip_surface->surface->width) / 2;
+		*y = ip_surface->output->y + ip_surface->output->height - ip_surface->surface->height;
+	}
+	return 0;
+}
+
 static void
 show_input_panel_surface(struct input_panel_surface *ipsurf)
 {
@@ -77,8 +94,8 @@ show_input_panel_surface(struct input_panel_surface *ipsurf)
 		if (!focus)
 			continue;
 		ipsurf->output = focus->output;
-		x = ipsurf->output->x + (ipsurf->output->width - ipsurf->surface->width) / 2;
-		y = ipsurf->output->y + ipsurf->output->height - ipsurf->surface->height;
+		if (calc_input_panel_position(ipsurf, &x, &y))
+			continue;
 		weston_view_set_position(ipsurf->view, x, y);
 	}
 
@@ -170,23 +187,13 @@ input_panel_committed(struct weston_surface *surface, int32_t sx, int32_t sy)
 {
 	struct input_panel_surface *ip_surface = surface->committed_private;
 	struct desktop_shell *shell = ip_surface->shell;
-	struct weston_view *view;
 	float x, y;
 
 	if (surface->width == 0)
 		return;
 
-	if (ip_surface->panel) {
-		view = get_default_view(shell->text_input.surface);
-		if (view == NULL)
-			return;
-		x = view->geometry.x + shell->text_input.cursor_rectangle.x2;
-		y = view->geometry.y + shell->text_input.cursor_rectangle.y2;
-	} else {
-		x = ip_surface->output->x + (ip_surface->output->width - surface->width) / 2;
-		y = ip_surface->output->y + ip_surface->output->height - surface->height;
-	}
-
+	if (calc_input_panel_position(ip_surface, &x, &y))
+		return;
 	weston_view_set_position(ip_surface->view, x, y);
 
 	if (!weston_surface_is_mapped(surface) && shell->showing_input_panels)

man/weston.ini.man

@@ -574,6 +574,11 @@ request. Currently, this option is supported by kiosk-shell.
 sets the path of the on screen keyboard input method (string).
 .RE
 .RE
+.TP 7
+.BI "overlay-keyboard=" false
+sets weston-keyboard as overlay panel.
+.RE
+.RE
 .SH "KEYBOARD SECTION"
 This section contains the following keys:
 .TP 7