From: <no-...@en...> - 2008-08-26 03:04:08
|
Author: raster Date: 2008-08-25 20:04:07 -0700 (Mon, 25 Aug 2008) New Revision: 35675 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_grabinput.c Log: add soem debugging. Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-08-26 02:36:44 UTC (rev 35674) +++ trunk/e/src/bin/e_border.c 2008-08-26 03:04:07 UTC (rev 35675) @@ -391,10 +391,12 @@ } else if (atoms[i] == ECORE_X_ATOM_NET_WM_STRUT) { + printf("ECORE_X_ATOM_NET_WM_STRUT\n"); bd->client.netwm.fetch.strut = 1; } else if (atoms[i] == ECORE_X_ATOM_NET_WM_STRUT_PARTIAL) { + printf("ECORE_X_ATOM_NET_WM_STRUT_PARTIAL\n"); bd->client.netwm.fetch.strut = 1; } else if (atoms[i] == ECORE_X_ATOM_NET_WM_WINDOW_TYPE) @@ -1367,9 +1369,14 @@ * focus as we do - so simply abort any focuse set on such windows */ /* be strict about accepting focus hint */ // 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) && (!bd->client.icccm.take_focus)) return; + printf("e_border_focus_set_with_pointer A\n"); 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" */ /* @@ -1391,6 +1398,7 @@ } 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); } else @@ -1414,13 +1422,17 @@ // printf("e_border_focus_set(%p, %s, %i %i);\n", bd, bd->client.icccm.name, focus, set); // printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus); // if (!bd->client.icccm.accepts_focus) return; + printf("e_border_focus_set(%p, %i %i)\n", bd, focus, set); if ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) return; + printf(" A\n"); if ((set) && (focus) && (bd->lock_focus_out)) return; + printf(" B\n"); /* dont focus an iconified window. that's silly! */ if ((focus) && (bd->iconic)) return; + printf(" C\n"); if ((bd->modal) && (bd->modal != bd)) { e_border_focus_set(bd->modal, focus, set); @@ -1431,6 +1443,7 @@ e_border_focus_set(bd->leader->modal, focus, set); return; } + printf(" D\n"); if ((focus) && (set) && (!bd->focused)) { @@ -1442,8 +1455,10 @@ //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; + printf(" Ret1\n"); return; } + printf(" Foc1\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE); return; } @@ -1455,12 +1470,15 @@ //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; + printf(" Ret2\n"); return; } + printf(" Foc2\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE); return; } } + printf(" E\n"); if ((bd->visible) && (bd->changes.visible)) { @@ -1474,6 +1492,7 @@ bd->changed = 1; return; } + printf(" F\n"); if ((focus) && (!bd->focused)) { if ((bd->visible) && (bd->changes.visible)) @@ -1481,6 +1500,8 @@ //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; + printf(" %i %i needs to be visible - abort now\n", + bd->visible, bd->changes.visible); return; } // if (bd->visible) @@ -1496,6 +1517,7 @@ if (bd->icon_object) edje_object_signal_emit(bd->icon_object, "e,state,focused", "e"); 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)) { @@ -1512,7 +1534,9 @@ ecore_timer_del(bd->raise_timer); 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))) focus_changed = 1; bd->focused = focus; @@ -1576,6 +1600,7 @@ focused->raise_timer = 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); @@ -1643,6 +1668,7 @@ _e_border_event_border_focus_out_free, NULL); } } + printf(" Z\n"); } EAPI void @@ -2527,6 +2553,7 @@ ecore_x_window_show(bd->win); } bd->changes.visible = 0; + printf("reset visible changes to 0 A\n"); } } e_container_border_list_free(bl); @@ -2553,6 +2580,7 @@ ecore_x_window_hide(bd->win); ecore_evas_hide(bd->bg_ecore_evas); bd->changes.visible = 0; + printf("reset visible changes to 0 B\n"); } if (bd->changed) _e_border_eval(bd); if ((bd->changes.visible) && (bd->visible) && @@ -2571,6 +2599,7 @@ ecore_x_window_show(bd->win); } bd->changes.visible = 0; + printf("reset visible changes to 0 C\n"); } } e_container_border_list_free(bl); @@ -6841,6 +6870,7 @@ } bd->changes.visible = 0; rem_change = 1; + printf("reset visible changes to 0 C\n"); } if (bd->changes.icon) @@ -6917,6 +6947,7 @@ bd->want_focus = 0; if (!bd->lock_focus_out) { + printf("FF needs in... %p BLAH\n", bd); e_border_focus_set_with_pointer(bd); } } Modified: trunk/e/src/bin/e_grabinput.c =================================================================== --- trunk/e/src/bin/e_grabinput.c 2008-08-26 02:36:44 UTC (rev 35674) +++ trunk/e/src/bin/e_grabinput.c 2008-08-26 03:04:07 UTC (rev 35675) @@ -96,11 +96,15 @@ { if (grab_key_win != 0) { + printf(" A\n"); focus_win = win; focus_method = method; } else - _e_grabinput_focus(win, method); + { + printf(" B\n"); + _e_grabinput_focus(win, method); + } } EAPI double @@ -116,18 +120,23 @@ switch (method) { case E_FOCUS_METHOD_NO_INPUT: + printf("--a\n"); break; case E_FOCUS_METHOD_LOCALLY_ACTIVE: + printf("--b\n"); ecore_x_window_focus(win); ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); break; case E_FOCUS_METHOD_GLOBALLY_ACTIVE: + printf("--c\n"); ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); break; case E_FOCUS_METHOD_PASSIVE: + printf("--d\n"); ecore_x_window_focus(win); break; default: + printf("--x\n"); break; } last_focus_time = ecore_time_get(); |
From: <no-...@en...> - 2008-08-26 04:12:44
|
Author: raster Date: 2008-08-25 21:12:41 -0700 (Mon, 25 Aug 2008) New Revision: 35676 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_grabinput.c Log: emove debug printf's Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-08-26 03:04:07 UTC (rev 35675) +++ trunk/e/src/bin/e_border.c 2008-08-26 04:12:41 UTC (rev 35676) @@ -1369,14 +1369,9 @@ * focus as we do - so simply abort any focuse set on such windows */ /* be strict about accepting focus hint */ // 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) && (!bd->client.icccm.take_focus)) return; - printf("e_border_focus_set_with_pointer A\n"); 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" */ /* @@ -1398,7 +1393,6 @@ } 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); } else @@ -1426,13 +1420,10 @@ if ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) return; - printf(" A\n"); if ((set) && (focus) && (bd->lock_focus_out)) return; - printf(" B\n"); /* dont focus an iconified window. that's silly! */ if ((focus) && (bd->iconic)) return; - printf(" C\n"); if ((bd->modal) && (bd->modal != bd)) { e_border_focus_set(bd->modal, focus, set); @@ -1443,7 +1434,6 @@ e_border_focus_set(bd->leader->modal, focus, set); return; } - printf(" D\n"); if ((focus) && (set) && (!bd->focused)) { @@ -1455,10 +1445,8 @@ //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; - printf(" Ret1\n"); return; } - printf(" Foc1\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE); return; } @@ -1470,15 +1458,12 @@ //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; - printf(" Ret2\n"); return; } - printf(" Foc2\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE); return; } } - printf(" E\n"); if ((bd->visible) && (bd->changes.visible)) { @@ -1492,7 +1477,6 @@ bd->changed = 1; return; } - printf(" F\n"); if ((focus) && (!bd->focused)) { if ((bd->visible) && (bd->changes.visible)) @@ -1500,8 +1484,6 @@ //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; - printf(" %i %i needs to be visible - abort now\n", - bd->visible, bd->changes.visible); return; } // if (bd->visible) @@ -1517,7 +1499,6 @@ if (bd->icon_object) edje_object_signal_emit(bd->icon_object, "e,state,focused", "e"); 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)) { @@ -1534,9 +1515,7 @@ ecore_timer_del(bd->raise_timer); 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))) focus_changed = 1; bd->focused = focus; @@ -1600,7 +1579,6 @@ focused->raise_timer = 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); @@ -1668,7 +1646,6 @@ _e_border_event_border_focus_out_free, NULL); } } - printf(" Z\n"); } EAPI void @@ -2553,7 +2530,6 @@ ecore_x_window_show(bd->win); } bd->changes.visible = 0; - printf("reset visible changes to 0 A\n"); } } e_container_border_list_free(bl); @@ -2580,7 +2556,6 @@ ecore_x_window_hide(bd->win); ecore_evas_hide(bd->bg_ecore_evas); bd->changes.visible = 0; - printf("reset visible changes to 0 B\n"); } if (bd->changed) _e_border_eval(bd); if ((bd->changes.visible) && (bd->visible) && @@ -2599,7 +2574,6 @@ ecore_x_window_show(bd->win); } bd->changes.visible = 0; - printf("reset visible changes to 0 C\n"); } } e_container_border_list_free(bl); @@ -6870,7 +6844,6 @@ } bd->changes.visible = 0; rem_change = 1; - printf("reset visible changes to 0 C\n"); } if (bd->changes.icon) @@ -6947,7 +6920,6 @@ bd->want_focus = 0; if (!bd->lock_focus_out) { - printf("FF needs in... %p BLAH\n", bd); e_border_focus_set_with_pointer(bd); } } Modified: trunk/e/src/bin/e_grabinput.c =================================================================== --- trunk/e/src/bin/e_grabinput.c 2008-08-26 03:04:07 UTC (rev 35675) +++ trunk/e/src/bin/e_grabinput.c 2008-08-26 04:12:41 UTC (rev 35676) @@ -96,13 +96,11 @@ { if (grab_key_win != 0) { - printf(" A\n"); focus_win = win; focus_method = method; } else { - printf(" B\n"); _e_grabinput_focus(win, method); } } @@ -120,23 +118,18 @@ switch (method) { case E_FOCUS_METHOD_NO_INPUT: - printf("--a\n"); break; case E_FOCUS_METHOD_LOCALLY_ACTIVE: - printf("--b\n"); ecore_x_window_focus(win); ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); break; case E_FOCUS_METHOD_GLOBALLY_ACTIVE: - printf("--c\n"); ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); break; case E_FOCUS_METHOD_PASSIVE: - printf("--d\n"); ecore_x_window_focus(win); break; default: - printf("--x\n"); break; } last_focus_time = ecore_time_get(); |
From: <no-...@en...> - 2008-08-29 03:30:46
|
Author: raster Date: 2008-08-28 20:30:45 -0700 (Thu, 28 Aug 2008) New Revision: 35726 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_desk.c trunk/e/src/bin/e_table.c Log: some debugging printfs - also avoid feeding focus back to the last focused window if its one of a set of types. Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-08-29 02:48:36 UTC (rev 35725) +++ trunk/e/src/bin/e_border.c 2008-08-29 03:30:45 UTC (rev 35726) @@ -1424,6 +1424,7 @@ /* dont focus an iconified window. that's silly! */ if ((focus) && (bd->iconic)) return; + printf(" actually try...\n"); if ((bd->modal) && (bd->modal != bd)) { e_border_focus_set(bd->modal, focus, set); @@ -4252,6 +4253,7 @@ if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return 1; else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1; } + printf("fout 1\n"); e_border_focus_set(bd, 0, 0); return 1; } Modified: trunk/e/src/bin/e_desk.c =================================================================== --- trunk/e/src/bin/e_desk.c 2008-08-29 02:48:36 UTC (rev 35725) +++ trunk/e/src/bin/e_desk.c 2008-08-29 03:30:45 UTC (rev 35726) @@ -361,10 +361,21 @@ Evas_List *l = NULL; E_Border *bd; + + printf("== e_desk_last_focused_focus\n"); for (l = e_border_focus_stack_get(); l; l = l->next) { bd = l->data; - if ((!bd->iconic) && (bd->visible) && (bd->desk == desk)) + printf("LAST %p ic=%i vis=%i desk=%p==%p\n", + bd, bd->iconic, bd->visible, bd->desk, desk); + if ((!bd->iconic) && (bd->visible) && (bd->desk == desk) && + (bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) && + (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DOCK) && + (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_TOOLBAR) && + (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_MENU) && + (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_SPLASH) && + (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DESKTOP) + ) { /* this was the window last focused in this desktop */ if (!bd->lock_focus_out) Modified: trunk/e/src/bin/e_table.c =================================================================== --- trunk/e/src/bin/e_table.c 2008-08-29 02:48:36 UTC (rev 35725) +++ trunk/e/src/bin/e_table.c 2008-08-29 03:30:45 UTC (rev 35726) @@ -322,7 +322,7 @@ obj = l->data; ti = evas_object_data_get(obj, "e_table_data"); if (ti->expand_w) expandw++; - if (ti->expand_w) expandh++; + if (ti->expand_h) expandh++; } if (expandw == 0) { |
From: <no-...@en...> - 2008-09-01 06:23:23
|
Author: raster Date: 2008-08-31 23:23:20 -0700 (Sun, 31 Aug 2008) New Revision: 35768 Modified: trunk/e/src/bin/e_pointer.c Log: my bad! fix. Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2008-09-01 04:56:31 UTC (rev 35767) +++ trunk/e/src/bin/e_pointer.c 2008-09-01 06:23:20 UTC (rev 35768) @@ -333,7 +333,10 @@ if (p->idle_timer) ecore_timer_del(p->idle_timer); if (p->idle_poller) ecore_poller_del(p->idle_poller); - + + p->type = NULL; + p->idle_timer = NULL; + p->idle_poller = NULL; free(p); } @@ -478,7 +481,11 @@ { /* we got some mouse event - if there was an idle timer emit an active * signal as we WERE idle, NOW we are active */ - if (p->idle_timer) ecore_timer_del(p->idle_timer); + if (p->idle_timer) + { + ecore_timer_del(p->idle_timer); + p->idle_timer = NULL; + } if (p->idle_poller) { ecore_poller_del(p->idle_poller); |
From: <no-...@en...> - 2008-09-04 13:57:54
|
Author: raster Date: 2008-09-04 06:57:52 -0700 (Thu, 04 Sep 2008) New Revision: 35826 Modified: trunk/e/src/bin/e_fm.c Log: support ilist-stule stacking info in odd/even items Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-09-04 13:37:09 UTC (rev 35825) +++ trunk/e/src/bin/e_fm.c 2008-09-04 13:57:52 UTC (rev 35826) @@ -3610,6 +3610,8 @@ evas_object_stack_below(ic->obj, ic->sd->drop); if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST) { + const char *stacking; + // if (ic->sd->config->icon.fixed.w) // { if (ic->odd) @@ -3620,6 +3622,15 @@ _e_fm2_theme_edje_object_set(ic->sd, ic->obj, "base/theme/widgets", "list/fixed"); + stacking = edje_object_data_get(ic->obj, "stacking"); + if (stacking) + { + if (!strcmp(stacking, "below")) + evas_object_stack_above(ic->obj, ic->sd->underlay); + else if (!strcmp(stacking, "above")) + evas_object_stack_below(ic->obj, ic->sd->drop); + } + // } // else // { @@ -3661,11 +3672,16 @@ if (ic->selected) { + const char *selectraise; + /* FIXME: need new signal to INSTANTLY activate - no anim */ /* FIXME: while listing dirs need to use icons in-place and not * unrealize and re-realize */ edje_object_signal_emit(ic->obj, "e,state,selected", "e"); edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e"); + selectraise = edje_object_data_get(ic->obj, "selectraise"); + if ((selectraise) && (!strcmp(selectraise, "on"))) + evas_object_stack_below(ic->obj, ic->sd->drop); } // printf("realize %s full = %i\n", ic->info.file, (int)ic->info.removable_full); if (ic->info.removable_full) @@ -3780,9 +3796,14 @@ ic->last_selected = 1; if (ic->realized) { + const char *selectraise; + edje_object_signal_emit(ic->obj, "e,state,selected", "e"); edje_object_signal_emit(ic->obj_icon, "e,state,selected", "e"); evas_object_stack_below(ic->obj, ic->sd->drop); + selectraise = edje_object_data_get(ic->obj, "selectraise"); + if ((selectraise) && (!strcmp(selectraise, "on"))) + evas_object_stack_below(ic->obj, ic->sd->drop); } } @@ -3794,8 +3815,17 @@ ic->last_selected = 0; if (ic->realized) { + const char *stacking, *selectraise; + edje_object_signal_emit(ic->obj, "e,state,unselected", "e"); edje_object_signal_emit(ic->obj_icon, "e,state,unselected", "e"); + stacking = edje_object_data_get(ic->obj, "stacking"); + selectraise = edje_object_data_get(ic->obj, "selectraise"); + if ((selectraise) && (!strcmp(selectraise, "on"))) + { + if ((stacking) && (!strcmp(stacking, "below"))) + evas_object_stack_above(ic->obj, ic->sd->underlay); + } } } |
From: <no-...@en...> - 2008-09-05 02:12:44
|
Author: raster Date: 2008-09-04 19:12:41 -0700 (Thu, 04 Sep 2008) New Revision: 35835 Modified: trunk/e/src/bin/e_int_config_modules.c Log: useless evas_list_free()'s Modified: trunk/e/src/bin/e_int_config_modules.c =================================================================== --- trunk/e/src/bin/e_int_config_modules.c 2008-09-05 00:40:12 UTC (rev 35834) +++ trunk/e/src/bin/e_int_config_modules.c 2008-09-05 02:12:41 UTC (rev 35835) @@ -142,7 +142,6 @@ if (!ecore_file_is_dir(epd->dir)) continue; _load_modules(epd->dir); } - if (l) evas_list_free(l); if (mdirs) e_path_dir_list_free(mdirs); } @@ -317,12 +316,8 @@ } if (l) count = evas_list_count(l); - if (count < 1) - { - if (l) evas_list_free(l); - continue; - } - + else continue; + /* We have at least one, append header */ e_widget_ilist_header_append(obj, NULL, cft->name); @@ -332,7 +327,11 @@ _list_widget_load(obj, l); - if (l) evas_list_free(l); + if (l) + { + evas_list_free(l); + l = NULL; + } } } @@ -446,7 +445,6 @@ else if (mod->short_name) e_widget_ilist_append(obj, ic, mod->short_name, NULL, mod, NULL); } - if (ml) evas_list_free(ml); } static void @@ -552,7 +550,6 @@ e_widget_textblock_markup_set(cfdata->o_desc, _("Description: Unavailable")); } - if (l) evas_list_free(l); } static void |
From: <no-...@en...> - 2008-09-10 04:34:02
|
Author: raster Date: 2008-09-09 21:33:57 -0700 (Tue, 09 Sep 2008) New Revision: 35914 Modified: trunk/e/src/bin/e_editable.c Log: removed editable change - breaks entering text! Modified: trunk/e/src/bin/e_editable.c =================================================================== --- trunk/e/src/bin/e_editable.c 2008-09-10 04:29:52 UTC (rev 35913) +++ trunk/e/src/bin/e_editable.c 2008-09-10 04:33:57 UTC (rev 35914) @@ -876,8 +876,7 @@ _e_editable_text_insert(Evas_Object *editable, int pos, const char *text) { E_Editable_Smart_Data *sd; - int char_length, unicode_length; - int prev_char_length, new_char_length, new_unicode_length; + int char_length, unicode_length, prev_length; int index; int i; @@ -902,48 +901,35 @@ index = 0; for (i = 0; i < pos; i++) index = evas_string_char_next_get(sd->text, index, NULL); - + if ((unicode_length <= 0) || (char_length <= 0)) return 0; - prev_char_length = sd->char_length; - new_char_length = sd->char_length + char_length; - new_unicode_length = sd->unicode_length + unicode_length; + prev_length = sd->char_length; + sd->char_length += char_length; + sd->unicode_length += unicode_length; - if (new_char_length > sd->allocated_length) + if (sd->char_length > sd->allocated_length) { - int new_allocated_length = E_EDITABLE_SIZE_TO_ALLOC(new_char_length); - char *old = sd->text; - if (sd->password_mode) { /* security -- copy contents into new buffer, and overwrite old contents */ - sd->text = malloc(new_allocated_length + 1); - if (!sd->text) - { - sd->text = old; - return 0; - } - memcpy(sd->text, old, prev_char_length + 1); - memset(old, 0, prev_char_length); + char *old = sd->text; + sd->text = malloc(E_EDITABLE_SIZE_TO_ALLOC(sd->char_length) + 1); + memcpy(sd->text, old, sd->char_length + 1); + memset(old, 0, sd->char_length); free(old); } else { - sd->text = realloc(sd->text, new_allocated_length + 1); - if (!sd->text) - { - sd->text = old; - return 0; - } + sd->text = realloc(sd->text, + E_EDITABLE_SIZE_TO_ALLOC(sd->char_length) + 1); } - sd->unicode_length = new_unicode_length; - sd->char_length = new_char_length; - sd->allocated_length = new_allocated_length; + sd->allocated_length = E_EDITABLE_SIZE_TO_ALLOC(sd->char_length); } - if (prev_char_length > index) - memmove(&sd->text[index + char_length], &sd->text[index], prev_char_length - index); + if (prev_length > index) + memmove(&sd->text[index + char_length], &sd->text[index], prev_length - index); strncpy(&sd->text[index], text, char_length); sd->text[sd->char_length] = '\0'; |
From: <no-...@en...> - 2008-09-10 04:34:45
|
Author: raster Date: 2008-09-09 21:34:42 -0700 (Tue, 09 Sep 2008) New Revision: 35915 Modified: trunk/e/src/bin/e_canvas.c Log: commented out.. scale testing! Modified: trunk/e/src/bin/e_canvas.c =================================================================== --- trunk/e/src/bin/e_canvas.c 2008-09-10 04:33:57 UTC (rev 35914) +++ trunk/e/src/bin/e_canvas.c 2008-09-10 04:34:42 UTC (rev 35915) @@ -39,6 +39,8 @@ } else if (e_config->font_hinting == 2) evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); +// FIXME: testing. +// edje_scale_set(2.0); } EAPI void |
From: Christopher M. <cpm...@co...> - 2008-09-10 07:14:11
|
more eyes on the scale please.... dh no-...@en... wrote: > Author: raster > Date: 2008-09-09 21:34:42 -0700 (Tue, 09 Sep 2008) > New Revision: 35915 > > Modified: > trunk/e/src/bin/e_canvas.c > Log: > > commented out.. scale testing! > > > > Modified: trunk/e/src/bin/e_canvas.c > =================================================================== > --- trunk/e/src/bin/e_canvas.c 2008-09-10 04:33:57 UTC (rev 35914) > +++ trunk/e/src/bin/e_canvas.c 2008-09-10 04:34:42 UTC (rev 35915) > @@ -39,6 +39,8 @@ > } > else if (e_config->font_hinting == 2) > evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); > +// FIXME: testing. > +// edje_scale_set(2.0); > } > > EAPI void > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > |
From: <no-...@en...> - 2008-09-10 06:40:25
|
Author: raster Date: 2008-09-09 23:40:24 -0700 (Tue, 09 Sep 2008) New Revision: 35923 Modified: trunk/e/src/bin/e_canvas.c Log: just testing. Modified: trunk/e/src/bin/e_canvas.c =================================================================== --- trunk/e/src/bin/e_canvas.c 2008-09-10 06:39:57 UTC (rev 35922) +++ trunk/e/src/bin/e_canvas.c 2008-09-10 06:40:24 UTC (rev 35923) @@ -40,7 +40,7 @@ else if (e_config->font_hinting == 2) evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); // FIXME: testing. -// edje_scale_set(2.0); +// edje_scale_set(1.0); } EAPI void |
From: <no-...@en...> - 2008-09-10 12:42:42
|
Author: raster Date: 2008-09-10 05:42:39 -0700 (Wed, 10 Sep 2008) New Revision: 35928 Modified: trunk/e/src/bin/e_border.c Log: fix focus set loop. Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-09-10 10:44:31 UTC (rev 35927) +++ trunk/e/src/bin/e_border.c 2008-09-10 12:42:39 UTC (rev 35928) @@ -1386,18 +1386,28 @@ if (e_border_under_pointer_get(bd->desk, bd)) { if (!e_border_pointer_warp_to_center(bd)) - e_border_focus_set(bd, 1, 1); + { +// printf("F1\n"); + e_border_focus_set(bd, 1, 1); + } } else - e_border_focus_set(bd, 1, 1); + { +// printf("F2\n"); + e_border_focus_set(bd, 1, 1); + } } else if (e_config->focus_policy == E_FOCUS_CLICK) { +// printf("F3\n"); e_border_focus_set(bd, 1, 1); } else if (!e_border_pointer_warp_to_center(bd)) - e_border_focus_set(bd, 1, 1); + { +// printf("F4\n"); + e_border_focus_set(bd, 1, 1); + } ecore_x_pointer_ungrab(); } @@ -1416,7 +1426,9 @@ // printf("e_border_focus_set(%p, %s, %i %i);\n", bd, bd->client.icccm.name, focus, set); // printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus); // if (!bd->client.icccm.accepts_focus) return; - printf("e_border_focus_set(%p, %i %i)\n", bd, focus, set); +// printf("e_border_focus_set(%p [%s][%s], %i %i)\n", +// bd, bd->client.icccm.title, bd->client.netwm.name, +// focus, set); if ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) return; @@ -1424,7 +1436,6 @@ /* dont focus an iconified window. that's silly! */ if ((focus) && (bd->iconic)) return; - printf(" actually try...\n"); if ((bd->modal) && (bd->modal != bd)) { e_border_focus_set(bd->modal, focus, set); @@ -1443,11 +1454,13 @@ { if ((bd->visible) && (bd->changes.visible)) { +// printf("want!\n"); //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; return; } +// printf(" real foc - locally active...\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE); return; } @@ -1456,11 +1469,13 @@ { if ((bd->visible) && (bd->changes.visible)) { +// printf("want2!\n"); //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; return; } +// printf(" real foc - globally active...\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE); return; } @@ -1473,15 +1488,17 @@ } if ((!bd->visible) && (focus)) { +// printf("want3!\n"); //// e_border_focus_latest_set(bd); - bd->want_focus = 1; - bd->changed = 1; +// bd->want_focus = 1; +// bd->changed = 1; return; } if ((focus) && (!bd->focused)) { if ((bd->visible) && (bd->changes.visible)) { +// printf("want4!\n"); //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; @@ -1524,6 +1541,7 @@ { if (bd->focused) { +// printf(" real foc - GO...\n"); if (bd->internal) e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE); else @@ -6916,12 +6934,14 @@ if ((bd->take_focus) || (bd->want_focus)) { bd->take_focus = 0; + printf("bd->want_focus = %i\n", bd->want_focus); if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus)) { bd->want_focus = 0; if (!bd->lock_focus_out) { + printf("E1\n"); e_border_focus_set_with_pointer(bd); } } @@ -6935,7 +6955,10 @@ e_border_focused_get()))) { if (!bd->lock_focus_out) - e_border_focus_set_with_pointer(bd); + { + printf("E2\n"); + e_border_focus_set_with_pointer(bd); + } } } } |
From: <no-...@en...> - 2008-09-11 03:27:36
|
Author: raster Date: 2008-09-10 20:27:34 -0700 (Wed, 10 Sep 2008) New Revision: 35938 Modified: trunk/e/src/bin/e_canvas.c Log: just a env var hack for playing with scaling.. for now. Modified: trunk/e/src/bin/e_canvas.c =================================================================== --- trunk/e/src/bin/e_canvas.c 2008-09-11 02:06:54 UTC (rev 35937) +++ trunk/e/src/bin/e_canvas.c 2008-09-11 03:27:34 UTC (rev 35938) @@ -39,8 +39,20 @@ } else if (e_config->font_hinting == 2) evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); -// FIXME: testing. -// edje_scale_set(1.0); +// FIXME: just a hack. + { + static scale = -1.0; + + if (scale == -1.0) + { + char *s; + + s = getenv("E_SCALE"); + if (s) scale = atof(s); + else scale = 1.0; + } + edje_scale_set(scale); + } } EAPI void |
From: <no-...@en...> - 2008-09-11 03:37:08
|
Author: raster Date: 2008-09-10 20:37:06 -0700 (Wed, 10 Sep 2008) New Revision: 35940 Modified: trunk/e/src/bin/e_scrollframe.c Log: simplify thumbscroll a little. Modified: trunk/e/src/bin/e_scrollframe.c =================================================================== --- trunk/e/src/bin/e_scrollframe.c 2008-09-11 03:36:52 UTC (rev 35939) +++ trunk/e/src/bin/e_scrollframe.c 2008-09-11 03:37:06 UTC (rev 35940) @@ -603,22 +603,21 @@ evas_event_feed_hold(e, 1, ev->timestamp, ev->data); ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; sd->down.dragged = 1; - } - x = sd->down.sx - (ev->cur.canvas.x - sd->down.x); - y = sd->down.sy - (ev->cur.canvas.y - sd->down.y); - if ((sd->down.dir_x) || (sd->down.dir_y)) - { - if (!sd->down.locked) + x = sd->down.sx - (ev->cur.canvas.x - sd->down.x); + y = sd->down.sy - (ev->cur.canvas.y - sd->down.y); + if ((sd->down.dir_x) || (sd->down.dir_y)) { - printf("lock dir to x%iy%i\n", sd->down.dir_x, sd->down.dir_y); - sd->down.locked_x = x; - sd->down.locked_y = y; - sd->down.locked = 1; + if (!sd->down.locked) + { + sd->down.locked_x = x; + sd->down.locked_y = y; + sd->down.locked = 1; + } + if (sd->down.dir_x) y = sd->down.locked_y; + else x = sd->down.locked_x; } - if (sd->down.dir_x) y = sd->down.locked_y; - else x = sd->down.locked_x; + e_scrollframe_child_pos_set(sd->smart_obj, x, y); } - e_scrollframe_child_pos_set(sd->smart_obj, x, y); } } } |
From: <no-...@en...> - 2008-09-11 23:31:20
|
Author: raster Date: 2008-09-11 16:31:11 -0700 (Thu, 11 Sep 2008) New Revision: 35959 Modified: trunk/e/src/bin/e_pointer.c trunk/e/src/bin/e_scrollframe.c Log: fix hotspot in e17 - cedrics deferred edje stuff b0rked it! :( Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2008-09-11 17:05:47 UTC (rev 35958) +++ trunk/e/src/bin/e_pointer.c 2008-09-11 23:31:11 UTC (rev 35959) @@ -307,7 +307,9 @@ p = data; if (!p->e_cursor) return; - evas_object_geometry_get(p->hot_object, &x, &y, NULL, NULL); + edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", + &x, &y, NULL, NULL); + printf("@@@@@@@@@@@@@@@@@@@@@@ HOT CHANGE -> %i %i\n", x, y); if ((p->hot.x != x) || (p->hot.y != y)) { p->hot.x = x; @@ -360,7 +362,8 @@ { Evas_Object *o; char cursor[1024]; - + Evas_Coord x, y; + if (!p->evas) _e_pointer_canvas_add(p); o = p->pointer_object; if (p->color) @@ -376,6 +379,14 @@ goto fallback; } edje_object_part_swallow(p->pointer_object, "e.swallow.hotspot", p->hot_object); + edje_object_part_geometry_get(p->pointer_object, "e.swallow.hotspot", + &x, &y, NULL, NULL); + printf("@@@@@@@@@@@@@@@@@@@@@@ HOT @ -> %i %i\n", x, y); + if ((p->hot.x != x) || (p->hot.y != y)) + { + p->hot.x = x; + p->hot.y = y; + } p->hot.update = 1; return 1; } Modified: trunk/e/src/bin/e_scrollframe.c =================================================================== --- trunk/e/src/bin/e_scrollframe.c 2008-09-11 17:05:47 UTC (rev 35958) +++ trunk/e/src/bin/e_scrollframe.c 2008-09-11 23:31:11 UTC (rev 35959) @@ -675,6 +675,8 @@ x = vx * (double)mx; y = vy * (double)my; sd->pan_func.set(sd->pan_obj, x, y); + if ((e_config->thumbscroll_enable) && (sd->down.now) && (!sd->down.dragged)) + sd->down.now = 0; } static void |
From: Enlightenment S. <no-...@en...> - 2008-09-16 19:21:04
|
Author: raster Date: 2008-09-16 19:21:00 -0700 (Tue, 16 Sep 2008) New Revision: 36033 Log: been hacking... umm. config dialog additions. Modified: trunk/e/src/bin/e_canvas.c trunk/e/src/bin/e_config_dialog.c trunk/e/src/bin/e_config_dialog.h trunk/e/src/bin/e_main.c trunk/e/src/bin/e_test.c trunk/e/src/bin/e_widget.c trunk/e/src/bin/e_widget_button.c Modified: trunk/e/src/bin/e_canvas.c =================================================================== --- trunk/e/src/bin/e_canvas.c 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_canvas.c 2008-09-17 02:21:00 UTC (rev 36033) @@ -39,20 +39,6 @@ } else if (e_config->font_hinting == 2) evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); -// FIXME: just a hack. - { - static scale = -1.0; - - if (scale == -1.0) - { - char *s; - - s = getenv("E_SCALE"); - if (s) scale = atof(s); - else scale = 1.0; - } - edje_scale_set(scale); - } } EAPI void Modified: trunk/e/src/bin/e_config_dialog.c =================================================================== --- trunk/e/src/bin/e_config_dialog.c 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_config_dialog.c 2008-09-17 02:21:00 UTC (rev 36033) @@ -173,6 +173,7 @@ else snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "ADVANCED"); cfd->dia = e_dialog_new(cfd->con, cfd->name, buf); + if (cfd->view->normal_win) e_win_dialog_set(cfd->dia->win, 0); cfd->dia->data = cfd; e_object_del_attach_func_set(E_OBJECT(cfd->dia), _e_config_dialog_cb_dialog_del); e_dialog_title_set(cfd->dia, cfd->title); @@ -210,6 +211,7 @@ } e_widget_min_size_get(o, &mw, &mh); + printf("SET changed on %p @ %p\n", o, _e_config_dialog_cb_changed); e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd); e_dialog_content_set(cfd->dia, o, mw, mh); @@ -226,7 +228,8 @@ e_dialog_button_add(cfd->dia, _("Close"), NULL, _e_config_dialog_cb_close, cfd); if (!pdia) { - e_win_centered_set(cfd->dia->win, 1); + if (!cfd->view->normal_win) + e_win_centered_set(cfd->dia->win, 1); e_dialog_show(cfd->dia); if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon); } @@ -364,6 +367,7 @@ E_Config_Dialog *cfd; cfd = data; + printf("_e_config_dialog_cb_changed\n"); if (!cfd->hide_buttons) { cfd->cfg_changed = 1; Modified: trunk/e/src/bin/e_config_dialog.h =================================================================== --- trunk/e/src/bin/e_config_dialog.h 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_config_dialog.h 2008-09-17 02:21:00 UTC (rev 36033) @@ -22,8 +22,9 @@ struct _E_Config_Dialog_View { - int override_auto_apply; - int basic_only; + unsigned char override_auto_apply : 1; + unsigned char basic_only : 1; + unsigned char normal_win : 1; void *(*create_cfdata) (E_Config_Dialog *cfd); void (*free_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_main.c 2008-09-17 02:21:00 UTC (rev 36033) @@ -534,6 +534,21 @@ /* setup edje to animate @ e_config->framerate frames per sec. */ edje_frametime_set(1.0 / e_config->framerate); +// FIXME: just a hack. + { + static scale = -1.0; + + if (scale == -1.0) + { + char *s; + + s = getenv("E_SCALE"); + if (s) scale = atof(s); + else scale = 1.0; + } + edje_scale_set(scale); + } + TS("font"); /* init font system */ if (!e_font_init()) Modified: trunk/e/src/bin/e_test.c =================================================================== --- trunk/e/src/bin/e_test.c 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_test.c 2008-09-17 02:21:00 UTC (rev 36033) @@ -187,7 +187,7 @@ e_dialog_title_set(dia, "A Test Dialog"); o = e_icon_add(dia->win->evas); - e_icon_file_set(o, "/home/rephorm/scroll.png"); + e_icon_file_set(o, "/home/raster/scroll.png"); evas_object_resize(o, 1024, 768); evas_object_focus_set(o, 1); evas_object_show(o); Modified: trunk/e/src/bin/e_widget.c =================================================================== --- trunk/e/src/bin/e_widget.c 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_widget.c 2008-09-17 02:21:00 UTC (rev 36033) @@ -134,22 +134,21 @@ e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj) { API_ENTRY return; -/* enable if i want to hunt bad things in widgets - if (evas_list_find(sd->subobjs, sobj)) - { - printf("----------EEEEEK! dupe sub obj is a sub obj!\n"); - abort(); - } - */ sd->subobjs = evas_list_append(sd->subobjs, sobj); if (!sd->child_can_focus) { if (e_widget_can_focus_get(sobj)) sd->child_can_focus = 1; } + printf("ADD SUB %p -> %p [%s]\n", obj, sobj, evas_object_type_get(sobj)); if (!strcmp(evas_object_type_get(sobj), SMART_NAME)) { sd = evas_object_smart_data_get(sobj); - if (sd) sd->parent_obj = obj; + if (sd) + { + if (sd->parent_obj) e_widget_sub_object_del(sd->parent_obj, sobj); + sd->parent_obj = obj; + } + printf(" SD = %p\n", sd); } } @@ -157,6 +156,7 @@ e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj) { API_ENTRY return; + printf("DEL SUB %p -> %p\n", obj, sobj); sd->subobjs = evas_list_remove(sd->subobjs, sobj); if (!sd->child_can_focus) { Modified: trunk/e/src/bin/e_widget_button.c =================================================================== --- trunk/e/src/bin/e_widget_button.c 2008-09-17 02:16:34 UTC (rev 36032) +++ trunk/e/src/bin/e_widget_button.c 2008-09-17 02:21:00 UTC (rev 36033) @@ -61,12 +61,12 @@ edje_object_part_text_set(o, "e.text.label", label); wd->type |= E_WIDGET_BUTTON_TEXT; } - evas_object_show(o); e_widget_sub_object_add(obj, o); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj); e_widget_resize_object_set(obj, o); + evas_object_show(o); if (icon) { @@ -74,8 +74,8 @@ wd->o_icon = o; e_util_edje_icon_set(o, icon); edje_object_part_swallow(wd->o_button, "e.swallow.icon", o); + e_widget_sub_object_add(obj, o); evas_object_show(o); - e_widget_sub_object_add(obj, o); wd->type |= E_WIDGET_BUTTON_ICON; } |
From: Enlightenment S. <no-...@en...> - 2008-09-16 22:58:47
|
Author: raster Date: 2008-09-16 22:58:46 -0700 (Tue, 16 Sep 2008) New Revision: 36035 Log: add a widget resize to min size call - convenience. tnx k-s for the oopsie catch! Modified: trunk/e/src/bin/e_widget.c trunk/e/src/bin/e_widget.h Modified: trunk/e/src/bin/e_widget.c =================================================================== --- trunk/e/src/bin/e_widget.c 2008-09-17 05:22:08 UTC (rev 36034) +++ trunk/e/src/bin/e_widget.c 2008-09-17 05:58:46 UTC (rev 36035) @@ -139,7 +139,6 @@ { if (e_widget_can_focus_get(sobj)) sd->child_can_focus = 1; } - printf("ADD SUB %p -> %p [%s]\n", obj, sobj, evas_object_type_get(sobj)); if (!strcmp(evas_object_type_get(sobj), SMART_NAME)) { sd = evas_object_smart_data_get(sobj); @@ -148,7 +147,6 @@ if (sd->parent_obj) e_widget_sub_object_del(sd->parent_obj, sobj); sd->parent_obj = obj; } - printf(" SD = %p\n", sd); } } @@ -156,7 +154,6 @@ e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj) { API_ENTRY return; - printf("DEL SUB %p -> %p\n", obj, sobj); sd->subobjs = evas_list_remove(sd->subobjs, sobj); if (!sd->child_can_focus) { @@ -462,6 +459,13 @@ return NULL; } +EAPI void +e_widget_min_size_resize(Evas_Object *obj) +{ + API_ENTRY return; + evas_object_resize(obj, sd->minw, sd->minh); +} + /* local subsystem functions */ static void _e_smart_reconfigure(E_Smart_Data *sd) Modified: trunk/e/src/bin/e_widget.h =================================================================== --- trunk/e/src/bin/e_widget.h 2008-09-17 05:22:08 UTC (rev 36034) +++ trunk/e/src/bin/e_widget.h 2008-09-17 05:58:46 UTC (rev 36035) @@ -34,6 +34,7 @@ EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled); EAPI int e_widget_disabled_get(Evas_Object *obj); EAPI E_Pointer *e_widget_pointer_get(Evas_Object *obj); +EAPI void e_widget_min_size_resize(Evas_Object *obj); #endif #endif |
From: Enlightenment S. <no-...@en...> - 2008-09-16 23:03:01
|
Author: raster Date: 2008-09-16 23:03:00 -0700 (Tue, 16 Sep 2008) New Revision: 36036 Log: remove some printf's Modified: trunk/e/src/bin/e_config_dialog.c Modified: trunk/e/src/bin/e_config_dialog.c =================================================================== --- trunk/e/src/bin/e_config_dialog.c 2008-09-17 05:58:46 UTC (rev 36035) +++ trunk/e/src/bin/e_config_dialog.c 2008-09-17 06:03:00 UTC (rev 36036) @@ -211,7 +211,6 @@ } e_widget_min_size_get(o, &mw, &mh); - printf("SET changed on %p @ %p\n", o, _e_config_dialog_cb_changed); e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd); e_dialog_content_set(cfd->dia, o, mw, mh); @@ -367,7 +366,6 @@ E_Config_Dialog *cfd; cfd = data; - printf("_e_config_dialog_cb_changed\n"); if (!cfd->hide_buttons) { cfd->cfg_changed = 1; |
From: Enlightenment S. <no-...@en...> - 2008-09-16 23:29:17
|
Author: raster Date: 2008-09-16 23:29:16 -0700 (Tue, 16 Sep 2008) New Revision: 36039 Log: get geometry form edje - not obj. deferred calc bork bork Modified: trunk/e/src/bin/e_scrollframe.c Modified: trunk/e/src/bin/e_scrollframe.c =================================================================== --- trunk/e/src/bin/e_scrollframe.c 2008-09-17 06:26:32 UTC (rev 36038) +++ trunk/e/src/bin/e_scrollframe.c 2008-09-17 06:29:16 UTC (rev 36039) @@ -271,7 +271,7 @@ { API_ENTRY return; edje_object_calc_force(sd->edje_obj); - evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, w, h); } EAPI void @@ -633,7 +633,7 @@ ev = event_info; e_scrollframe_child_pos_get(sd->smart_obj, &x, &y); sd->pan_func.max_get(sd->pan_obj, &mx, &my); - evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); if (!strcmp(ev->keyname, "Left")) x -= sd->step.x; else if (!strcmp(ev->keyname, "Right")) @@ -700,7 +700,7 @@ w = sd->child.w; h = sd->child.h; - evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); if (sd->vbar_visible) { if (sd->vbar_flags == E_SCROLLFRAME_POLICY_AUTO) @@ -764,7 +764,7 @@ w = sd->child.w; h = sd->child.h; - evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh); + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); if (sd->hbar_visible) { if (sd->hbar_flags == E_SCROLLFRAME_POLICY_AUTO) @@ -841,8 +841,8 @@ { Evas_Coord x, y, w, h, mx = 0, my = 0, vw = 0, vh = 0; double vx, vy, size; - - evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh); + + edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); w = sd->child.w; if (w < 1) w = 1; size = (double)vw / (double)w; |
From: Enlightenment S. <no-...@en...> - 2008-09-19 02:44:09
|
Author: raster Date: 2008-09-19 02:44:07 -0700 (Fri, 19 Sep 2008) New Revision: 36093 Log: and - that vlc fullscreen bug. found. fixed. but vlc's x11 code is really nasty. does some utterly evil things. should i send off some suggestions to them? (like 1. dont reparent the window in xcommon.c line 217, dont play with wm focus policies in xcommon.c line 2269 - just dont send the _NET_ACTIVE_WINDOW, you shouldnt' need to (wm should make the focus be correct itself and wm's that don't should get a freindly reminder from users when they dont remain consistent with focus policy), and then... xcommon.c 2317 remove the do {} while loop - i can think of many reasons the wm may choose not to map your client window (yet - or ever), so this will never work "reliably" always. just put in an XSync(p_vout->p_sys->p_display, False); instead to force the x pipe to flush and do everything you asked before returning control to the code and thus avoiding any badaccess stuff from x). Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_border.h trunk/e/src/bin/e_desk.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-09-19 09:36:48 UTC (rev 36092) +++ trunk/e/src/bin/e_border.c 2008-09-19 09:44:07 UTC (rev 36093) @@ -222,7 +222,7 @@ EAPI E_Border * e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal) { - E_Border *bd; + E_Border *bd, *bd2; Ecore_X_Window_Attributes *att; unsigned int managed, desk[2]; int deskx, desky; @@ -484,6 +484,19 @@ bd->desk = e_desk_current_get(bd->zone); e_container_border_add(bd); borders = evas_list_append(borders, bd); + bd2 = evas_hash_find(borders_hash, e_util_winid_str_get(bd->client.win)); + if (bd2) + { + printf("EEEEK! 2 borders with same client window id in them! very bad!\n"); + printf("optimisations failing due to bizarre client behavior. will\n"); + printf("work around.\n"); + printf("bd=%p, bd->references=%i, bd->deleted=%i, bd->client.win=%x\n", + bd2, bd2->e_obj_inherit.references, bd2->e_obj_inherit.deleted, + bd2->client.win); + borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd->client.win), bd2); + borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd2->bg_win), bd2); + borders_hash = evas_hash_del(borders_hash, e_util_winid_str_get(bd2->win), bd2); + } borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->client.win), bd); borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->bg_win), bd); borders_hash = evas_hash_add(borders_hash, e_util_winid_str_get(bd->win), bd); @@ -1369,7 +1382,6 @@ * expect us to emulate a look of focus but not actually set x input * focus as we do - so simply abort any focuse set on such windows */ /* be strict about accepting focus hint */ -// printf(" 2accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus); if ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) return; if (bd->lock_focus_out) return; @@ -1388,25 +1400,21 @@ { if (!e_border_pointer_warp_to_center(bd)) { -// printf("F1\n"); e_border_focus_set(bd, 1, 1); } } else { -// printf("F2\n"); e_border_focus_set(bd, 1, 1); } } else if (e_config->focus_policy == E_FOCUS_CLICK) { -// printf("F3\n"); e_border_focus_set(bd, 1, 1); } else if (!e_border_pointer_warp_to_center(bd)) { -// printf("F4\n"); e_border_focus_set(bd, 1, 1); } @@ -1424,12 +1432,6 @@ * expect us to emulate a look of focus but not actually set x input * focus as we do - so simply abort any focuse set on such windows */ /* be strict about accepting focus hint */ -// printf("e_border_focus_set(%p, %s, %i %i);\n", bd, bd->client.icccm.name, focus, set); -// printf(" accept:%i take:%i\n", bd->client.icccm.accepts_focus, bd->client.icccm.take_focus); -// if (!bd->client.icccm.accepts_focus) return; -// printf("e_border_focus_set(%p [%s][%s], %i %i)\n", -// bd, bd->client.icccm.title, bd->client.netwm.name, -// focus, set); if ((!bd->client.icccm.accepts_focus) && (!bd->client.icccm.take_focus)) return; @@ -1455,13 +1457,11 @@ { if ((bd->visible) && (bd->changes.visible)) { -// printf("want!\n"); //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; return; } -// printf(" real foc - locally active...\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_LOCALLY_ACTIVE); return; } @@ -1470,13 +1470,11 @@ { if ((bd->visible) && (bd->changes.visible)) { -// printf("want2!\n"); //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; return; } -// printf(" real foc - globally active...\n"); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_GLOBALLY_ACTIVE); return; } @@ -1489,7 +1487,6 @@ } if ((!bd->visible) && (focus)) { -// printf("want3!\n"); //// e_border_focus_latest_set(bd); // bd->want_focus = 1; // bd->changed = 1; @@ -1499,7 +1496,6 @@ { if ((bd->visible) && (bd->changes.visible)) { -// printf("want4!\n"); //// e_border_focus_latest_set(bd); bd->want_focus = 1; bd->changed = 1; @@ -1512,7 +1508,6 @@ //// e_border_focus_latest_set(bd); // } // } -// printf("EMIT 0x%x activeve\n", bd->client.win); e_border_focus_latest_set(bd); edje_object_signal_emit(bd->bg_object, "e,state,focused", "e"); if (bd->icon_object) @@ -1521,7 +1516,6 @@ } else if ((!focus) && (bd->focused)) { -// printf("EMIT 0x%x passive\n", bd->client.win); edje_object_signal_emit(bd->bg_object, "e,state,unfocused", "e"); if (bd->icon_object) edje_object_signal_emit(bd->icon_object, "e,state,unfocused", "e"); @@ -1542,7 +1536,6 @@ { if (bd->focused) { -// printf(" real foc - GO...\n"); if (bd->internal) e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE); else @@ -1638,8 +1631,6 @@ E_Event_Border_Focus_In *ev; focused = bd; - //printf("set focused to %p\n", focused); - // Let send the focus event iff the focus is set explicitly, // not via callback ev = calloc(1, sizeof(E_Event_Border_Focus_In)); @@ -1654,8 +1645,6 @@ E_Event_Border_Focus_Out *ev; focused = NULL; - //printf("set focused to %p\n", focused); - // Let send the focus event iff the focus is set explicitly, // not via callback ev = calloc(1, sizeof(E_Event_Border_Focus_Out)); @@ -1682,8 +1671,6 @@ ecore_x_window_shadow_tree_flush(); if (!bd->shaded) { -// printf("SHADE!\n"); - bd->shade.x = bd->x; bd->shade.y = bd->y; bd->shade.dir = dir; @@ -1773,8 +1760,6 @@ ecore_x_window_shadow_tree_flush(); if (bd->shaded) { -// printf("UNSHADE!\n"); - bd->shade.dir = dir; e_hints_window_shaded_set(bd, 0); @@ -2231,7 +2216,6 @@ if (bd->fullscreen) { bd->pre_res_change.valid = 0; -// printf("UNFULLSCREEEN!\n"); bd->fullscreen = 0; bd->need_fullscreen = 0; @@ -2351,7 +2335,6 @@ E_OBJECT_CHECK(bd); E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); if (bd->sticky) return; -// printf("STICK!\n"); bd->sticky = 1; e_hints_window_sticky_set(bd, 1); e_border_show(bd); @@ -2389,7 +2372,6 @@ E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); /* Set the desk before we unstick the border */ if (!bd->sticky) return; -// printf("UNSTICK!\n"); bd->sticky = 0; e_hints_window_sticky_set(bd, 0); @@ -2460,6 +2442,17 @@ } EAPI E_Border * +e_border_find_all_by_client_window(Ecore_X_Window win) +{ + E_Border *bd; + + bd = evas_hash_find(borders_hash, e_util_winid_str_get(win)); + if ((bd) && (bd->client.win == win)) + return bd; + return NULL; +} + +EAPI E_Border * e_border_find_by_frame_window(Ecore_X_Window win) { E_Border *bd; @@ -3740,6 +3733,8 @@ bd->x + bd->client_inset.l, bd->y + bd->client_inset.t); ecore_x_window_save_set_del(bd->client.win); + bd->already_unparented = 1; +// bd->client.win = 0; } bd->already_unparented = 1; @@ -3840,9 +3835,10 @@ E_Border *bd; Ecore_X_Event_Window_Hide *e; -// printf("in hide cb\n"); bd = data; e = ev; +// not interested in hide events from windows other than the window in question + if (e->win != e->event_win) return 1; bd = e_border_find_by_client_window(e->win); if (!bd) return 1; if (bd->ignore_first_unmap > 0) @@ -3855,7 +3851,9 @@ (bd->await_hide_event > 0)) { if (bd->await_hide_event > 0) - bd->await_hide_event--; + { + bd->await_hide_event--; + } else { /* Only hide the border if it is visible */ @@ -3902,10 +3900,14 @@ bd = data; e = ev; + return 1; bd = e_border_find_by_client_window(e->win); if (!bd) return 1; -// if (e->parent == bd->client.shell_win) return 1; - if (ecore_x_window_parent_get(e->win) == bd->client.shell_win) return 1; + if (e->parent == bd->client.shell_win) return 1; + if (ecore_x_window_parent_get(e->win) == bd->client.shell_win) + { + return 1; + } e_border_hide(bd, 0); e_object_del(E_OBJECT(bd)); return 1; @@ -3919,32 +3921,16 @@ bd = data; e = ev; -// printf("##- CONF REQ 0x%x , %iX%i+%i+%i\n", -// e->win, e->w, e->h, e->x, e->y); bd = e_border_find_by_client_window(e->win); if (!bd) { if (e_stolen_win_get(e->win)) return 1; -// printf("generic config request 0x%x 0x%lx %i %i %ix%i %i 0x%x 0x%x...\n", -// e->win, e->value_mask, e->x, e->y, e->w, e->h, e->border, e->abovewin, e->detail); if (!e_util_container_window_find(e->win)) ecore_x_window_configure(e->win, e->value_mask, e->x, e->y, e->w, e->h, e->border, e->abovewin, e->detail); return 1; } -#if 0 - printf("##- CONFIGURE REQ 0x%0x mask: %c%c%c%c%c%c%c\n", - e->win, - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ? 'X':' ', - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y) ? 'Y':' ', - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ? 'W':' ', - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) ? 'H':' ', - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_BORDER_WIDTH) ? 'B':' ', - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING) ? 'C':' ', - (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE) ? 'S':' ' - ); -#endif if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) || (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)) @@ -3953,13 +3939,6 @@ x = bd->x; y = bd->y; -#if 0 - printf("##- ASK FOR 0x%x TO MOVE TO [FLG X%liY%li] %i,%i -> %i,%i\n", - bd->client.win, - e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X, - e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y, - x, y, e->x, e->y); -#endif if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) x = e->x; if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y) @@ -3975,13 +3954,6 @@ w = e->w + bd->client_inset.l + bd->client_inset.r; if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) h = e->h + bd->client_inset.t + bd->client_inset.b; -#if 0 - printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n", - bd->client.win, - e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W, - e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H, - e->w, e->h); -#endif if ((!bd->lock_client_location) && (!bd->lock_client_size)) { if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE) @@ -4061,13 +4033,6 @@ w = e->w + bd->client_inset.l + bd->client_inset.r; if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) h = e->h + bd->client_inset.t + bd->client_inset.b; -#if 0 - printf("##- ASK FOR 0x%x TO RESIZE TO [FLG W%liH%li] %i,%i\n", - bd->client.win, - e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W, - e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H, - e->w, e->h); -#endif if (!bd->lock_client_size) { if ((bd->shaded) || (bd->shading)) @@ -4162,18 +4127,13 @@ bd = data; e = ev; -// printf("##- RESZ REQ 0x%x , %iX%i\n", -// e->win, e->w, e->h); bd = e_border_find_by_client_window(e->win); if (!bd) { if (e_stolen_win_get(e->win)) return 1; -// printf("generic resize request %x %ix%i ...\n", -// e->win, e->w, e->h); ecore_x_window_resize(e->win, e->w, e->h); return 1; } -// printf("##- RESIZE REQ 0x%x\n", bd->client.win); { int w, h; @@ -4181,8 +4141,6 @@ w = bd->w; w = e->w + bd->client_inset.l + bd->client_inset.r; h = e->h + bd->client_inset.t + bd->client_inset.b; -// printf("##- ASK FOR 0x%x TO RESIZE TO %i,%i\n", -// bd->client.win, e->w, e->h); if ((bd->shaded) || (bd->shading)) { int pw, ph; @@ -4216,7 +4174,6 @@ e = ev; bd = e_border_find_by_client_window(e->win); if (!bd) return 1; -// printf("gravity for %0x\n", e->win); return 1; } @@ -4228,7 +4185,6 @@ e = ev; bd = e_border_find_by_client_window(e->win); -// printf("stack req for %0x bd %p\n", e->win, bd); if (!bd) { if (e_stolen_win_get(e->win)) return 1; @@ -4551,7 +4507,6 @@ if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return 1; else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1; } - printf("fout 1\n"); e_border_focus_set(bd, 0, 0); return 1; } @@ -5158,7 +5113,6 @@ } if ((ev->win != bd->event_win) && (ev->event_win != bd->win)) { -// printf("abort ev\n"); return 1; } if ((ev->button >= 1) && (ev->button <= 3)) @@ -5182,8 +5136,6 @@ /* if (bd->moving) { - - printf("moving\n"); } else if (bd->resize_mode != RESIZE_NONE) { @@ -5261,10 +5213,6 @@ ev = event; bd = data; - if (ev->event_win == bd->win) - { -// printf("GRABMOVE2!\n"); - } if ((ev->win != bd->event_win) && (ev->event_win != bd->win)) return 1; bd->mouse.current.mx = ev->root.x; @@ -5675,7 +5623,6 @@ } else { -// printf("##- NO SIZE HINTS!\n"); } if (bd->client.icccm.min_w > 32767) bd->client.icccm.min_w = 32767; if (bd->client.icccm.min_h > 32767) bd->client.icccm.min_h = 32767; @@ -5685,15 +5632,6 @@ if (bd->client.icccm.base_h > 32767) bd->client.icccm.base_h = 32767; // if (bd->client.icccm.step_w < 1) bd->client.icccm.step_w = 1; // if (bd->client.icccm.step_h < 1) bd->client.icccm.step_h = 1; -#if 0 - printf("##- SIZE HINTS for 0x%x: min %ix%i, max %ix%i, base %ix%i, step %ix%i, aspect (%f, %f)\n", - bd->client.win, - bd->client.icccm.min_w, bd->client.icccm.min_h, - bd->client.icccm.max_w, bd->client.icccm.max_h, - bd->client.icccm.base_w, bd->client.icccm.base_h, - bd->client.icccm.step_w, bd->client.icccm.step_h, - bd->client.icccm.min_aspect, bd->client.icccm.max_aspect); -#endif bd->client.icccm.fetch.size_pos_hints = 0; rem_change = 1; @@ -5802,7 +5740,6 @@ if (!ecore_x_netwm_icons_get(bd->client.win, &bd->client.netwm.icons, &bd->client.netwm.num_icons)) { -// printf("ERROR: Fetch icon from client\n"); bd->client.netwm.icons = NULL; bd->client.netwm.num_icons = 0; } @@ -5933,7 +5870,6 @@ bd->client.mwm.borderless = 0; if (bd->client.mwm.exists) { -// printf("##- MWM HINTS SET 0x%x!\n", bd->client.win); if ((!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_ALL)) && (!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_TITLE)) && (!(bd->client.mwm.decor & ECORE_X_MWM_HINT_DECOR_BORDER))) @@ -6420,10 +6356,8 @@ if (bd->new_client) { -// printf("##- NEW CLIENT SETUP 0x%x\n", bd->client.win); if (bd->re_manage) { -// printf("##- REMANAGE!\n"); bd->x -= bd->client_inset.l; bd->y -= bd->client_inset.t; bd->changes.pos = 1; @@ -6437,8 +6371,6 @@ int bw; att = &bd->client.initial_attributes; -// printf("##- REQUEST POS 0x%x [%i,%i]\n", -// bd->client.win, att->x, att->y); bw = att->border * 2; switch (bd->client.icccm.gravity) { @@ -6512,7 +6444,6 @@ Evas_List *skiplist = NULL; int new_x, new_y; -// printf("##- AUTO POS 0x%x\n", bd->client.win); if (bd->zone->w > bd->w) new_x = bd->zone->x + (rand() % (bd->zone->w - bd->w)); else @@ -6696,7 +6627,6 @@ ecore_evas_managed_move(bd->internal_ecore_evas, bd->x + bd->fx.x + bd->client_inset.l, bd->y + bd->fx.y + bd->client_inset.t); -// printf("##- BORDER NEEDS POS/SIZE CHANGE 0x%x\n", bd->client.win); if ((bd->shaded) && (!bd->shading)) { evas_obscured_clear(bd->bg_evas); @@ -6839,7 +6769,6 @@ ecore_evas_managed_move(bd->internal_ecore_evas, bd->x + bd->fx.x + bd->client_inset.l, bd->y + bd->fx.y + bd->client_inset.t); -// printf("##- BORDER NEEDS SIZE CHANGE 0x%x\n", bd->client.win); if (bd->shaded && !bd->shading) { evas_obscured_clear(bd->bg_evas); @@ -7214,14 +7143,12 @@ if ((bd->take_focus) || (bd->want_focus)) { bd->take_focus = 0; - printf("bd->want_focus = %i\n", bd->want_focus); if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus)) { bd->want_focus = 0; if (!bd->lock_focus_out) { - printf("E1\n"); e_border_focus_set_with_pointer(bd); } } @@ -7235,10 +7162,7 @@ e_border_focused_get()))) { if (!bd->lock_focus_out) - { - printf("E2\n"); - e_border_focus_set_with_pointer(bd); - } + e_border_focus_set_with_pointer(bd); } } } Modified: trunk/e/src/bin/e_border.h =================================================================== --- trunk/e/src/bin/e_border.h 2008-09-19 09:36:48 UTC (rev 36092) +++ trunk/e/src/bin/e_border.h 2008-09-19 09:44:07 UTC (rev 36093) @@ -589,6 +589,7 @@ EAPI void e_border_pinned_set(E_Border *bd, int set); EAPI E_Border *e_border_find_by_client_window(Ecore_X_Window win); +EAPI E_Border *e_border_find_all_by_client_window(Ecore_X_Window win); EAPI E_Border *e_border_find_by_frame_window(Ecore_X_Window win); EAPI E_Border *e_border_find_by_window(Ecore_X_Window win); EAPI E_Border *e_border_find_by_alarm(Ecore_X_Sync_Alarm alarm); Modified: trunk/e/src/bin/e_desk.c =================================================================== --- trunk/e/src/bin/e_desk.c 2008-09-19 09:36:48 UTC (rev 36092) +++ trunk/e/src/bin/e_desk.c 2008-09-19 09:44:07 UTC (rev 36093) @@ -360,14 +360,10 @@ { Evas_List *l = NULL; E_Border *bd; - - printf("== e_desk_last_focused_focus\n"); for (l = e_border_focus_stack_get(); l; l = l->next) { bd = l->data; - printf("LAST %p ic=%i vis=%i desk=%p==%p\n", - bd, bd->iconic, bd->visible, bd->desk, desk); if ((!bd->iconic) && (bd->visible) && (bd->desk == desk) && (bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) && (bd->client.netwm.type != ECORE_X_WINDOW_TYPE_DOCK) && |
From: Enlightenment S. <no-...@en...> - 2008-09-19 02:47:01
|
Author: raster Date: 2008-09-19 02:47:00 -0700 (Fri, 19 Sep 2008) New Revision: 36094 Log: remvoe printfs's Modified: trunk/e/src/bin/e_canvas.c trunk/e/src/bin/e_exec.c Modified: trunk/e/src/bin/e_canvas.c =================================================================== --- trunk/e/src/bin/e_canvas.c 2008-09-19 09:44:07 UTC (rev 36093) +++ trunk/e/src/bin/e_canvas.c 2008-09-19 09:47:00 UTC (rev 36094) @@ -124,7 +124,6 @@ } edje_file_cache_flush(); edje_collection_cache_flush(); - printf("...caches flushed.\n"); } EAPI void Modified: trunk/e/src/bin/e_exec.c =================================================================== --- trunk/e/src/bin/e_exec.c 2008-09-19 09:44:07 UTC (rev 36093) +++ trunk/e/src/bin/e_exec.c 2008-09-19 09:47:00 UTC (rev 36094) @@ -290,17 +290,13 @@ E_Exec_Instance *inst; ev = event; - printf("child exit...\n"); if (!ev->exe) return 1; if (ecore_exe_tag_get(ev->exe)) printf(" tag %s\n", ecore_exe_tag_get(ev->exe)); if (!(ecore_exe_tag_get(ev->exe) && (!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1; inst = ecore_exe_data_get(ev->exe); - printf(" inst = %p\n", inst); if (!inst) return 1; - printf(" inst exec line -- '%s'\n", ecore_exe_cmd_get(inst->exe)); - /* /bin/sh uses this if cmd not found */ if ((ev->exited) && ((ev->exit_code == 127) || (ev->exit_code == 255))) |
From: Enlightenment S. <no-...@en...> - 2008-09-20 00:21:42
|
Author: raster Date: 2008-09-19 16:58:07 -0700 (Fri, 19 Sep 2008) New Revision: 36103 Log: fix dnd for desktop - if you have multiple zones! remove printf's too. lots of noisiness in e. Modified: trunk/e/src/bin/e_dnd.c trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_shelf.c Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2008-09-19 15:20:14 UTC (rev 36102) +++ trunk/e/src/bin/e_dnd.c 2008-09-19 23:58:07 UTC (rev 36103) @@ -241,7 +241,6 @@ drag->x = x; drag->y = y; drag->xy_update = 1; -// printf("DND MOVE %i %i\n", x, y); } EAPI void @@ -335,7 +334,7 @@ drag->dx = x - drag->x; drag->dy = y - drag->y; - + ecore_x_dnd_aware_set(_drag_win, 1); ecore_x_dnd_types_set(_drag_win, drag->types, drag->num_types); ecore_x_dnd_actions_set(_drag_win, actions, 5); @@ -502,7 +501,6 @@ } if (drag->xy_update) { -// printf("DND REAL MOVE\n"); ecore_evas_move(drag->ecore_evas, drag->x, drag->y); e_container_shape_move(drag->shape, drag->x, drag->y); drag->xy_update = 0; @@ -587,7 +585,6 @@ drag->x = x - drag->dx; drag->y = y - drag->dy; drag->xy_update = 1; -// printf("DND MOVE 2 %i %i\n", x, y); } static void @@ -615,8 +612,8 @@ py = ((E_Win *)(h->obj))->y; break; case E_ZONE_TYPE: - px = ((E_Zone *)(h->obj))->x; - py = ((E_Zone *)(h->obj))->y; +// px = ((E_Zone *)(h->obj))->x; +// py = ((E_Zone *)(h->obj))->y; break; case E_BORDER_TYPE: px = ((E_Border *)(h->obj))->x + ((E_Border *)(h->obj))->fx.x; @@ -633,6 +630,7 @@ } *dx += px; *dy += py; + printf("T: %x | dx = %i dy = %i\n", h->obj->type, *dx, *dy); } static Ecore_X_Window @@ -776,6 +774,7 @@ if (_drag_current) { + printf("--\n"); for (l = _drop_handlers; l; l = l->next) { E_Drop_Handler *h; @@ -792,9 +791,16 @@ move_ev.action = action; leave_ev.x = x - dx; leave_ev.y = y - dy; - if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win, 0)) + + int inside, matches; + + inside = E_INSIDE(x, y, dx, dy, dw, dh); + matches = _e_drag_win_matches(h, win, 0); + printf(" inside = %i, matches = %i\n", inside, matches); + if (E_INSIDE(x, y, dx, dy, dw, dh) && + _e_drag_win_matches(h, win, 0)) { - if(e_drop_handler_responsive_get(h)) responsive = 1; + if (e_drop_handler_responsive_get(h)) responsive = 1; if (!h->entered) { @@ -808,6 +814,7 @@ } else enter_ev.data = _drag_current->data; + printf("ENTER!\n"); h->cb.enter(h->cb.data, h->active_type, &enter_ev); } h->entered = 1; @@ -1223,7 +1230,6 @@ id = e_util_winid_str_get(ev->win); if (!evas_hash_find(_drop_win_hash, id)) return 1; - printf("Xdnd leave\n"); leave_ev.x = 0; leave_ev.y = 0; @@ -1333,7 +1339,6 @@ Ecore_X_Event_Xdnd_Finished *ev; ev = event; - printf("Xdnd finished\n"); if (!ev->completed) return 1; @@ -1360,7 +1365,6 @@ ev = event; id = e_util_winid_str_get(ev->win); if (!evas_hash_find(_drop_win_hash, id)) return 1; - printf("Xdnd drop %x %s\n", ev->win, _xdnd->type); ecore_x_selection_xdnd_request(ev->win, _xdnd->type); @@ -1381,7 +1385,6 @@ id = e_util_winid_str_get(ev->win); if (!evas_hash_find(_drop_win_hash, id)) return 1; if (ev->selection != ECORE_X_SELECTION_XDND) return 1; - printf("Xdnd selection\n"); if (!strcmp("text/uri-list", _xdnd->type)) { @@ -1390,7 +1393,7 @@ files = ev->data; for (i = 0; i < files->num_files; i++) - l = evas_list_append(l, files->files[i]), printf("file: %s\n", files->files[i]); + l = evas_list_append(l, files->files[i]); _xdnd->data = l; _e_drag_xdnd_end(ev->win, _xdnd->x, _xdnd->y); evas_list_free(l); @@ -1425,9 +1428,9 @@ } */ } - printf("\n"); +// printf("\n"); file[i] = '\0'; - printf("file: %d \"%s\"\n", i, file); +// printf("file: %d \"%s\"\n", i, file); l = evas_list_append(l, file); _xdnd->data = l; Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-09-19 15:20:14 UTC (rev 36102) +++ trunk/e/src/bin/e_fm.c 2008-09-19 23:58:07 UTC (rev 36103) @@ -471,7 +471,6 @@ /* FIXME; some dialog */ if (sd->mount) { - printf("UM1\n"); e_fm2_hal_unmount(sd->mount); sd->mount = NULL; evas_object_smart_callback_call(data, "dir_deleted", NULL); @@ -573,7 +572,6 @@ && strncmp(sd->mount->mount_point, sd->realpath, strlen(sd->mount->mount_point))) { - printf("UM2\n"); e_fm2_hal_unmount(sd->mount); sd->mount = NULL; } @@ -985,7 +983,8 @@ _e_fm2_cb_dnd_move, _e_fm2_cb_dnd_leave, _e_fm2_cb_dnd_drop, - drop, 3, sd->x, sd->y, sd->w, sd->h); + drop, 3, + sd->x, sd->y, sd->w, sd->h); e_drop_handler_responsive_set(sd->drop_handler); } @@ -1726,7 +1725,6 @@ d = alloca(l); strcpy(d, udi); strcpy(d + l1 + 1, mountpoint); - printf("SEND %s %s\n", udi, mountpoint); return _e_fm_client_send_new(E_FM_OP_MOUNT, (void *)d, l); } @@ -1744,7 +1742,6 @@ strcpy(d, udi); cl = _e_fm2_client_get(); - printf("send UM %s\n", udi); return _e_fm_client_send_new(E_FM_OP_UNMOUNT, (void *)d, l); } @@ -2919,8 +2916,6 @@ l = l->next; if ((ic2 != ic) && (ic2->saved_pos)) { -// printf("REMOVE %p [%s]\n", -// pl->data, ((E_Fm2_Icon *)pl->data)->info.file); // ic->sd->icons_place = evas_list_remove_list(ic->sd->icons_place, pl); } } @@ -3474,7 +3469,6 @@ * fileman/list_odd/variable * */ -// printf("CALC ICON\n"); if ((!ic->sd->config->icon.fixed.w) || (!ic->sd->config->icon.fixed.h)) { obj = ic->sd->tmp.obj; @@ -3490,7 +3484,6 @@ "base/theme/fileman", "icon/variable"); ic->sd->tmp.obj = obj; -// printf("CALC OBJ %p\n", ic->sd->tmp.obj); } _e_fm2_icon_label_set(ic, obj); obj2 = ic->sd->tmp.obj2; @@ -3504,7 +3497,6 @@ edje_extern_object_max_size_set(obj2, ic->sd->config->icon.icon.w, ic->sd->config->icon.icon.h); edje_object_part_swallow(obj, "e.swallow.icon", obj2); edje_object_size_min_calc(obj, &mw, &mh); -// printf("CALC %ix%i\n", mw, mh); } ic->w = mw; ic->h = mh; @@ -3684,7 +3676,6 @@ if ((selectraise) && (!strcmp(selectraise, "on"))) evas_object_stack_below(ic->obj, ic->sd->drop); } -// printf("realize %s full = %i\n", ic->info.file, (int)ic->info.removable_full); if (ic->info.removable_full) edje_object_signal_emit(ic->obj_icon, "e,state,removable,full", "e"); // else @@ -3862,7 +3853,6 @@ if (!desktop) goto error; // if (desktop->type != EFREET_DESKTOP_TYPE_LINK) goto error; -// printf(" mod time %lli\n", desktop->load_time); ic->info.removable = 0; ic->info.removable_full = 0; if (desktop->name) ic->info.label = evas_stringshare_add(desktop->name); @@ -3882,18 +3872,15 @@ else if (!strcmp(type, "Removable")) { ic->info.removable = 1; -// printf("REMOVABLE %s\n", ic->info.link); if ((!e_fm2_hal_storage_find(ic->info.link)) && (!e_fm2_hal_volume_find(ic->info.link))) { -// printf("REMOVE IT %s\n", ic->info.file); _e_fm2_live_file_del(ic->sd->obj, ic->info.file); efreet_desktop_free(desktop); goto error; } } type = ecore_hash_get(desktop->x, "X-Enlightenment-Removable-State"); -// printf(" rem state type = %s\n", type); if (type) { if (!strcmp(type, "Full")) @@ -4416,7 +4403,6 @@ } if (!sd->drop_all) { - printf("DISP DROP ALL SHOW\n"); edje_object_signal_emit(sd->overlay, "e,state,drop,start", "e"); sd->drop_all = 1; } @@ -4434,7 +4420,6 @@ if (!sd) return; if (sd->drop_all) { - printf("DISP DROP ALL HIDE\n"); edje_object_signal_emit(sd->overlay, "e,state,drop,stop", "e"); sd->drop_all = 0; } @@ -4459,7 +4444,6 @@ { if (ic->sd->drop_after != -1) { - printf("DISP DROP ON drop\n"); edje_object_signal_emit(ic->sd->drop_in, "e,state,unselected", "e"); edje_object_signal_emit(ic->sd->drop, "e,state,selected", "e"); ic->sd->drop_in_show = 0; @@ -4467,7 +4451,6 @@ } else { - printf("DISP DROP ON drop_in\n"); edje_object_signal_emit(ic->sd->drop, "e,state,unselected", "e"); edje_object_signal_emit(ic->sd->drop_in, "e,state,selected", "e"); ic->sd->drop_in_show = 1; @@ -4486,7 +4469,6 @@ sd = evas_object_smart_data_get(obj); if (!sd) return; - printf("DISP DROP OFF BOTH\n"); if (sd->drop_show) { edje_object_signal_emit(sd->drop, "e,state,unselected", "e"); @@ -4534,7 +4516,6 @@ if (!type) return; if (strcmp(type, "text/uri-list")) return; ev = (E_Event_Dnd_Enter *)event; - printf("DND IN %i %i\n", ev->x, ev->y); e_drop_handler_action_set(ev->action); } @@ -4550,14 +4531,12 @@ if (!type) return; if (strcmp(type, "text/uri-list")) return; ev = (E_Event_Dnd_Move *)event; - printf("DND MOVE %i %i\n", ev->x, ev->y); e_drop_handler_action_set(ev->action); for (l = sd->icons; l; l = l->next) /* FIXME: should only walk regions and skip non-visible ones */ { ic = l->data; if (E_INSIDE(ev->x, ev->y, ic->x - ic->sd->pos.x, ic->y - ic->sd->pos.y, ic->w, ic->h)) { - printf("OVER %s\n", ic->info.file); if (ic->drag.dnd) continue; /* if list view */ if (ic->sd->config->view.mode == E_FM2_VIEW_MODE_LIST) @@ -4574,17 +4553,14 @@ if (ev->y <= (ic->y - ic->sd->pos.y + (ic->h / 4))) { _e_fm2_dnd_drop_show(ic, 0); - printf("DDD 0\n"); } else if (ev->y > (ic->y - ic->sd->pos.y + ((ic->h * 3) / 4))) { _e_fm2_dnd_drop_show(ic, 1); - printf("DDD 1\n"); } else { _e_fm2_dnd_drop_show(ic, -1); - printf("DDD -1\n"); } } else @@ -4660,7 +4636,6 @@ if (!type) return; if (strcmp(type, "text/uri-list")) return; ev = (E_Event_Dnd_Leave *)event; - printf("DND LEAVE %i %i\n", ev->x, ev->y); _e_fm2_dnd_drop_hide(sd->obj); _e_fm2_dnd_drop_all_hide(sd->obj); } @@ -4832,15 +4807,9 @@ if (strcmp(type, "text/uri-list")) return; ev = (E_Event_Dnd_Drop *)event; - printf("DROP: %i %i\n", ev->x, ev->y); fsel = _e_fm2_uri_path_list_get(ev->data); isel = _e_fm2_uri_icon_list_get(fsel); if (!isel) return; - for (l = fsel; l; l = l->next) - { - fl = l->data; - printf(" %s\n", fl); - } dx = 0; dy = 0; ox = 0; oy = 0; for (l = isel; l; l = l->next) @@ -4852,11 +4821,6 @@ oy = ic->y; dx = (ic->drag.x + ic->x - ic->sd->pos.x); dy = (ic->drag.y + ic->y - ic->sd->pos.y); - printf("DND offset %i %i | %i %i | %i %i | %i %i\n", - dx, dy, - ic->drag.x, ic->drag.y, - ic->x, ic->y, - ic->sd->pos.x, ic->sd->pos.y); break; } } @@ -4870,7 +4834,6 @@ */ if (sd->drop_all) /* drop arbitarily into the dir */ { - printf("drop all\n"); /* move file into this fm dir */ for (ll = fsel, il = isel; ll && il; ll = ll->next, il = il->next) { @@ -4931,7 +4894,6 @@ } else if (sd->drop_icon) /* inot or before/after an icon */ { - printf("drop on/before/after icon\n"); if (sd->drop_after == -1) /* put into subdir in icon */ { /* move file into dir that this icon is for */ @@ -4943,7 +4905,6 @@ /* move the file into the subdir */ snprintf(buf, sizeof(buf), "%s/%s/%s", sd->realpath, sd->drop_icon->info.file, ecore_file_file_get(fp)); - printf("mv %s %s\n", (char *)fp, buf); args = _e_fm_string_append_quoted(args, &size, &length, fp); args = _e_fm_string_append_char(args, &size, &length, ' '); @@ -4967,7 +4928,6 @@ sd->realpath, ecore_file_file_get(fp)); if (sd->config->view.link_drop) { - printf("ln -s %s %s\n", (char *)fp, buf); _e_fm2_client_file_symlink(buf, fp, sd->drop_icon->info.file, sd->drop_after, -9999, -9999, sd->h, sd->h); } else @@ -5060,7 +5020,6 @@ else if (evas_key_modifier_is_set(modifiers, "Shift")) multi_sel = 1; } -// printf("MOUSE 1 range=%i multi=%i\n", range_sel, multi_sel); if (ic->sd->config->selection.single) { multi_sel = 0; @@ -5200,7 +5159,6 @@ { ic->drag.x = ev->output.x - ic->x - ic->sd->x + ic->sd->pos.x; ic->drag.y = ev->output.y - ic->y - ic->sd->y + ic->sd->pos.y; -// printf("DX: %i %i\n", ic->drag.x, ic->drag.y); ic->drag.start = 1; ic->drag.dnd = 0; ic->drag.src = 1; @@ -5906,7 +5864,6 @@ _e_fm2_regions_populate(sd->obj); break; case E_FM2_VIEW_MODE_CUSTOM_ICONS: - printf("CUSTOM ICONRESIZE HANDLE\n"); if (sd->config->view.fit_custom_pos) { for (l = sd->icons; l; l = l->next) @@ -5938,7 +5895,6 @@ _e_fm2_regions_populate(sd->obj); break; case E_FM2_VIEW_MODE_LIST: -// printf("LIST RESIZE HANDLE\n"); if (sd->iconlist_changed) { for (l = sd->icons; l; l = l->next) @@ -6200,7 +6156,6 @@ if (sd->path) evas_stringshare_del(sd->path); if (sd->mount) { - printf("UM3\n"); e_fm2_hal_unmount(sd->mount); sd->mount = NULL; } @@ -7767,7 +7722,6 @@ _e_fm2_cb_live_timer(data); if ((sd->order_file) || (sd->config->view.always_order)) { - printf("refresh from .order\n"); e_fm2_refresh(data); } sd->live.idler = NULL; Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2008-09-19 15:20:14 UTC (rev 36102) +++ trunk/e/src/bin/e_shelf.c 2008-09-19 23:58:07 UTC (rev 36103) @@ -184,7 +184,7 @@ { e_drop_xdnd_register_set(es->zone->container->bg_win, 1); e_gadcon_xdnd_window_set(es->gadcon, es->zone->container->bg_win); - e_gadcon_dnd_window_set(es->gadcon, es->zone->container->event_win); + e_gadcon_dnd_window_set(es->gadcon, es->zone->container->bg_win); } e_gadcon_util_menu_attach_func_set(es->gadcon, _e_shelf_cb_menu_items_append, es); |
From: Enlightenment S. <no-...@en...> - 2008-09-20 00:21:45
|
Author: raster Date: 2008-09-19 16:59:29 -0700 (Fri, 19 Sep 2008) New Revision: 36104 Log: remove debugging i added to fix dnd. Modified: trunk/e/src/bin/e_dnd.c Modified: trunk/e/src/bin/e_dnd.c =================================================================== --- trunk/e/src/bin/e_dnd.c 2008-09-19 23:58:07 UTC (rev 36103) +++ trunk/e/src/bin/e_dnd.c 2008-09-19 23:59:29 UTC (rev 36104) @@ -612,6 +612,8 @@ py = ((E_Win *)(h->obj))->y; break; case E_ZONE_TYPE: +// zone based drag targets are in a container thus their coords should be +// screen-relative as containers just cover the screen // px = ((E_Zone *)(h->obj))->x; // py = ((E_Zone *)(h->obj))->y; break; @@ -630,7 +632,6 @@ } *dx += px; *dy += py; - printf("T: %x | dx = %i dy = %i\n", h->obj->type, *dx, *dy); } static Ecore_X_Window @@ -774,7 +775,6 @@ if (_drag_current) { - printf("--\n"); for (l = _drop_handlers; l; l = l->next) { E_Drop_Handler *h; @@ -792,11 +792,6 @@ leave_ev.x = x - dx; leave_ev.y = y - dy; - int inside, matches; - - inside = E_INSIDE(x, y, dx, dy, dw, dh); - matches = _e_drag_win_matches(h, win, 0); - printf(" inside = %i, matches = %i\n", inside, matches); if (E_INSIDE(x, y, dx, dy, dw, dh) && _e_drag_win_matches(h, win, 0)) { @@ -814,7 +809,6 @@ } else enter_ev.data = _drag_current->data; - printf("ENTER!\n"); h->cb.enter(h->cb.data, h->active_type, &enter_ev); } h->entered = 1; |
From: Enlightenment S. <no-...@en...> - 2008-09-20 05:17:00
|
Log: fix gadcon popups across multiple zones. Author: raster Date: 2008-09-19 22:16:49 -0700 (Fri, 19 Sep 2008) New Revision: 36120 Modified: trunk/e/src/bin/e_gadcon_popup.c Modified: trunk/e/src/bin/e_gadcon_popup.c =================================================================== --- trunk/e/src/bin/e_gadcon_popup.c 2008-09-20 05:09:06 UTC (rev 36119) +++ trunk/e/src/bin/e_gadcon_popup.c 2008-09-20 05:16:49 UTC (rev 36120) @@ -62,7 +62,7 @@ e_gadcon_popup_show(E_Gadcon_Popup *pop) { Evas_Object *o; - Evas_Coord gx, gy, gw, gh, zw, zh, zx; + Evas_Coord gx, gy, gw, gh, zw, zh, zx, zy; Evas_Coord px, py, ww, wh; if (!pop) return; @@ -91,9 +91,10 @@ /* Popup positioning */ e_gadcon_client_geometry_get(pop->gcc, &gx, &gy, &gw, &gh); + zx = pop->gcc->gadcon->zone->x; + zy = pop->gcc->gadcon->zone->y; zw = pop->gcc->gadcon->zone->w; zh = pop->gcc->gadcon->zone->h; - zx = pop->gcc->gadcon->zone->x; switch (pop->gcc->gadcon->orient) { case E_GADCON_ORIENT_CORNER_RT: @@ -101,7 +102,7 @@ case E_GADCON_ORIENT_RIGHT: px = gx - pop->w; py = gy; - if (py + pop->h >= zh) + if (py + pop->h >= (zy + zh)) py = gy + gh - pop->h; break; case E_GADCON_ORIENT_LEFT: @@ -109,7 +110,7 @@ case E_GADCON_ORIENT_CORNER_LB: px = gx + gw; py = gy; - if (py + pop->h >= zh) + if (py + pop->h >= (zy + zh)) py = gy + gh - pop->h; break; break; @@ -118,7 +119,7 @@ case E_GADCON_ORIENT_CORNER_TR: py = gy + gh; px = (gx + (gw / 2)) - (pop->w / 2); - if (px + pop->w >= zw) + if ((px + pop->w) >= (zx + zw)) px = gx + gw - pop->w; else if (px < zx) px = zx; @@ -128,19 +129,19 @@ case E_GADCON_ORIENT_CORNER_BR: py = gy - pop->h; px = (gx + (gw / 2)) - (pop->w / 2); - if (px + pop->w >= zw) + if ((px + pop->w) >= (zx + zw)) px = gx + gw - pop->w; else if (px < zx) px = zx; break; case E_GADCON_ORIENT_FLOAT: px = (gx + (gw / 2)) - (pop->w / 2); - if (gy >= zh / 2) + if (gy >= (zy + (zh / 2))) py = gy - pop->h; else py = gy + gh; - if (px + pop->w >= zw) - px = zw - pop->w; + if ((px + pop->w) >= (zx + zw)) + px = gx + gw - pop->w; else if (px < zx) px = zx; break; @@ -148,7 +149,7 @@ e_popup_move_resize(pop->win, 50, 50, pop->w, pop->h); return; } - e_popup_move_resize(pop->win, px, py, pop->w, pop->h); + e_popup_move_resize(pop->win, px - zx, py - zy, pop->w, pop->h); } EAPI void |
From: Enlightenment S. <no-...@en...> - 2008-09-21 08:26:16
|
Log: fix e_box fill/expand. Author: raster Date: 2008-09-21 01:25:53 -0700 (Sun, 21 Sep 2008) New Revision: 36143 Modified: trunk/e/src/bin/e_box.c Modified: trunk/e/src/bin/e_box.c =================================================================== --- trunk/e/src/bin/e_box.c 2008-09-21 07:43:46 UTC (rev 36142) +++ trunk/e/src/bin/e_box.c 2008-09-21 08:25:53 UTC (rev 36143) @@ -532,10 +532,10 @@ ww = w; hh = (h / (Evas_Coord)count); ow = bi->min.w; - if (bi->expand_w) ow = ww; + if (bi->fill_w) ow = ww; if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w; oh = bi->min.h; - if (bi->expand_h) oh = hh; + if (bi->fill_h) oh = hh; if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h; evas_object_move(obj, xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x), @@ -557,10 +557,10 @@ hh += oh; } ow = bi->min.w; - if (bi->expand_w) ow = ww; + if (bi->fill_w) ow = ww; if ((bi->max.w >= 0) && (bi->max.w < ow)) ow = bi->max.w; oh = bi->min.h; - if (bi->expand_h) oh = hh; + if (bi->fill_h) oh = hh; if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h; evas_object_move(obj, xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x), |
From: Enlightenment S. <no-...@en...> - 2008-09-25 00:41:06
|
Log: fix rememebr box to actually match basic/advanced and even be consistent with basic with "everything" flags. Author: raster Date: 2008-09-24 17:40:56 -0700 (Wed, 24 Sep 2008) New Revision: 36226 Modified: trunk/e/src/bin/e_int_border_remember.c Modified: trunk/e/src/bin/e_int_border_remember.c =================================================================== --- trunk/e/src/bin/e_int_border_remember.c 2008-09-24 17:21:53 UTC (rev 36225) +++ trunk/e/src/bin/e_int_border_remember.c 2008-09-25 00:40:56 UTC (rev 36226) @@ -114,8 +114,7 @@ (cfdata->remember.apply_border) && (cfdata->remember.apply_sticky) && (cfdata->remember.apply_desktop) && (cfdata->remember.apply_shade) && (cfdata->remember.apply_zone) && (cfdata->remember.apply_skip_winlist) && - (cfdata->remember.apply_skip_pager) && (cfdata->remember.apply_skip_taskbar) && - (cfdata->remember.set_focus_on_start)) + (cfdata->remember.apply_skip_pager) && (cfdata->remember.apply_skip_taskbar)) cfdata->mode = MODE_ALL; else if ((cfdata->remember.apply_pos) && (cfdata->remember.apply_size) && (cfdata->remember.apply_locks)) @@ -284,7 +283,8 @@ cfdata->border->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_LAYER | E_REMEMBER_APPLY_LOCKS | E_REMEMBER_APPLY_BORDER | E_REMEMBER_APPLY_STICKY | E_REMEMBER_APPLY_DESKTOP | E_REMEMBER_APPLY_SHADE | E_REMEMBER_APPLY_ZONE | - E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR; + E_REMEMBER_APPLY_SKIP_WINLIST | E_REMEMBER_APPLY_SKIP_PAGER | E_REMEMBER_APPLY_SKIP_TASKBAR | + E_REMEMBER_APPLY_ICON_PREF; cfdata->border->remember->apply_first_only = 0; e_remember_update(cfdata->border->remember, cfdata->border); } |