e17: whitespaces--

SVN revision: 72561
devs/princeamd/enlightenment-0.17-elive
Vincent Torri 10 years ago
parent 06c0c4d5f3
commit c3b0637802
  1. 2
      src/bin/e_about.h
  2. 76
      src/bin/e_acpi.c
  3. 10
      src/bin/e_acpi.h
  4. 1
      src/bin/e_actions.c
  5. 5
      src/bin/e_alert.c
  6. 4
      src/bin/e_alert.h
  7. 114
      src/bin/e_alert_main.c
  8. 2
      src/bin/e_atoms.c
  9. 14
      src/bin/e_backlight.c
  10. 2
      src/bin/e_backlight_main.c
  11. 2
      src/bin/e_bg.c
  12. 2
      src/bin/e_bg.h
  13. 35
      src/bin/e_bindings.c
  14. 4
      src/bin/e_bindings.h
  15. 78
      src/bin/e_border.c
  16. 70
      src/bin/e_border.h
  17. 114
      src/bin/e_box.c
  18. 27
      src/bin/e_canvas.c
  19. 6
      src/bin/e_color_dialog.c
  20. 6
      src/bin/e_color_dialog.h
  21. 28
      src/bin/e_config.c
  22. 12
      src/bin/e_config.h
  23. 1
      src/bin/e_config_data.c
  24. 22
      src/bin/e_config_dialog.c
  25. 6
      src/bin/e_config_dialog.h
  26. 10
      src/bin/e_configure.c
  27. 2
      src/bin/e_confirm_dialog.c
  28. 4
      src/bin/e_confirm_dialog.h
  29. 30
      src/bin/e_container.c
  30. 12
      src/bin/e_container.h
  31. 1
      src/bin/e_desk.c
  32. 2
      src/bin/e_desk.h
  33. 2
      src/bin/e_deskenv.c
  34. 1
      src/bin/e_desklock.c
  35. 33
      src/bin/e_dialog.c
  36. 44
      src/bin/e_dnd.c
  37. 9
      src/bin/e_dnd.h
  38. 74
      src/bin/e_eap_editor.c
  39. 6
      src/bin/e_eap_editor.h
  40. 2
      src/bin/e_editable.c
  41. 4
      src/bin/e_entry.c
  42. 46
      src/bin/e_entry_dialog.c
  43. 6
      src/bin/e_entry_dialog.h
  44. 4
      src/bin/e_env.c
  45. 2
      src/bin/e_error.h
  46. 1
      src/bin/e_exec.c
  47. 22
      src/bin/e_exehist.c
  48. 2
      src/bin/e_filereg.h
  49. 148
      src/bin/e_flowlayout.c
  50. 1
      src/bin/e_fm.c
  51. 4
      src/bin/e_fm.h
  52. 1
      src/bin/e_fm/e_fm_ipc.c
  53. 2
      src/bin/e_fm/e_fm_main_udisks.c
  54. 12
      src/bin/e_fm_custom.c
  55. 9
      src/bin/e_fm_device.c
  56. 4
      src/bin/e_fm_device.h
  57. 6
      src/bin/e_fm_mime.c
  58. 2
      src/bin/e_fm_mime.h
  59. 1
      src/bin/e_fm_op.c
  60. 2
      src/bin/e_fm_op_registry.c
  61. 4
      src/bin/e_fm_op_registry.h
  62. 84
      src/bin/e_fm_prop.c
  63. 4
      src/bin/e_fm_shared_types.h.in
  64. 2
      src/bin/e_focus.h
  65. 22
      src/bin/e_font.c
  66. 4
      src/bin/e_font.h
  67. 1
      src/bin/e_gadcon.c
  68. 1
      src/bin/e_grabinput.c
  69. 2
      src/bin/e_grabinput.h
  70. 3
      src/bin/e_hints.c
  71. 288
      src/bin/e_ilist.c
  72. 2
      src/bin/e_ilist.h
  73. 32
      src/bin/e_imc_main.c
  74. 4
      src/bin/e_init.c
  75. 12
      src/bin/e_init_main.c
  76. 28
      src/bin/e_int_border_locks.c
  77. 22
      src/bin/e_int_border_menu.c
  78. 82
      src/bin/e_int_border_prop.c
  79. 20
      src/bin/e_int_border_remember.c
  80. 16
      src/bin/e_int_config_modules.c
  81. 92
      src/bin/e_int_gadcon_config.c
  82. 208
      src/bin/e_int_menus.c
  83. 6
      src/bin/e_int_menus.h
  84. 140
      src/bin/e_int_shelf_config.c
  85. 37
      src/bin/e_int_toolbar_config.c
  86. 1
      src/bin/e_intl.c
  87. 1
      src/bin/e_intl_data.c
  88. 14
      src/bin/e_ipc.c
  89. 2
      src/bin/e_ipc.h
  90. 47
      src/bin/e_ipc_codec.c
  91. 8
      src/bin/e_ipc_codec.h
  92. 66
      src/bin/e_layout.c
  93. 17
      src/bin/e_livethumb.c
  94. 2
      src/bin/e_livethumb.h
  95. 1
      src/bin/e_main.c
  96. 74
      src/bin/e_manager.c
  97. 14
      src/bin/e_manager.h
  98. 25
      src/bin/e_maximize.c
  99. 186
      src/bin/e_menu.c
  100. 32
      src/bin/e_menu.h
  101. Some files were not shown because too many files have changed in this diff Show More

@ -8,6 +8,6 @@ typedef struct _E_Obj_Dialog E_About;
EAPI E_About *e_about_new (E_Container *con);
EAPI void e_about_show (E_About *about);
#endif
#endif

@ -1,21 +1,21 @@
#include "e.h"
/* TODO:
*
*
* Sanatize data received from acpi for message status into something
* meaningful (ie: 00000002 == LID_CLOSED, etc, etc).
*
* Find someone with a WIFI that actually emits ACPI events and add/debug the
*
* Find someone with a WIFI that actually emits ACPI events and add/debug the
* E_EVENT_ACPI for wifi.
*
*
*/
/* local structures */
/* for simple acpi device mapping */
typedef struct _E_ACPI_Device_Simple E_ACPI_Device_Simple;
typedef struct _E_ACPI_Device_Simple E_ACPI_Device_Simple;
typedef struct _E_ACPI_Device_Multiplexed E_ACPI_Device_Multiplexed;
struct _E_ACPI_Device_Simple
struct _E_ACPI_Device_Simple
{
const char *name;
// ->
@ -56,7 +56,7 @@ static E_ACPI_Device_Simple _devices_simple[] =
{"processor", E_ACPI_TYPE_PROCESSOR},
{"thermal_zone", E_ACPI_TYPE_THERMAL},
{"video", E_ACPI_TYPE_VIDEO},
{NULL, E_ACPI_TYPE_UNKNOWN}
};
@ -79,7 +79,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
{"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
@ -87,7 +87,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
{"video", "DD03", 0x86, E_ACPI_TYPE_BRIGHTNESS_UP},
{"video", "OVGA", 0x80, E_ACPI_TYPE_VIDEO},
*/
/* END */
/* END */
{NULL, NULL, 0x00, E_ACPI_TYPE_UNKNOWN}
};
@ -96,7 +96,7 @@ EAPI int E_EVENT_ACPI = 0;
/* public functions */
EINTERN int
e_acpi_init(void)
e_acpi_init(void)
{
E_EVENT_ACPI = ecore_event_type_new();
@ -104,30 +104,30 @@ e_acpi_init(void)
if (!ecore_file_exists("/var/run/acpid.socket")) return 1;
/* try to connect to acpid socket */
_e_acpid = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM,
_e_acpid = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM,
"/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_acpid_hdls =
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_acpid_hdls =
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,
_e_acpid_hdls =
eina_list_append(_e_acpid_hdls,
ecore_event_handler_add(E_EVENT_ACPI,
_e_acpi_cb_event, NULL));
return 1;
}
EINTERN int
e_acpi_shutdown(void)
e_acpi_shutdown(void)
{
Ecore_Event_Handler *hdl;
@ -143,14 +143,14 @@ e_acpi_shutdown(void)
return 1;
}
EAPI void
e_acpi_events_freeze(void)
EAPI void
e_acpi_events_freeze(void)
{
_e_acpi_events_frozen++;
}
EAPI void
e_acpi_events_thaw(void)
EAPI void
e_acpi_events_thaw(void)
{
_e_acpi_events_frozen--;
if (_e_acpi_events_frozen < 0) _e_acpi_events_frozen = 0;
@ -186,7 +186,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
int sig, status, i, done = 0;
char device[1024], bus[1024], *sdata;
const char *str, *p;
ev = event;
if ((!ev->data) || (ev->size < 1)) return ECORE_CALLBACK_PASS_ON;
@ -208,7 +208,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
strncpy(sdata, str, (int)(p - str));
sdata[p - str] = 0;
/* parse out this acpi string into separate pieces */
if (sscanf(sdata, "%1023s %1023s %x %x",
if (sscanf(sdata, "%1023s %1023s %x %x",
device, bus, &sig, &status) != 4)
{
sig = -1;
@ -216,13 +216,13 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
if (sscanf(sdata, "%1023s %1023s", device, bus) != 2)
goto done_event;
}
/* create new event structure to raise */
acpi_event = E_NEW(E_Event_Acpi, 1);
acpi_event->bus_id = eina_stringshare_add(bus);
acpi_event->signal = sig;
acpi_event->status = status;
/* FIXME: add in a key faking layer */
if ((!done) && (sig >= 0) && (status >= 0))
{
@ -266,14 +266,14 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
switch (acpi_event->type)
{
case E_ACPI_TYPE_LID:
acpi_event->status =
acpi_event->status =
_e_acpi_lid_status_get(device, bus);
break;
default:
break;
}
/* actually raise the event */
ecore_event_add(E_EVENT_ACPI, acpi_event,
ecore_event_add(E_EVENT_ACPI, acpi_event,
_e_acpi_cb_event_free, NULL);
}
done_event:
@ -288,7 +288,7 @@ done_event:
else
{
Eina_Strbuf *newbuf;
newbuf = eina_strbuf_new();
eina_strbuf_append(newbuf, str);
eina_strbuf_free(acpibuf);
@ -297,8 +297,8 @@ done_event:
return ECORE_CALLBACK_PASS_ON;
}
static void
_e_acpi_cb_event_free(void *data __UNUSED__, void *event)
static void
_e_acpi_cb_event_free(void *data __UNUSED__, void *event)
{
E_Event_Acpi *ev;
@ -308,8 +308,8 @@ _e_acpi_cb_event_free(void *data __UNUSED__, void *event)
E_FREE(ev);
}
static int
_e_acpi_lid_status_get(const char *device, const char *bus)
static int
_e_acpi_lid_status_get(const char *device, const char *bus)
{
FILE *f;
int i = 0;
@ -329,7 +329,7 @@ _e_acpi_lid_status_get(const char *device, const char *bus)
/* hack around ppurka's Thinkpad (G460 + Linux) that reports lid
* state as "/proc/acpi/button/lid/LID0/state" but where the lid
* event says "button/lid LID close".
*
*
* so let's take the base device name "LID" and add a numeric like
* 0, 1, 2, 3 so we have LID0, LID1, LID2 etc. - try up to LID9
* and then give up.

@ -1,10 +1,10 @@
#ifdef E_TYPEDEFS
/* enum for various event types */
typedef enum _E_Acpi_Type
typedef enum _E_Acpi_Type
{
E_ACPI_TYPE_UNKNOWN = 0,
E_ACPI_TYPE_AC_ADAPTER, // 1
E_ACPI_TYPE_BATTERY, // 2
E_ACPI_TYPE_BUTTON, // 3
@ -30,7 +30,7 @@ typedef enum _E_Acpi_Type
} E_Acpi_Type;
/* enum for acpi signals */
typedef enum _E_Acpi_Device_Signal
typedef enum _E_Acpi_Device_Signal
{
E_ACPI_DEVICE_SIGNAL_UNKNOWN, // 0
E_ACPI_DEVICE_SIGNAL_NOTIFY = 80,
@ -40,7 +40,7 @@ typedef enum _E_Acpi_Device_Signal
} E_Acpi_Device_Signal;
/* enum for lid status */
typedef enum _E_Acpi_Lid_Status
typedef enum _E_Acpi_Lid_Status
{
E_ACPI_LID_UNKNOWN, // 0
E_ACPI_LID_CLOSED, // 1
@ -54,7 +54,7 @@ typedef struct _E_Event_Acpi E_Event_Acpi;
# ifndef E_ACPI_H
# define E_ACPI_H
struct _E_Event_Acpi
struct _E_Event_Acpi
{
const char *device, *bus_id;
int type, signal, status;

@ -3457,4 +3457,3 @@ _action_groups_sort_cb(const void *d1, const void *d2)
if (!(g2 = d2)) return -1;
return strcmp(g1->act_grp, g2->act_grp);
}

@ -16,8 +16,8 @@ e_alert_shutdown(void)
return 1;
}
EAPI void
e_alert_show(int sig)
EAPI void
e_alert_show(int sig)
{
char *args[4];
pid_t pid;
@ -77,4 +77,3 @@ e_alert_show(int sig)
e_util_env_set("MTRACK", "track");
ecore_app_restart();
}

@ -1,8 +1,8 @@
#ifdef E_TYPEDEFS
typedef enum _E_Alert_Op_Type
typedef enum _E_Alert_Op_Type
{
E_ALERT_OP_RESTART = 0,
E_ALERT_OP_RESTART = 0,
E_ALERT_OP_EXIT
} E_Alert_Op_Type;

@ -121,8 +121,8 @@ _e_alert_connect(void)
return 1;
}
static void
_e_alert_create(void)
static void
_e_alert_create(void)
{
uint32_t mask, mask_list[4];
int wx = 0, wy = 0;
@ -134,36 +134,36 @@ _e_alert_create(void)
xcb_open_font(conn, font, strlen("fixed"), "fixed");
/* create main window */
mask = (XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL |
mask = (XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL |
XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK);
mask_list[0] = screen->white_pixel;
mask_list[1] = screen->black_pixel;
mask_list[2] = 1;
mask_list[3] = (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
mask_list[3] = (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
XCB_EVENT_MASK_EXPOSURE);
win = xcb_generate_id(conn);
xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, screen->root,
wx, wy, WINDOW_WIDTH, WINDOW_HEIGHT, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, screen->root,
wx, wy, WINDOW_WIDTH, WINDOW_HEIGHT, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
XCB_COPY_FROM_PARENT, mask, mask_list);
/* create button 1 */
mask_list[3] = (XCB_EVENT_MASK_BUTTON_PRESS |
mask_list[3] = (XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_EXPOSURE);
btn1 = xcb_generate_id(conn);
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn1, win,
-100, -100, 1, 1, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn1, win,
-100, -100, 1, 1, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
XCB_COPY_FROM_PARENT, mask, mask_list);
xcb_map_window(conn, btn1);
/* create button 2 */
btn2 = xcb_generate_id(conn);
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn2, win,
-100, -100, 1, 1, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn2, win,
-100, -100, 1, 1, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT,
XCB_COPY_FROM_PARENT, mask, mask_list);
xcb_map_window(conn, btn2);
@ -177,8 +177,8 @@ _e_alert_create(void)
xcb_create_gc(conn, gc, win, mask, mask_list);
}
static void
_e_alert_display(void)
static void
_e_alert_display(void)
{
xcb_char2b_t *str = NULL;
xcb_query_text_extents_cookie_t cookie;
@ -187,10 +187,10 @@ _e_alert_display(void)
str = _e_alert_build_string(title);
cookie =
cookie =
xcb_query_text_extents_unchecked(conn, font, strlen(title), str);
reply = xcb_query_text_extents_reply(conn, cookie, NULL);
if (reply)
if (reply)
{
fa = reply->font_ascent;
fh = (fa + reply->font_descent);
@ -202,11 +202,11 @@ _e_alert_display(void)
/* move buttons */
x = 20;
w = (WINDOW_WIDTH / 2) - 40;
_e_alert_button_move_resize(btn1, x, WINDOW_HEIGHT - 20 - (fh + 20),
_e_alert_button_move_resize(btn1, x, WINDOW_HEIGHT - 20 - (fh + 20),
w, (fh + 20));
x = ((WINDOW_WIDTH / 2) + 20);
_e_alert_button_move_resize(btn2, x, WINDOW_HEIGHT - 20 - (fh + 20),
_e_alert_button_move_resize(btn2, x, WINDOW_HEIGHT - 20 - (fh + 20),
w, (fh + 20));
if (comp_win)
@ -222,8 +222,8 @@ _e_alert_display(void)
rect.width = WINDOW_WIDTH;
rect.height = WINDOW_HEIGHT;
xcb_shape_rectangles(conn, XCB_SHAPE_SO_SET,
XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED,
xcb_shape_rectangles(conn, XCB_SHAPE_SO_SET,
XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED,
comp_win, 0, 0, 1, &rect);
xcb_reparent_window(conn, win, comp_win, wx, wy);
@ -234,14 +234,14 @@ _e_alert_display(void)
_e_alert_window_raise(win);
/* grab pointer & keyboard */
xcb_grab_pointer_unchecked(conn, 0, win,
(XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE),
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
xcb_grab_pointer_unchecked(conn, 0, win,
(XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE),
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
XCB_NONE, XCB_NONE, XCB_CURRENT_TIME);
xcb_grab_keyboard_unchecked(conn, 0, win, XCB_CURRENT_TIME,
xcb_grab_keyboard_unchecked(conn, 0, win, XCB_CURRENT_TIME,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
win, XCB_CURRENT_TIME);
/* flush screen */
@ -251,14 +251,14 @@ _e_alert_display(void)
_e_alert_sync();
}
static void
_e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h)
static void
_e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h)
{
uint32_t list[4], mask;
if (!btn) return;
mask = (XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
mask = (XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT);
list[0] = x;
list[1] = y;
@ -277,17 +277,17 @@ _e_alert_window_raise(xcb_window_t window)
xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, list);
}
static void
_e_alert_sync(void)
static void
_e_alert_sync(void)
{
free(xcb_get_input_focus_reply(conn,
free(xcb_get_input_focus_reply(conn,
xcb_get_input_focus(conn), NULL));
}
static void
_e_alert_shutdown(void)
static void
_e_alert_shutdown(void)
{
if (!xcb_connection_has_error(conn))
if (!xcb_connection_has_error(conn))
{
xcb_close_font(conn, font);
xcb_destroy_window(conn, btn1);
@ -299,23 +299,23 @@ _e_alert_shutdown(void)
}
}
static void
_e_alert_run(void)
static void
_e_alert_run(void)
{
xcb_generic_event_t *event = NULL;
xcb_flush(conn);
while ((event = xcb_wait_for_event(conn)))
while ((event = xcb_wait_for_event(conn)))
{
switch (event->response_type & ~0x80)
switch (event->response_type & ~0x80)
{
case XCB_BUTTON_PRESS:
ret = _e_alert_handle_button_press(event);
break;
case XCB_KEY_PRESS:
case XCB_KEY_PRESS:
ret = _e_alert_handle_key_press(event);
break;
case XCB_EXPOSE:
case XCB_EXPOSE:
{
xcb_expose_event_t *ev;
@ -335,8 +335,8 @@ _e_alert_run(void)
}
}
static void
_e_alert_draw(void)
static void
_e_alert_draw(void)
{
_e_alert_draw_outline();
_e_alert_draw_title_outline();
@ -348,8 +348,8 @@ _e_alert_draw(void)
xcb_flush(conn);
}
static int
_e_alert_handle_key_press(xcb_generic_event_t *event)
static int
_e_alert_handle_key_press(xcb_generic_event_t *event)
{
xcb_key_press_event_t *ev;
@ -362,13 +362,13 @@ _e_alert_handle_key_press(xcb_generic_event_t *event)
return 0;
}
static int
_e_alert_handle_button_press(xcb_generic_event_t *event)
static int
_e_alert_handle_button_press(xcb_generic_event_t *event)
{
xcb_button_press_event_t *ev;
ev = (xcb_button_press_event_t *)event;
if (ev->child == btn1)
if (ev->child == btn1)
return 1;
else if (ev->child == btn2)
return 2;
@ -394,8 +394,8 @@ _e_alert_build_string(const char *str)
return r;
}
static void
_e_alert_draw_outline(void)
static void
_e_alert_draw_outline(void)
{
xcb_rectangle_t rect;
@ -407,8 +407,8 @@ _e_alert_draw_outline(void)
xcb_poly_rectangle(conn, win, gc, 1, &rect);
}
static void
_e_alert_draw_title_outline(void)
static void
_e_alert_draw_title_outline(void)
{
xcb_rectangle_t rect;
@ -420,8 +420,8 @@ _e_alert_draw_title_outline(void)
xcb_poly_rectangle(conn, win, gc, 1, &rect);
}
static void
_e_alert_draw_title(void)
static void
_e_alert_draw_title(void)
{
xcb_void_cookie_t cookie;
int x = 0, y = 0;
@ -430,7 +430,7 @@ _e_alert_draw_title(void)
x = (2 + 2 + ((WINDOW_WIDTH - 4 - 4 - fw) / 2));
y = (2 + 2 + fh);
cookie =
cookie =
xcb_image_text_8(conn, strlen(title), win, gc, x, y, title);
}

@ -31,7 +31,7 @@ e_atoms_init(void)
"__E_ATOM_DESKTOP_FILE"
};
Ecore_X_Atom atoms[11];
ecore_x_atoms_get(atom_names, 11, atoms);
E_ATOM_MANAGED = atoms[0];
E_ATOM_CONTAINER = atoms[1];

@ -54,7 +54,7 @@ e_backlight_init(void)
eeze_init();
#endif
// why did someone do this? this makes it ONLY work if xrandr has bl support.
// WRONG!
// WRONG!
// bl_avail = ecore_x_randr_output_backlight_available();
bl_avail = EINA_TRUE;
@ -330,7 +330,7 @@ _e_backlight_set(E_Zone *zone, double val)
Ecore_X_Window root;
Ecore_X_Randr_Output *out;
int num = 0;
root = zone->container->manager->root;
out = ecore_x_randr_window_outputs_get(root, &num);
if ((out) && (num > 0))
@ -355,7 +355,7 @@ _bl_anim(void *data, double pos)
{
E_Zone *zone = data;
double v;
// 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);
@ -448,7 +448,7 @@ static Eina_Bool
_e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
{
Ecore_Exe_Event_Del *ev;
ev = event;
if (ev->exe == bl_sys_set_exe)
{
@ -463,7 +463,7 @@ static void
_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);
@ -473,8 +473,8 @@ _bl_sys_level_set(double val)
return;
}
// printf("SET: %1.3f\n", val);
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_backlight %i",
snprintf(buf, sizeof(buf),
"%s/enlightenment/utils/enlightenment_backlight %i",
e_prefix_lib_get(), (int)(val * 1000.0));
bl_sys_set_exe = ecore_exe_run(buf, NULL);
}

@ -44,7 +44,7 @@ main(int argc, char **argv)
int maxlevel = 0, curlevel = -1;
Eina_List *devs;
char buf[4096] = "";
for (i = 1; i < argc; i++)
{
if ((!strcmp(argv[i], "-h")) ||

@ -102,7 +102,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
{
int spec;
if (!cfbg) continue;
spec = 0;
if (cfbg->container == container_num) spec++;

@ -17,7 +17,7 @@ typedef struct _E_Bg_Image_Import_Handle E_Bg_Image_Import_Handle;
extern EAPI int E_EVENT_BG_UPDATE;
struct _E_Event_Bg_Update
struct _E_Event_Bg_Update
{
int container;
int zone;

@ -89,7 +89,7 @@ e_bindings_init(void)
ebw->any_mod, ebw->action, ebw->params);
EINA_LIST_FOREACH(e_config->acpi_bindings, l, eba)
e_bindings_acpi_add(eba->context, eba->type, eba->status,
e_bindings_acpi_add(eba->context, eba->type, eba->status,
eba->action, eba->params);
return 1;
@ -104,13 +104,13 @@ e_bindings_shutdown(void)
E_FREE_LIST(signal_bindings, _e_bindings_signal_free);
E_FREE_LIST(wheel_bindings, _e_bindings_wheel_free);
E_FREE_LIST(acpi_bindings, _e_bindings_acpi_free);
if (mapping_handler)
{
ecore_event_handler_del(mapping_handler);
mapping_handler = NULL;
}
return 1;
}
@ -429,7 +429,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
if (_e_bindings_context_match(binding->ctxt, ctxt))
{
E_Action *act;
act = e_action_find(binding->action);
if (act)
{
@ -994,8 +994,8 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event
return act;
}
EAPI void
e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
EAPI void
e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
{
E_Binding_Acpi *binding;
@ -1008,8 +1008,8 @@ e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *ac
acpi_bindings = eina_list_append(acpi_bindings, binding);
}
EAPI void
e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
EAPI void
e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
{
E_Binding_Acpi *binding;
Eina_List *l;
@ -1017,7 +1017,7 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac
EINA_LIST_FOREACH(acpi_bindings, l, binding)
{
if ((binding->ctxt == ctxt) &&
(binding->type == type) && (binding->status == status) &&
(binding->type == type) && (binding->status == status) &&
(((binding->action) && (action) && (!strcmp(binding->action, action))) ||
((!binding->action) && (!action))) &&
(((binding->params) && (params) && (!strcmp(binding->params, params))) ||
@ -1031,7 +1031,7 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac
}
EAPI E_Action *
e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret)
e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret)
{
E_Binding_Acpi *binding;
Eina_List *l;
@ -1041,7 +1041,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_A
if (binding->type == ev->type)
{
/* if binding status is -1, then we don't compare event status */
if (binding->status != -1)
if (binding->status != -1)
{
/* binding status is set to something, compare event status */
if (binding->status != ev->status) continue;
@ -1060,7 +1060,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_A
}
EAPI E_Action *
e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev)
e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev)
{
E_Action *act;
E_Binding_Acpi *binding;
@ -1139,8 +1139,8 @@ _e_bindings_wheel_free(E_Binding_Wheel *binding)
free(binding);
}
static void
_e_bindings_acpi_free(E_Binding_Acpi *binding)
static void
_e_bindings_acpi_free(E_Binding_Acpi *binding)
{
if (binding->action) eina_stringshare_del(binding->action);
if (binding->params) eina_stringshare_del(binding->params);
@ -1170,16 +1170,16 @@ _e_bindings_modifiers(unsigned int modifiers)
* have it on, sometimes they don't, and often they have no idea. waaaay
* back in E 0.1->0.13 or so days this caused issues thus numlock,
* scrollock and capslock are not usable modifiers.
*
*
* if we REALLY want to be able to use numlock we need to add more binding
* flags and config that says "REALLY pay attention to numlock for this
* binding" field in the binding (like there is a "any_mod" flag - we need a
* "num_lock_respect" field)
*
*
* also it should be an E_BINDING_MODIFIER_LOCK_NUM as the ecore lock flag
* 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;
*/
@ -1231,4 +1231,3 @@ _e_bindings_edge_cb_timer(void *data)
return ECORE_CALLBACK_CANCEL;
}

@ -93,7 +93,7 @@ struct _E_Binding_Wheel
const char *params;
};
struct _E_Binding_Acpi
struct _E_Binding_Acpi
{
E_Binding_Context ctxt;
int type, status;
@ -137,7 +137,7 @@ EAPI void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig,
EAPI void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
EAPI E_Action *e_bindings_signal_find(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src, E_Binding_Signal **bind_ret);
EAPI E_Action *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src);
EAPI void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
EAPI void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
EAPI void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win);

@ -269,7 +269,7 @@ _e_border_sub_borders_new(E_Border *bd)
Eina_List *list = NULL, *l;
E_Border *child;
E_Border_List *bl;
EINA_LIST_FOREACH(bd->transients, l, child)
{
if (!eina_list_data_find(list, child))
@ -280,7 +280,7 @@ _e_border_sub_borders_new(E_Border *bd)
{
if (e_object_is_del(E_OBJECT(child))) continue;
if (child == bd) continue;
/*
/*
if ((bd->client.icccm.client_leader) &&
(child->client.icccm.client_leader ==
bd->client.icccm.client_leader))
@ -912,7 +912,7 @@ e_border_desk_set(E_Border *bd,
Eina_List *l;
E_Border *child;
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_FOREACH(list, l, child)
{
e_border_desk_set(child, bd->desk);
@ -1022,7 +1022,7 @@ e_border_hide(E_Border *bd,
ecore_x_window_hide(bd->client.win);
}
}
visible = 0;
ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &visible, 1);
if (!manage)
@ -1708,7 +1708,7 @@ e_border_raise(E_Border *bd)
if (e_config->transient.raise)
{
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_REVERSE_FOREACH(list, l, child)
{
/* Don't stack iconic transients. If the user wants these shown,
@ -1721,10 +1721,10 @@ e_border_raise(E_Border *bd)
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
@ -1797,7 +1797,7 @@ e_border_lower(E_Border *bd)
if (e_config->transient.lower)
{
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_REVERSE_FOREACH(list, l, child)
{
/* Don't stack iconic transients. If the user wants these shown,
@ -1810,10 +1810,10 @@ e_border_lower(E_Border *bd)
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
@ -1887,7 +1887,7 @@ e_border_stack_above(E_Border *bd,
if (e_config->transient.raise)
{
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_REVERSE_FOREACH(list, l, child)
{
/* Don't stack iconic transients. If the user wants these shown,
@ -1945,7 +1945,7 @@ e_border_stack_below(E_Border *bd,
if (e_config->transient.lower)
{
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_REVERSE_FOREACH(bd->transients, l, child)
{
/* Don't stack iconic transients. If the user wants these shown,
@ -2108,7 +2108,7 @@ e_border_focus_set(E_Border *bd,
bd->want_focus = 1;
bd->changed = 1;
}
else if ((!bd->focused) ||
else if ((!bd->focused) ||
(focus_next && (bd != eina_list_data_get(focus_next))))
{
Eina_List *l;
@ -2183,7 +2183,7 @@ e_border_focus_set(E_Border *bd,
{
Eina_Bool unfocus_is_parent = EINA_FALSE;
E_Border *bd_parent;
bd_parent = bd->parent;
while (bd_parent)
{
@ -2905,7 +2905,7 @@ e_border_iconify(E_Border *bd)
Eina_List *l;
E_Border *child;
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_FOREACH(list, l, child)
{
e_border_iconify(child);
@ -2977,7 +2977,7 @@ e_border_stick(E_Border *bd)
Eina_List *l;
E_Border *child;
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_FOREACH(list, l, child)
{
child->sticky = 1;
@ -3013,7 +3013,7 @@ e_border_unstick(E_Border *bd)
Eina_List *l;
E_Border *child;
Eina_List *list = _e_border_sub_borders_new(bd);
EINA_LIST_FOREACH(list, l, child)
{
child->sticky = 0;
@ -4421,7 +4421,7 @@ _e_border_free(E_Border *bd)
}
if (bd->client.e.state.video_parent)
{
bd->client.e.state.video_parent_border->client.e.state.video_child =
bd->client.e.state.video_parent_border->client.e.state.video_child =
eina_list_remove
(bd->client.e.state.video_parent_border->client.e.state.video_child,
bd);
@ -6601,7 +6601,7 @@ _e_border_eval0(E_Border *bd)
char *title = ecore_x_icccm_title_get(bd->client.win);
eina_stringshare_replace(&bd->client.icccm.title, title);
if (title) free(title);
if (bd->bg_object)
edje_object_part_text_set(bd->bg_object, "e.text.title",
bd->client.icccm.title);
@ -6637,7 +6637,7 @@ _e_border_eval0(E_Border *bd)
if (!((bd->client.icccm.name == pname) &&
(bd->client.icccm.class == pclass)))
bd->changes.icon = 1;
if (pname) eina_stringshare_del(pname);
if (pclass) eina_stringshare_del(pclass);
bd->client.icccm.fetch.name_class = 0;
@ -6683,10 +6683,10 @@ _e_border_eval0(E_Border *bd)
if ((!machine) && (bd->client.icccm.client_leader))
machine = ecore_x_icccm_client_machine_get(bd->client.icccm.client_leader);
eina_stringshare_replace(&bd->client.icccm.machine, machine);
if (machine) free(machine);
bd->client.icccm.fetch.machine = 0;
rem_change = 1;
}
@ -6885,9 +6885,9 @@ _e_border_eval0(E_Border *bd)
if (bd->client.icccm.fetch.icon_name)
{
char *icon_name = ecore_x_icccm_icon_name_get(bd->client.win);
eina_stringshare_replace(&bd->client.icccm.icon_name, icon_name);
eina_stringshare_replace(&bd->client.icccm.icon_name, icon_name);
if (icon_name) free(icon_name);
bd->client.icccm.fetch.icon_name = 0;
rem_change = 1;
}
@ -6895,9 +6895,9 @@ _e_border_eval0(E_Border *bd)
{
char *icon_name;
ecore_x_netwm_icon_name_get(bd->client.win, &icon_name);
eina_stringshare_replace(&bd->client.netwm.icon_name, icon_name);
eina_stringshare_replace(&bd->client.netwm.icon_name, icon_name);
if (icon_name) free(icon_name);
bd->client.netwm.fetch.icon_name = 0;
rem_change = 1;
}
@ -7171,7 +7171,7 @@ _e_border_eval0(E_Border *bd)
/* unlinking child/parent */
if (bd->client.e.state.video_parent_border != NULL)
{
bd->client.e.state.video_parent_border->client.e.state.video_child =
bd->client.e.state.video_parent_border->client.e.state.video_child =
eina_list_remove
(bd->client.e.state.video_parent_border->client.e.state.video_child,
bd);
@ -7278,9 +7278,9 @@ _e_border_eval0(E_Border *bd)
if ((!bd->lock_border) || (!bd->client.border.name))
bd->client.border.changed = 1;
{
{
char *str = NULL;
if ((ecore_x_netwm_startup_id_get(bd->client.win, &str) && (str)) ||
((bd->client.icccm.client_leader > 0) &&
ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str))
@ -7289,7 +7289,7 @@ _e_border_eval0(E_Border *bd)
if (!strncmp(str, "E_START|", 8))
{
int id;
id = atoi(str + 8);
if (id > 0) bd->client.netwm.startup_id = id;
}
@ -7308,14 +7308,14 @@ _e_border_eval0(E_Border *bd)
else
bd->client.netwm.pid = -1;
}
inst = e_exec_startup_id_pid_instance_find(bd->client.netwm.startup_id,
bd->client.netwm.pid);
if ((inst) && (inst->used == 0))
{
E_Zone *zone;
E_Desk *desk;
inst->used++;
zone = e_container_zone_number_get(bd->zone->container,
inst->screen);
@ -7323,11 +7323,11 @@ _e_border_eval0(E_Border *bd)
desk = e_desk_at_xy_get(bd->zone, inst->desk_x, inst->desk_y);
if (desk) e_border_desk_set(bd, desk);
}
if (0) // keep all windows of one app/group on the same screen/desk
{
E_Border *bdl = NULL;
bdl = bd->parent;
if (!bdl)
{
@ -7337,7 +7337,7 @@ _e_border_eval0(E_Border *bd)
{
E_Border *child;
E_Border_List *bl;
bl = e_container_border_list_first(bd->zone->container);
while ((child = e_container_border_list_next(bl)))
{
@ -8243,7 +8243,7 @@ _e_border_eval(E_Border *bd)
char buf[128];
snprintf(buf, sizeof(buf), "%s.desktop", bd->client.icccm.class);
bd->desktop = efreet_util_desktop_file_id_find(buf);
}
}
}
if (!bd->desktop)
{
@ -8295,7 +8295,7 @@ _e_border_eval(E_Border *bd)
}
bd->changes.icon = 0;
}
bd->new_client = 0;
bd->changed =