commit 0636ac307e900c08fe6b90784637d6c9ca46601a
author Kristian Høgsberg <krh@bitplanet.net> Wed Jun 27 10:22:15 2012 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Wed Jun 27 10:24:21 2012 -0400
tree bde2941605eb3c069ebb5e3e6a4c2e84a22812f5
parent 1a73a6335ddd81bfdefbcb6c330943ac91002095

shell: Make input_panel just a regular wl_surface

clients/keyboard.c

diff --git a/clients/keyboard.c b/clients/keyboard.c
index f7bddeb..9fdd8cc 100644
--- a/clients/keyboard.c
+++ b/clients/keyboard.c
@@ -156,11 +156,10 @@
 	memset(keyboard, 0, sizeof *keyboard);
 
 	keyboard->keyboard = virtual_keyboard;
-	keyboard->window = window_create(virtual_keyboard->display);
+	keyboard->window = window_create_custom(virtual_keyboard->display);
 	keyboard->widget = window_add_widget(keyboard->window, keyboard);
 
 	window_set_title(keyboard->window, "Virtual keyboard");
-	window_set_custom(keyboard->window);
 	window_set_user_data(keyboard->window, keyboard);
 	
 	keyboard->cx = 40;
@@ -173,7 +172,7 @@
 	window_schedule_resize(keyboard->window, keyboard->cx * 10, keyboard->cy * 5);
 
 	input_panel_set_surface(virtual_keyboard->input_panel,
-				window_get_wl_shell_surface(keyboard->window),
+				window_get_wl_surface(keyboard->window),
 				output_get_wl_output(output));
 }