diff --git a/src/bin/e_init.c b/src/bin/e_init.c index 85ee9eaed..32cec2fb7 100644 --- a/src/bin/e_init.c +++ b/src/bin/e_init.c @@ -18,8 +18,7 @@ static int _e_init_cb_exe_event_del(void *data, int type, void *event) { Ecore_Exe_Event_Del *ev; - Evas_List *l; - + ev = event; if (ev->exe == init_exe) { @@ -32,7 +31,7 @@ _e_init_cb_exe_event_del(void *data, int type, void *event) EAPI int e_init_init(void) -{ +{ exe_del_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_init_cb_exe_event_del, NULL); @@ -69,20 +68,20 @@ e_init_show(void) s = evas_stringshare_add(e_config->init_default_theme); else s = e_path_find(path_init, e_config->init_default_theme); - + if (s) theme = strdup(e_util_filename_escape(s)); else theme = strdup("XdX"); if (s) evas_stringshare_del(s); - + if (title) tit = strdup(e_util_filename_escape(title)); else tit = strdup("XtX"); - + if (version) ver = strdup(e_util_filename_escape(version)); else ver = strdup("XvX"); - + snprintf(buf, sizeof(buf), "%s/enlightenment_init %s %i %i %s %s", e_prefix_bin_get(), - theme, + theme, e_canvas_engine_decide(e_config->evas_engine_init), e_config->font_hinting, tit, ver); @@ -124,7 +123,7 @@ e_init_status_set(const char *str) return; } printf("---SEND\n"); - ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 1, 0, 0, 0, (void *)str, + ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 1, 0, 0, 0, (void *)str, strlen(str) + 1); ecore_ipc_client_flush(client); } @@ -159,17 +158,17 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e) { int i, num; Ecore_X_Window *initwins; - + num = e->size / sizeof(Ecore_X_Window); initwins = e->data; for (i = 0; i < num; i+= 2) { Evas_List *l; - + for (l = e_manager_list(); l; l = l->next) { E_Manager *man; - + man = l->data; if (man->root == initwins[i + 0]) { @@ -182,7 +181,7 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e) while (stats) { const char *s; - + s = stats->data; stats = evas_list_remove_list(stats, stats); printf("---SPOOL %s\n", s); @@ -205,12 +204,12 @@ e_init_client_del(Ecore_Ipc_Event_Client_Del *e) if (e->client == client) { Evas_List *l; - + client = NULL; for (l = e_manager_list(); l; l = l->next) { E_Manager *man; - + man = l->data; man->initwin = 0; } @@ -270,7 +269,7 @@ static Evas_Object *_e_init_icon_box = NULL; static E_Pointer *_e_init_pointer = NULL; static Ecore_Event_Handler *_e_init_configure_handler = NULL; static Ecore_Timer *_e_init_timeout_timer = NULL; - + /* startup icons */ static Evas_Coord _e_init_icon_size = 0; static Evas_List *_e_init_icon_list = NULL; @@ -287,10 +286,10 @@ e_init_init(void) Evas_List *l, *screens; const char *s; - _e_init_configure_handler = - ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, + _e_init_configure_handler = + ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, _e_init_cb_window_configure, NULL); - + num = 0; roots = ecore_x_window_root_list(&num); if ((!roots) || (num <= 0)) @@ -301,7 +300,7 @@ e_init_init(void) } root = roots[0]; _e_init_root_win = root; - + ecore_x_window_size_get(root, &w, &h); _e_init_ecore_evas = e_canvas_new(e_config->evas_engine_init, root, 0, 0, w, h, 1, 1, @@ -322,14 +321,14 @@ e_init_init(void) s = evas_stringshare_add(e_config->init_default_theme); else s = e_path_find(path_init, e_config->init_default_theme); - + screens = (Evas_List *)e_xinerama_screens_get(); if (screens) { for (l = screens; l; l = l->next) { E_Screen *scr; - + scr = l->data; o = edje_object_add(_e_init_evas); /* first screen */ @@ -357,8 +356,8 @@ e_init_init(void) evas_object_show(o); } if (s) evas_stringshare_del(s); - - edje_object_part_text_set(_e_init_object, "e.text.disable_text", + + edje_object_part_text_set(_e_init_object, "e.text.disable_text", _("Disable this splash screen in the future?")); edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e", _e_init_cb_signal_disable, NULL); @@ -455,11 +454,11 @@ e_init_icons_desktop_add(Efreet_Desktop *desktop) char buf[128]; if (!_e_init_evas) return; - + if (!_e_init_icon_box) { Evas_Coord w, h; - + o = e_box_add(_e_init_evas); _e_init_icon_box = o; e_box_homogenous_set(o, 1); @@ -478,16 +477,16 @@ e_init_icons_desktop_add(Efreet_Desktop *desktop) } evas_object_show(o); } - + snprintf(buf, sizeof(buf), "%dx%d", _e_init_icon_size, _e_init_icon_size); o = e_util_desktop_icon_add(desktop, buf, _e_init_evas); if (o) { evas_object_resize(o, _e_init_icon_size, _e_init_icon_size); e_box_pack_end(_e_init_icon_box, o); - e_box_pack_options_set(o, - 0, 0, - 0, 0, + e_box_pack_options_set(o, + 0, 0, + 0, 0, 0.5, 0.5, _e_init_icon_size, _e_init_icon_size, _e_init_icon_size, _e_init_icon_size); @@ -541,7 +540,7 @@ static int _e_init_cb_window_configure(void *data, int ev_type, void *ev) { Ecore_X_Event_Window_Configure *e; - + e = ev; /* really simple - don't handle xinerama - because this event will only * happen in single head */ diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c index ab5a9e6c7..2b66eb28a 100644 --- a/src/bin/e_int_border_menu.c +++ b/src/bin/e_int_border_menu.c @@ -70,7 +70,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/stack_on_top"), "e/widgets/border/default/stack_on_top"); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Normal")); e_menu_item_radio_set(mi, 1); @@ -113,7 +113,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/maximize"), "e/widgets/border/default/maximize"); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Maximize vertically")); e_menu_item_radio_set(mi, 1); @@ -124,7 +124,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/maximize"), "e/widgets/border/default/maximize"); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Maximize horizontally")); e_menu_item_radio_set(mi, 1); @@ -135,7 +135,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/maximize"), "e/widgets/border/default/maximize"); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Unmaximize")); e_menu_item_radio_set(mi, 1); @@ -194,7 +194,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ "e/widgets/border/default/sendto"); } - if ((bd->client.netwm.state.stacking != E_STACKING_BELOW) || + if ((bd->client.netwm.state.stacking != E_STACKING_BELOW) || (!bd->user_skip_winlist) || (!bd->borderless)) { mi = e_menu_item_new(m); @@ -205,8 +205,8 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ "e/widgets/border/default/stick"), "e/widgets/border/default/stick"); } - - if ((bd->client.netwm.state.stacking == E_STACKING_BELOW) && + + if ((bd->client.netwm.state.stacking == E_STACKING_BELOW) && (bd->user_skip_winlist) && (bd->borderless)) { mi = e_menu_item_new(m); @@ -220,7 +220,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Stacking")); e_menu_item_submenu_set(mi, bd->border_stacking_menu); @@ -228,7 +228,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/stacking"), "e/widgets/border/default/stacking"); - + if (!(((bd->client.icccm.min_w == bd->client.icccm.max_w) && (bd->client.icccm.min_h == bd->client.icccm.max_h)) || (bd->lock_user_maximize))) @@ -259,11 +259,11 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ "e/widgets/border/default/skip"); #if 1 - if (!bd->internal) + if (!bd->internal) { mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - + if (bd->desktop) { mi = e_menu_item_new(m); @@ -307,7 +307,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/properties"), "e/widgets/border/default/properties"); - + mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); @@ -316,7 +316,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Kill")); e_menu_item_callback_set(mi, _e_border_menu_cb_kill, bd); - e_menu_item_icon_edje_set(mi, + e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/kill"), "e/widgets/border/default/kill"); @@ -327,19 +327,19 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Close")); e_menu_item_callback_set(mi, _e_border_menu_cb_close, bd); - e_menu_item_icon_edje_set(mi, + e_menu_item_icon_edje_set(mi, e_theme_edje_file_get("base/theme/borders", - "e/widgets/border/default/close"), + "e/widgets/border/default/close"), "e/widgets/border/default/close"); } - - if (!bd->internal) + + if (!bd->internal) { mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); /* Only allow to change layer for windows in "normal" layers */ - if ((!bd->lock_user_stacking) && + if ((!bd->lock_user_stacking) && ((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150))) { mi = e_menu_item_new(m); @@ -349,7 +349,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ e_theme_edje_file_get("base/theme/borders", "e/widgets/border/default/stack_on_top"), "e/widgets/border/default/stack_on_top"); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Lower")); e_menu_item_callback_set(mi, _e_border_menu_cb_lower, bd); @@ -370,7 +370,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_ "e/widgets/border/default/minimize"); } } - + if (key) e_menu_activate_key(m, bd->zone, x, y, 1, 1, E_MENU_POP_DIRECTION_DOWN); else @@ -382,7 +382,7 @@ EAPI void e_int_border_menu_del(E_Border *bd) { int was_menu = 0; - + if (bd->border_stacking_menu) { e_object_del(E_OBJECT(bd->border_stacking_menu)); @@ -425,12 +425,12 @@ static void _e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; - + bd = data; if (bd->border_locks_dialog) return; e_int_border_locks(bd); } - + static void _e_border_menu_cb_remember(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -440,19 +440,19 @@ _e_border_menu_cb_remember(void *data, E_Menu *m, E_Menu_Item *mi) if (bd->border_remember_dialog) return; e_int_border_remember(bd); } - + static void _e_border_menu_cb_border(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; char buf[256]; - + bd = data; if (bd->border_border_dialog) return; snprintf(buf, sizeof(buf), "%p", bd); e_configure_registry_call("internal/borders_border", bd->zone->container, buf); } - + static void _e_border_menu_cb_close(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -471,9 +471,9 @@ _e_border_menu_cb_iconify(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd->lock_user_iconify) { - if (bd->iconic) + if (bd->iconic) e_border_uniconify(bd); - else + else e_border_iconify(bd); } } @@ -498,7 +498,7 @@ _e_border_menu_cb_maximize(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd->lock_user_maximize) - e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | + e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | E_MAXIMIZE_BOTH); } @@ -512,7 +512,7 @@ _e_border_menu_cb_maximize_vertically(void *data, E_Menu *m, E_Menu_Item *mi) { if ((bd->maximized & E_MAXIMIZE_HORIZONTAL)) e_border_unmaximize(bd, E_MAXIMIZE_HORIZONTAL); - e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | + e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | E_MAXIMIZE_VERTICAL); } } @@ -527,7 +527,7 @@ _e_border_menu_cb_maximize_horizontally(void *data, E_Menu *m, E_Menu_Item *mi) { if ((bd->maximized & E_MAXIMIZE_VERTICAL)) e_border_unmaximize(bd, E_MAXIMIZE_VERTICAL); - e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | + e_border_maximize(bd, (e_config->maximize_policy & E_MAXIMIZE_TYPE) | E_MAXIMIZE_HORIZONTAL); } } @@ -549,9 +549,9 @@ _e_border_menu_cb_shade(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd->lock_user_shade) { - if (bd->shaded) + if (bd->shaded) e_border_unshade(bd, E_DIRECTION_UP); - else + else e_border_shade(bd, E_DIRECTION_UP); } } @@ -560,7 +560,7 @@ static void _e_border_menu_cb_icon_edit(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; - + bd = data; e_desktop_border_edit(m->zone->container, bd); } @@ -569,7 +569,7 @@ static void _e_border_menu_cb_prop(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; - + bd = data; e_int_border_prop(bd); } @@ -582,9 +582,9 @@ _e_border_menu_cb_stick(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd->lock_user_sticky) { - if (bd->sticky) + if (bd->sticky) e_border_unstick(bd); - else + else e_border_stick(bd); } } @@ -636,7 +636,7 @@ _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd) return; - + if (!bd->lock_user_fullscreen) { toggle = e_menu_item_toggle_get(mi); @@ -654,7 +654,7 @@ _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd) return; - + if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) && (!bd->client.netwm.state.skip_taskbar)) bd->user_skip_winlist = e_menu_item_toggle_get(mi); @@ -670,7 +670,7 @@ _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item *mi) bd = data; if (!bd) return; - + if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus)) bd->client.netwm.state.skip_pager = e_menu_item_toggle_get(mi); else @@ -763,7 +763,7 @@ _e_border_menu_cb_lower(void *data, E_Menu *m, E_Menu_Item *mi) ((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150))) { e_border_lower(bd); - } + } } static void @@ -872,8 +872,8 @@ _e_border_menu_cb_iconpref_e(void *data, E_Menu *m, E_Menu_Item *mi) bd->changed = 1; } -static void -_e_border_menu_cb_iconpref_user(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_e_border_menu_cb_iconpref_user(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; @@ -885,8 +885,8 @@ _e_border_menu_cb_iconpref_user(void *data, E_Menu *m, E_Menu_Item *mi) bd->changed = 1; } -static void -_e_border_menu_cb_iconpref_netwm(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_e_border_menu_cb_iconpref_netwm(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; @@ -898,19 +898,19 @@ _e_border_menu_cb_iconpref_netwm(void *data, E_Menu *m, E_Menu_Item *mi) bd->changed = 1; } -static void -_e_border_menu_cb_state_pre(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_e_border_menu_cb_state_pre(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd = data; E_Menu *subm; E_Menu_Item *submi; - + if (!bd) return; subm = e_menu_new(); e_object_data_set(E_OBJECT(subm), bd); e_menu_item_submenu_set(mi, subm); - + if ((!bd->lock_user_shade) && (!bd->fullscreen) && (!bd->maximized) && ((!bd->client.border.name) || (strcmp("borderless", bd->client.border.name)))) { @@ -1008,18 +1008,17 @@ _e_border_menu_cb_kbdshrtct_add(void *data, E_Menu *m, E_Menu_Item *mi) { E_Border *bd; E_Zone *zone; - char buf[4096]; - + bd = data; if (!bd) return; zone = e_util_zone_current_get(e_manager_current_get()); if(!zone) return; - e_configure_registry_call("keyboard_and_mouse/key_bindings", + e_configure_registry_call("keyboard_and_mouse/key_bindings", zone->container, bd->desktop->exec); } -static void -_e_border_menu_cb_ibar_add_pre(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_e_border_menu_cb_ibar_add_pre(void *data, E_Menu *m, E_Menu_Item *mi) { E_Menu *sm; E_Border *bd; @@ -1033,15 +1032,15 @@ _e_border_menu_cb_ibar_add_pre(void *data, E_Menu *m, E_Menu_Item *mi) snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar", homedir); dirs = ecore_file_ls(buf); if (!dirs) return; - + sm = e_menu_new(); - while ((file = ecore_list_next(dirs))) + while ((file = ecore_list_next(dirs))) { E_Menu_Item *smi; - + if (file[0] == '.') continue; snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, file); - if (ecore_file_is_dir(buf)) + if (ecore_file_is_dir(buf)) { smi = e_menu_item_new(sm); e_menu_item_label_set(smi, file); @@ -1052,18 +1051,18 @@ _e_border_menu_cb_ibar_add_pre(void *data, E_Menu *m, E_Menu_Item *mi) e_menu_item_submenu_set(mi, sm); } -static void -_e_border_menu_cb_ibar_add(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_e_border_menu_cb_ibar_add(void *data, E_Menu *m, E_Menu_Item *mi) { E_Order *od; E_Border *bd; char buf[4096]; - + bd = e_object_data_get(E_OBJECT(m)); if (!bd) return; if (!bd->desktop) return; - - snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s/.order", + + snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s/.order", e_user_homedir_get(), (char *)data); od = e_order_new(buf); if (!od) return; diff --git a/src/bin/e_place.c b/src/bin/e_place.c index a25fd10fe..d01657fce 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -29,7 +29,7 @@ e_place_zone_region_smart_cleanup(E_Zone *zone) { int testarea; E_Border *bd; - + bd = ll->data; testarea = bd->w * bd->h; /* Insert the border if larger than the current border */ @@ -74,7 +74,7 @@ _e_place_coverage_border_add(E_Zone *zone, Evas_List *skiplist, int ar, int x, i int ok; int iw, ih; int x0, x00, y0, y00; - + bl = e_container_border_list_first(zone->container); while ((bd = e_container_border_list_next(bl))) { @@ -113,38 +113,15 @@ _e_place_coverage_shelf_add(E_Zone *zone, int ar, int x, int y, int w, int h) Evas_List *l; E_Shelf *es; int x2, y2, w2, h2; - int iw, ih; - int x0, x00, y0, y00; - int tmp; - + for (l = e_shelf_list(); l; l = l->next) { - + es = l->data; if (es->zone != zone) continue; x2 = es->x; y2 = es->y; w2 = es->w; h2 = es->h; if (E_INTERSECTS(x, y, w, h, x2, y2, w2, h2)) return 0x7fffffff; -/* - { - x0 = x; - if (x < x2) x0 = x2; - x00 = (x + w); - if ((x2 + w2) < (x + w)) x00 = (x2 + w2); - y0 = y; - if (y < y2) y0 = y2; - y00 = (y + h); - if ((y2 + h2) < (y + h)) y00 = (y2 + h2); - iw = x00 - x0; - ih = y00 - y0; - tmp = (iw * ih); - // 100 times the weight for avoidance - if (tmp > (0x7ffffff / 100)) tmp = 0x7fffffff; - else tmp *= 100; - if ((0x7fffffff - ar) <= tmp) ar = 0x7fffffff; - else ar += tmp; - } - */ } return ar; } @@ -172,7 +149,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w printf("EEEK! trying to place 0x0 window!!!!\n"); return 1; } - + /* FIXME: this NEEDS optimizing */ a_w = 2; a_h = 2; @@ -185,7 +162,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w y -= zone->y; zw = zone->w; zh = zone->h; - + u_x = calloc(zw + 1, sizeof(char)); u_y = calloc(zh + 1, sizeof(char)); @@ -193,24 +170,24 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w a_x[1] = zw; a_y[0] = 0; a_y[1] = zh; - + u_x[0] = 1; u_x[zw] = 1; u_y[0] = 1; u_y[zh] = 1; - + if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_SMART) { Evas_List *l; - + for (l = e_shelf_list(); l; l = l->next) { E_Shelf *es; int bx, by, bw, bh; - + es = l->data; if (es->zone != zone) continue; - + bx = es->x; by = es->y; bw = es->w; @@ -277,13 +254,13 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w } } } - + bl = e_container_border_list_first(zone->container); while ((bd = e_container_border_list_next(bl))) { int ok; int bx, by, bw, bh; - + ok = 1; for (ll = skiplist; ll; ll = ll->next) { @@ -294,12 +271,12 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w } } if ((!ok) || (!bd->visible)) continue; - + bx = bd->x - zone->x; by = bd->y - zone->y; bw = bd->w; bh = bd->h; - + if (E_INTERSECTS(bx, by, bw, bh, 0, 0, zw, zh)) { if (bx < 0) @@ -466,7 +443,7 @@ e_place_zone_region_smart(E_Zone *zone, Evas_List *skiplist, int x, int y, int w if (*ry < 0) *ry = 0; printf("0 - PLACE %i %i | %ix%i\n", *rx, *ry, w, h); - + *rx += zone->x; *ry += zone->y; return 1; @@ -484,19 +461,19 @@ e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, i *rx = cursor_x - (w >> 1); *ry = cursor_y - (it >> 1); - if (*rx < zone->x) + if (*rx < zone->x) *rx = zone->x; - if (*ry < zone->y) + if (*ry < zone->y) *ry = zone->y; zone_right = zone->x + zone->w; zone_bottom = zone->y + zone->h; - if ((*rx + w) > zone_right) + if ((*rx + w) > zone_right) *rx = zone_right - w; - if ((*ry + h) > zone_bottom) + if ((*ry + h) > zone_bottom) *ry = zone_bottom - h; return 1; diff --git a/src/bin/e_xinerama.c b/src/bin/e_xinerama.c index 3fce3f32a..5f697aca7 100644 --- a/src/bin/e_xinerama.c +++ b/src/bin/e_xinerama.c @@ -87,15 +87,14 @@ _e_xinerama_update(void) int n; Ecore_X_Window *roots; Evas_List *l; - int sorted; - + roots = ecore_x_window_root_list(&n); if (roots) { int i; int rw, rh; Ecore_X_Window root; - + /* more than 1 root window - xinerama wont be active */ if (n > 1) { @@ -112,7 +111,7 @@ _e_xinerama_update(void) if (n < 1) { E_Screen *scr; - + scr = calloc(1, sizeof(E_Screen)); scr->screen = 0; scr->x = 0; @@ -126,12 +125,12 @@ _e_xinerama_update(void) for (i = 0; i < n; i++) { int x, y, w, h; - + /* get each xinerama screen geometry */ if (ecore_x_xinerama_screen_geometry_get(i, &x, &y, &w, &h)) { E_Screen *scr; - + printf("E17 INIT: XINERAMA SCREEN: [%i], %ix%i+%i+%i\n", i, w, h, x, y); /* add it to our list */ @@ -153,7 +152,7 @@ _e_xinerama_update(void) E_Screen *scr; int add = 0; Evas_List *removes; - + scr = l->data; add = 1; removes = NULL; @@ -161,14 +160,14 @@ _e_xinerama_update(void) for (ll = chosen_screens; ll; ll = ll->next) { E_Screen *scr2; - + scr2 = ll->data; /* if they intersect */ if (E_INTERSECTS(scr->x, scr->y, scr->w, scr->h, scr2->x, scr2->y, scr2->w, scr2->h)) { int sz, sz2; - + /* calculate pixel area */ sz = scr->w * scr->h; sz2 = scr2->w * scr2->h; @@ -196,7 +195,7 @@ _e_xinerama_update(void) for (n = 0, l = chosen_screens; l; l = l->next, n++) { E_Screen *scr; - + scr = l->data; printf("E17 INIT: XINERAMA CHOSEN: [%i], %ix%i+%i+%i\n", scr->screen, scr->w, scr->h, scr->x, scr->y); @@ -209,7 +208,7 @@ _e_xinerama_cb_screen_sort(void *data1, void *data2) { E_Screen *scr, *scr2; int dif; - + scr = data1; scr2 = data2; dif = (scr2->w * scr2->h) - (scr->w * scr->h);