From: Enlightenment S. <no-...@en...> - 2010-03-02 15:07:10
|
Log: e: check whether fork failed Author: billiob Date: 2010-03-02 07:07:03 -0800 (Tue, 02 Mar 2010) New Revision: 46787 Modified: trunk/e/src/bin/e_desklock.c Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2010-03-02 14:53:27 UTC (rev 46786) +++ trunk/e/src/bin/e_desklock.c 2010-03-02 15:07:03 UTC (rev 46787) @@ -711,14 +711,15 @@ _desklock_auth(char *passwd) { _e_desklock_state_set(E_DESKLOCK_STATE_CHECKING); - if ((_e_desklock_child_pid = fork())) + _e_desklock_child_pid = fork(); + if (_e_desklock_child_pid > 0) { /* parent */ _e_desklock_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_desklock_cb_exit, NULL); } - else + else if (_e_desklock_child_pid == 0) { /* child */ int pamerr; @@ -762,6 +763,11 @@ free(current_user); exit(-1); } + else + { + _e_desklock_state_set(E_DESKLOCK_STATE_INVALID); + return 0; + } return 1; } |
From: Enlightenment S. <no-...@en...> - 2011-02-13 19:38:00
|
Log: e: whitespaces-- and use x = !x instead of if else Author: billiob Date: 2011-02-13 11:37:50 -0800 (Sun, 13 Feb 2011) New Revision: 56992 Trac: http://trac.enlightenment.org/e/changeset/56992 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-13 18:50:42 UTC (rev 56991) +++ trunk/e/src/bin/e_actions.c 2011-02-13 19:37:50 UTC (rev 56992) @@ -4,7 +4,7 @@ # define MAX(x, y) (((x) > (y)) ? (x) : (y)) #endif -#define INITS +#define INITS #define ACT_GO(name) \ { \ act = e_action_add(#name); \ @@ -319,7 +319,7 @@ e_object_del(E_OBJECT(kill_dialog)); kill_dialog = NULL; } - if ((!((E_Border *)obj)->lock_close) && (!((E_Border *)obj)->internal)) + if ((!((E_Border *)obj)->lock_close) && (!((E_Border *)obj)->internal)) e_border_act_kill_begin((E_Border *)obj); } @@ -366,15 +366,15 @@ _("You are about to kill %s.<br><br>" "Please keep in mind that all data from this window<br>" "which has not yet been saved will be lost!<br><br>" - "Are you sure you want to kill this window?"), + "Are you sure you want to kill this window?"), bd->client.icccm.name); - kill_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), + kill_dialog = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_kill_dialog"); if (!kill_dialog) return; - e_win_delete_callback_set(kill_dialog->win, + e_win_delete_callback_set(kill_dialog->win, _e_actions_cb_kill_dialog_delete); - e_dialog_title_set(kill_dialog, + e_dialog_title_set(kill_dialog, _("Are you sure you want to kill this window?")); e_dialog_text_set(kill_dialog, _(dialog_text)); e_dialog_icon_set(kill_dialog, "application-exit", 64); @@ -575,8 +575,8 @@ goto maximize; } else if (max == E_MAXIMIZE_HORIZONTAL) - { - if (bd->maximized & E_MAXIMIZE_HORIZONTAL) + { + if (bd->maximized & E_MAXIMIZE_HORIZONTAL) e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL); else goto maximize; @@ -586,7 +586,7 @@ } } else - { + { maximize: e_border_maximize(bd, _e_actions_maximize_parse(params)); } @@ -628,15 +628,15 @@ { if (v == 1) { - if (!strcmp(s1, "fullscreen")) + if (!strcmp(s1, "fullscreen")) e_border_maximize(bd, E_MAXIMIZE_FULLSCREEN | max); - else if (!strcmp(s1, "smart")) + else if (!strcmp(s1, "smart")) e_border_maximize(bd, E_MAXIMIZE_SMART | max); - else if (!strcmp(s1, "expand")) + else if (!strcmp(s1, "expand")) e_border_maximize(bd, E_MAXIMIZE_EXPAND | max); - else if (!strcmp(s1, "fill")) + else if (!strcmp(s1, "fill")) e_border_maximize(bd, E_MAXIMIZE_FILL | max); - else + else e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | max); } else if (v == 0) @@ -667,15 +667,15 @@ e_border_unshade(bd, E_DIRECTION_UP); else { - if (!strcmp(params, "up")) + if (!strcmp(params, "up")) e_border_unshade(bd, E_DIRECTION_UP); - else if (!strcmp(params, "down")) + else if (!strcmp(params, "down")) e_border_unshade(bd, E_DIRECTION_DOWN); - else if (!strcmp(params, "left")) + else if (!strcmp(params, "left")) e_border_unshade(bd, E_DIRECTION_LEFT); - else if (!strcmp(params, "right")) + else if (!strcmp(params, "right")) e_border_unshade(bd, E_DIRECTION_RIGHT); - else + else e_border_unshade(bd, E_DIRECTION_UP); } } @@ -685,15 +685,15 @@ e_border_shade(bd, E_DIRECTION_UP); else { - if (!strcmp(params, "up")) + if (!strcmp(params, "up")) e_border_shade(bd, E_DIRECTION_UP); - else if (!strcmp(params, "down")) + else if (!strcmp(params, "down")) e_border_shade(bd, E_DIRECTION_DOWN); - else if (!strcmp(params, "left")) + else if (!strcmp(params, "left")) e_border_shade(bd, E_DIRECTION_LEFT); - else if (!strcmp(params, "right")) + else if (!strcmp(params, "right")) e_border_shade(bd, E_DIRECTION_RIGHT); - else + else e_border_shade(bd, E_DIRECTION_UP); } } @@ -724,24 +724,24 @@ { if (v == 1) { - if (!strcmp(buf, "up")) + if (!strcmp(buf, "up")) e_border_shade(bd, E_DIRECTION_UP); - else if (!strcmp(buf, "down")) + else if (!strcmp(buf, "down")) e_border_shade(bd, E_DIRECTION_DOWN); - else if (!strcmp(buf, "left")) + else if (!strcmp(buf, "left")) e_border_shade(bd, E_DIRECTION_LEFT); - else if (!strcmp(buf, "right")) + else if (!strcmp(buf, "right")) e_border_shade(bd, E_DIRECTION_RIGHT); } else if (v == 0) { - if (!strcmp(buf, "up")) + if (!strcmp(buf, "up")) e_border_unshade(bd, E_DIRECTION_UP); - else if (!strcmp(buf, "down")) + else if (!strcmp(buf, "down")) e_border_unshade(bd, E_DIRECTION_DOWN); - else if (!strcmp(buf, "left")) + else if (!strcmp(buf, "left")) e_border_unshade(bd, E_DIRECTION_LEFT); - else if (!strcmp(buf, "right")) + else if (!strcmp(buf, "right")) e_border_unshade(bd, E_DIRECTION_RIGHT); } } @@ -752,7 +752,7 @@ /***************************************************************************/ ACT_FN_GO(window_borderless_toggle, __UNUSED__) { - if ((!obj) || (obj->type != E_BORDER_TYPE)) + if ((!obj) || (obj->type != E_BORDER_TYPE)) obj = E_OBJECT(e_border_focused_get()); if (!obj) return; if (!((E_Border *)obj)->lock_border) @@ -760,10 +760,7 @@ E_Border *bd; bd = (E_Border *)obj; - if (bd->borderless) - bd->borderless = 0; - else - bd->borderless = 1; + bd->borderless = !bd->borderless; bd->client.border.changed = 1; bd->changed = 1; @@ -772,21 +769,21 @@ /***************************************************************************/ ACT_FN_GO(window_pinned_toggle, __UNUSED__) -{ - if ((!obj) || (obj->type != E_BORDER_TYPE)) - obj = E_OBJECT(e_border_focused_get()); - if (!obj) return; - if (!((E_Border *)obj)->lock_border) +{ + if ((!obj) || (obj->type != E_BORDER_TYPE)) + obj = E_OBJECT(e_border_focused_get()); + if (!obj) return; + if (!((E_Border *)obj)->lock_border) { - E_Border *bd; + E_Border *bd; bd = (E_Border *)obj; - if ((bd->client.netwm.state.stacking == E_STACKING_BELOW) && + if ((bd->client.netwm.state.stacking == E_STACKING_BELOW) && (bd->user_skip_winlist) && (bd->borderless)) e_border_pinned_set(bd, 0); else e_border_pinned_set(bd, 1); - } + } } /***************************************************************************/ @@ -911,7 +908,7 @@ obj = E_OBJECT(e_border_focused_get()); if (!obj) return; } - + if (params) { int dw, dh; @@ -1219,7 +1216,7 @@ E_Desk *current = NULL; E_Event_Pointer_Warp *wev; int x, y, offset = 25; - + if (!ev) return; // with flip on _e_zone_cb_edge_timer we don't have ev!!! zone = _e_actions_zone_get(obj); wev = E_NEW(E_Event_Pointer_Warp, 1); @@ -1309,7 +1306,7 @@ default: break; } - + current = e_desk_current_get(zone); if (current) ecore_event_add(E_EVENT_POINTER_WARP, wev, NULL, NULL); @@ -1390,7 +1387,7 @@ { int dx = 0, dy = 0; - if (sscanf(params, "%i %i", &dx, &dy) == 2) + if (sscanf(params, "%i %i", &dx, &dy) == 2) { DESK_ACTION_ALL(zone, e_zone_desk_flip_to(zone, dx, dy)); } @@ -1404,7 +1401,7 @@ { int dx = 0; - if (sscanf(params, "%i", &dx) == 1) + if (sscanf(params, "%i", &dx) == 1) { DESK_ACTION_ALL(zone, e_zone_desk_linear_flip_by(zone, dx)); } @@ -1418,7 +1415,7 @@ { int dx = 0; - if (sscanf(params, "%i", &dx) == 1) + if (sscanf(params, "%i", &dx) == 1) { DESK_ACTION_ALL(zone, e_zone_desk_linear_flip_to(zone, dx)); } @@ -1605,17 +1602,17 @@ static E_Menu * _e_actions_menu_find(const char *name) { - if (!strcmp(name, "main")) + if (!strcmp(name, "main")) return e_int_menus_main_new(); - else if (!strcmp(name, "favorites")) + else if (!strcmp(name, "favorites")) return e_int_menus_favorite_apps_new(); - else if (!strcmp(name, "all")) + else if (!strcmp(name, "all")) return e_int_menus_all_apps_new(); - else if (!strcmp(name, "clients")) + else if (!strcmp(name, "clients")) return e_int_menus_clients_new(); - else if (!strcmp(name, "lost_clients")) + else if (!strcmp(name, "lost_clients")) return e_int_menus_lost_clients_new(); - else if (!strcmp(name, "configuration")) + else if (!strcmp(name, "configuration")) return e_int_menus_config_new(); return NULL; } @@ -1643,7 +1640,7 @@ ecore_x_pointer_xy_get(zone->container->win, &x, &y); e_menu_post_deactivate_callback_set(m, _e_actions_cb_menu_end, NULL); e_menu_activate_mouse(m, zone, x, y, 1, 1, - E_MENU_POP_DIRECTION_DOWN, + E_MENU_POP_DIRECTION_DOWN, ecore_x_current_time_get()); } } @@ -2207,7 +2204,7 @@ bd = (E_Border *)obj; if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) || - (bd->fullscreen) || + (bd->fullscreen) || ((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))) return; @@ -2225,7 +2222,7 @@ bd = (E_Border *)obj; if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) || - (bd->fullscreen) || + (bd->fullscreen) || ((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))) return; e_pointer_type_pop(bd->pointer, bd, params); @@ -2278,7 +2275,7 @@ { Eina_List *l; E_Shelf *es; - + if (params) { for (; *params != '\0'; params++) @@ -2338,7 +2335,7 @@ const char *keyname; E_Object *obj; Ecore_Timer *timer; - struct + struct { const char *action, *params; } def, delayed; @@ -2484,9 +2481,9 @@ Eina_List *l; Delayed_Action *da; - EINA_LIST_FOREACH(_delayed_actions, l, da) + EINA_LIST_FOREACH(_delayed_actions, l, da) { - if ((da->obj == obj) && (!da->mouse) && + if ((da->obj == obj) && (!da->mouse) && (!strcmp(da->keyname, ev->keyname))) { _delayed_action_do(da); @@ -2591,7 +2588,7 @@ /* window_resize */ ACT_GO(window_resize); - e_action_predef_name_set(N_("Window : Actions"), N_("Resize"), + e_action_predef_name_set(N_("Window : Actions"), N_("Resize"), "window_resize", NULL, NULL, 0); ACT_GO_MOUSE(window_resize); @@ -2602,7 +2599,7 @@ /* window_menu */ ACT_GO(window_menu); - e_action_predef_name_set(N_("Menu"), N_("Window Menu"), + e_action_predef_name_set(N_("Menu"), N_("Window Menu"), "window_menu", NULL, NULL, 0); ACT_GO_MOUSE(window_menu); @@ -2610,34 +2607,34 @@ /* window_raise */ ACT_GO(window_raise); - e_action_predef_name_set(N_("Window : Actions"), N_("Raise"), + e_action_predef_name_set(N_("Window : Actions"), N_("Raise"), "window_raise", NULL, NULL, 0); /* window_lower */ ACT_GO(window_lower); - e_action_predef_name_set(N_("Window : Actions"), N_("Lower"), + e_action_predef_name_set(N_("Window : Actions"), N_("Lower"), "window_lower", NULL, NULL, 0); /* window_close */ ACT_GO(window_close); - e_action_predef_name_set(N_("Window : Actions"), N_("Close"), + e_action_predef_name_set(N_("Window : Actions"), N_("Close"), "window_close", NULL, NULL, 0); /* window_kill */ ACT_GO(window_kill); - e_action_predef_name_set(N_("Window : Actions"), N_("Kill"), + e_action_predef_name_set(N_("Window : Actions"), N_("Kill"), "window_kill", NULL, NULL, 0); /* window_sticky_toggle */ ACT_GO(window_sticky_toggle); - e_action_predef_name_set(N_("Window : State"), N_("Sticky Mode Toggle"), + e_action_predef_name_set(N_("Window : State"), N_("Sticky Mode Toggle"), "window_sticky_toggle", NULL, NULL, 0); ACT_GO(window_sticky); - + /* window_iconic_toggle */ ACT_GO(window_iconic_toggle); - e_action_predef_name_set(N_("Window : State"), N_("Iconic Mode Toggle"), + e_action_predef_name_set(N_("Window : State"), N_("Iconic Mode Toggle"), "window_iconic_toggle", NULL, NULL, 0); ACT_GO(window_iconic); @@ -2651,28 +2648,28 @@ /* window_maximized_toggle */ ACT_GO(window_maximized_toggle); - e_action_predef_name_set(N_("Window : State"), N_("Maximize"), + e_action_predef_name_set(N_("Window : State"), N_("Maximize"), "window_maximized_toggle", NULL, NULL, 0); e_action_predef_name_set(N_("Window : State"), N_("Maximize Vertically"), - "window_maximized_toggle", "default vertical", + "window_maximized_toggle", "default vertical", NULL, 0); e_action_predef_name_set(N_("Window : State"), N_("Maximize Horizontally"), - "window_maximized_toggle", "default horizontal", + "window_maximized_toggle", "default horizontal", NULL, 0); e_action_predef_name_set(N_("Window : State"), N_("Maximize Fullscreen"), "window_maximized_toggle", "fullscreen", NULL, 0); - e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Smart\""), + e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Smart\""), "window_maximized_toggle", "smart", NULL, 0); e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Expand\""), "window_maximized_toggle", "expand", NULL, 0); - e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Fill\""), + e_action_predef_name_set(N_("Window : State"), N_("Maximize Mode \"Fill\""), "window_maximized_toggle", "fill", NULL, 0); ACT_GO(window_maximized); /* window_shaded_toggle */ ACT_GO(window_shaded_toggle); - e_action_predef_name_set(N_("Window : State"), N_("Shade Up Mode Toggle"), + e_action_predef_name_set(N_("Window : State"), N_("Shade Up Mode Toggle"), "window_shaded_toggle", "up", NULL, 0); e_action_predef_name_set(N_("Window : State"), N_("Shade Down Mode Toggle"), "window_shaded_toggle", "down", NULL, 0); @@ -2680,7 +2677,7 @@ "window_shaded_toggle", "left", NULL, 0); e_action_predef_name_set(N_("Window : State"), N_("Shade Right Mode Toggle"), "window_shaded_toggle", "right", NULL, 0); - e_action_predef_name_set(N_("Window : State"), N_("Shade Mode Toggle"), + e_action_predef_name_set(N_("Window : State"), N_("Shade Mode Toggle"), "window_shaded_toggle", NULL, NULL, 0); ACT_GO(window_shaded); @@ -2697,21 +2694,21 @@ /* desk_flip_by */ ACT_GO(desk_flip_by); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Left"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Left"), "desk_flip_by", "-1 0", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Right"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Right"), "desk_flip_by", "1 0", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Up"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Up"), "desk_flip_by", "0 -1", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Down"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Down"), "desk_flip_by", "0 1", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop By..."), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop By..."), "desk_flip_by", NULL, "syntax: X-offset Y-offset, example: -1 0", 1); /* desk_deskshow_toggle */ ACT_GO(desk_deskshow_toggle); - e_action_predef_name_set(N_("Desktop"), N_("Show The Desktop"), + e_action_predef_name_set(N_("Desktop"), N_("Show The Desktop"), "desk_deskshow_toggle", NULL, NULL, 0); /* shelf_show */ @@ -2722,184 +2719,184 @@ /* desk_linear_flip_to */ ACT_GO(desk_flip_to); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop To..."), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop To..."), "desk_flip_to", NULL, "syntax: X Y, example: 1 2", 1); /* desk_linear_flip_by */ ACT_GO(desk_linear_flip_by); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly..."), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly..."), "desk_linear_flip_by", NULL, "syntax: N-offset, example: -2", 1); /* desk_linear_flip_to */ ACT_GO(desk_linear_flip_to); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 0"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 0"), "desk_linear_flip_to", "0", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 1"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 1"), "desk_linear_flip_to", "1", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 2"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 2"), "desk_linear_flip_to", "2", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 3"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 3"), "desk_linear_flip_to", "3", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 4"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 4"), "desk_linear_flip_to", "4", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 5"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 5"), "desk_linear_flip_to", "5", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 6"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 6"), "desk_linear_flip_to", "6", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 7"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 7"), "desk_linear_flip_to", "7", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 8"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 8"), "desk_linear_flip_to", "8", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 9"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 9"), "desk_linear_flip_to", "9", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 10"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 10"), "desk_linear_flip_to", "10", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 11"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 11"), "desk_linear_flip_to", "11", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop..."), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop..."), "desk_linear_flip_to", NULL, "syntax: N, example: 1", 1); /* desk_flip_by_all */ ACT_GO(desk_flip_by_all); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Left (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Left (All Screens)"), "desk_flip_by_all", "-1 0", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Right (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Right (All Screens)"), "desk_flip_by_all", "1 0", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Up (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Up (All Screens)"), "desk_flip_by_all", "0 -1", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Down (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Down (All Screens)"), "desk_flip_by_all", "0 1", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop By... (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop By... (All Screens)"), "desk_flip_by_all", NULL, "syntax: X-offset Y-offset, example: -1 0", 1); /* desk_flip_to_all */ ACT_GO(desk_flip_to_all); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop To... (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop To... (All Screens)"), "desk_flip_to_all", NULL, "syntax: X Y, example: 1 2", 1); /* desk_linear_flip_by_all */ ACT_GO(desk_linear_flip_by_all); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly... (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly... (All Screens)"), "desk_linear_flip_by_all", NULL, "syntax: N-offset, example: -2", 1); /* desk_flip_in_direction */ ACT_GO_EDGE(desk_flip_in_direction); - e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop In Direction..."), + e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop In Direction..."), "desk_flip_in_direction", NULL, "syntax: N-pixel-offset, example: 25", 1); /* desk_linear_flip_to_all */ ACT_GO(desk_linear_flip_to_all); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 0 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 0 (All Screens)"), "desk_linear_flip_to_all", "0", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 1 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 1 (All Screens)"), "desk_linear_flip_to_all", "1", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 2 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 2 (All Screens)"), "desk_linear_flip_to_all", "2", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 3 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 3 (All Screens)"), "desk_linear_flip_to_all", "3", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 4 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 4 (All Screens)"), "desk_linear_flip_to_all", "4", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 5 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 5 (All Screens)"), "desk_linear_flip_to_all", "5", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 6 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 6 (All Screens)"), "desk_linear_flip_to_all", "6", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 7 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 7 (All Screens)"), "desk_linear_flip_to_all", "7", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 8 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 8 (All Screens)"), "desk_linear_flip_to_all", "8", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 9 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 9 (All Screens)"), "desk_linear_flip_to_all", "9", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 10 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 10 (All Screens)"), "desk_linear_flip_to_all", "10", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 11 (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop 11 (All Screens)"), "desk_linear_flip_to_all", "11", NULL, 0); - e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop... (All Screens)"), + e_action_predef_name_set(N_("Desktop"), N_("Switch To Desktop... (All Screens)"), "desk_linear_flip_to_all", NULL, "syntax: N, example: 1", 1); /* screen_send_to */ ACT_GO(screen_send_to); - e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 0"), + e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 0"), "screen_send_to", "0", NULL, 0); - e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 1"), + e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 1"), "screen_send_to", "1", NULL, 0); - e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen..."), + e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen..."), "screen_send_to", NULL, "syntax: N, example: 0", 1); /* screen_send_by */ ACT_GO(screen_send_by); - e_action_predef_name_set(N_("Screen"), N_("Send Mouse Forward 1 Screen"), + e_action_predef_name_set(N_("Screen"), N_("Send Mouse Forward 1 Screen"), "screen_send_by", "1", NULL, 0); - e_action_predef_name_set(N_("Screen"), N_("Send Mouse Back 1 Screen"), + e_action_predef_name_set(N_("Screen"), N_("Send Mouse Back 1 Screen"), "screen_send_by", "-1", NULL, 0); - e_action_predef_name_set(N_("Screen"), N_("Send Mouse Forward/Back Screens..."), - "screen_send_by", NULL, + e_action_predef_name_set(N_("Screen"), N_("Send Mouse Forward/Back Screens..."), + "screen_send_by", NULL, "syntax: N-offset, example: -2", 1); /* window_move_to_center */ ACT_GO(window_move_to_center); - e_action_predef_name_set(N_("Window : Actions"), N_("Move To Center"), + e_action_predef_name_set(N_("Window : Actions"), N_("Move To Center"), "window_move_to_center", NULL, NULL, 0); /* window_move_to */ ACT_GO(window_move_to); - e_action_predef_name_set(N_("Window : Actions"), N_("Move To..."), + e_action_predef_name_set(N_("Window : Actions"), N_("Move To..."), "window_move_to", NULL, "syntax: [+,-]X [+,-]Y or * [+,-]Y or [+,-]X *, example: -1 +1", 1); /* window_move_by */ ACT_GO(window_move_by); - e_action_predef_name_set(N_("Window : Actions"), N_("Move By..."), + e_action_predef_name_set(N_("Window : Actions"), N_("Move By..."), "window_move_by", NULL, "syntax: X-offset Y-offset, example: -1 0", 1); /* window_resize_by */ ACT_GO(window_resize_by); - e_action_predef_name_set(N_("Window : Actions"), N_("Resize By..."), + e_action_predef_name_set(N_("Window : Actions"), N_("Resize By..."), "window_resize_by", NULL, "syntax: W H, example: 100 150", 1); /* window_push */ ACT_GO(window_push); - e_action_predef_name_set(N_("Window : Actions"), N_("Push in Direction..."), + e_action_predef_name_set(N_("Window : Actions"), N_("Push in Direction..."), "window_push", NULL, "syntax: direction, example: up, down, left, right, up-left, up-right, down-left, down-right", 1); /* window_drag_icon */ ACT_GO(window_drag_icon); - e_action_predef_name_set(N_("Window : Actions"), N_("Drag Icon..."), + e_action_predef_name_set(N_("Window : Actions"), N_("Drag Icon..."), "window_drag_icon", NULL, NULL, 0); /* window_desk_move_by */ ACT_GO(window_desk_move_by); - e_action_predef_name_set(N_("Window : Moving"), N_("To Next Desktop"), + e_action_predef_name_set(N_("Window : Moving"), N_("To Next Desktop"), "window_desk_move_by", "1 0", NULL, 0); - e_action_predef_name_set(N_("Window : Moving"), N_("To Previous Desktop"), + e_action_predef_name_set(N_("Window : Moving"), N_("To Previous Desktop"), "window_desk_move_by", "-1 0", NULL, 0); - e_action_predef_name_set(N_("Window : Moving"), N_("By Desktop #..."), + e_action_predef_name_set(N_("Window : Moving"), N_("By Desktop #..."), "window_desk_move_by", NULL, "syntax: X-offset Y-offset, example: -2 2", 1); /* window_desk_move_to */ ACT_GO(window_desk_move_to); - e_action_predef_name_set(N_("Window : Moving"), N_("To Desktop..."), + e_action_predef_name_set(N_("Window : Moving"), N_("To Desktop..."), "window_desk_move_to", NULL, "syntax: X Y, example: 0 1", 1); /* menu_show */ ACT_GO(menu_show); - e_action_predef_name_set(N_("Menu"), N_("Show Main Menu"), + e_action_predef_name_set(N_("Menu"), N_("Show Main Menu"), "menu_show", "main", NULL, 0); - e_action_predef_name_set(N_("Menu"), N_("Show Favorites Menu"), "menu_show", + e_action_predef_name_set(N_("Menu"), N_("Show Favorites Menu"), "menu_show", "favorites", NULL, 0); - e_action_predef_name_set(N_("Menu"), N_("Show All Applications Menu"), + e_action_predef_name_set(N_("Menu"), N_("Show All Applications Menu"), "menu_show", "all", NULL, 0); - e_action_predef_name_set(N_("Menu"), N_("Show Clients Menu"), "menu_show", + e_action_predef_name_set(N_("Menu"), N_("Show Clients Menu"), "menu_show", "clients", NULL, 0); e_action_predef_name_set(N_("Menu"), N_("Show Menu..."), "menu_show", NULL, "syntax: MenuName, example: MyMenu", 1); @@ -2913,19 +2910,19 @@ /* app */ ACT_GO(app); - e_action_predef_name_set(N_("Launch"), N_("Application"), "app", NULL, + e_action_predef_name_set(N_("Launch"), N_("Application"), "app", NULL, "syntax: , example:", 1); ACT_GO(restart); - e_action_predef_name_set(N_("Enlightenment"), N_("Restart"), "restart", + e_action_predef_name_set(N_("Enlightenment"), N_("Restart"), "restart", NULL, NULL, 0); ACT_GO(exit); - e_action_predef_name_set(N_("Enlightenment"), N_("Exit"), "exit", + e_action_predef_name_set(N_("Enlightenment"), N_("Exit"), "exit", NULL, NULL, 0); ACT_GO(exit_now); - e_action_predef_name_set(N_("Enlightenment"), N_("Exit Now"), + e_action_predef_name_set(N_("Enlightenment"), N_("Exit Now"), "exit_now", NULL, NULL, 0); ACT_GO(mode_presentation_toggle); @@ -2939,7 +2936,7 @@ "mode_offline_toggle", NULL, NULL, 0); ACT_GO(logout); - e_action_predef_name_set(N_("System"), N_("Log Out"), "logout", + e_action_predef_name_set(N_("System"), N_("Log Out"), "logout", NULL, NULL, 0); ACT_GO(halt_now); @@ -2947,23 +2944,23 @@ "halt_now", NULL, NULL, 0); ACT_GO(halt); - e_action_predef_name_set(N_("System"), N_("Power Off"), "halt", + e_action_predef_name_set(N_("System"), N_("Power Off"), "halt", NULL, NULL, 0); ACT_GO(reboot); - e_action_predef_name_set(N_("System"), N_("Reboot"), "reboot", + e_action_predef_name_set(N_("System"), N_("Reboot"), "reboot", NULL, NULL, 0); ACT_GO(suspend_now); - e_action_predef_name_set(N_("System"), N_("Suspend Now"), "suspend_now", + e_action_predef_name_set(N_("System"), N_("Suspend Now"), "suspend_now", NULL, NULL, 0); ACT_GO(suspend); - e_action_predef_name_set(N_("System"), N_("Suspend"), "suspend", + e_action_predef_name_set(N_("System"), N_("Suspend"), "suspend", NULL, NULL, 0); ACT_GO(hibernate); - e_action_predef_name_set(N_("System"), N_("Hibernate"), "hibernate", + e_action_predef_name_set(N_("System"), N_("Hibernate"), "hibernate", NULL, NULL, 0); ACT_GO(pointer_resize_push); @@ -2971,28 +2968,28 @@ /* desk_lock */ ACT_GO(desk_lock); - e_action_predef_name_set(N_("Desktop"), N_("Lock"), "desk_lock", + e_action_predef_name_set(N_("Desktop"), N_("Lock"), "desk_lock", NULL, NULL, 0); /* cleanup_windows */ ACT_GO(cleanup_windows); - e_action_predef_name_set(N_("Desktop"), N_("Cleanup Windows"), + e_action_predef_name_set(N_("Desktop"), N_("Cleanup Windows"), "cleanup_windows", NULL, NULL, 0); /* delayed_action */ ACT_GO_KEY(delayed_action); - e_action_predef_name_set(N_("Generic : Actions"), N_("Delayed Action"), + e_action_predef_name_set(N_("Generic : Actions"), N_("Delayed Action"), "delayed_action", NULL, "[0.0 exec xterm] [0.3 exec xev]", 1); ACT_GO_MOUSE(delayed_action); ACT_END_KEY(delayed_action); ACT_END_MOUSE(delayed_action); ACT_GO_ACPI(dim_screen); - e_action_predef_name_set(N_("Acpi"), N_("Dim Screen"), "dim_screen", + e_action_predef_name_set(N_("Acpi"), N_("Dim Screen"), "dim_screen", NULL, NULL, 0); ACT_GO_ACPI(undim_screen); - e_action_predef_name_set(N_("Acpi"), N_("Undim Screen"), "undim_screen", + e_action_predef_name_set(N_("Acpi"), N_("Undim Screen"), "undim_screen", NULL, NULL, 0); return 1; @@ -3154,11 +3151,11 @@ if (actd->act_params) eina_stringshare_del(actd->act_params); if (actd->param_example) eina_stringshare_del(actd->param_example); - E_FREE(actd); + E_FREE(actd); - if (!eina_list_count(actg->acts)) - { - action_groups = eina_list_remove(action_groups, actg); + if (!eina_list_count(actg->acts)) + { + action_groups = eina_list_remove(action_groups, actg); if (actg->act_grp) eina_stringshare_del(actg->act_grp); E_FREE(actg); } @@ -3218,24 +3215,24 @@ ret = sscanf(params, "%20s %20s", s1, s2); if (ret == 2) { - if (!strcmp(s2, "horizontal")) + if (!strcmp(s2, "horizontal")) max = E_MAXIMIZE_HORIZONTAL; - else if (!strcmp(s2, "vertical")) + else if (!strcmp(s2, "vertical")) max = E_MAXIMIZE_VERTICAL; - else + else max = E_MAXIMIZE_BOTH; } if (ret >= 1) { - if (!strcmp(s1, "fullscreen")) + if (!strcmp(s1, "fullscreen")) max |= E_MAXIMIZE_FULLSCREEN; - else if (!strcmp(s1, "smart")) + else if (!strcmp(s1, "smart")) max |= E_MAXIMIZE_SMART; - else if (!strcmp(s1, "expand")) + else if (!strcmp(s1, "expand")) max |= E_MAXIMIZE_EXPAND; - else if (!strcmp(s1, "fill")) + else if (!strcmp(s1, "fill")) max |= E_MAXIMIZE_FILL; - else + else max |= (e_config->maximize_policy & E_MAXIMIZE_TYPE); } else |
From: Enlightenment S. <no-...@en...> - 2011-02-13 21:23:35
|
Log: e: add window_border_set as possible action Author: billiob Date: 2011-02-13 13:23:29 -0800 (Sun, 13 Feb 2011) New Revision: 56994 Trac: http://trac.enlightenment.org/e/changeset/56994 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-13 20:34:59 UTC (rev 56993) +++ trunk/e/src/bin/e_actions.c 2011-02-13 21:23:29 UTC (rev 56994) @@ -90,7 +90,7 @@ static E_Maximize _e_actions_maximize_parse(const char *maximize); static int _action_groups_sort_cb(const void *d1, const void *d2); -/* to save writing this in N places - the sctions are defined here */ +/* to save writing this in N places - the sections are defined here */ /***************************************************************************/ ACT_FN_GO(window_move, __UNUSED__) { @@ -767,6 +767,28 @@ } } +/***************************************************************************/ +ACT_FN_GO(window_border_set, __UNUSED__) +{ + if ((!obj) || (obj->type != E_BORDER_TYPE)) + obj = E_OBJECT(e_border_focused_get()); + if (!obj) return; + if (!((E_Border *)obj)->lock_border) + { + E_Border *bd; + + bd = (E_Border *)obj; + if (bd && params) + { + if (bd->bordername) + eina_stringshare_del(bd->bordername); + bd->bordername = eina_stringshare_add(params); + bd->client.border.changed = 1; + bd->changed = 1; + } + } +} + /***************************************************************************/ ACT_FN_GO(window_pinned_toggle, __UNUSED__) { @@ -2687,6 +2709,12 @@ e_action_predef_name_set(N_("Window : State"), N_("Toggle Borderless State"), "window_borderless_toggle", NULL, NULL, 0); + /* window_border_set */ + ACT_GO(window_border_set); + e_action_predef_name_set(N_("Window : State"), N_("Set Border"), + "window_border_set", NULL, + "syntax: BorderName, example: pixel", 1); + /* window_pinned_toggle */ ACT_GO(window_pinned_toggle); e_action_predef_name_set(N_("Window : State"), N_("Toggle Pinned State"), |
From: Enlightenment S. <no-...@en...> - 2011-02-14 21:35:54
|
Log: e: add window_border_cycle to e_actions Author: billiob Date: 2011-02-14 13:35:48 -0800 (Mon, 14 Feb 2011) New Revision: 57040 Trac: http://trac.enlightenment.org/e/changeset/57040 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-14 21:16:13 UTC (rev 57039) +++ trunk/e/src/bin/e_actions.c 2011-02-14 21:35:48 UTC (rev 57040) @@ -789,6 +789,62 @@ } } +/***************************************************************************/ +ACT_FN_GO(window_border_cycle, __UNUSED__) +{ + if ((!obj) || (obj->type != E_BORDER_TYPE)) + obj = E_OBJECT(e_border_focused_get()); + if (!obj) return; + if (!((E_Border *)obj)->lock_border) + { + E_Border *bd; + + bd = (E_Border *)obj; + if (bd && params) + { + const char *space; + + while (*params == ' ') + params++; + + if (bd->bordername) + { + const char *bdname = params; + + while (bdname && (space = strchr(bdname, ' '))) + { + if (strncmp(bd->bordername, bdname, space - bdname) == 0) { + bdname = space + 1; + while (*bdname == ' ') + bdname++; + space = strchr(bdname, ' '); + if (space) + bd->bordername = eina_stringshare_add_length( + bdname, space - bdname); + else + bd->bordername = eina_stringshare_add(bdname); + bd->client.border.changed = 1; + bd->changed = 1; + return; + } + bdname = space + 1; + while (*bdname == ' ') + bdname++; + } + eina_stringshare_del(bd->bordername); + } + + space = strchr(params, ' '); + if (space) + bd->bordername = eina_stringshare_add_length(params, space - params); + else + bd->bordername = eina_stringshare_add(params); + bd->client.border.changed = 1; + bd->changed = 1; + } + } +} + /***************************************************************************/ ACT_FN_GO(window_pinned_toggle, __UNUSED__) { @@ -2715,6 +2771,12 @@ "window_border_set", NULL, "syntax: BorderName, example: pixel", 1); + /* window_border_cycle */ + ACT_GO(window_border_cycle); + e_action_predef_name_set(N_("Window : State"), N_("Cycle between Borders"), + "window_border_cycle", NULL, + "syntax: BorderNames, example: default pixel", 1); + /* window_pinned_toggle */ ACT_GO(window_pinned_toggle); e_action_predef_name_set(N_("Window : State"), N_("Toggle Pinned State"), |
From: Enlightenment S. <no-...@en...> - 2011-02-15 18:16:01
|
Log: e: use stringshare_replace in window_border_cycle Author: billiob Date: 2011-02-15 10:15:54 -0800 (Tue, 15 Feb 2011) New Revision: 57059 Trac: http://trac.enlightenment.org/e/changeset/57059 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-15 17:26:13 UTC (rev 57058) +++ trunk/e/src/bin/e_actions.c 2011-02-15 18:15:54 UTC (rev 57059) @@ -819,10 +819,11 @@ bdname++; space = strchr(bdname, ' '); if (space) - bd->bordername = eina_stringshare_add_length( + eina_stringshare_replace_length( + &bd->bordername, bdname, space - bdname); else - bd->bordername = eina_stringshare_add(bdname); + eina_stringshare_replace(&bd->bordername, bdname); bd->client.border.changed = 1; bd->changed = 1; return; @@ -831,7 +832,15 @@ while (*bdname == ' ') bdname++; } - eina_stringshare_del(bd->bordername); + space = strchr(params, ' '); + if (space) + eina_stringshare_replace_length(&bd->bordername, + params, space - params); + else + eina_stringshare_replace(&bd->bordername, params); + bd->client.border.changed = 1; + bd->changed = 1; + return; } space = strchr(params, ' '); |
From: Enlightenment S. <no-...@en...> - 2011-02-16 09:07:52
|
Log: e: use stringshare_replace in window_border_set Author: billiob Date: 2011-02-16 01:07:44 -0800 (Wed, 16 Feb 2011) New Revision: 57077 Trac: http://trac.enlightenment.org/e/changeset/57077 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-16 05:44:01 UTC (rev 57076) +++ trunk/e/src/bin/e_actions.c 2011-02-16 09:07:44 UTC (rev 57077) @@ -781,8 +781,9 @@ if (bd && params) { if (bd->bordername) - eina_stringshare_del(bd->bordername); - bd->bordername = eina_stringshare_add(params); + eina_stringshare_replace(&bd->bordername, params); + else + bd->bordername = eina_stringshare_add(params); bd->client.border.changed = 1; bd->changed = 1; } |
From: Enlightenment S. <no-...@en...> - 2011-02-16 09:31:51
|
Log: e: just use eina_stringshare_replace Author: billiob Date: 2011-02-16 01:31:44 -0800 (Wed, 16 Feb 2011) New Revision: 57079 Trac: http://trac.enlightenment.org/e/changeset/57079 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-16 09:31:01 UTC (rev 57078) +++ trunk/e/src/bin/e_actions.c 2011-02-16 09:31:44 UTC (rev 57079) @@ -780,10 +780,7 @@ bd = (E_Border *)obj; if (bd && params) { - if (bd->bordername) - eina_stringshare_replace(&bd->bordername, params); - else - bd->bordername = eina_stringshare_add(params); + eina_stringshare_replace(&bd->bordername, params); bd->client.border.changed = 1; bd->changed = 1; } @@ -833,22 +830,14 @@ while (*bdname == ' ') bdname++; } - space = strchr(params, ' '); - if (space) - eina_stringshare_replace_length(&bd->bordername, - params, space - params); - else - eina_stringshare_replace(&bd->bordername, params); - bd->client.border.changed = 1; - bd->changed = 1; - return; } space = strchr(params, ' '); if (space) - bd->bordername = eina_stringshare_add_length(params, space - params); + eina_stringshare_replace_length(&bd->bordername, + params, space - params); else - bd->bordername = eina_stringshare_add(params); + eina_stringshare_replace(&bd->bordername, params); bd->client.border.changed = 1; bd->changed = 1; } |
From: Enlightenment S. <no-...@en...> - 2011-02-17 09:54:50
|
Log: e: fix indent Author: billiob Date: 2011-02-17 01:54:43 -0800 (Thu, 17 Feb 2011) New Revision: 57118 Trac: http://trac.enlightenment.org/e/changeset/57118 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2011-02-17 09:21:25 UTC (rev 57117) +++ trunk/e/src/bin/e_actions.c 2011-02-17 09:54:43 UTC (rev 57118) @@ -811,21 +811,22 @@ while (bdname && (space = strchr(bdname, ' '))) { - if (strncmp(bd->bordername, bdname, space - bdname) == 0) { + if (strncmp(bd->bordername, bdname, space - bdname) == 0) + { bdname = space + 1; while (*bdname == ' ') bdname++; space = strchr(bdname, ' '); if (space) - eina_stringshare_replace_length( - &bd->bordername, - bdname, space - bdname); + eina_stringshare_replace_length( + &bd->bordername, + bdname, space - bdname); else - eina_stringshare_replace(&bd->bordername, bdname); + eina_stringshare_replace(&bd->bordername, bdname); bd->client.border.changed = 1; bd->changed = 1; return; - } + } bdname = space + 1; while (*bdname == ' ') bdname++; @@ -834,10 +835,10 @@ space = strchr(params, ' '); if (space) - eina_stringshare_replace_length(&bd->bordername, - params, space - params); + eina_stringshare_replace_length(&bd->bordername, + params, space - params); else - eina_stringshare_replace(&bd->bordername, params); + eina_stringshare_replace(&bd->bordername, params); bd->client.border.changed = 1; bd->changed = 1; } |
From: Enlightenment S. <no-...@en...> - 2011-02-19 12:50:10
|
Log: e: use "while" and not an ugly "for" Author: billiob Date: 2011-02-19 04:50:02 -0800 (Sat, 19 Feb 2011) New Revision: 57160 Trac: http://trac.enlightenment.org/e/changeset/57160 Modified: trunk/e/src/bin/e_alert.c Modified: trunk/e/src/bin/e_alert.c =================================================================== --- trunk/e/src/bin/e_alert.c 2011-02-19 12:37:12 UTC (rev 57159) +++ trunk/e/src/bin/e_alert.c 2011-02-19 12:50:02 UTC (rev 57160) @@ -145,7 +145,7 @@ XSync(dd, False); button = 0; - for (; button == 0;) + while (button == 0) { XNextEvent(dd, &ev); switch (ev.type) |
From: Enlightenment S. <no-...@en...> - 2011-03-02 22:09:14
|
Log: e: fix bd->changes.border this way it's possible to know whether the border has changed when hooking on E_BORDER_HOOK_EVAL_POST_BORDER_ASSIGN Author: billiob Date: 2011-03-02 14:09:05 -0800 (Wed, 02 Mar 2011) New Revision: 57478 Trac: http://trac.enlightenment.org/e/changeset/57478 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2011-03-02 22:07:01 UTC (rev 57477) +++ trunk/e/src/bin/e_border.c 2011-03-02 22:09:05 UTC (rev 57478) @@ -6060,6 +6060,8 @@ _e_border_hook_call(E_BORDER_HOOK_EVAL_PRE_FETCH, bd); + bd->changes.border = 0; + /* fetch any info queued to be fetched */ if (bd->client.icccm.fetch.client_leader) { @@ -6712,6 +6714,7 @@ if ((!bd->client.border.name) || (strcmp(bd->client.border.name, bordername))) { + bd->changes.border = 1; if (bd->client.border.name) eina_stringshare_del(bd->client.border.name); bd->client.border.name = eina_stringshare_add(bordername); @@ -7563,7 +7566,6 @@ bd->changed = 0; bd->changes.stack = 0; bd->changes.prop = 0; - bd->changes.border = 0; if ((bd->take_focus) || (bd->want_focus)) { |
From: Enlightenment S. <no-...@en...> - 2011-03-03 22:05:20
|
Log: e: fix variable scope + indenting Author: billiob Date: 2011-03-03 14:05:12 -0800 (Thu, 03 Mar 2011) New Revision: 57506 Trac: http://trac.enlightenment.org/e/changeset/57506 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2011-03-03 21:12:45 UTC (rev 57505) +++ trunk/e/src/bin/e_border.c 2011-03-03 22:05:12 UTC (rev 57506) @@ -6673,11 +6673,7 @@ if ((bd->client.border.changed) && (!bd->shaded) && (!(((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN)))) { - Evas_Object *o; - char buf[PATH_MAX]; const char *bordername; - Evas_Coord cx, cy, cw, ch; - int l, r, t, b, ok; if (bd->fullscreen) bordername = "borderless"; @@ -6714,6 +6710,11 @@ if ((!bd->client.border.name) || (strcmp(bd->client.border.name, bordername))) { + Evas_Object *o; + char buf[PATH_MAX]; + Evas_Coord cx, cy, cw, ch; + int l, r, t, b, ok; + bd->changes.border = 1; if (bd->client.border.name) eina_stringshare_del(bd->client.border.name); @@ -6740,41 +6741,41 @@ "e/widgets/border/default/border"); if (ok) { - /* Reset default border style to default */ - if (e_config->theme_default_border_style) - eina_stringshare_del(e_config->theme_default_border_style); - e_config->theme_default_border_style = eina_stringshare_add("default"); - e_config_save_queue(); + /* Reset default border style to default */ + if (e_config->theme_default_border_style) + eina_stringshare_del(e_config->theme_default_border_style); + e_config->theme_default_border_style = eina_stringshare_add("default"); + e_config_save_queue(); } } - + bd->shaped = 0; if (ok) { const char *shape_option, *argb_option; - int use_argb = 0; + int use_argb = 0; - bd->bg_object = o; - - if (!bd->client.argb) - { - argb_option = edje_object_data_get(o, "argb"); - if ((argb_option) && (!strcmp(argb_option, "1"))) - use_argb = 1; + bd->bg_object = o; - if (use_argb != bd->argb) - _e_border_frame_replace(bd, use_argb); + if (!bd->client.argb) + { + argb_option = edje_object_data_get(o, "argb"); + if ((argb_option) && (!strcmp(argb_option, "1"))) + use_argb = 1; - o = bd->bg_object; - } - - if (!bd->argb) - { - shape_option = edje_object_data_get(o, "shaped"); - if ((shape_option) && (!strcmp(shape_option, "1"))) - bd->shaped = 1; - } - + if (use_argb != bd->argb) + _e_border_frame_replace(bd, use_argb); + + o = bd->bg_object; + } + + if (!bd->argb) + { + shape_option = edje_object_data_get(o, "shaped"); + if ((shape_option) && (!strcmp(shape_option, "1"))) + bd->shaped = 1; + } + if (bd->client.netwm.name) edje_object_part_text_set(o, "e.text.title", bd->client.netwm.name); @@ -8611,4 +8612,4 @@ else ecore_x_composite_window_events_enable(bd->win); } - +/*vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0*/ |
From: Enlightenment S. <no-...@en...> - 2011-03-20 19:23:09
|
Log: e: add vim-like bindings to move/resize windows Author: billiob Date: 2011-03-20 12:22:59 -0700 (Sun, 20 Mar 2011) New Revision: 57920 Trac: http://trac.enlightenment.org/e/changeset/57920 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2011-03-20 17:50:08 UTC (rev 57919) +++ trunk/e/src/bin/e_border.c 2011-03-20 19:22:59 UTC (rev 57920) @@ -3141,13 +3141,13 @@ x = action_border->x; y = action_border->y; - if (strcmp(ev->key, "Up") == 0) + if ((strcmp(ev->key, "Up") == 0) || (strcmp(ev->key, "k") == 0)) y -= _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dy); - else if (strcmp(ev->key, "Down") == 0) + else if ((strcmp(ev->key, "Down") == 0) || (strcmp(ev->key, "j") == 0)) y += _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dy); - else if (strcmp(ev->key, "Left") == 0) + else if ((strcmp(ev->key, "Left") == 0) || (strcmp(ev->key, "h") == 0)) x -= _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dx); - else if (strcmp(ev->key, "Right") == 0) + else if ((strcmp(ev->key, "Right") == 0) || (strcmp(ev->key, "l") == 0)) x += _e_border_key_down_modifier_apply(ev->modifiers, e_config->border_keyboard.move.dx); else if (strcmp(ev->key, "Return") == 0) goto stop; @@ -3266,13 +3266,13 @@ if (dy < action_border->client.icccm.step_h) dy = action_border->client.icccm.step_h; - if (strcmp(ev->key, "Up") == 0) + if ((strcmp(ev->key, "Up") == 0) || (strcmp(ev->key, "k") == 0)) h -= dy; - else if (strcmp(ev->key, "Down") == 0) + else if ((strcmp(ev->key, "Down") == 0) || (strcmp(ev->key, "j") == 0)) h += dy; - else if (strcmp(ev->key, "Left") == 0) + else if ((strcmp(ev->key, "Left") == 0) || (strcmp(ev->key, "h") == 0)) w -= dx; - else if (strcmp(ev->key, "Right") == 0) + else if ((strcmp(ev->key, "Right") == 0) || (strcmp(ev->key, "l") == 0)) w += dx; else if (strcmp(ev->key, "Return") == 0) goto stop; |
From: Enlightenment S. <no-...@en...> - 2011-03-21 20:55:41
|
Log: e: changing the border on maximized window keeps it maximized Useful for vertical/horizontal maximization Author: billiob Date: 2011-03-21 13:55:34 -0700 (Mon, 21 Mar 2011) New Revision: 57944 Trac: http://trac.enlightenment.org/e/changeset/57944 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2011-03-21 20:33:29 UTC (rev 57943) +++ trunk/e/src/bin/e_border.c 2011-03-21 20:55:34 UTC (rev 57944) @@ -2227,14 +2227,14 @@ if (!(bd->maximized & E_MAXIMIZE_HORIZONTAL)) { /* Horizontal hasn't been set */ - bd->saved.x = bd->x - bd->zone->x; - bd->saved.w = bd->w; + bd->saved.x = bd->x - bd->zone->x; + bd->saved.w = bd->w; } if (!(bd->maximized & E_MAXIMIZE_VERTICAL)) { /* Vertical hasn't been set */ - bd->saved.y = bd->y - bd->zone->y; - bd->saved.h = bd->h; + bd->saved.y = bd->y - bd->zone->y; + bd->saved.h = bd->h; } bd->saved.zone = bd->zone->num; e_hints_window_size_set(bd); @@ -2428,19 +2428,19 @@ if (max & E_MAXIMIZE_VERTICAL) { - /* Remove vertical */ - h = bd->saved.h; - y = bd->saved.y + bd->zone->y; - bd->saved.h = bd->saved.y = 0; - bd->maximized &= ~E_MAXIMIZE_VERTICAL; + /* Remove vertical */ + h = bd->saved.h; + y = bd->saved.y + bd->zone->y; + bd->saved.h = bd->saved.y = 0; + bd->maximized &= ~E_MAXIMIZE_VERTICAL; } if (max & E_MAXIMIZE_HORIZONTAL) { - /* Remove horizontal */ - w = bd->saved.w; - x = bd->saved.x + bd->zone->x; - bd->saved.w = bd->saved.x = 0; - bd->maximized &= ~E_MAXIMIZE_HORIZONTAL; + /* Remove horizontal */ + w = bd->saved.w; + x = bd->saved.x + bd->zone->x; + bd->saved.w = bd->saved.x = 0; + bd->maximized &= ~E_MAXIMIZE_HORIZONTAL; } e_border_resize_limit(bd, &w, &h); @@ -6763,6 +6763,129 @@ ecore_evas_shaped_set(bd->bg_ecore_evas, bd->shaped); bd->changes.size = 1; ecore_x_window_move(bd->client.shell_win, l, t); + + if (bd->maximized != E_MAXIMIZE_NONE) + { + E_Maximize maximized = bd->maximized; + int x1, y1, x2, y2; + int w, h, pw, ph; + int zx, zy, zw, zh; + + zx = zy = zw = zh = 0; + + switch (bd->maximized & E_MAXIMIZE_TYPE) + { + case E_MAXIMIZE_FULLSCREEN: + w = bd->zone->w; + h = bd->zone->h; + + if (bd->bg_object) + { + Evas_Coord cx, cy, cw, ch; + + edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e"); + + evas_object_resize(bd->bg_object, w, h); + edje_object_calc_force(bd->bg_object); + edje_object_part_geometry_get(bd->bg_object, "e.swallow.client", &cx, &cy, &cw, &ch); + bd->client_inset.l = cx; + bd->client_inset.r = w - (cx + cw); + bd->client_inset.t = cy; + bd->client_inset.b = h - (cy + ch); + ecore_x_netwm_frame_size_set(bd->client.win, + bd->client_inset.l, bd->client_inset.r, + bd->client_inset.t, bd->client_inset.b); + ecore_x_e_frame_size_set(bd->client.win, + bd->client_inset.l, bd->client_inset.r, + bd->client_inset.t, bd->client_inset.b); + } + e_border_resize_limit(bd, &w, &h); + /* center x-direction */ + x1 = bd->zone->x + (bd->zone->w - w) / 2; + /* center y-direction */ + y1 = bd->zone->y + (bd->zone->h - h) / 2; + + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) + _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1); + else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1); + + else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1); + break; + + case E_MAXIMIZE_SMART: + case E_MAXIMIZE_EXPAND: + if (bd->zone) + e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh); + + if (bd->w < zw) + w = bd->w; + else + w = zw; + + if (bd->h < zh) + h = bd->h; + else + h = zh; + + if (bd->x < zx) // window left not useful coordinates + x1 = zx; + else if (bd->x + bd->w > zx + zw) // window right not useful coordinates + x1 = zx + zw - bd->w; + else // window normal position + x1 = bd->x; + + if (bd->y < zy) // window top not useful coordinates + y1 = zy; + else if (bd->y + bd->h > zy + zh) // window bottom not useful coordinates + y1 = zy + zh - bd->h; + else // window normal position + y1 = bd->y; + + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) + _e_border_move_resize_internal(bd, zx, zy, zw, zh, 0, 1); + else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + _e_border_move_resize_internal(bd, x1, zy, w, zh, 0, 1); + else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + _e_border_move_resize_internal(bd, zx, y1, zw, h, 0, 1); + break; + + case E_MAXIMIZE_FILL: + x1 = bd->zone->x; + y1 = bd->zone->y; + x2 = bd->zone->x + bd->zone->w; + y2 = bd->zone->y + bd->zone->h; + + /* walk through all shelves */ + e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, bd->maximized); + + /* walk through all windows */ + e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, bd->maximized); + + w = x2 - x1; + h = y2 - y1; + pw = w; + ph = h; + e_border_resize_limit(bd, &w, &h); + /* center x-direction */ + x1 = x1 + (pw - w) / 2; + /* center y-direction */ + y1 = y1 + (ph - h) / 2; + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) + _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1); + else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1); + else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1); + break; + } + /* restore maximized state */ + bd->maximized = maximized; + + e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL, + bd->maximized & E_MAXIMIZE_VERTICAL); + } if (bd->bg_object) { edje_object_signal_callback_add(bd->bg_object, "*", "*", @@ -6777,10 +6900,6 @@ edje_object_signal_emit(bd->bg_object, "e,state,shaded", "e"); if (bd->sticky) edje_object_signal_emit(bd->bg_object, "e,state,sticky", "e"); - if ((bd->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN) - edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e"); - else if ((bd->maximized & E_MAXIMIZE_TYPE) != E_MAXIMIZE_NONE) - edje_object_signal_emit(bd->bg_object, "e,action,maximize", "e"); if (bd->hung) edje_object_signal_emit(bd->bg_object, "e,state,hung", "e"); if (bd->client.icccm.urgent) |
From: Enlightenment S. <no-...@en...> - 2011-04-03 09:51:20
|
Log: e: fix compilation when E_INTERNAL is not defined Author: billiob Date: 2011-04-03 02:51:13 -0700 (Sun, 03 Apr 2011) New Revision: 58295 Trac: http://trac.enlightenment.org/e/changeset/58295 Modified: trunk/e/src/bin/e_intl.h Modified: trunk/e/src/bin/e_intl.h =================================================================== --- trunk/e/src/bin/e_intl.h 2011-04-03 09:50:51 UTC (rev 58294) +++ trunk/e/src/bin/e_intl.h 2011-04-03 09:51:13 UTC (rev 58295) @@ -1,5 +1,6 @@ #ifdef E_TYPEDEFS +#ifdef E_INTERNAL #if E_INTERNAL #ifdef HAVE_GETTEXT #define _(str) gettext(str) @@ -9,9 +10,10 @@ #define d_(str, dom) (str) #endif #endif +#endif /* This macro is used to just mark string for translation, this is useful - * for string lists which are not dynamically allocated + * for string lists which are not dynamically allocated */ #define N_(str) (str) |
From: Enlightenment S. <no-...@en...> - 2011-04-03 11:21:58
|
Log: e: fix E_INTERNAL use Author: billiob Date: 2011-04-03 04:21:51 -0700 (Sun, 03 Apr 2011) New Revision: 58297 Trac: http://trac.enlightenment.org/e/changeset/58297 Modified: trunk/e/src/bin/e_intl.h Modified: trunk/e/src/bin/e_intl.h =================================================================== --- trunk/e/src/bin/e_intl.h 2011-04-03 11:21:37 UTC (rev 58296) +++ trunk/e/src/bin/e_intl.h 2011-04-03 11:21:51 UTC (rev 58297) @@ -1,7 +1,4 @@ -#ifdef E_TYPEDEFS -#ifdef E_INTERNAL -#if E_INTERNAL #ifdef HAVE_GETTEXT #define _(str) gettext(str) #define d_(str, dom) dgettext(PACKAGE dom, str) @@ -9,17 +6,18 @@ #define _(str) (str) #define d_(str, dom) (str) #endif -#endif -#endif - /* This macro is used to just mark string for translation, this is useful * for string lists which are not dynamically allocated */ #define N_(str) (str) +#ifdef E_INTERNAL +#if E_INTERNAL + +#ifdef E_TYPEDEFS typedef struct _E_Locale_Parts E_Locale_Parts; +#endif -#else #ifndef E_INTL_H #define E_INTL_H @@ -60,3 +58,4 @@ EAPI char *e_intl_locale_charset_canonic_get(const char *charset); #endif #endif +#endif |
From: Enlightenment S. <no-...@en...> - 2011-04-03 11:56:16
|
Log: e: fix e_intl.h Author: billiob Date: 2011-04-03 04:56:09 -0700 (Sun, 03 Apr 2011) New Revision: 58299 Trac: http://trac.enlightenment.org/e/changeset/58299 Modified: trunk/e/src/bin/e_intl.h Modified: trunk/e/src/bin/e_intl.h =================================================================== --- trunk/e/src/bin/e_intl.h 2011-04-03 11:55:56 UTC (rev 58298) +++ trunk/e/src/bin/e_intl.h 2011-04-03 11:56:09 UTC (rev 58299) @@ -1,4 +1,9 @@ +#ifdef E_INTERNAL +#if E_INTERNAL +#ifndef E_INTL_H +#define E_INTL_H + #ifdef HAVE_GETTEXT #define _(str) gettext(str) #define d_(str, dom) dgettext(PACKAGE dom, str) @@ -11,16 +16,10 @@ */ #define N_(str) (str) -#ifdef E_INTERNAL -#if E_INTERNAL - #ifdef E_TYPEDEFS typedef struct _E_Locale_Parts E_Locale_Parts; #endif -#ifndef E_INTL_H -#define E_INTL_H - #define E_INTL_LOC_CODESET 1 << 0 #define E_INTL_LOC_REGION 1 << 1 #define E_INTL_LOC_MODIFIER 1 << 2 @@ -56,6 +55,7 @@ EAPI void e_intl_locale_parts_free(E_Locale_Parts *locale_parts); EAPI char *e_intl_locale_parts_combine(E_Locale_Parts *locale_parts, int mask); EAPI char *e_intl_locale_charset_canonic_get(const char *charset); + #endif #endif #endif |
From: Enlightenment S. <no-...@en...> - 2011-04-03 12:31:07
|
Log: e: apply coding style to e_intl.h Author: billiob Date: 2011-04-03 05:31:01 -0700 (Sun, 03 Apr 2011) New Revision: 58300 Trac: http://trac.enlightenment.org/e/changeset/58300 Modified: trunk/e/src/bin/e_intl.h Modified: trunk/e/src/bin/e_intl.h =================================================================== --- trunk/e/src/bin/e_intl.h 2011-04-03 11:56:09 UTC (rev 58299) +++ trunk/e/src/bin/e_intl.h 2011-04-03 12:31:01 UTC (rev 58300) @@ -1,9 +1,7 @@ #ifdef E_INTERNAL #if E_INTERNAL -#ifndef E_INTL_H -#define E_INTL_H - +#ifdef E_TYPEDEFS #ifdef HAVE_GETTEXT #define _(str) gettext(str) #define d_(str, dom) dgettext(PACKAGE dom, str) @@ -16,10 +14,12 @@ */ #define N_(str) (str) -#ifdef E_TYPEDEFS typedef struct _E_Locale_Parts E_Locale_Parts; -#endif +#else +#ifndef E_INTL_H +#define E_INTL_H + #define E_INTL_LOC_CODESET 1 << 0 #define E_INTL_LOC_REGION 1 << 1 #define E_INTL_LOC_MODIFIER 1 << 2 @@ -58,4 +58,6 @@ #endif #endif + #endif +#endif |
From: Enlightenment S. <no-...@en...> - 2011-04-14 21:19:32
|
Log: e: move/resize maximized windows but still keeping them maximized Author: billiob Date: 2011-04-14 14:19:25 -0700 (Thu, 14 Apr 2011) New Revision: 58673 Trac: http://trac.enlightenment.org/e/changeset/58673 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2011-04-14 20:30:17 UTC (rev 58672) +++ trunk/e/src/bin/e_border.c 2011-04-14 21:19:25 UTC (rev 58673) @@ -1122,6 +1122,30 @@ return; } + if (bd->maximized) + { + if ((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) + { + if (e_config->allow_manip) + bd->maximized = 0; + + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + { + x = bd->x; + } + else + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + { + y = bd->y; + } + } + else + if (e_config->allow_manip) + bd->maximized = 0; + else + return; + } + if (without_border) { x -= bd->client_inset.l; @@ -1129,7 +1153,6 @@ } if ((x == bd->x) && (y == bd->y)) return; - bd->maximized = 0; bd->pre_res_change.valid = 0; bd->x = x; bd->y = y; @@ -1173,10 +1196,6 @@ if (bd->fullscreen) return; - /* allow border to unshade when it was maximized _and_ shaded */ - if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)) - return; - _e_border_move_internal(bd, x, y, 0); } @@ -1204,10 +1223,6 @@ if (bd->fullscreen) return; - /* allow border to unshade when it was maximized _and_ shaded */ - if ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading)) - return; - _e_border_move_internal(bd, x, y, 1); } @@ -1277,6 +1292,32 @@ return; } + if (bd->maximized) + { + if ((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) + { + if (e_config->allow_manip) + bd->maximized = 0; + + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + { + x = bd->x; + w = bd->w; + } + else + if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + { + y = bd->y; + h = bd->h; + } + } + else + if (e_config->allow_manip) + bd->maximized = 0; + else + return; + } + if (without_border) { x -= bd->client_inset.l; @@ -1289,7 +1330,6 @@ (w == bd->w) && (h == bd->h)) return; - bd->maximized = 0; bd->pre_res_change.valid = 0; if (move) { @@ -1379,8 +1419,7 @@ int w, int h) { - if ((bd->fullscreen) || - ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))) + if (bd->fullscreen) return; _e_border_move_resize_internal(bd, x, y, w, h, 0, 1); @@ -1408,8 +1447,7 @@ int w, int h) { - if ((bd->fullscreen) || - ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))) + if (bd->fullscreen) return; _e_border_move_resize_internal(bd, x, y, w, h, 1, 1); @@ -1433,8 +1471,7 @@ int w, int h) { - if ((bd->fullscreen) || - ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))) + if (bd->fullscreen) return; _e_border_move_resize_internal(bd, 0, 0, w, h, 0, 0); @@ -1461,8 +1498,7 @@ int w, int h) { - if ((bd->fullscreen) || - ((bd->maximized) && (!e_config->allow_manip) && (!bd->shading))) + if (bd->fullscreen) return; _e_border_move_resize_internal(bd, 0, 0, w, h, 1, 0); @@ -2371,6 +2407,7 @@ e_border_move_resize(bd, x1, bd->y, w, bd->h); break; } + /* Remove previous type */ bd->maximized &= ~E_MAXIMIZE_TYPE; /* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */ @@ -2464,15 +2501,18 @@ e_border_resize_limit(bd, &w, &h); - _e_border_move_resize_internal(bd, x, y, w, h, 0, 1); if (!(bd->maximized & E_MAXIMIZE_DIRECTION)) { bd->maximized = E_MAXIMIZE_NONE; + _e_border_move_resize_internal(bd, x, y, w, h, 0, 1); e_hints_window_size_unset(bd); edje_object_signal_emit(bd->bg_object, "e,action,unmaximize", "e"); } else - e_hints_window_size_set(bd); + { + _e_border_move_resize_internal(bd, x, y, w, h, 0, 1); + e_hints_window_size_set(bd); + } } e_hints_window_maximized_set(bd, bd->maximized & E_MAXIMIZE_HORIZONTAL, bd->maximized & E_MAXIMIZE_VERTICAL); @@ -5304,7 +5344,6 @@ if (!bd) return ECORE_CALLBACK_PASS_ON; if ((bd->shaded) || (bd->shading) || - ((bd->maximized) && (!e_config->allow_manip)) || (bd->fullscreen) || (bd->moving) || (bd->resize_mode != RESIZE_NONE)) return ECORE_CALLBACK_PASS_ON; @@ -6927,14 +6966,17 @@ if (bd->maximized != E_MAXIMIZE_NONE) { - E_Maximize maximized = bd->maximized; int x1, y1, x2, y2; int w, h, pw, ph; int zx, zy, zw, zh; + E_Maximize maximized = bd->maximized; + /* to force possible resizes */ + bd->maximized = E_MAXIMIZE_NONE; + zx = zy = zw = zh = 0; - switch (bd->maximized & E_MAXIMIZE_TYPE) + switch (maximized & E_MAXIMIZE_TYPE) { case E_MAXIMIZE_FULLSCREEN: w = bd->zone->w; @@ -6966,12 +7008,12 @@ /* center y-direction */ y1 = bd->zone->y + (bd->zone->h - h) / 2; - if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) + if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1); - else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1); - else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1); break; @@ -7004,11 +7046,11 @@ else // window normal position y1 = bd->y; - if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) + if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) _e_border_move_resize_internal(bd, zx, zy, zw, zh, 0, 1); - else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) _e_border_move_resize_internal(bd, x1, zy, w, zh, 0, 1); - else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) _e_border_move_resize_internal(bd, zx, y1, zw, h, 0, 1); break; @@ -7019,10 +7061,10 @@ y2 = bd->zone->y + bd->zone->h; /* walk through all shelves */ - e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, bd->maximized); + e_maximize_border_shelf_fill(bd, &x1, &y1, &x2, &y2, maximized); /* walk through all windows */ - e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, bd->maximized); + e_maximize_border_border_fill(bd, &x1, &y1, &x2, &y2, maximized); w = x2 - x1; h = y2 - y1; @@ -7033,11 +7075,11 @@ x1 = x1 + (pw - w) / 2; /* center y-direction */ y1 = y1 + (ph - h) / 2; - if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) + if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH) _e_border_move_resize_internal(bd, x1, y1, w, h, 0, 1); - else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) + else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL) _e_border_move_resize_internal(bd, bd->x, y1, bd->w, h, 0, 1); - else if ((bd->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) + else if ((maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL) _e_border_move_resize_internal(bd, x1, bd->y, w, bd->h, 0, 1); break; } @@ -8365,9 +8407,6 @@ (bd->fullscreen) || (bd->lock_user_size)) return 0; - if ((bd->maximized) && (!e_config->allow_manip)) - return 0; - if (grabbed && !e_grabinput_get(bd->win, 0, bd->win)) { grabbed = 0; @@ -8444,9 +8483,6 @@ if ((bd->fullscreen) || (bd->lock_user_location)) return 0; - if ((bd->maximized) && (!e_config->allow_manip)) - return 0; - if (grabbed && !e_grabinput_get(bd->win, 0, bd->win)) { grabbed = 0; |
From: Enlightenment S. <no-...@en...> - 2011-04-14 21:26:59
|
Log: e: remove trailing whitespaces in e_border.c Author: billiob Date: 2011-04-14 14:26:53 -0700 (Thu, 14 Apr 2011) New Revision: 58674 Trac: http://trac.enlightenment.org/e/changeset/58674 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2011-04-14 21:19:25 UTC (rev 58673) +++ trunk/e/src/bin/e_border.c 2011-04-14 21:26:53 UTC (rev 58674) @@ -601,7 +601,7 @@ bd->changes.size = 1; bd->changes.shape = 1; bd->changes.shape_input = 1; - + bd->offer_resistance = 1; /* just to friggin make java happy - we're DELAYING the reparent until @@ -980,7 +980,7 @@ Ecore_X_Window win; Ecore_Evas *bg_ecore_evas; char buf[PATH_MAX]; - + bd->argb = argb; win = bd->win; @@ -996,7 +996,7 @@ if (bd->icon_object) evas_object_del(bd->icon_object); - + evas_object_del(bd->bg_object); e_canvas_del(bg_ecore_evas); ecore_evas_free(bg_ecore_evas); @@ -1014,7 +1014,7 @@ bd->x, bd->y, bd->w, bd->h); ecore_x_window_shape_events_select(bd->win, 1); } - + ecore_x_window_configure(bd->win, ECORE_X_WINDOW_CONFIGURE_MASK_SIBLING | ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE, @@ -1031,7 +1031,7 @@ e_canvas_add(bd->bg_ecore_evas); ecore_x_window_reparent(bd->event_win, bd->win, 0, 0); - + bd->bg_evas = ecore_evas_get(bd->bg_ecore_evas); ecore_evas_name_class_set(bd->bg_ecore_evas, "E", "Frame_Window"); ecore_evas_title_set(bd->bg_ecore_evas, "Enlightenment Frame"); @@ -1052,13 +1052,13 @@ ecore_evas_show(bd->bg_ecore_evas); ecore_x_window_show(bd->win); } - + bd->bg_object = edje_object_add(bd->bg_evas); snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name); e_theme_edje_object_set(bd->bg_object, "base/theme/borders", buf); bd->icon_object = e_border_icon_add(bd, bd->bg_evas); - + /* cleanup old frame */ ecore_x_window_free(win); } @@ -1265,7 +1265,7 @@ bd->changes.pos = 1; bd->changed = 1; - + if (bd->moving) _e_border_move_update(bd); } @@ -1915,7 +1915,7 @@ int set) { E_Border *unfocus = NULL; - + E_OBJECT_CHECK(bd); E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); /* note: this is here as it seems there are enough apps that do not even @@ -1969,17 +1969,17 @@ if ((!bd->focused) || (focus_next && (bd != eina_list_data_get(focus_next)))) { Eina_List *l; - + if ((l = eina_list_data_find_list(focus_next, bd))) - focus_next = eina_list_promote_list(focus_next, l); + focus_next = eina_list_promote_list(focus_next, l); else focus_next = eina_list_prepend(focus_next, bd); return; } } else if ((focus) && (!bd->focused)) - { - E_Event_Border_Focus_In *ev; + { + E_Event_Border_Focus_In *ev; if (focused) unfocus = focused; @@ -2014,7 +2014,7 @@ else if ((!focus) && (bd->focused)) { unfocus = bd; - + /* should always be the case. anyway */ if (bd == focused) focused = NULL; @@ -2026,7 +2026,7 @@ if ((unfocus) && (!e_object_is_del(E_OBJECT(unfocus)) && (e_object_ref_get(E_OBJECT(unfocus)) > 0))) - { + { E_Event_Border_Focus_Out *ev; bd = unfocus; @@ -2120,7 +2120,7 @@ { bd->need_shape_merge = 1; } - + bd->changes.size = 1; bd->shaded = 1; bd->changes.shaded = 1; @@ -2228,7 +2228,7 @@ { bd->need_shape_merge = 1; } - + bd->changes.size = 1; bd->shaded = 0; bd->changes.shaded = 1; @@ -2924,7 +2924,7 @@ return focused; } -static void +static void _e_border_shape_input_rectangle_set(E_Border* bd) { if (!bd) return; @@ -2934,8 +2934,8 @@ Ecore_X_Rectangle rects[4]; Ecore_X_Window twin, twin2; int x, y; - - twin = ecore_x_window_override_new(bd->zone->container->scratch_win, + + twin = ecore_x_window_override_new(bd->zone->container->scratch_win, 0, 0, bd->w, bd->h); rects[0].x = 0; rects[0].y = 0; @@ -2954,7 +2954,7 @@ rects[3].width = bd->w; rects[3].height = bd->client_inset.b; ecore_x_window_shape_input_rectangles_set(twin, rects, 4); - + twin2 = ecore_x_window_override_new (bd->zone->container->scratch_win, 0, 0, bd->w - bd->client_inset.l - bd->client_inset.r, @@ -2964,10 +2964,10 @@ if ((bd->shading) || (bd->shaded)) { if (bd->shade.dir == E_DIRECTION_UP) - y = bd->h - bd->client_inset.t - bd->client_inset.b - + y = bd->h - bd->client_inset.t - bd->client_inset.b - bd->client.h; else if (bd->shade.dir == E_DIRECTION_LEFT) - x = bd->w - bd->client_inset.l - bd->client_inset.r - + x = bd->w - bd->client_inset.l - bd->client_inset.r - bd->client.w; } ecore_x_window_shape_input_window_set_xy(twin2, bd->client.win, @@ -3026,7 +3026,7 @@ { _e_border_show(bd); bd->changes.visible = 0; - } + } } e_container_border_list_free(bl); @@ -3057,7 +3057,7 @@ if (focus_next) { E_Border *bd = NULL, *bd2; - + EINA_LIST_FREE(focus_next, bd2) if ((!bd) && (bd2->visible)) bd = bd2; @@ -3071,9 +3071,9 @@ #endif if (bd == focused) return; - + focus_time = ecore_x_current_time_get(); - + if ((bd->client.icccm.take_focus) && (bd->client.icccm.accepts_focus)) { @@ -3108,29 +3108,29 @@ static void _e_border_show(E_Border *bd) -{ +{ ecore_evas_show(bd->bg_ecore_evas); - + if (bd->post_job) - { + { bd->post_show = 1; return; } - + if (!bd->comp_hidden) { _e_border_shape_input_rectangle_set(bd); -// not anymore +// not anymore // ecore_x_composite_window_events_enable(bd->win); ecore_x_window_ignore_set(bd->win, EINA_FALSE); } - + ecore_x_window_show(bd->win); } static void _e_border_hide(E_Border *bd) -{ +{ if (!e_manager_comp_evas_get(bd->zone->container->manager)) { ecore_x_window_hide(bd->win); @@ -4341,7 +4341,7 @@ focused = NULL; focus_next = eina_list_remove(focus_next, bd); - + if (bd->fullscreen) bd->desk->fullscreen_borders--; if ((drag_border) && (drag_border->data == bd)) @@ -6125,7 +6125,7 @@ { ecore_x_window_resize(bd->win, bd->w, bd->h); } - + if (bd->post_show) { if (bd->visible) @@ -6675,7 +6675,7 @@ { Ecore_X_Rectangle *rects; int num; - + bd->changes.shape_input = 0; rects = ecore_x_window_shape_input_rectangles_get(bd->client.win, &num); if (rects) @@ -7724,7 +7724,7 @@ } _e_border_show(bd); - + if (bd->cur_mouse_action) { bd->moveinfo.down.x = bd->x + bd->fx.x; @@ -7837,7 +7837,7 @@ (bd->want_focus)) { bd->want_focus = 0; -#ifdef INOUTDEBUG_FOCUS +#ifdef INOUTDEBUG_FOCUS printf("__________ focus new window _________\n"); #endif e_border_focus_set_with_pointer(bd); @@ -7849,7 +7849,7 @@ (e_border_find_by_client_window(bd->client.icccm.transient_for) == e_border_focused_get()))) { -#ifdef INOUTDEBUG_FOCUS +#ifdef INOUTDEBUG_FOCUS printf("__________ focus new dialog _________\n"); #endif @@ -7858,7 +7858,7 @@ } else { -#ifdef INOUTDEBUG_FOCUS +#ifdef INOUTDEBUG_FOCUS printf("__________ window takes focus _________\n"); #endif /* focus window by default when it is the only one on desk */ @@ -8574,7 +8574,7 @@ E_Border *bd; bd = data; -// dont wait until it's hung - +// dont wait until it's hung - // if (bd->hung) // { if (bd->client.netwm.pid > 1) @@ -8877,7 +8877,7 @@ if (bd->comp_hidden == hidden) return; bd->comp_hidden = hidden; - + if (bd->comp_hidden) { ecore_x_composite_window_events_disable(bd->win); |
From: Enlightenment S. <no-...@en...> - 2011-05-08 18:54:15
|
Log: e: move/resize uni-directional maximized window from menu Author: billiob Date: 2011-05-08 11:54:07 -0700 (Sun, 08 May 2011) New Revision: 59283 Trac: http://trac.enlightenment.org/e/changeset/59283 Modified: trunk/e/src/bin/e_int_border_menu.c Modified: trunk/e/src/bin/e_int_border_menu.c =================================================================== --- trunk/e/src/bin/e_int_border_menu.c 2011-05-08 15:43:44 UTC (rev 59282) +++ trunk/e/src/bin/e_int_border_menu.c 2011-05-08 18:54:07 UTC (rev 59283) @@ -647,7 +647,8 @@ } } - if ((!bd->lock_user_location) && (!bd->fullscreen) && (!bd->maximized || e_config->allow_manip)) + if ((!bd->lock_user_location) && (!bd->fullscreen) && + (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip)) { submi = e_menu_item_new(subm); e_menu_item_label_set(submi, _("Move")); @@ -658,7 +659,8 @@ "e/widgets/border/default/move_icon"); } - if (((!bd->lock_user_size) && (!bd->fullscreen) && (!bd->maximized || e_config->allow_manip)) && + if (((!bd->lock_user_size) && (!bd->fullscreen) && + (((bd->maximized & E_MAXIMIZE_DIRECTION) != E_MAXIMIZE_BOTH) || e_config->allow_manip)) && ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_NORMAL) || (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_UNKNOWN))) { |
From: Enlightenment S. <no-...@en...> - 2011-05-14 14:39:52
|
Log: e: add pid in segfault alert Author: billiob Date: 2011-05-14 07:39:44 -0700 (Sat, 14 May 2011) New Revision: 59384 Trac: http://trac.enlightenment.org/e/changeset/59384 Modified: trunk/e/src/bin/e_signals.c Modified: trunk/e/src/bin/e_signals.c =================================================================== --- trunk/e/src/bin/e_signals.c 2011-05-14 14:39:25 UTC (rev 59383) +++ trunk/e/src/bin/e_signals.c 2011-05-14 14:39:44 UTC (rev 59384) @@ -120,90 +120,116 @@ EAPI void e_sigseg_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { + char msg[1024]; + _e_backtrace("**** SEGMENTATION FAULT ****"); _e_x_composite_shutdown(); ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); ecore_x_sync(); - e_alert_show("This is very bad. Enlightenment SEGV'd.\n" - "\n" - "This is not meant to happen and is likely a sign of\n" - "a bug in Enlightenment or the libraries it relies\n" - "on. You can gdb attach to this process now to try\n" - "debug it or you could exit, or just hit restart to\n" - "try and get your desktop back the way it was.\n" - "\n" - "Please compile everything with -g in your CFLAGS\n"); - exit(-11); + snprintf(msg, sizeof(msg), + "This is very bad. Enlightenment SEGV'd.\n" + "\n" + "This is not meant to happen and is likely a sign of\n" + "a bug in Enlightenment or the libraries it relies\n" + "on. You can gdb attach to this process (%d) now\n" + "to try debug it or you could exit, or just hit\n" + "restart to try and get your desktop back the way\n" + "it was.\n" + "\n" + "Please compile everything with -g in your CFLAGS.\n", + getpid()); + e_alert_show(msg); + exit(-11); } EAPI void e_sigill_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { + char msg[1024]; + _e_backtrace("**** ILLEGAL INSTRUCTION ****"); _e_x_composite_shutdown(); ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); ecore_x_sync(); - e_alert_show("This is very bad. Enlightenment SIGILL'd.\n" - "\n" - "This is not meant to happen and is likely a sign of\n" - "a bug in Enlightenment or the libraries it relies\n" - "on. You can gdb attach to this process now to try\n" - "debug it or you could exit, or just hit restart to\n" - "try and get your desktop back the way it was.\n" - "\n" - "Please compile everything with -g in your CFLAGS\n"); + snprintf(msg, sizeof(msg), + "This is very bad. Enlightenment SIGILL'd.\n" + "\n" + "This is not meant to happen and is likely a sign of\n" + "a bug in Enlightenment or the libraries it relies\n" + "on. You can gdb attach to this process (%d) now\n" + "to try debug it or you could exit, or just hit\n" + "restart to try and get your desktop back the way\n" + "it was.\n" + "\n" + "Please compile everything with -g in your CFLAGS.\n", + getpid()); + e_alert_show(msg); exit(-11); } EAPI void e_sigfpe_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { + char msg[1024]; + _e_backtrace("**** FLOATING POINT EXCEPTION ****"); _e_x_composite_shutdown(); ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); ecore_x_sync(); - e_alert_show("This is very bad. Enlightenment SIGFPE'd.\n" - "\n" - "This is not meant to happen and is likely a sign of\n" - "a bug in Enlightenment or the libraries it relies\n" - "on. You can gdb attach to this process now to try\n" - "debug it or you could exit, or just hit restart to\n" - "try and get your desktop back the way it was.\n" - "\n" - "Please compile everything with -g in your CFLAGS\n"); + snprintf(msg, sizeof(msg), + "This is very bad. Enlightenment SIGFPE'd.\n" + "\n" + "This is not meant to happen and is likely a sign of\n" + "a bug in Enlightenment or the libraries it relies\n" + "on. You can gdb attach to this process (%d) now\n" + "to try debug it or you could exit, or just hit\n" + "restart to try and get your desktop back the way\n" + "it was.\n" + "\n" + "Please compile everything with -g in your CFLAGS.\n", + getpid()); + e_alert_show(msg); exit(-11); } EAPI void e_sigbus_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { + char msg[1024]; + _e_backtrace("**** BUS ERROR ****"); _e_x_composite_shutdown(); ecore_x_pointer_ungrab(); ecore_x_keyboard_ungrab(); ecore_x_ungrab(); ecore_x_sync(); - e_alert_show("This is very bad. Enlightenment SIGILL'd.\n" - "\n" - "This is not meant to happen and is likely a sign of\n" - "a bug in Enlightenment or the libraries it relies\n" - "on. You can gdb attach to this process now to try\n" - "debug it or you could exit, or just hit restart to\n" - "try and get your desktop back the way it was.\n" - "\n" - "Please compile everything with -g in your CFLAGS\n"); + snprintf(msg, sizeof(msg), + "This is very bad. Enlightenment SIGBUS'd.\n" + "\n" + "This is not meant to happen and is likely a sign of\n" + "a bug in Enlightenment or the libraries it relies\n" + "on. You can gdb attach to this process (%d) now\n" + "to try debug it or you could exit, or just hit\n" + "restart to try and get your desktop back the way\n" + "it was.\n" + "\n" + "Please compile everything with -g in your CFLAGS.\n", + getpid()); + e_alert_show(msg); exit(-11); } EAPI void e_sigabrt_act(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__) { + char msg[1024]; + _e_backtrace("**** ABORT ****"); _e_x_composite_shutdown(); ecore_x_pointer_ungrab(); |
From: Enlightenment S. <no-...@en...> - 2011-06-19 19:44:47
|
Log: e: remove if in E_FREE Author: billiob Date: 2011-06-19 12:44:40 -0700 (Sun, 19 Jun 2011) New Revision: 60494 Trac: http://trac.enlightenment.org/e/changeset/60494 Modified: trunk/e/src/bin/e.h Modified: trunk/e/src/bin/e.h =================================================================== --- trunk/e/src/bin/e.h 2011-06-19 16:55:41 UTC (rev 60493) +++ trunk/e/src/bin/e.h 2011-06-19 19:44:40 UTC (rev 60494) @@ -144,7 +144,7 @@ #define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n) #define E_NEW(s, n) (s *)calloc(n, sizeof(s)) #define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s)) -#define E_FREE(p) do { if (p) {free(p); p = NULL;} } while (0) +#define E_FREE(p) do { free(p); p = NULL; } while (0) #define E_FREE_LIST(list, free) \ do \ { \ |
From: Enlightenment S. <no-...@en...> - 2011-06-19 19:45:05
|
Log: e: s/E_NEW_BIG/E_NEW_RAW/ Author: billiob Date: 2011-06-19 12:44:58 -0700 (Sun, 19 Jun 2011) New Revision: 60495 Trac: http://trac.enlightenment.org/e/changeset/60495 Modified: trunk/e/src/bin/e.h Modified: trunk/e/src/bin/e.h =================================================================== --- trunk/e/src/bin/e.h 2011-06-19 19:44:40 UTC (rev 60494) +++ trunk/e/src/bin/e.h 2011-06-19 19:44:58 UTC (rev 60495) @@ -143,7 +143,7 @@ #define E_SPANS_COMMON(x1, w1, x2, w2) (!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1))))) #define E_REALLOC(p, s, n) p = (s *)realloc(p, sizeof(s) * n) #define E_NEW(s, n) (s *)calloc(n, sizeof(s)) -#define E_NEW_BIG(s, n) (s *)malloc(n * sizeof(s)) +#define E_NEW_RAW(s, n) (s *)malloc(n * sizeof(s)) #define E_FREE(p) do { free(p); p = NULL; } while (0) #define E_FREE_LIST(list, free) \ do \ |
From: Enlightenment S. <no-...@en...> - 2011-06-30 20:37:41
|
Log: e: add e_popup_alpha_set()/get() Author: billiob Date: 2011-06-30 13:37:34 -0700 (Thu, 30 Jun 2011) New Revision: 60885 Trac: http://trac.enlightenment.org/e/changeset/60885 Modified: trunk/e/src/bin/e_popup.c trunk/e/src/bin/e_popup.h Modified: trunk/e/src/bin/e_popup.c =================================================================== --- trunk/e/src/bin/e_popup.c 2011-06-30 20:02:12 UTC (rev 60884) +++ trunk/e/src/bin/e_popup.c 2011-06-30 20:37:34 UTC (rev 60885) @@ -75,6 +75,18 @@ } EAPI void +e_popup_alpha_set(E_Popup *pop, Eina_Bool alpha) +{ + ecore_evas_alpha_set(pop->ecore_evas, alpha); +} + +EAPI Eina_Bool +e_popup_alpha_get(E_Popup *pop) +{ + return ecore_evas_alpha_get(pop->ecore_evas); +} + +EAPI void e_popup_name_set(E_Popup *pop, const char *name) { if (eina_stringshare_replace(&pop->name, name)) Modified: trunk/e/src/bin/e_popup.h =================================================================== --- trunk/e/src/bin/e_popup.h 2011-06-30 20:02:12 UTC (rev 60884) +++ trunk/e/src/bin/e_popup.h 2011-06-30 20:37:34 UTC (rev 60885) @@ -34,6 +34,8 @@ EAPI E_Popup *e_popup_new(E_Zone *zone, int x, int y, int w, int h); EAPI void e_popup_name_set(E_Popup *pop, const char *name); +EAPI void e_popup_alpha_set(E_Popup *pop, Eina_Bool alpha); +EAPI Eina_Bool e_popup_alpha_get(E_Popup *pop); EAPI void e_popup_show(E_Popup *pop); EAPI void e_popup_hide(E_Popup *pop); EAPI void e_popup_move(E_Popup *pop, int x, int y); |
From: Enlightenment S. <no-...@en...> - 2011-06-30 21:05:47
|
Log: Revert "e: add e_popup_alpha_set()/get()" This reverts commit a79f3900a3a18c6c179bd110a43b80f89878284d. Author: billiob Date: 2011-06-30 14:05:41 -0700 (Thu, 30 Jun 2011) New Revision: 60886 Trac: http://trac.enlightenment.org/e/changeset/60886 Modified: trunk/e/src/bin/e_popup.c trunk/e/src/bin/e_popup.h Modified: trunk/e/src/bin/e_popup.c =================================================================== --- trunk/e/src/bin/e_popup.c 2011-06-30 20:37:34 UTC (rev 60885) +++ trunk/e/src/bin/e_popup.c 2011-06-30 21:05:41 UTC (rev 60886) @@ -75,18 +75,6 @@ } EAPI void -e_popup_alpha_set(E_Popup *pop, Eina_Bool alpha) -{ - ecore_evas_alpha_set(pop->ecore_evas, alpha); -} - -EAPI Eina_Bool -e_popup_alpha_get(E_Popup *pop) -{ - return ecore_evas_alpha_get(pop->ecore_evas); -} - -EAPI void e_popup_name_set(E_Popup *pop, const char *name) { if (eina_stringshare_replace(&pop->name, name)) Modified: trunk/e/src/bin/e_popup.h =================================================================== --- trunk/e/src/bin/e_popup.h 2011-06-30 20:37:34 UTC (rev 60885) +++ trunk/e/src/bin/e_popup.h 2011-06-30 21:05:41 UTC (rev 60886) @@ -34,8 +34,6 @@ EAPI E_Popup *e_popup_new(E_Zone *zone, int x, int y, int w, int h); EAPI void e_popup_name_set(E_Popup *pop, const char *name); -EAPI void e_popup_alpha_set(E_Popup *pop, Eina_Bool alpha); -EAPI Eina_Bool e_popup_alpha_get(E_Popup *pop); EAPI void e_popup_show(E_Popup *pop); EAPI void e_popup_hide(E_Popup *pop); EAPI void e_popup_move(E_Popup *pop, int x, int y); |