kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e17/border: fix formatting, tabs and trailing whitespace 

SVN revision: 62901
This commit is contained in:
Hannes Janetzek 2011-08-28 06:48:33 +00:00
parent 8445b89578
commit 61d968c948
1 changed files with 630 additions and 630 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/bin/e_border.c
View File

@ -1220,8 +1220,7 @@ _e_border_move_internal(E_Border *bd,
y = bd->y;
}
}
else
if (e_config->allow_manip)
else if (e_config->allow_manip)
bd->maximized = 0;
else
return;
@ -2040,7 +2039,6 @@ e_border_focus_set(E_Border *bd,
{
if (focused) bd_unfocus = focused;
if (focusing == bd) focusing = NULL;
bd->focused = 1;
focused = bd;
@ -2052,7 +2050,6 @@ e_border_focus_set(E_Border *bd,
bd->want_focus = 0;
focus_next = eina_list_remove(focus_next, bd);
if (bd == focusing) focusing = NULL;
if (bd->focused)
{
bd_unfocus = bd;
@ -2637,7 +2634,8 @@ e_border_fullscreen(E_Border *bd,
if (!e_config->allow_above_fullscreen)
e_border_layer_set(bd, 200);
if ((eina_list_count(bd->zone->container->zones) > 1) || (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
if ((eina_list_count(bd->zone->container->zones) > 1) ||
(policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
{
e_border_move_resize(bd, bd->zone->x, bd->zone->y, bd->zone->w, bd->zone->h);
}
@ -2646,8 +2644,12 @@ e_border_fullscreen(E_Border *bd,
Ecore_X_Randr_Screen_Size_MM *sizes;
int num_sizes, i, best_size_index = 0;
ecore_x_randr_screen_primary_output_current_size_get(bd->zone->container->manager->root, &screen_size.width, &screen_size.height, NULL, NULL, NULL);
sizes = ecore_x_randr_screen_primary_output_sizes_get(bd->zone->container->manager->root, &num_sizes);
ecore_x_randr_screen_primary_output_current_size_get(bd->zone->container->manager->root,
&screen_size.width,
&screen_size.height,
NULL, NULL, NULL);
sizes = ecore_x_randr_screen_primary_output_sizes_get(bd->zone->container->manager->root,
&num_sizes);
if (sizes)
{
Ecore_X_Randr_Screen_Size best_size = { -1, -1 };
@ -2698,7 +2700,7 @@ e_border_fullscreen(E_Border *bd,
ev = E_NEW(E_Event_Border_Fullscreen, 1);
ev->border = bd;
e_object_ref(E_OBJECT(bd));
// e_object_breadcrumb_add(E_OBJECT(bd), "border_fullscreen_event");
// e_object_breadcrumb_add(E_OBJECT(bd), "border_fullscreen_event");
ecore_event_add(E_EVENT_BORDER_FULLSCREEN, ev, _e_border_event_border_fullscreen_free, NULL);
e_remember_update(bd);
@ -2722,7 +2724,8 @@ e_border_unfullscreen(E_Border *bd)
if ((screen_size.width != -1) && (screen_size.height != -1))
{
ecore_x_randr_screen_primary_output_size_set(bd->zone->container->manager->root, screen_size_index);
ecore_x_randr_screen_primary_output_size_set(bd->zone->container->manager->root,
screen_size_index);
screen_size.width = -1;
screen_size.height = -1;
}
@ -2745,7 +2748,7 @@ e_border_unfullscreen(E_Border *bd)
ev = E_NEW(E_Event_Border_Unfullscreen, 1);
ev->border = bd;
e_object_ref(E_OBJECT(bd));
// e_object_breadcrumb_add(E_OBJECT(bd), "border_unfullscreen_event");
// e_object_breadcrumb_add(E_OBJECT(bd), "border_unfullscreen_event");
ecore_event_add(E_EVENT_BORDER_UNFULLSCREEN, ev, _e_border_event_border_unfullscreen_free, NULL);
e_remember_update(bd);
@ -3214,8 +3217,8 @@ _e_border_show(E_Border *bd)
if (!((bd->comp_hidden) || (bd->tmp_input_hidden > 0)))
{
_e_border_shape_input_rectangle_set(bd);
// not anymore
// ecore_x_composite_window_events_enable(bd->win);
// not anymore
// ecore_x_composite_window_events_enable(bd->win);
ecore_x_window_ignore_set(bd->win, EINA_FALSE);
}
@ -3870,11 +3873,13 @@ e_border_lost_windows_get(E_Zone *zone)
E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
EINA_LIST_FOREACH(borders, l, bd)
{
if (bd->zone)
{
if ((bd->zone == zone) ||
(bd->zone->container == zone->container))
{
if (!bd->zone)
continue;
if ((bd->zone != zone) ||
(bd->zone->container != zone->container))
continue;
if (!E_INTERSECTS(bd->zone->x + loss_overlap,
bd->zone->y + loss_overlap,
bd->zone->w - (2 * loss_overlap),
@ -3916,8 +3921,6 @@ e_border_lost_windows_get(E_Zone *zone)
}
}
}
}
}
return list;
}
@ -6488,8 +6491,8 @@ _e_border_eval0(E_Border *bd)
if (bd->client.icccm.max_h > 32767) bd->client.icccm.max_h = 32767;
if (bd->client.icccm.base_w > 32767) bd->client.icccm.base_w = 32767;
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 (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 doing a resize, fix it up
if (bd->resize_mode != RESIZE_NONE)
{
@ -6909,7 +6912,7 @@ _e_border_eval0(E_Border *bd)
ev = E_NEW(E_Event_Border_Add, 1);
ev->border = bd;
e_object_ref(E_OBJECT(bd));
// e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
// e_object_breadcrumb_add(E_OBJECT(bd), "border_add_event");
ecore_event_add(E_EVENT_BORDER_ADD, ev, _e_border_event_border_add_free, NULL);
if ((!bd->lock_border) || (!bd->client.border.name))
@ -6994,8 +6997,7 @@ _e_border_eval0(E_Border *bd)
evas_object_del(bd->bg_object);
}
o = edje_object_add(bd->bg_evas);
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border",
bd->client.border.name);
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
{
@ -7093,9 +7095,9 @@ _e_border_eval0(E_Border *bd)
edje_object_signal_emit(bd->bg_object, "e,state,hung", "e");
if (bd->client.icccm.urgent)
edje_object_signal_emit(bd->bg_object, "e,state,urgent", "e");
// FIXME: in eval -do differently
// edje_object_message_signal_process(bd->bg_object);
// e_border_frame_recalc(bd);
// FIXME: in eval -do differently
// edje_object_message_signal_process(bd->bg_object);
// e_border_frame_recalc(bd);
evas_object_move(bd->bg_object, 0, 0);
evas_object_resize(bd->bg_object, bd->w, bd->h);
@ -7191,10 +7193,9 @@ _e_border_eval(E_Border *bd)
bd->changes.pos = 1;
bd->placed = 1;
}
else if (!bd->placed)
{
if (bd->client.icccm.request_pos)
else if ((!bd->placed) && (bd->client.icccm.request_pos))
{
Ecore_X_Window_Attributes *att;
int bw;
@ -7298,6 +7299,7 @@ _e_border_eval(E_Border *bd)
bd->changes.pos = 1;
bd->placed = 1;
}
}
if (!bd->placed)
{
Eina_List *skiplist = NULL;
@ -7334,8 +7336,6 @@ _e_border_eval(E_Border *bd)
bd->y = new_y;
bd->changes.pos = 1;
}
}
}
EINA_LIST_FREE(bd->pending_move_resize, pnd)
{
if ((!bd->lock_client_location) && (pnd->move))
@ -7606,7 +7606,7 @@ _e_border_eval(E_Border *bd)
}
else
ecore_x_window_shape_mask_set(bd->win, 0);
// bd->need_shape_export = 1;
// bd->need_shape_export = 1;
bd->need_shape_merge = 0;
}
@ -7804,7 +7804,7 @@ _e_border_eval(E_Border *bd)
ev = E_NEW(E_Event_Border_Icon_Change, 1);
ev->border = bd;
e_object_ref(E_OBJECT(bd));
// e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
// e_object_breadcrumb_add(E_OBJECT(bd), "border_icon_change_event");
ecore_event_add(E_EVENT_BORDER_ICON_CHANGE, ev,
_e_border_event_border_icon_change_free, NULL);
}
@ -7818,11 +7818,8 @@ _e_border_eval(E_Border *bd)
if ((bd->take_focus) || (bd->want_focus))
{
bd->take_focus = 0;
if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) ||
(bd->want_focus))
if ((e_config->focus_setting == E_FOCUS_NEW_WINDOW) || (bd->want_focus))
{
bd->want_focus = 0;
e_border_focus_set_with_pointer(bd);
}
else if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
@ -7843,13 +7840,16 @@ _e_border_eval(E_Border *bd)
EINA_LIST_FOREACH(focus_stack, l, bd2)
{
if (bd == bd2) continue;
if ((!bd2->iconic) && (bd2->visible) && (bd->desk == bd2->desk))
if ((!bd2->iconic) && (bd2->visible) &&
((bd->desk == bd2->desk) || bd2->sticky))
break;
}
if (!bd2)
e_border_focus_set_with_pointer(bd);
}
bd->want_focus = 0;
bd->take_focus = 0;
}
if (bd->need_maximize)
@ -8833,7 +8833,7 @@ _e_border_pointer_warp_to_center_timer(void *data __UNUSED__)
ecore_x_pointer_warp(warp_to_win, warp_x, warp_y);
return ECORE_CALLBACK_RENEW;
}
cleanup:
cleanup:
ecore_timer_del(warp_timer);
warp_timer = NULL;
return ECORE_CALLBACK_CANCEL;