summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-07 10:51:10 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-07 10:51:10 +0000
commitbf0348f1333a688364e85730178dca0c2dd025fd (patch)
tree0188ff27d9b3c6b1b535e2395c311916ee9ac2c9
parent053c841f52cb9f3c85abe912fc9b976a2ed4d07a (diff)
remove unused timer variable, reduce e_grabinput calls slightly with some reordering
SVN revision: 83733
Diffstat (limited to '')
-rw-r--r--src/modules/winlist/e_winlist.c42
1 files changed, 12 insertions, 30 deletions
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index ed788c324..33f897be9 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -54,7 +54,6 @@ static Ecore_X_Window _input_window = 0;
54static int _scroll_to = 0; 54static int _scroll_to = 0;
55static double _scroll_align_to = 0.0; 55static double _scroll_align_to = 0.0;
56static double _scroll_align = 0.0; 56static double _scroll_align = 0.0;
57static Ecore_Timer *_warp_timer = NULL;
58static Ecore_Timer *_scroll_timer = NULL; 57static Ecore_Timer *_scroll_timer = NULL;
59static Ecore_Animator *_animator = NULL; 58static Ecore_Animator *_animator = NULL;
60static E_Border *_bd_next = NULL; 59static E_Border *_bd_next = NULL;
@@ -232,7 +231,6 @@ e_winlist_hide(void)
232{ 231{
233 E_Border *bd = NULL; 232 E_Border *bd = NULL;
234 E_Winlist_Win *ww; 233 E_Winlist_Win *ww;
235 Ecore_Event_Handler *handler;
236 234
237 if (!_winlist) return; 235 if (!_winlist) return;
238 if (_win_selected) 236 if (_win_selected)
@@ -272,24 +270,14 @@ e_winlist_hide(void)
272 _hold_mod = 0; 270 _hold_mod = 0;
273 _activate_type = 0; 271 _activate_type = 0;
274 272
275 EINA_LIST_FREE(_handlers, handler) 273 E_FREE_LIST(_handlers, ecore_event_handler_del);
276 ecore_event_handler_del(handler);
277 274
278 if (_warp_timer) 275 E_FN_DEL(ecore_timer_del, _scroll_timer);
279 { 276 E_FN_DEL(ecore_animator_del, _animator);
280 ecore_timer_del(_warp_timer); 277
281 _warp_timer = NULL; 278 ecore_x_window_free(_input_window);
282 } 279 e_grabinput_release(_input_window, _input_window);
283 if (_scroll_timer) 280 _input_window = 0;
284 {
285 ecore_timer_del(_scroll_timer);
286 _scroll_timer = NULL;
287 }
288 if (_animator)
289 {
290 ecore_animator_del(_animator);
291 _animator = NULL;
292 }
293 if (bd) 281 if (bd)
294 { 282 {
295 if (bd->shaded) 283 if (bd->shaded)
@@ -304,12 +292,6 @@ e_winlist_hide(void)
304 if (!bd->lock_user_stacking) 292 if (!bd->lock_user_stacking)
305 e_border_raise(bd); 293 e_border_raise(bd);
306 294
307 if (!bd->lock_focus_out)
308 {
309 e_border_focus_set(bd, 1, 1);
310 e_border_focus_latest_set(bd);
311 e_border_focus_set(bd, 1, 1);
312 }
313 if ((e_config->focus_policy != E_FOCUS_CLICK) || 295 if ((e_config->focus_policy != E_FOCUS_CLICK) ||
314 (e_config->winlist_warp_at_end) || 296 (e_config->winlist_warp_at_end) ||
315 (e_config->winlist_warp_while_selecting)) 297 (e_config->winlist_warp_while_selecting))
@@ -317,14 +299,15 @@ e_winlist_hide(void)
317 if (!e_border_pointer_warp_to_center_now(bd)) 299 if (!e_border_pointer_warp_to_center_now(bd))
318 e_border_focus_set(bd, 1, 0); 300 e_border_focus_set(bd, 1, 0);
319 } 301 }
302 else if (!bd->lock_focus_out)
303 {
304 e_border_focus_set(bd, 1, 1);
305 e_border_focus_latest_set(bd);
306 }
320 e_object_unref(E_OBJECT(bd)); 307 e_object_unref(E_OBJECT(bd));
321 } 308 }
322 309
323 e_border_idler_before(); 310 e_border_idler_before();
324
325 ecore_x_window_free(_input_window);
326 e_grabinput_release(_input_window, _input_window);
327 _input_window = 0;
328} 311}
329 312
330void 313void
@@ -1032,7 +1015,6 @@ _e_winlist_activate(void)
1032 } 1015 }
1033 else 1016 else
1034 { 1017 {
1035 E_FN_DEL(ecore_timer_del, _warp_timer);
1036 E_FN_DEL(ecore_animator_del, _animator); 1018 E_FN_DEL(ecore_animator_del, _animator);
1037 } 1019 }
1038 1020