jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

emove debug printf's 

SVN revision: 35676
This commit is contained in:
Carsten Haitzler 2008-08-26 04:12:41 +00:00
parent 6c0718f75f
commit dbaf8091ff
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/e_border.c
View File

@ -1369,14 +1369,9 @@ e_border_focus_set_with_pointer(E_Border *bd)
* focus as we do - so simply abort any focuse set on such windows */ * focus as we do - so simply abort any focuse set on such windows */
/* be strict about accepting focus hint */ /* be strict about accepting focus hint */
// printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus); // printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus);
printf("e_border_focus_set_with_pointer .. %i %i\n",
bd->client.icccm.accepts_focus,
bd->client.icccm.take_focus);
if ((!bd->client.icccm.accepts_focus) && if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus)) return; (!bd->client.icccm.take_focus)) return;
printf("e_border_focus_set_with_pointer A\n");
if (bd->lock_focus_out) return; if (bd->lock_focus_out) return;
printf("e_border_focus_set_with_pointer B\n");
/* Try to grab the pointer to make sure it's not "in use" */ /* Try to grab the pointer to make sure it's not "in use" */
/* /*
@ -1398,7 +1393,6 @@ e_border_focus_set_with_pointer(E_Border *bd)
} }
else if (e_config->focus_policy == E_FOCUS_CLICK) else if (e_config->focus_policy == E_FOCUS_CLICK)
{ {
printf("e_border_focus_set_with_pointer C\n");
e_border_focus_set(bd, 1, 1); e_border_focus_set(bd, 1, 1);
} }
else else
@ -1426,13 +1420,10 @@ e_border_focus_set(E_Border *bd, int focus, int set)
if ((!bd->client.icccm.accepts_focus) && if ((!bd->client.icccm.accepts_focus) &&
(!bd->client.icccm.take_focus)) (!bd->client.icccm.take_focus))
return; return;
printf(" A\n");
if ((set) && (focus) && (bd->lock_focus_out)) return; if ((set) && (focus) && (bd->lock_focus_out)) return;
printf(" B\n");
/* dont focus an iconified window. that's silly! */ /* dont focus an iconified window. that's silly! */
if ((focus) && (bd->iconic)) if ((focus) && (bd->iconic))
return; return;
printf(" C\n");
if ((bd->modal) && (bd->modal != bd)) if ((bd->modal) && (bd->modal != bd))
{ {
e_border_focus_set(bd->modal, focus, set); e_border_focus_set(bd->modal, focus, set);
@ -1443,7 +1434,6 @@ e_border_focus_set(E_Border *bd, int focus, int set)
e_border_focus_set(bd->leader->modal, focus, set); e_border_focus_set(bd->leader->modal, focus, set);
return; return;
} }
printf(" D\n");
if ((focus) && (set) && (!bd->focused)) if ((focus) && (set) && (!bd->focused))
{ {
@ -1455,10 +1445,8 @@ e_border_focus_set(E_Border *bd, int focus, int set)
//// e_border_focus_latest_set(bd); //// e_border_focus_latest_set(bd);
bd->want_focus = 1; bd->want_focus = 1;
bd->changed = 1; bd->changed = 1;
printf(" Ret1\n");
return; return;
} }
printf(" Foc1\n");
e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE);
return; return;
} }
@ -1470,15 +1458,12 @@ e_border_focus_set(E_Border *bd, int focus, int set)
//// e_border_focus_latest_set(bd); //// e_border_focus_latest_set(bd);
bd->want_focus = 1; bd->want_focus = 1;
bd->changed = 1; bd->changed = 1;
printf(" Ret2\n");
return; return;
} }
printf(" Foc2\n");
e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE);
return; return;
} }
} }
printf(" E\n");
if ((bd->visible) && (bd->changes.visible)) if ((bd->visible) && (bd->changes.visible))
{ {
@ -1492,7 +1477,6 @@ e_border_focus_set(E_Border *bd, int focus, int set)
bd->changed = 1; bd->changed = 1;
return; return;
} }
printf(" F\n");
if ((focus) && (!bd->focused)) if ((focus) && (!bd->focused))
{ {
if ((bd->visible) && (bd->changes.visible)) if ((bd->visible) && (bd->changes.visible))
@ -1500,8 +1484,6 @@ e_border_focus_set(E_Border *bd, int focus, int set)
//// e_border_focus_latest_set(bd); //// e_border_focus_latest_set(bd);
bd->want_focus = 1; bd->want_focus = 1;
bd->changed = 1; bd->changed = 1;
printf(" %i %i needs to be visible - abort now\n",
bd->visible, bd->changes.visible);
return; return;
} }
// if (bd->visible) // if (bd->visible)
@ -1517,7 +1499,6 @@ e_border_focus_set(E_Border *bd, int focus, int set)
if (bd->icon_object) if (bd->icon_object)
edje_object_signal_emit(bd->icon_object, "e,state,focused", "e"); edje_object_signal_emit(bd->icon_object, "e,state,focused", "e");
e_focus_event_focus_in(bd); e_focus_event_focus_in(bd);
printf("F IN %p %s\n", bd, (bd->client.icccm.title ? bd->client.icccm.title : bd->client.netwm.name));
} }
else if ((!focus) && (bd->focused)) else if ((!focus) && (bd->focused))
{ {
@ -1534,9 +1515,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
ecore_timer_del(bd->raise_timer); ecore_timer_del(bd->raise_timer);
bd->raise_timer = NULL; bd->raise_timer = NULL;
} }
printf("F OUT %p %s\n", bd, (bd->client.icccm.title ? bd->client.icccm.title : bd->client.netwm.name));
} }
printf(" G\n");
if (((bd->focused) && (!focus)) || ((!bd->focused) && (focus))) if (((bd->focused) && (!focus)) || ((!bd->focused) && (focus)))
focus_changed = 1; focus_changed = 1;
bd->focused = focus; bd->focused = focus;
@ -1600,7 +1579,6 @@ e_border_focus_set(E_Border *bd, int focus, int set)
focused->raise_timer = NULL; focused->raise_timer = NULL;
} }
focused = NULL; focused = NULL;
printf("F OUT %p %s\n", bd, (bd->client.icccm.title ? bd->client.icccm.title : bd->client.netwm.name));
} }
} }
e_hints_active_window_set(bd->zone->container->manager, bd); e_hints_active_window_set(bd->zone->container->manager, bd);
@ -1668,7 +1646,6 @@ e_border_focus_set(E_Border *bd, int focus, int set)
_e_border_event_border_focus_out_free, NULL); _e_border_event_border_focus_out_free, NULL);
} }
} }
printf(" Z\n");
} }
EAPI void EAPI void
@ -2553,7 +2530,6 @@ e_border_idler_before(void)
ecore_x_window_show(bd->win); ecore_x_window_show(bd->win);
} }
bd->changes.visible = 0; bd->changes.visible = 0;
printf("reset visible changes to 0 A\n");
} }
} }
e_container_border_list_free(bl); e_container_border_list_free(bl);
@ -2580,7 +2556,6 @@ e_border_idler_before(void)
ecore_x_window_hide(bd->win); ecore_x_window_hide(bd->win);
ecore_evas_hide(bd->bg_ecore_evas); ecore_evas_hide(bd->bg_ecore_evas);
bd->changes.visible = 0; bd->changes.visible = 0;
printf("reset visible changes to 0 B\n");
} }
if (bd->changed) _e_border_eval(bd); if (bd->changed) _e_border_eval(bd);
if ((bd->changes.visible) && (bd->visible) && if ((bd->changes.visible) && (bd->visible) &&
@ -2599,7 +2574,6 @@ e_border_idler_before(void)
ecore_x_window_show(bd->win); ecore_x_window_show(bd->win);
} }
bd->changes.visible = 0; bd->changes.visible = 0;
printf("reset visible changes to 0 C\n");
} }
} }
e_container_border_list_free(bl); e_container_border_list_free(bl);
@ -6870,7 +6844,6 @@ _e_border_eval(E_Border *bd)
} }
bd->changes.visible = 0; bd->changes.visible = 0;
rem_change = 1; rem_change = 1;
printf("reset visible changes to 0 C\n");
} }
if (bd->changes.icon) if (bd->changes.icon)
@ -6947,7 +6920,6 @@ _e_border_eval(E_Border *bd)
bd->want_focus = 0; bd->want_focus = 0;
if (!bd->lock_focus_out) if (!bd->lock_focus_out)
{ {
printf("FF needs in... %p BLAH\n", bd);
e_border_focus_set_with_pointer(bd); e_border_focus_set_with_pointer(bd);
} }
} }

7
src/bin/e_grabinput.c
View File

@ -96,13 +96,11 @@ e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
{ {
if (grab_key_win != 0) if (grab_key_win != 0)
{ {
printf(" A\n");
focus_win = win; focus_win = win;
focus_method = method; focus_method = method;
} }
else else
{ {
printf(" B\n");
_e_grabinput_focus(win, method); _e_grabinput_focus(win, method);
} }
} }
@ -120,23 +118,18 @@ _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
switch (method) switch (method)
{ {
case E_FOCUS_METHOD_NO_INPUT: case E_FOCUS_METHOD_NO_INPUT:
printf("--a\n");
break; break;
case E_FOCUS_METHOD_LOCALLY_ACTIVE: case E_FOCUS_METHOD_LOCALLY_ACTIVE:
printf("--b\n");
ecore_x_window_focus(win); ecore_x_window_focus(win);
ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
break; break;
case E_FOCUS_METHOD_GLOBALLY_ACTIVE: case E_FOCUS_METHOD_GLOBALLY_ACTIVE:
printf("--c\n");
ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get());
break; break;
case E_FOCUS_METHOD_PASSIVE: case E_FOCUS_METHOD_PASSIVE:
printf("--d\n");
ecore_x_window_focus(win); ecore_x_window_focus(win);
break; break;
default: default:
printf("--x\n");
break; break;
} }
last_focus_time = ecore_time_get(); last_focus_time = ecore_time_get();