summaryrefslogtreecommitdiff
path: root/src/bin/controls.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2013-01-23 05:53:18 +0000
committerCarsten Haitzler <raster@rasterman.com>2013-01-23 05:53:18 +0000
commit097bf1a09def098547ffd2b55383102a28e4c1d4 (patch)
tree9f04fd6e6938f9d60e31ceca67e1d4ee12953ac3 /src/bin/controls.c
parentf32da4a10eaf71b37f7709deab938ceebbf123b8 (diff)
options work agai - less purty. i need to adapt options now to
grid/pane-term. - they should be an overkay over all terms, not done inside per-term theme. split needed. SVN revision: 83124
Diffstat (limited to 'src/bin/controls.c')
-rw-r--r--src/bin/controls.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/controls.c b/src/bin/controls.c
index 7df44fc..5781822 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -13,8 +13,7 @@ static Eina_Bool ct_out = EINA_FALSE;
13static Ecore_Timer *ct_del_timer = NULL; 13static Ecore_Timer *ct_del_timer = NULL;
14static Evas_Object *saved_win = NULL; 14static Evas_Object *saved_win = NULL;
15static Evas_Object *saved_bg = NULL; 15static Evas_Object *saved_bg = NULL;
16 16static Evas_Object *ct_win = NULL, *ct_bg = NULL, *ct_term = NULL;
17static Evas_Object *ct_win, *ct_bg, *ct_term;
18 17
19static Eina_Bool 18static Eina_Bool
20_cb_ct_del_delay(void *data __UNUSED__) 19_cb_ct_del_delay(void *data __UNUSED__)
@@ -80,7 +79,8 @@ _cb_ct_about(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __U
80static void 79static void
81_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__) 80_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __UNUSED__)
82{ 81{
83 controls_toggle(saved_win, saved_bg, data); 82 controls_toggle(ct_win, ct_bg, ct_term);
83 options_toggle(ct_win, ct_bg, ct_term);
84} 84}
85 85
86static void 86static void
@@ -240,6 +240,8 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
240 ct_win = win; 240 ct_win = win;
241 ct_bg = bg; 241 ct_bg = bg;
242 ct_term = term; 242 ct_term = term;
243 saved_win = win;
244 saved_bg = bg;
243 edje_object_signal_emit(bg, "controls,show", "terminology"); 245 edje_object_signal_emit(bg, "controls,show", "terminology");
244 ct_out = EINA_TRUE; 246 ct_out = EINA_TRUE;
245 elm_object_focus_set(ct_frame, EINA_TRUE); 247 elm_object_focus_set(ct_frame, EINA_TRUE);
@@ -262,9 +264,9 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
262 elm_object_focus_set(ct_term, EINA_TRUE); 264 elm_object_focus_set(ct_term, EINA_TRUE);
263 if (ct_del_timer) ecore_timer_del(ct_del_timer); 265 if (ct_del_timer) ecore_timer_del(ct_del_timer);
264 ct_del_timer = ecore_timer_add(10.0, _cb_ct_del_delay, NULL); 266 ct_del_timer = ecore_timer_add(10.0, _cb_ct_del_delay, NULL);
265 ct_term = NULL; 267// ct_term = NULL;
266 ct_bg = NULL; 268// ct_bg = NULL;
267 ct_win = NULL; 269// ct_win = NULL;
268 } 270 }
269 if (saved_win) 271 if (saved_win)
270 { 272 {
@@ -274,8 +276,6 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
274 } 276 }
275 if (ct_out) 277 if (ct_out)
276 { 278 {
277 saved_win = win;
278 saved_bg = bg;
279 evas_object_event_callback_add(saved_win, EVAS_CALLBACK_DEL, _cb_saved_del, NULL); 279 evas_object_event_callback_add(saved_win, EVAS_CALLBACK_DEL, _cb_saved_del, NULL);
280 evas_object_event_callback_add(saved_bg, EVAS_CALLBACK_DEL, _cb_saved_del, NULL); 280 evas_object_event_callback_add(saved_bg, EVAS_CALLBACK_DEL, _cb_saved_del, NULL);
281 evas_object_event_callback_add(ct_term, EVAS_CALLBACK_DEL, _cb_saved_del, NULL); 281 evas_object_event_callback_add(ct_term, EVAS_CALLBACK_DEL, _cb_saved_del, NULL);
@@ -284,8 +284,8 @@ controls_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
284 { 284 {
285 saved_win = NULL; 285 saved_win = NULL;
286 saved_bg = NULL; 286 saved_bg = NULL;
287 ct_term = NULL; 287// ct_term = NULL;
288 ct_bg = NULL; 288// ct_bg = NULL;
289 ct_win = NULL; 289// ct_win = NULL;
290 } 290 }
291} 291}