summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-08-21 13:26:01 -0400
committerChris Michael <cp.michael@samsung.com>2014-10-01 16:15:37 -0400
commit3c2f43194fc55cd758c462307361a7aaec7e142b (patch)
tree5f2f8e735c6ad4b7102a1325b7394a59d606362d /src
parent795e26044244ff9bb2b2571fa0460262ca067350 (diff)
ecore-wayland: Fix formatting and add a FIXME note
Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index b8d276de9d..4b0de0c358 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -154,14 +154,15 @@ ecore_wl_window_free(Ecore_Wl_Window *win)
154EAPI void 154EAPI void
155ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y) 155ecore_wl_window_move(Ecore_Wl_Window *win, int x, int y)
156{ 156{
157 Ecore_Wl_Input *input;
158
157 LOGFN(__FILE__, __LINE__, __FUNCTION__); 159 LOGFN(__FILE__, __LINE__, __FUNCTION__);
158 160
159 if (!win) return; 161 if (!win) return;
160 162
163 input = win->keyboard_device;
161 ecore_wl_window_update_location(win, x, y); 164 ecore_wl_window_update_location(win, x, y);
162 165
163 Ecore_Wl_Input *input = win->keyboard_device;
164
165 if ((!input) && (win->parent)) 166 if ((!input) && (win->parent))
166 { 167 {
167 input = win->parent->keyboard_device; 168 input = win->parent->keyboard_device;
@@ -349,17 +350,16 @@ ecore_wl_window_show(Ecore_Wl_Window *win)
349 win->surface); 350 win->surface);
350 if (!win->shell_surface) return; 351 if (!win->shell_surface) return;
351 352
353 wl_shell_surface_add_listener(win->shell_surface,
354 &_ecore_wl_shell_surface_listener,
355 win);
356
352 if (win->title) 357 if (win->title)
353 wl_shell_surface_set_title(win->shell_surface, win->title); 358 wl_shell_surface_set_title(win->shell_surface, win->title);
354 359
355 if (win->class_name) 360 if (win->class_name)
356 wl_shell_surface_set_class(win->shell_surface, win->class_name); 361 wl_shell_surface_set_class(win->shell_surface, win->class_name);
357 } 362 }
358
359 if (win->shell_surface)
360 wl_shell_surface_add_listener(win->shell_surface,
361 &_ecore_wl_shell_surface_listener,
362 win);
363 } 363 }
364 364
365 /* trap for valid shell surface */ 365 /* trap for valid shell surface */
@@ -449,6 +449,7 @@ ecore_wl_window_raise(Ecore_Wl_Window *win)
449 LOGFN(__FILE__, __LINE__, __FUNCTION__); 449 LOGFN(__FILE__, __LINE__, __FUNCTION__);
450 450
451 if (!win) return; 451 if (!win) return;
452 /* FIXME: This should raise the xdg surface also */
452 if (win->shell_surface) 453 if (win->shell_surface)
453 wl_shell_surface_set_toplevel(win->shell_surface); 454 wl_shell_surface_set_toplevel(win->shell_surface);
454} 455}