enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

formatting for seb 

SVN revision: 77880
This commit is contained in:
Mike Blumenkrantz 2012-10-11 13:23:14 +00:00
parent bc3d8d18e2
commit 6134584e47
4 changed files with 1003 additions and 998 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/bin/e_border.c
View File

@ -205,7 +205,7 @@ static void _e_border_client_move_resize_send(E_Border *bd);
static void _e_border_frame_replace(E_Border *bd,
Eina_Bool argb);
static void _e_border_shape_input_rectangle_set(E_Border* bd);
static void _e_border_shape_input_rectangle_set(E_Border *bd);
static void _e_border_show(E_Border *bd);
static void _e_border_hide(E_Border *bd);
@ -1079,11 +1079,14 @@ e_border_hide(E_Border *bd,
switch (manage)
{
case 2: break;
case 3:
bd->hidden = 1;
case 1:
/* Make sure that this border isn't deleted */
bd->await_hide_event++;
default:
if (!e_manager_comp_evas_get(bd->zone->container->manager))
ecore_x_window_hide(bd->client.win);
@ -1377,7 +1380,8 @@ _e_border_move_internal(E_Border *bd,
bd->move_intercept_cb(bd, x, y);
if ((bd->x == px) && (bd->y == py)) return;
}
else if ((x == bd->x) && (y == bd->y)) return;
else if ((x == bd->x) && (y == bd->y))
return;
bd->pre_res_change.valid = 0;
bd->x = x;
bd->y = y;
@ -1423,11 +1427,10 @@ e_border_move(E_Border *bd,
_e_border_move_internal(bd, x, y, 0);
if(_e_border_lost_window_internal_get(bd))
if (_e_border_lost_window_internal_get(bd))
_e_border_reset_lost_window(bd);
}
/**
* Set a callback which will be called just prior to updating the
* move coordinates for a border
@ -2848,7 +2851,6 @@ e_border_maximize(E_Border *bd,
_e_border_maximize(bd, max);
/* Remove previous type */
bd->maximized &= ~E_MAXIMIZE_TYPE;
/* Add new maximization. It must be added, so that VERTICAL + HORIZONTAL == BOTH */
@ -3365,7 +3367,7 @@ e_border_focused_get(void)
}
static void
_e_border_shape_input_rectangle_set(E_Border* bd)
_e_border_shape_input_rectangle_set(E_Border *bd)
{
if (!bd) return;
@ -4305,8 +4307,8 @@ _e_border_lost_window_internal_get(E_Border *bd)
{
int loss_overlap = 5;
if(e_config->window_out_of_vscreen_limits) return EINA_FALSE;
if(!(bd->zone))
if (e_config->window_out_of_vscreen_limits) return EINA_FALSE;
if (!(bd->zone))
return EINA_FALSE;
if (!E_INTERSECTS(bd->zone->x + loss_overlap,
@ -4360,8 +4362,8 @@ _e_border_reset_lost_window(E_Border *bd)
int x, y, w, h;
E_OBJECT_CHECK(bd);
if(bd->iconic) e_border_uniconify(bd);
if(!bd->moving) e_border_center(bd);
if (bd->iconic) e_border_uniconify(bd);
if (!bd->moving) e_border_center(bd);
e_zone_useful_geometry_get(bd->zone, &x, &y, &w, &h);
ecore_x_pointer_xy_get(bd->zone->container->win, &warp_x, &warp_y);
@ -4372,12 +4374,12 @@ _e_border_reset_lost_window(E_Border *bd)
warp_to = 1;
warp_to_win = bd->zone->container->win;
if(!warp_timer)
if (!warp_timer)
warp_timer = ecore_timer_add(0.01,
_e_border_pointer_warp_to_center_timer, (const void *) bd);
_e_border_pointer_warp_to_center_timer, (const void *)bd);
e_border_raise(bd);
if(!bd->lock_focus_out)
if (!bd->lock_focus_out)
e_border_focus_set(bd, 1, 1);
}
@ -5551,7 +5553,7 @@ _e_border_cb_window_property(void *data __UNUSED__,
bd = e_border_find_by_client_window(e->win);
if (!bd) return ECORE_CALLBACK_PASS_ON;
if(_e_border_lost_window_internal_get(bd))
if (_e_border_lost_window_internal_get(bd))
_e_border_reset_lost_window(bd);
if (e->atom == ECORE_X_ATOM_WM_NAME)
@ -6255,7 +6257,8 @@ _e_border_cb_config_icon_theme(void *data __UNUSED__,
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool _e_border_cb_config_mode(void *data __UNUSED__,
static Eina_Bool
_e_border_cb_config_mode(void *data __UNUSED__,
int ev_type __UNUSED__,
void *ev __UNUSED__)
{
@ -6648,7 +6651,7 @@ _e_border_stay_within_container(E_Border *bd, int x, int y, int *new_x, int *new
lw = bd->w > bd->zone->w ? EINA_TRUE : EINA_FALSE;
lh = bd->h > bd->zone->h ? EINA_TRUE : EINA_FALSE;
if(lw)
if (lw)
{
if (x <= new_x_max)
*new_x = new_x_max;
@ -6663,7 +6666,7 @@ _e_border_stay_within_container(E_Border *bd, int x, int y, int *new_x, int *new
*new_x = 0;
}
if(lh)
if (lh)
{
if (y <= new_y_max)
*new_y = new_y_max;
@ -6678,6 +6681,7 @@ _e_border_stay_within_container(E_Border *bd, int x, int y, int *new_x, int *new
*new_y = 0;
}
}
static Eina_Bool
_e_border_cb_mouse_move(void *data,
int type __UNUSED__,
@ -6722,8 +6726,7 @@ _e_border_cb_mouse_move(void *data,
new_x = x;
new_y = y;
if(e_config->window_out_of_vscreen_limits_partly)
if (e_config->window_out_of_vscreen_limits_partly)
_e_border_stay_within_container(bd, x, y, &new_x, &new_y);
else
{
@ -8105,7 +8108,6 @@ _e_border_eval(E_Border *bd)
}
else if ((!bd->placed) && (bd->client.icccm.request_pos))
{
Ecore_X_Window_Attributes *att;
int bw;
@ -8965,7 +8967,8 @@ _e_border_shade_animator(void *data)
val = dt / dur;
if (val < 0.0) val = 0.0;
else if (val > 1.0) val = 1.0;
else if (val > 1.0)
val = 1.0;
if (e_config->border_shade_transition == E_TRANSITION_SINUSOIDAL)
{
@ -9656,7 +9659,7 @@ _e_border_hooks_clean(void)
Eina_List *l, *ln;
E_Border_Hook *bh;
EINA_LIST_FOREACH_SAFE(_e_border_hooks, l, ln, bh)
EINA_LIST_FOREACH_SAFE (_e_border_hooks, l, ln, bh)
{
if (bh->delete_me)
{
@ -9798,7 +9801,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;
@ -9961,4 +9964,5 @@ e_border_activate(E_Border *bd, Eina_Bool just_do_it)
}
}
}
/*vim:ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0*/

6
src/bin/e_int_menus.c
View File

@ -270,7 +270,7 @@ e_int_menus_apps_new(const char *dir)
E_Menu *m;
m = e_menu_new();
if (dir) e_object_data_set(E_OBJECT(m), (void*)eina_stringshare_add(dir));
if (dir) e_object_data_set(E_OBJECT(m), (void *)eina_stringshare_add(dir));
e_menu_pre_activate_callback_set(m, _e_int_menus_apps_start, NULL);
return m;
}
@ -728,7 +728,7 @@ _e_int_menus_apps_thread_new(E_Menu *m, const char *dir)
if (_e_int_menus_app_menus)
menu = eina_hash_find(_e_int_menus_app_menus, dir);
else
_e_int_menus_app_menus = eina_hash_string_superfast_new((void*)efreet_menu_free);
_e_int_menus_app_menus = eina_hash_string_superfast_new((void *)efreet_menu_free);
}
else
menu = _e_int_menus_app_menu_default;
@ -792,7 +792,7 @@ _e_int_menus_apps_free_hook2(void *obj)
m = obj;
// XXX TODO: this should be automatic in e_menu, just get references right!
// XXX TODO: fix references and remove me!!!
EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi)
EINA_LIST_FOREACH_SAFE (m->items, l, l_next, mi)
{
if (mi->submenu)
e_object_del(E_OBJECT(mi->submenu));

5
src/modules/conf_window_manipulation/e_int_config_window_display.c
View File

@ -111,7 +111,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((e_config->window_placement_policy != cfdata->window_placement_policy) ||
return (e_config->window_placement_policy != cfdata->window_placement_policy) ||
(e_config->window_grouping != cfdata->window_grouping) ||
(e_config->move_info_visible != cfdata->move_info_visible) ||
(e_config->move_info_follows != cfdata->move_info_follows) ||
@ -123,7 +123,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(e_config->use_app_icon != cfdata->use_app_icon) ||
(e_config->desk_auto_switch != cfdata->desk_auto_switch) ||
(e_config->window_out_of_vscreen_limits != cfdata->window_out_of_vscreen_limits) ||
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly));
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly);
}
static Evas_Object *
@ -293,3 +293,4 @@ _cb_disable_check_list(void *data, Evas_Object *obj)
EINA_LIST_FOREACH(list, l, o)
e_widget_disabled_set(o, disable);
}