From da4ac3908461a81abfefce96df26a1ad539325d8 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 19 Jan 2010 00:17:24 +0000 Subject: [PATCH] Don't need/want separate code for handling back & close. Just send the message and let illume2 handle it. SVN revision: 45308 --- src/modules/illume-softkey/e_mod_win.c | 39 +++++++------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/src/modules/illume-softkey/e_mod_win.c b/src/modules/illume-softkey/e_mod_win.c index 3b870c828..86699a33b 100644 --- a/src/modules/illume-softkey/e_mod_win.c +++ b/src/modules/illume-softkey/e_mod_win.c @@ -90,40 +90,21 @@ _il_sk_win_cb_resize(E_Win *win) static void _il_sk_win_cb_back_click(void *data, void *data2) { - E_Border *bd, *fbd; - Eina_List *focused, *l; + Il_Sk_Win *swin; + E_Zone *zone; - if (!data) return; - if (!(bd = e_border_focused_get())) return; - focused = e_border_focus_stack_get(); - EINA_LIST_REVERSE_FOREACH(focused, l, fbd) - { - E_Border *fb; - - if (e_object_is_del(E_OBJECT(fbd))) continue; - if ((!fbd->client.icccm.accepts_focus) && - (!fbd->client.icccm.take_focus)) continue; - if (fbd->client.netwm.state.skip_taskbar) continue; - if (fbd == bd) - { - if (!(fb = focused->next->data)) continue; - if (e_object_is_del(E_OBJECT(fb))) continue; - if ((!fb->client.icccm.accepts_focus) && - (!fb->client.icccm.take_focus)) continue; - if (fb->client.netwm.state.skip_taskbar) continue; - e_border_raise(fb); - e_border_focus_set(fb, 1, 1); - break; - } - } + if (!(swin = data)) return; + zone = swin->win->border->zone; + ecore_x_e_illume_back_send(zone->black_win); } static void _il_sk_win_cb_close_click(void *data, void *data2) { - E_Border *bd; + Il_Sk_Win *swin; + E_Zone *zone; - if (!data) return; - if (!(bd = e_border_focused_get())) return; - e_border_act_close_begin(bd); + if (!(swin = data)) return; + zone = swin->win->border->zone; + ecore_x_e_illume_close_send(zone->black_win); }