formatting: all at once

SVN revision: 82625
devs/asdfuser/comp-sounds
Mike Blumenkrantz 10 years ago
parent 845ba1ba12
commit 9e8e755cdf
  1. 52
      src/bin/e_about.c
  2. 96
      src/bin/e_acpi.c
  3. 32
      src/bin/e_actions.c
  4. 4
      src/bin/e_alert_main.c
  5. 23
      src/bin/e_atoms.c
  6. 66
      src/bin/e_backlight.c
  7. 16
      src/bin/e_backlight_main.c
  8. 5
      src/bin/e_bg.c
  9. 92
      src/bin/e_bindings.c
  10. 300
      src/bin/e_border.c
  11. 8
      src/bin/e_box.c
  12. 32
      src/bin/e_color.c
  13. 72
      src/bin/e_color_class.c
  14. 9
      src/bin/e_color_dialog.c
  15. 307
      src/bin/e_comp.c
  16. 3
      src/bin/e_comp_cfdata.c
  17. 18
      src/bin/e_comp_update.c
  18. 2
      src/bin/e_comp_wl.c
  19. 4
      src/bin/e_comp_wl_comp.c
  20. 24
      src/bin/e_comp_wl_input.c
  21. 2
      src/bin/e_comp_wl_shell.c
  22. 3
      src/bin/e_comp_wl_surface.c
  23. 369
      src/bin/e_config.c
  24. 5
      src/bin/e_config_data.c
  25. 4
      src/bin/e_config_dialog.c
  26. 24
      src/bin/e_configure.c
  27. 352
      src/bin/e_configure_option.c
  28. 4
      src/bin/e_container.c
  29. 15
      src/bin/e_dbusmenu.c
  30. 22
      src/bin/e_desk.c
  31. 1
      src/bin/e_deskenv.c
  32. 59
      src/bin/e_desklock.c
  33. 11
      src/bin/e_dnd.c
  34. 22
      src/bin/e_dpms.c
  35. 262
      src/bin/e_entry.c
  36. 4
      src/bin/e_env.c
  37. 89
      src/bin/e_exec.c
  38. 27
      src/bin/e_filereg.c
  39. 263
      src/bin/e_fm.c
  40. 13
      src/bin/e_fm_cmdline.c
  41. 33
      src/bin/e_fm_device.c
  42. 3
      src/bin/e_fm_mime.c
  43. 71
      src/bin/e_fm_op.c
  44. 4
      src/bin/e_fm_prop.c
  45. 2
      src/bin/e_fm_shared_codec.c
  46. 4
      src/bin/e_fm_shared_device.c
  47. 83
      src/bin/e_gadcon.c
  48. 15
      src/bin/e_grab_dialog.c
  49. 9
      src/bin/e_grabinput.c
  50. 111
      src/bin/e_hints.c
  51. 12
      src/bin/e_icon.c
  52. 53
      src/bin/e_ilist.c
  53. 218
      src/bin/e_imc_main.c
  54. 28
      src/bin/e_import_config_dialog.c
  55. 12
      src/bin/e_import_dialog.c
  56. 1
      src/bin/e_int_border_locks.c
  57. 2
      src/bin/e_int_border_menu.c
  58. 36
      src/bin/e_int_border_prop.c
  59. 11
      src/bin/e_int_border_remember.c
  60. 17
      src/bin/e_int_config_modules.c
  61. 63
      src/bin/e_int_gadcon_config.c
  62. 15
      src/bin/e_int_menus.c
  63. 41
      src/bin/e_int_shelf_config.c
  64. 37
      src/bin/e_int_toolbar_config.c
  65. 1
      src/bin/e_intl.c
  66. 22
      src/bin/e_intl_data.c
  67. 136
      src/bin/e_ipc.c
  68. 74
      src/bin/e_ipc_codec.c
  69. 183
      src/bin/e_layout.c
  70. 3
      src/bin/e_log.c
  71. 24
      src/bin/e_main.c
  72. 4
      src/bin/e_manager.c
  73. 268
      src/bin/e_maximize.c
  74. 68
      src/bin/e_menu.c
  75. 147
      src/bin/e_module.c
  76. 1
      src/bin/e_mouse.c
  77. 40
      src/bin/e_msg.c
  78. 123
      src/bin/e_msgbus.c
  79. 37
      src/bin/e_notification.c
  80. 27
      src/bin/e_obj_dialog.c
  81. 211
      src/bin/e_object.c
  82. 81
      src/bin/e_open.c
  83. 1
      src/bin/e_pan.c
  84. 629
      src/bin/e_place.c
  85. 71
      src/bin/e_pointer.c
  86. 3
      src/bin/e_prefix.c
  87. 6
      src/bin/e_randr.c
  88. 5
      src/bin/e_randr_11.c
  89. 17
      src/bin/e_randr_11_serialization.c
  90. 25
      src/bin/e_randr_12_ask_dialog.c
  91. 7
      src/bin/e_randr_12_crtc.c
  92. 26
      src/bin/e_randr_12_output.c
  93. 66
      src/bin/e_randr_12_serialization.c
  94. 23
      src/bin/e_randr_serialization.c
  95. 20
      src/bin/e_remember.c
  96. 17
      src/bin/e_scale.c
  97. 91
      src/bin/e_screensaver.c
  98. 15
      src/bin/e_scrollframe.c
  99. 122
      src/bin/e_sha1.c
  100. 197
      src/bin/e_shelf.c
  101. Some files were not shown because too many files have changed in this diff Show More

@ -32,32 +32,32 @@ e_about_new(E_Container *con)
"To contact us please visit:<br>"
"<hilight>http://www.enlightenment.org</><br>"
"<br>"
),
"All rights reserved.<br>"
"<br>"
"Redistribution and use in source and binary forms, with or without "
"modification, are permitted provided that the following conditions "
"are met:<br>"
"<br>"
"1. Redistributions of source code must retain the above copyright "
"notice, this list of conditions and the following disclaimer.<br>"
"2. Redistributions in binary form must reproduce the above copyright "
"notice, this list of conditions and the following disclaimer in the "
"documentation and/or other materials provided with the "
"distribution.<br>"
"<br>"
"<hilight>THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR "
"IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED "
"WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE "
"ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR "
"CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, "
"SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT "
"LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF "
"USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED "
"AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT "
"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN "
"ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE "
"POSSIBILITY OF SUCH DAMAGE.</><br>"
),
"All rights reserved.<br>"
"<br>"
"Redistribution and use in source and binary forms, with or without "
"modification, are permitted provided that the following conditions "
"are met:<br>"
"<br>"
"1. Redistributions of source code must retain the above copyright "
"notice, this list of conditions and the following disclaimer.<br>"
"2. Redistributions in binary form must reproduce the above copyright "
"notice, this list of conditions and the following disclaimer in the "
"documentation and/or other materials provided with the "
"distribution.<br>"
"<br>"
"<hilight>THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR "
"IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED "
"WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE "
"ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR "
"CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, "
"SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT "
"LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF "
"USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED "
"AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT "
"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN "
"ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE "
"POSSIBILITY OF SUCH DAMAGE.</><br>"
);
e_obj_dialog_obj_part_text_set(od, "e.textblock.about", buf);

@ -34,8 +34,8 @@ struct _E_ACPI_Device_Multiplexed
/* local function prototypes */
static Eina_Bool _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event);
static Eina_Bool _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event);
static void _e_acpi_cb_event_free(void *data __UNUSED__, void *event);
static int _e_acpi_lid_status_get(const char *device, const char *bus);
static void _e_acpi_cb_event_free(void *data __UNUSED__, void *event);
static int _e_acpi_lid_status_get(const char *device, const char *bus);
static Eina_Bool _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event);
/* local variables */
@ -47,48 +47,48 @@ static Eina_Strbuf *acpibuf = NULL;
static E_ACPI_Device_Simple _devices_simple[] =
{
/* NB: DO NOT TRANSLATE THESE. */
{"ac_adapter", E_ACPI_TYPE_AC_ADAPTER},
{"battery", E_ACPI_TYPE_BATTERY},
{"button/lid", E_ACPI_TYPE_LID},
{"ac_adapter", E_ACPI_TYPE_AC_ADAPTER},
{"battery", E_ACPI_TYPE_BATTERY},
{"button/lid", E_ACPI_TYPE_LID},
{"button/power", E_ACPI_TYPE_POWER},
{"button/sleep", E_ACPI_TYPE_SLEEP},
{"fan", E_ACPI_TYPE_FAN},
{"processor", E_ACPI_TYPE_PROCESSOR},
{"fan", E_ACPI_TYPE_FAN},
{"processor", E_ACPI_TYPE_PROCESSOR},
{"thermal_zone", E_ACPI_TYPE_THERMAL},
{"video", E_ACPI_TYPE_VIDEO},
{"video", E_ACPI_TYPE_VIDEO},
{NULL, E_ACPI_TYPE_UNKNOWN}
{NULL, E_ACPI_TYPE_UNKNOWN}
};
static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
{
/* NB: DO NOT TRANSLATE THESE. */
/* Sony VAIO - VPCF115FM / PCG-81114L - nvidia gfx */
{"sony/hotkey", NULL, 0x10, E_ACPI_TYPE_BRIGHTNESS_DOWN},
{"sony/hotkey", NULL, 0x11, E_ACPI_TYPE_BRIGHTNESS_UP},
{"sony/hotkey", NULL, 0x12, E_ACPI_TYPE_VIDEO},
{"sony/hotkey", NULL, 0x14, E_ACPI_TYPE_ZOOM_OUT},
{"sony/hotkey", NULL, 0x15, E_ACPI_TYPE_ZOOM_IN},
{"sony/hotkey", NULL, 0x17, E_ACPI_TYPE_HIBERNATE},
{"sony/hotkey", NULL, 0xa6, E_ACPI_TYPE_ASSIST},
{"sony/hotkey", NULL, 0x20, E_ACPI_TYPE_S1},
{"sony/hotkey", NULL, 0xa5, E_ACPI_TYPE_VAIO},
{"sony/hotkey", NULL, 0x10, E_ACPI_TYPE_BRIGHTNESS_DOWN},
{"sony/hotkey", NULL, 0x11, E_ACPI_TYPE_BRIGHTNESS_UP},
{"sony/hotkey", NULL, 0x12, E_ACPI_TYPE_VIDEO},
{"sony/hotkey", NULL, 0x14, E_ACPI_TYPE_ZOOM_OUT},
{"sony/hotkey", NULL, 0x15, E_ACPI_TYPE_ZOOM_IN},
{"sony/hotkey", NULL, 0x17, E_ACPI_TYPE_HIBERNATE},
{"sony/hotkey", NULL, 0xa6, E_ACPI_TYPE_ASSIST},
{"sony/hotkey", NULL, 0x20, E_ACPI_TYPE_S1},
{"sony/hotkey", NULL, 0xa5, E_ACPI_TYPE_VAIO},
/* Sony VAIO - X505 - intel gfx */
{"sony/hotkey", NULL, 0x0e, E_ACPI_TYPE_MUTE},
{"sony/hotkey", NULL, 0x0f, E_ACPI_TYPE_VOLUME},
{"sony/hotkey", NULL, 0x10, E_ACPI_TYPE_BRIGHTNESS},
{"sony/hotkey", NULL, 0x12, E_ACPI_TYPE_VIDEO},
{"sony/hotkey", NULL, 0x0e, E_ACPI_TYPE_MUTE},
{"sony/hotkey", NULL, 0x0f, E_ACPI_TYPE_VOLUME},
{"sony/hotkey", NULL, 0x10, E_ACPI_TYPE_BRIGHTNESS},
{"sony/hotkey", NULL, 0x12, E_ACPI_TYPE_VIDEO},
/* HP Compaq Presario - CQ61 - intel gfx */
/** interesting these get auto-mapped to keys in x11. here for documentation
** but not enabled as we can use regular keybinds for these
** but not enabled as we can use regular keybinds for these
{"video", "DD03", 0x87, E_ACPI_TYPE_BRIGHTNESS_DOWN},
{"video", "DD03", 0x86, E_ACPI_TYPE_BRIGHTNESS_UP},
{"video", "OVGA", 0x80, E_ACPI_TYPE_VIDEO},
*/
*/
/* END */
{NULL, NULL, 0x00, E_ACPI_TYPE_UNKNOWN}
{NULL, NULL, 0x00, E_ACPI_TYPE_UNKNOWN}
};
/* public variables */
@ -105,24 +105,24 @@ e_acpi_init(void)
/* try to connect to acpid socket */
_e_acpid = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM,
"/var/run/acpid.socket", -1, NULL);
"/var/run/acpid.socket", -1, NULL);
if (!_e_acpid) return 1;
/* setup handlers */
_e_acpid_hdls =
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
_e_acpi_cb_server_del, NULL));
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
_e_acpi_cb_server_del, NULL));
_e_acpid_hdls =
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_e_acpi_cb_server_data, NULL));
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_e_acpi_cb_server_data, NULL));
/* Add handlers for standard acpi events */
_e_acpid_hdls =
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(E_EVENT_ACPI,
_e_acpi_cb_event, NULL));
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(E_EVENT_ACPI,
_e_acpi_cb_event, NULL));
return 1;
}
@ -132,7 +132,8 @@ e_acpi_shutdown(void)
Ecore_Event_Handler *hdl;
/* cleanup event handlers */
EINA_LIST_FREE(_e_acpid_hdls, hdl) ecore_event_handler_del(hdl);
EINA_LIST_FREE(_e_acpid_hdls, hdl)
ecore_event_handler_del(hdl);
/* kill the server if existing */
if (_e_acpid)
@ -167,7 +168,8 @@ _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event)
if (ev->server != _e_acpid) return ECORE_CALLBACK_PASS_ON;
/* cleanup event handlers */
EINA_LIST_FREE(_e_acpid_hdls, hdl) ecore_event_handler_del(hdl);
EINA_LIST_FREE(_e_acpid_hdls, hdl)
ecore_event_handler_del(hdl);
/* kill the server if existing */
if (_e_acpid)
@ -192,7 +194,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
if ((!ev->data) || (ev->size < 1)) return ECORE_CALLBACK_PASS_ON;
/* write out actual acpi received data to stdout for debugging
res = fwrite(ev->data, ev->size, 1, stdout);
res = fwrite(ev->data, ev->size, 1, stdout);
*/
/* data from a server isnt a string - its not 0 byte terminated. it's just
* a blob of data. copy to string and 0 byte terminate it so it can be
@ -232,8 +234,8 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
if ((!strcmp(device, _devices_multiplexed[i].name)) &&
// AND busname not set OR device name matches
(!_devices_multiplexed[i].bus ||
(_devices_multiplexed[i].bus &&
(!strcmp(bus, _devices_multiplexed[i].bus)))) &&
(_devices_multiplexed[i].bus &&
(!strcmp(bus, _devices_multiplexed[i].bus)))) &&
// AND status matches
(_devices_multiplexed[i].status == status))
{
@ -269,6 +271,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
acpi_event->status =
_e_acpi_lid_status_get(device, bus);
break;
default:
break;
}
@ -350,15 +353,19 @@ _e_acpi_lid_status_get(const char *device, const char *bus)
/* parse out state file */
i = 0;
while (buff[i] != ':') i++;
while (!isalnum(buff[i])) i++;
while (buff[i] != ':')
i++;
while (!isalnum(buff[i]))
i++;
ret = &(buff[i]);
while (isalnum(buff[i])) i++;
while (isalnum(buff[i]))
i++;
buff[i] = 0;
/* compare value from state file and return something sane */
if (!strcmp(ret, "open")) return E_ACPI_LID_OPEN;
else if (!strcmp(ret, "closed")) return E_ACPI_LID_CLOSED;
else if (!strcmp(ret, "closed"))
return E_ACPI_LID_CLOSED;
else return E_ACPI_LID_UNKNOWN;
}
@ -372,3 +379,4 @@ _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event)
e_bindings_acpi_event_handle(E_BINDING_CONTEXT_NONE, NULL, ev);
return ECORE_CALLBACK_PASS_ON;
}

@ -82,7 +82,7 @@
static void _e_actions_act_##act##_go_acpi(E_Object * obj __UNUSED__, const char *params use, E_Event_Acpi * ev __UNUSED__)
/* local functions forward declarations (window_jump_to needs the definition of exec) */
ACT_FN_GO(exec,);
ACT_FN_GO(exec, );
/* local subsystem functions */
static void _e_action_free(E_Action *act);
@ -1175,9 +1175,9 @@ window_jump_to(const char *params)
* only if we don't have to warp the pointer anyway */
current_zone = e_util_zone_current_get(e_manager_current_get());
if (current_zone != bd->zone && e_config->focus_policy == E_FOCUS_CLICK)
ecore_x_pointer_warp(bd->zone->container->win,
bd->zone->x + (bd->zone->w / 2),
bd->zone->y + (bd->zone->h / 2));
ecore_x_pointer_warp(bd->zone->container->win,
bd->zone->x + (bd->zone->w / 2),
bd->zone->y + (bd->zone->h / 2));
/* Change the virtual desktop if the window isn't on the current virtual desktop */
e_desk_show(bd->desk);
@ -1193,12 +1193,12 @@ window_jump_to(const char *params)
return 0;
}
ACT_FN_GO(window_jump_to,)
ACT_FN_GO(window_jump_to, )
{
window_jump_to(params);
}
ACT_FN_GO(window_jump_to_or_start,)
ACT_FN_GO(window_jump_to_or_start, )
{
char *window_name, *start_name;
if (!params) return;
@ -1967,7 +1967,7 @@ ACT_FN_GO_KEY(menu_show, , __UNUSED__)
}
/***************************************************************************/
ACT_FN_GO(exec,)
ACT_FN_GO(exec, )
{
E_Zone *zone;
static double lock;
@ -2037,7 +2037,7 @@ ACT_FN_GO(app_new_instance, __UNUSED__)
E_Zone *zone;
zone = _e_actions_zone_get(obj);
if (!zone)
if (!zone)
zone = e_util_zone_current_get(e_manager_current_get());
if (!obj) obj = E_OBJECT(e_border_focused_get());
@ -2812,7 +2812,7 @@ _delayed_action_mouse_del(E_Object *obj, const char *params __UNUSED__, Ecore_Ev
}
// obj , params , ev
ACT_FN_GO_KEY(delayed_action, ,)
ACT_FN_GO_KEY(delayed_action, , )
{
_delayed_action_key_add(obj, params, ev);
}
@ -2889,7 +2889,7 @@ ACT_FN_GO(kbd_layout_prev, __UNUSED__)
ACT_FN_GO(module_enable, )
{
E_Module *m;
if (!params) return;
m = e_module_find(params);
if (!m)
@ -2903,7 +2903,7 @@ ACT_FN_GO(module_enable, )
ACT_FN_GO(module_disable, )
{
E_Module *m;
if (!params) return;
m = e_module_find(params);
if (!m) return;
@ -2913,7 +2913,7 @@ ACT_FN_GO(module_disable, )
ACT_FN_GO(module_toggle, )
{
E_Module *m;
fprintf(stderr, "toggle\n");
if (!params) return;
fprintf(stderr, "'%s'\n", params);
@ -3019,7 +3019,6 @@ e_actions_init(void)
e_action_predef_name_set(N_("Window : State"), N_("Fullscreen Mode Enable"),
"window_fullscreen", NULL, NULL, 0);
/* window_maximized_toggle */
ACT_GO(window_maximized_toggle);
e_action_predef_name_set(N_("Window : State"), N_("Maximize"),
@ -3062,7 +3061,7 @@ e_actions_init(void)
ACT_GO(window_shaded);
e_action_predef_name_set(N_("Window : State"), N_("Set Shaded State"),
"window_shaded", NULL, _("syntax: \"(0|1) (up|down|left|right)\"") , 1);
"window_shaded", NULL, _("syntax: \"(0|1) (up|down|left|right)\""), 1);
/* window_borderless_toggle */
ACT_GO(window_borderless_toggle);
@ -3228,8 +3227,6 @@ e_actions_init(void)
e_action_predef_name_set(N_("Window : List"), N_("Jump to window... or start..."),
"window_jump_to_or_start", NULL, "syntax: icccm_window_name application", 1);
/* screen_send_to */
ACT_GO(screen_send_to);
e_action_predef_name_set(N_("Screen"), N_("Send Mouse To Screen 0"),
@ -3392,7 +3389,7 @@ e_actions_init(void)
e_action_predef_name_set(N_("Enlightenment : Module"),
N_("Toggle the named module"),
"module_toggle", NULL, NULL, 1);
ACT_GO(logout);
e_action_predef_name_set(N_("System"), N_("Log Out"), "logout",
NULL, NULL, 0);
@ -3726,3 +3723,4 @@ _action_groups_sort_cb(const void *d1, const void *d2)
if (!(g2 = d2)) return -1;
return strcmp(g1->act_grp, g2->act_grp);
}

@ -82,8 +82,8 @@ main(int argc, char **argv)
pid = atoi(argv[i]); // E's pid
else if (i == 3)
backtrace_str = argv[i];
else if (i == 4)
exit_gdb = atoi(argv[i]);
else if (i == 4)
exit_gdb = atoi(argv[i]);
}
fprintf(stderr, "exit_gdb: %i\n", exit_gdb);

@ -20,17 +20,17 @@ e_atoms_init(void)
{
const char *atom_names[] = {
"__E_WINDOW_MANAGED",
"__E_WINDOW_CONTAINER",
"__E_WINDOW_ZONE",
"__E_WINDOW_DESK",
"__E_WINDOW_MAPPED",
"__E_WINDOW_SHADE_DIRECTION",
"__E_WINDOW_HIDDEN",
"__E_WINDOW_BORDER_SIZE",
"__E_ATOM_WINDOW_STATE",
"__E_ATOM_WINDOW_STATE_CENTERED",
"__E_ATOM_DESKTOP_FILE",
"E_ZONE_GEOMETRY"
"__E_WINDOW_CONTAINER",
"__E_WINDOW_ZONE",
"__E_WINDOW_DESK",
"__E_WINDOW_MAPPED",
"__E_WINDOW_SHADE_DIRECTION",
"__E_WINDOW_HIDDEN",
"__E_WINDOW_BORDER_SIZE",
"__E_ATOM_WINDOW_STATE",
"__E_ATOM_WINDOW_STATE_CENTERED",
"__E_ATOM_DESKTOP_FILE",
"E_ZONE_GEOMETRY"
};
Ecore_X_Atom atoms[12];
@ -56,3 +56,4 @@ e_atoms_shutdown(void)
/* Nothing really to do here yet, just present for consistency right now */
return 1;
}

@ -26,8 +26,8 @@ static Ecore_Event_Handler *_e_backlight_handler_border_uniconify = NULL;
static Ecore_Event_Handler *_e_backlight_handler_border_desk_set = NULL;
static Ecore_Event_Handler *_e_backlight_handler_desk_show = NULL;
static void _e_backlight_update(E_Zone *zone);
static void _e_backlight_set(E_Zone *zone, double val);
static void _e_backlight_update(E_Zone *zone);
static void _e_backlight_set(E_Zone *zone, double val);
static Eina_Bool _bl_anim(void *data, double pos);
static Eina_Bool bl_avail = EINA_FALSE;
static Eina_Bool _e_backlight_handler(void *d, int type, void *ev);
@ -39,10 +39,10 @@ static Ecore_Exe *bl_sys_set_exe = NULL;
static Eina_Bool bl_sys_pending_set = EINA_FALSE;
static Eina_Bool bl_sys_set_exe_ready = EINA_TRUE;
static void _bl_sys_find(void);
static void _bl_sys_level_get(void);
static void _bl_sys_find(void);
static void _bl_sys_level_get(void);
static Eina_Bool _e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event);
static void _bl_sys_level_set(double val);
static void _bl_sys_level_set(double val);
#endif
EAPI int E_EVENT_BACKLIGHT_CHANGE = -1;
@ -59,28 +59,28 @@ e_backlight_init(void)
bl_avail = EINA_TRUE;
_e_backlight_handler_config_mode = ecore_event_handler_add
(E_EVENT_CONFIG_MODE_CHANGED, _e_backlight_handler, NULL);
(E_EVENT_CONFIG_MODE_CHANGED, _e_backlight_handler, NULL);
_e_backlight_handler_border_fullscreen = ecore_event_handler_add
(E_EVENT_BORDER_FULLSCREEN, _e_backlight_handler, NULL);
(E_EVENT_BORDER_FULLSCREEN, _e_backlight_handler, NULL);
_e_backlight_handler_border_unfullscreen = ecore_event_handler_add
(E_EVENT_BORDER_UNFULLSCREEN, _e_backlight_handler, NULL);
(E_EVENT_BORDER_UNFULLSCREEN, _e_backlight_handler, NULL);
_e_backlight_handler_border_remove = ecore_event_handler_add
(E_EVENT_BORDER_REMOVE, _e_backlight_handler, NULL);
(E_EVENT_BORDER_REMOVE, _e_backlight_handler, NULL);
_e_backlight_handler_border_iconify = ecore_event_handler_add
(E_EVENT_BORDER_ICONIFY, _e_backlight_handler, NULL);
(E_EVENT_BORDER_ICONIFY, _e_backlight_handler, NULL);
_e_backlight_handler_border_uniconify = ecore_event_handler_add
(E_EVENT_BORDER_UNICONIFY, _e_backlight_handler, NULL);
(E_EVENT_BORDER_UNICONIFY, _e_backlight_handler, NULL);
_e_backlight_handler_border_desk_set = ecore_event_handler_add
(E_EVENT_BORDER_DESK_SET, _e_backlight_handler, NULL);
(E_EVENT_BORDER_DESK_SET, _e_backlight_handler, NULL);
_e_backlight_handler_desk_show = ecore_event_handler_add
(E_EVENT_DESK_SHOW, _e_backlight_handler, NULL);
(E_EVENT_DESK_SHOW, _e_backlight_handler, NULL);
if (bl_avail)
{
@ -101,14 +101,15 @@ EINTERN int
e_backlight_shutdown(void)
{
const char *s;
if (bl_anim) ecore_animator_del(bl_anim);
bl_anim = NULL;
if (e_config->backlight.mode != E_BACKLIGHT_MODE_NORMAL)
e_backlight_level_set(NULL, e_config->backlight.normal, 0.0);
EINA_LIST_FREE(bl_devs, s) eina_stringshare_del(s);
EINA_LIST_FREE(bl_devs, s)
eina_stringshare_del(s);
#ifdef HAVE_EEZE
if (bl_sysval) eina_stringshare_del(bl_sysval);
bl_sysval = NULL;
@ -206,16 +207,18 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
// if tim == 0.0 - then do it instantnly, if time == -1 use some default
// transition time
if (val < 0.0) val = 0.0;
else if (val > 1.0) val = 1.0;
else if (val > 1.0)
val = 1.0;
if ((val == bl_val) && (!bl_anim)) return;
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
bl_now = bl_val;
bl_val = val;
// if (e_config->backlight.mode != E_BACKLIGHT_MODE_NORMAL) return;
if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
tim = 0.5;
tim = 0.5;
else
if (tim < 0.0) tim = e_config->backlight.transition;
if (tim < 0.0)
tim = e_config->backlight.transition;
ecore_event_add(E_EVENT_BACKLIGHT_CHANGE, NULL, NULL, NULL);
if (tim == 0.0)
{
@ -225,7 +228,7 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
bl_anim = NULL;
}
_e_backlight_set(zone, val);
return;
return;
}
if (bl_anim) ecore_animator_del(bl_anim);
bl_anim = ecore_animator_timeline_add(tim, _bl_anim, zone);
@ -245,7 +248,7 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
// zone == NULL == everything
if (e_config->backlight.mode == mode) return;
e_config->backlight.mode = mode;
if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
{
e_backlight_level_set(zone, e_config->backlight.normal, -1.0);
}
@ -258,7 +261,7 @@ e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
e_backlight_level_set(zone, e_config->backlight.dim, -1.0);
}
else if (e_config->backlight.mode == E_BACKLIGHT_MODE_MAX)
e_backlight_level_set(zone, 1.0, -1.0);
e_backlight_level_set(zone, 1.0, -1.0);
}
EAPI E_Backlight_Mode
@ -299,8 +302,9 @@ _e_backlight_update(E_Zone *zone)
char *name;
const char *s;
Eina_Bool gotten = EINA_FALSE;
EINA_LIST_FREE(bl_devs, s) eina_stringshare_del(s);
EINA_LIST_FREE(bl_devs, s)
eina_stringshare_del(s);
for (i = 0; i < num; i++)
{
name = ecore_x_randr_output_name_get(root, out[i], NULL);
@ -390,7 +394,7 @@ _bl_anim(void *data, double pos)
// FIXME: if zone is deleted while anim going... bad things.
pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
v = (bl_animval * (1.0 - pos)) + (bl_val *pos);
v = (bl_animval * (1.0 - pos)) + (bl_val * pos);
_e_backlight_set(zone, v);
if (pos >= 1.0)
{
@ -470,7 +474,8 @@ _bl_sys_find(void)
eina_stringshare_del(bl_sysval);
bl_sysval = NULL;
}
EINA_LIST_FREE(bl_devs, s) eina_stringshare_del(s);
EINA_LIST_FREE(bl_devs, s)
eina_stringshare_del(s);
/* if configured backlight is there - use it, or if not use first */
EINA_LIST_FOREACH(pdevs, l, f)
{
@ -504,7 +509,7 @@ _bl_sys_level_get(void)
const char *str;
if (bl_anim) return;
str = eeze_udev_syspath_get_sysattr(bl_sysval, "max_brightness");
if (!str) return;
@ -528,7 +533,7 @@ _e_bl_cb_ext_delay(void *data __UNUSED__)
if (bl_sys_pending_set)
{
bl_sys_pending_set = EINA_FALSE;
_bl_sys_level_set(bl_delayval);
}
return EINA_FALSE;
@ -555,8 +560,8 @@ _bl_sys_level_set(double val)
char buf[PATH_MAX];
if (!bl_sys_exit_handler)
bl_sys_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_e_bl_cb_exit, NULL);
bl_sys_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_e_bl_cb_exit, NULL);
bl_delayval = val;
if ((bl_sys_set_exe) || (!bl_sys_set_exe_ready))
{
@ -569,4 +574,5 @@ _bl_sys_level_set(double val)
e_prefix_lib_get(), (int)(val * 1000.0), bl_sysval);
bl_sys_set_exe = ecore_exe_run(buf, NULL);
}
#endif

@ -61,7 +61,7 @@ main(int argc, char **argv)
}
else
exit(1);
if (!dev) return -1;
if (setuid(0) != 0)
@ -94,9 +94,9 @@ main(int argc, char **argv)
}
}
}
if (!devok) return -1;
str = eeze_udev_syspath_get_sysattr(dev, "max_brightness");
if (str)
{
@ -109,19 +109,21 @@ main(int argc, char **argv)
eina_stringshare_del(str);
}
}
if (maxlevel <= 0) maxlevel = 255;
if (curlevel >= 0)
{
curlevel = ((maxlevel * level) + 500) / 1000;
if (curlevel > maxlevel) curlevel = maxlevel;
else if (curlevel < 0) curlevel = 0;
else if (curlevel < 0)
curlevel = 0;
snprintf(buf, sizeof(buf), "%s/brightness", f);
return _bl_write_file(buf, curlevel);
}
EINA_LIST_FREE(devs, f)
eina_stringshare_del(f);
return -1;
}

@ -4,7 +4,7 @@
static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_bg_event_bg_update_free(void *data, void *event);
static void e_bg_handler_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path);
static int e_bg_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path);
static int e_bg_handler_test(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *path);
static void _e_bg_handler_image_imported(const char *image_path, void *data);
/* local subsystem globals */
@ -187,7 +187,7 @@ e_bg_file_get(int container_num, int zone_num, int desk_x, int desk_y)
ok = 1;
if (!ok)
eina_stringshare_replace(&bgfile, e_theme_edje_file_get("base/theme/background",
"e/desktop/background"));
"e/desktop/background"));
return bgfile;
}
@ -538,7 +538,6 @@ _e_bg_event_bg_update_free(void *data __UNUSED__, void *event)
static void
_e_bg_handler_image_imported(const char *image_path, void *data __UNUSED__)
{
e_bg_default_set(image_path);
e_bg_update();
e_config_save_queue();

@ -1,18 +1,18 @@
#include "e.h"
/* local subsystem functions */
static Eina_Bool _e_bindings_mapping_change_event_cb(void *data, int type, void *event);
static void _e_bindings_mouse_free(E_Binding_Mouse *bind);
static void _e_bindings_key_free(E_Binding_Key *bind);
static void _e_bindings_edge_free(E_Binding_Edge *bind);
static void _e_bindings_signal_free(E_Binding_Signal *bind);
static void _e_bindings_wheel_free(E_Binding_Wheel *bind);
static void _e_bindings_acpi_free(E_Binding_Acpi *bind);
static int _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt);
static Eina_Bool _e_bindings_mapping_change_event_cb(void *data, int type, void *event);
static void _e_bindings_mouse_free(E_Binding_Mouse *bind);
static void _e_bindings_key_free(E_Binding_Key *bind);
static void _e_bindings_edge_free(E_Binding_Edge *bind);
static void _e_bindings_signal_free(E_Binding_Signal *bind);
static void _e_bindings_wheel_free(E_Binding_Wheel *bind);
static void _e_bindings_acpi_free(E_Binding_Acpi *bind);
static int _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt);
static E_Binding_Modifier _e_bindings_modifiers(unsigned int modifiers);
static int _e_ecore_modifiers(E_Binding_Modifier modifiers);
static Eina_Bool _e_bindings_edge_cb_timer(void *data);
static int _e_ecore_modifiers(E_Binding_Modifier modifiers);
static Eina_Bool _e_bindings_edge_cb_timer(void *data);
/* local subsystem globals */
@ -50,7 +50,7 @@ e_bindings_init(void)
Eina_List *l;
mapping_handler = ecore_event_handler_add
(ECORE_X_EVENT_MAPPING_CHANGE, _e_bindings_mapping_change_event_cb, NULL);
(ECORE_X_EVENT_MAPPING_CHANGE, _e_bindings_mapping_change_event_cb, NULL);
EINA_LIST_FOREACH(e_config->mouse_bindings, l, ebm)
e_bindings_mouse_add(ebm->context, ebm->button, ebm->modifiers,
@ -107,10 +107,10 @@ e_bindings_shutdown(void)
E_FREE_LIST(acpi_bindings, _e_bindings_acpi_free);
if (mapping_handler)
{
ecore_event_handler_del(mapping_handler);
mapping_handler = NULL;
}
{
ecore_event_handler_del(mapping_handler);
mapping_handler = NULL;
}
return 1;
}
@ -175,9 +175,9 @@ e_bindings_edge_reset(void)
{
E_Config_Binding_Edge *ebe;
Eina_List *l;
E_FREE_LIST(edge_bindings, _e_bindings_edge_free);
EINA_LIST_FOREACH(e_config->edge_bindings, l, ebe)
e_bindings_edge_add(ebe->context, ebe->edge, ebe->modifiers,
ebe->any_mod, ebe->action, ebe->params, ebe->delay);
@ -194,7 +194,6 @@ e_bindings_mouse_reset(void)
EINA_LIST_FOREACH(e_config->mouse_bindings, l, ebm)
e_bindings_mouse_add(ebm->context, ebm->button, ebm->modifiers,
ebm->any_mod, ebm->action, ebm->params);
}
EAPI void
@ -307,7 +306,7 @@ e_bindings_mouse_down_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, Eco
mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(mouse_bindings, l, binding)
{
if ((binding->button == (int) ev->buttons) &&
if ((binding->button == (int)ev->buttons) &&
((binding->any_mod) || (binding->mod == mod)))
{
if (_e_bindings_context_match(binding->ctxt, ctxt))
@ -351,7 +350,7 @@ e_bindings_mouse_up_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, Ecore
mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(mouse_bindings, l, binding)
{
if ((binding->button == (int) ev->buttons) &&
if ((binding->button == (int)ev->buttons) &&
((binding->any_mod) || (binding->mod == mod)))
{
if (_e_bindings_context_match(binding->ctxt, ctxt))
@ -634,7 +633,7 @@ e_bindings_edge_flippable_get(E_Zone_Edge edge)
{
if ((!strcmp(binding->action, "desk_flip_in_direction")) ||
(!strcmp(binding->action, "desk_flip_by")))
return EINA_TRUE;
return EINA_TRUE;
}
}
return EINA_FALSE;
@ -652,7 +651,7 @@ e_bindings_edge_non_flippable_get(E_Zone_Edge edge)
{
if ((!strcmp(binding->action, "desk_flip_in_direction")) ||
(!strcmp(binding->action, "desk_flip_by")))
continue;
continue;
return EINA_TRUE;
}
}
@ -740,16 +739,16 @@ e_bindings_edge_in_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Z
/* The original event will be freed before it can be
* used again */
ev2->zone = ev->zone;
ev2->edge = ev->edge;
ev2->x = ev->x;
ev2->y = ev->y;
ev2->zone = ev->zone;
ev2->edge = ev->edge;
ev2->x = ev->x;
ev2->y = ev->y;
ed->bind = binding;
ed->obj = obj;
ed->act = act;
ed->ev = ev2;
binding->timer = ecore_timer_add(((double) binding->delay), _e_bindings_edge_cb_timer, ed);
ed->obj = obj;
ed->act = act;
ed->ev = ev2;
binding->timer = ecore_timer_add(((double)binding->delay), _e_bindings_edge_cb_timer, ed);
}
}
}
@ -907,7 +906,7 @@ e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src,
}
}
EAPI E_Action *
EAPI E_Action *
e_bindings_signal_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, const char *sig, const char *src, E_Binding_Signal **bind_ret)
{
E_Binding_Modifier mod = 0;
@ -1013,12 +1012,14 @@ e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win)
if (binding->direction == 0)
{
if (binding->z < 0) button = 4;
else if (binding->z > 0) button = 5;
else if (binding->z > 0)
button = 5;
}
else if (binding->direction == 1)
{
if (binding->z < 0) button = 6;
else if (binding->z > 0) button = 7;
else if (binding->z > 0)
button = 7;
}
if (button != 0)
ecore_x_window_button_grab(win, button,
@ -1043,12 +1044,14 @@ e_bindings_wheel_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
if (binding->direction == 0)
{
if (binding->z < 0) button = 4;
else if (binding->z > 0) button = 5;
else if (binding->z > 0)
button = 5;
}
else if (binding->direction == 1)
{
if (binding->z < 0) button = 6;
else if (binding->z > 0) button = 7;
else if (binding->z > 0)
button = 7;
}
if (button != 0)
ecore_x_window_button_ungrab(win, button,
@ -1200,12 +1203,12 @@ e_bindings_mapping_change_enable(Eina_Bool enable)
static Eina_Bool
_e_bindings_mapping_change_event_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
if (!_e_bindings_mapping_change_enabled) return ECORE_CALLBACK_RENEW;
e_managers_keys_ungrab();
e_border_button_bindings_ungrab_all();
e_border_button_bindings_grab_all();
e_managers_keys_grab();
return ECORE_CALLBACK_PASS_ON;
if (!_e_bindings_mapping_change_enabled) return ECORE_CALLBACK_RENEW;
e_managers_keys_ungrab();
e_border_button_bindings_ungrab_all();
e_border_button_bindings_grab_all();
e_managers_keys_grab();
return ECORE_CALLBACK_PASS_ON;
}
static void
@ -1299,7 +1302,7 @@ _e_bindings_modifiers(unsigned int modifiers)
* may vary from system to system as different xservers may have differing
* modifier masks for numlock (it is queried at startup).
*
if (ev->modifiers & ECORE_X_LOCK_NUM) mod |= ECORE_X_LOCK_NUM;
if (ev->modifiers & ECORE_X_LOCK_NUM) mod |= ECORE_X_LOCK_NUM;
*/
return mod;
@ -1316,7 +1319,7 @@ _e_ecore_modifiers(E_Binding_Modifier modifiers)
if (modifiers & E_BINDING_MODIFIER_WIN) mod |= ECORE_EVENT_MODIFIER_WIN;
/* see comment in e_bindings on numlock
if (modifiers & ECORE_X_LOCK_NUM) mod |= ECORE_X_LOCK_NUM;
*/
*/
return mod;
}
@ -1350,3 +1353,4 @@ _e_bindings_edge_cb_timer(void *data)
return ECORE_CALLBACK_CANCEL;
}

<
@ -130,7 +130,7 @@ static void _e_border_cb_drag_finished(E_Drag *drag,
int dropped);
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
static Eina_Bool _e_border_cb_desk_window_profile_change(void *data,
int ev_type,
int ev_type,
void *ev);
#endif
static void _e_border_eval(E_Border *bd);
@ -214,7 +214,7 @@ 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);
static void _e_border_move_lost_window_to_center(E_Border *bd);
static void _e_border_move_lost_window_to_center(E_Border *bd);
static void _e_border_reset_lost_window(E_Border *bd);
static Eina_Bool _e_border_pointer_warp_to_center_timer(void *data);
/* local subsystem globals */
@ -272,10 +272,10 @@ EAPI int E_EVENT_BORDER_PROPERTY = 0;
EAPI int E_EVENT_BORDER_FULLSCREEN = 0;
EAPI int E_EVENT_BORDER_UNFULLSCREEN = 0;
#define GRAV_SET(bd, grav) \
ecore_x_window_gravity_set(bd->bg_win, grav); \
ecore_x_window_gravity_set(bd->client.shell_win, grav); \
if (bd->client.lock_win) ecore_x_window_gravity_set(bd->client.lock_win, grav); \
#define GRAV_SET(bd, grav) \
ecore_x_window_gravity_set(bd->bg_win, grav); \
ecore_x_window_gravity_set(bd->client.shell_win, grav); \
if (bd->client.lock_win) ecore_x_window_gravity_set(bd->client.lock_win, grav); \
ecore_x_window_gravity_set(bd->client.win, grav);
static Eina_List *
@ -1000,7 +1000,7 @@ e_border_desk_set(E_Border *bd,
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_FREE(list, child)
e_border_desk_set(child, bd->desk);
e_border_desk_set(child, bd->desk);
}
e_remember_update(bd);
}
@ -1091,16 +1091,18 @@ e_border_hide(E_Border *bd,
switch (manage)
{
case 2: break;
case 3:
bd->hidden = 1;
case 1:
default:
if (!e_manager_comp_evas_get(bd->zone->container->manager))
{
/* Make sure that this border isn't deleted */
bd->await_hide_event++;
ecore_x_window_hide(bd->client.win);
}
if (!e_manager_comp_evas_get(bd->zone->container->manager))
{
/* Make sure that this border isn't deleted */
bd->await_hide_event++;
ecore_x_window_hide(bd->client.win);
}
}
}
@ -1785,7 +1787,7 @@ e_border_layer_set(E_Border *bd,
*/
e_config->transient.raise = 1;
EINA_LIST_FREE(list, child)
e_border_layer_set(child, layer);
e_border_layer_set(child, layer);
}
e_border_raise(bd);
if (layer == E_LAYER_BELOW)
@ -1814,39 +1816,39 @@ e_border_raise(E_Border *bd)
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_REVERSE_FOREACH_SAFE(list, l, l_prev, child)
{
/* Don't stack iconic transients. If the user wants these shown,
* thats another option.
*/
if (!child->iconic)
{
if (last)
e_border_stack_below(child, last);
else
{
E_Border *above;
/* First raise the border to find out which border we will end up above */
above = e_container_border_raise(child);
if (above)
{
/* We ended up above a border, now we must stack this border to
* generate the stacking event, and to check if this transient
* has other transients etc.
*/
e_border_stack_above(child, above);
}
else
{
/* If we didn't end up above any border, we are on the bottom! */
e_border_lower(child);
}
}
last = child;
}
list = eina_list_remove_list(list, l);
}
{
/* Don't stack iconic transients. If the user wants these shown,
* thats another option.
*/
if (!child->iconic)
{
if (last)
e_border_stack_below(child, last);
else
{
E_Border *above;
/* First raise the border to find out which border we will end up above */
above = e_container_border_raise(child);
if (above)
{
/* We ended up above a border, now we must stack this border to
* generate the stacking event, and to check if this transient
* has other transients etc.
*/
e_border_stack_above(child, above);
}
else
{
/* If we didn't end up above any border, we are on the bottom! */
e_border_lower(child);
}
}
last = child;
}
list = eina_list_remove_list(list, l);
}
}
ev = E_NEW(E_Event_Border_Stack, 1);
@ -1903,39 +1905,39 @@ e_border_lower(E_Border *bd)
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_REVERSE_FOREACH_SAFE(list, l, l_prev, child)
{
/* Don't stack iconic transients. If the user wants these shown,
* thats another option.
*/
if (!child->iconic)
{
if (last)
e_border_stack_below(child, last);
else
{
E_Border *below;
/* First lower the border to find out which border we will end up below */
below = e_container_border_lower(child);
if (below)
{
/* We ended up below a border, now we must stack this border to
* generate the stacking event, and to check if this transient
* has other transients etc.
*/
e_border_stack_below(child, below);
}
else
{
/* If we didn't end up below any border, we are on top! */
e_border_raise(child);
}
}
last = child;
}
list = eina_list_remove_list(list, l);
}
{
/* Don't stack iconic transients. If the user wants these shown,
* thats another option.
*/
if (!child->iconic)
{
if (last)
e_border_stack_below(child, last);
else
{
E_Border *below;
/* First lower the border to find out which border we will end up below */
below = e_container_border_lower(child);
if (below)
{