Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/x11
Modified Files:
ewl_engine_x11.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/x11/ewl_engine_x11.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- ewl_engine_x11.c 6 May 2008 20:20:37 -0000 1.58
+++ ewl_engine_x11.c 7 May 2008 13:38:22 -0000 1.59
@@ -70,8 +70,8 @@
static void ee_window_states_set(Ewl_Window *win);
static void ee_window_state_request(Ewl_Window *win, int states);
static void ee_window_state_handle(Ewl_Window *win, int states,
- Ewl_Window_Flags ewl_flag,
- Ecore_X_Window_State ecore_flag);
+ Ewl_Window_Flags ewl_flag,
+ Ecore_X_Window_State ecore_flag);
static void ee_window_states_set_helper(Ewl_Window *win);
static void ee_window_hints_set(Ewl_Window *win);
static void ee_window_transient_for(Ewl_Window *win);
@@ -98,43 +98,43 @@
static void *window_funcs[EWL_ENGINE_WINDOW_MAX] =
{
- ee_window_new,
- ee_window_destroy,
- ee_window_move,
- ee_window_resize,
- ee_window_min_max_size_set,
- ee_window_show,
- ee_window_hide,
- ee_window_title_set,
- ee_window_name_class_set,
- ee_window_borderless_set,
- ee_window_dialog_set,
- ee_window_states_set,
- ee_window_hints_set,
- ee_window_transient_for,
- ee_window_leader_set,
- ee_window_raise,
- ee_window_lower,
- ee_keyboard_grab,
- ee_keyboard_ungrab,
- ee_pointer_grab,
- ee_pointer_ungrab,
- ee_window_selection_text_set,
- ee_window_geometry_set,
- ee_dnd_aware_set,
- ee_desktop_size_get,
- ee_dnd_drag_types_set,
- ee_dnd_drag_begin,
- ee_dnd_drag_drop,
- ee_dnd_drag_data_send,
+ ee_window_new,
+ ee_window_destroy,
+ ee_window_move,
+ ee_window_resize,
+ ee_window_min_max_size_set,
+ ee_window_show,
+ ee_window_hide,
+ ee_window_title_set,
+ ee_window_name_class_set,
+ ee_window_borderless_set,
+ ee_window_dialog_set,
+ ee_window_states_set,
+ ee_window_hints_set,
+ ee_window_transient_for,
+ ee_window_leader_set,
+ ee_window_raise,
+ ee_window_lower,
+ ee_keyboard_grab,
+ ee_keyboard_ungrab,
+ ee_pointer_grab,
+ ee_pointer_ungrab,
+ ee_window_selection_text_set,
+ ee_window_geometry_set,
+ ee_dnd_aware_set,
+ ee_desktop_size_get,
+ ee_dnd_drag_types_set,
+ ee_dnd_drag_begin,
+ ee_dnd_drag_drop,
+ ee_dnd_drag_data_send,
};
static void *pointer_funcs[EWL_ENGINE_POINTER_MAX] =
{
- ee_pointer_data_new,
- ee_pointer_free,
- ee_pointer_get,
- ee_pointer_set,
+ ee_pointer_data_new,
+ ee_pointer_free,
+ ee_pointer_get,
+ ee_pointer_set,
};
Ecore_DList *
@@ -154,12 +154,12 @@
engine = NEW(Ewl_Engine_X11, 1);
if (!engine)
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
if (!ee_init(EWL_ENGINE(engine), argc, argv))
{
- FREE(engine);
- DRETURN_PTR(NULL, DLEVEL_STABLE);
+ FREE(engine);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
}
DRETURN_PTR(EWL_ENGINE(engine), DLEVEL_STABLE);
@@ -177,117 +177,117 @@
/* If the event handlers are already setup don't do it again */
if (ee_expose_handler)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
if (argc && argv)
{
- for (i = 1; i < *argc; i++)
- {
- if (!strcmp(argv[i], "-display"))
- {
- if (++i < *argc)
- display = argv[i];
- }
- }
+ for (i = 1; i < *argc; i++)
+ {
+ if (!strcmp(argv[i], "-display"))
+ {
+ if (++i < *argc)
+ display = argv[i];
+ }
+ }
}
if (!ecore_x_init(display))
{
- fprintf(stderr, "Unable to initialize Ecore X.\n"
- "Is your DISPLAY variable set correctly?\n\n");
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ fprintf(stderr, "Unable to initialize Ecore X.\n"
+ "Is your DISPLAY variable set correctly?\n\n");
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
ee_expose_handler = ecore_event_handler_add(
- ECORE_X_EVENT_WINDOW_DAMAGE,
- ewl_ev_x_window_expose, NULL);
+ ECORE_X_EVENT_WINDOW_DAMAGE,
+ ewl_ev_x_window_expose, NULL);
ee_configure_handler = ecore_event_handler_add(
- ECORE_X_EVENT_WINDOW_CONFIGURE,
- ewl_ev_x_window_configure, NULL);
+ ECORE_X_EVENT_WINDOW_CONFIGURE,
+ ewl_ev_x_window_configure, NULL);
ee_delete_request_handler = ecore_event_handler_add(
- ECORE_X_EVENT_WINDOW_DELETE_REQUEST,
- ewl_ev_x_window_delete, NULL);
+ ECORE_X_EVENT_WINDOW_DELETE_REQUEST,
+ ewl_ev_x_window_delete, NULL);
/*
* Register dispatching functions for keyboard events.
*/
ee_key_down_handler = ecore_event_handler_add(
- ECORE_X_EVENT_KEY_DOWN,
- ewl_ev_x_key_down, NULL);
+ ECORE_X_EVENT_KEY_DOWN,
+ ewl_ev_x_key_down, NULL);
ee_key_up_handler = ecore_event_handler_add(
- ECORE_X_EVENT_KEY_UP,
- ewl_ev_x_key_up, NULL);
+ ECORE_X_EVENT_KEY_UP,
+ ewl_ev_x_key_up, NULL);
/*
* Register dispatching functions for DND events
*/
ee_dnd_position_handler = ecore_event_handler_add(
- ECORE_X_EVENT_XDND_POSITION,
- ewl_ev_dnd_position, NULL);
+ ECORE_X_EVENT_XDND_POSITION,
+ ewl_ev_dnd_position, NULL);
ee_dnd_enter_handler = ecore_event_handler_add(
- ECORE_X_EVENT_XDND_ENTER,
- ewl_ev_dnd_enter, NULL);
+ ECORE_X_EVENT_XDND_ENTER,
+ ewl_ev_dnd_enter, NULL);
ee_dnd_leave_handler = ecore_event_handler_add(
- ECORE_X_EVENT_XDND_LEAVE,
- ewl_ev_dnd_leave, NULL);
+ ECORE_X_EVENT_XDND_LEAVE,
+ ewl_ev_dnd_leave, NULL);
ee_dnd_drop_handler = ecore_event_handler_add(
- ECORE_X_EVENT_XDND_DROP,
- ewl_ev_dnd_drop, NULL);
+ ECORE_X_EVENT_XDND_DROP,
+ ewl_ev_dnd_drop, NULL);
/*
* Selection callbacks to allow for data transfers.
*/
ee_selection_notify_handler = ecore_event_handler_add(
- ECORE_X_EVENT_SELECTION_NOTIFY,
- ewl_ev_x_data_received, NULL);
+ ECORE_X_EVENT_SELECTION_NOTIFY,
+ ewl_ev_x_data_received, NULL);
/*
* Selection callbacks to allow for pasting.
*/
ee_selection_request_handler = ecore_event_handler_add(
- ECORE_X_EVENT_SELECTION_REQUEST,
- ewl_ev_x_data_request, NULL);
+
ECORE_X_EVENT_SELECTION_REQUEST,
+ ewl_ev_x_data_request, NULL);
/*
* Finally, register dispatching functions for mouse events.
*/
ee_mouse_down_handler = ecore_event_handler_add(
- ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
- ewl_ev_x_mouse_down, NULL);
+
ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
+ ewl_ev_x_mouse_down, NULL);
ee_mouse_up_handler = ecore_event_handler_add(
- ECORE_X_EVENT_MOUSE_BUTTON_UP,
- ewl_ev_x_mouse_up, NULL);
+ ECORE_X_EVENT_MOUSE_BUTTON_UP,
+ ewl_ev_x_mouse_up, NULL);
ee_mouse_move_handler = ecore_event_handler_add(
- ECORE_X_EVENT_MOUSE_MOVE,
- ewl_ev_x_mouse_move, NULL);
+ ECORE_X_EVENT_MOUSE_MOVE,
+ ewl_ev_x_mouse_move, NULL);
ee_mouse_wheel_handler = ecore_event_handler_add(
- ECORE_X_EVENT_MOUSE_WHEEL,
- ewl_ev_x_mouse_wheel, NULL);
+ ECORE_X_EVENT_MOUSE_WHEEL,
+ ewl_ev_x_mouse_wheel, NULL);
ee_mouse_out_handler = ecore_event_handler_add(
- ECORE_X_EVENT_MOUSE_OUT,
- ewl_ev_x_mouse_out, NULL);
+ ECORE_X_EVENT_MOUSE_OUT,
+ ewl_ev_x_mouse_out, NULL);
ee_focus_in_handler = ecore_event_handler_add(
- ECORE_X_EVENT_WINDOW_FOCUS_IN,
- ewl_ev_x_focus_in, NULL);
+ ECORE_X_EVENT_WINDOW_FOCUS_IN,
+ ewl_ev_x_focus_in, NULL);
ee_focus_out_handler = ecore_event_handler_add(
- ECORE_X_EVENT_WINDOW_FOCUS_OUT,
- ewl_ev_x_focus_out, NULL);
+ ECORE_X_EVENT_WINDOW_FOCUS_OUT,
+ ewl_ev_x_focus_out, NULL);
if (!ee_expose_handler || !ee_configure_handler
- || !ee_delete_request_handler
- || !ee_key_down_handler || !ee_key_up_handler
- || !ee_dnd_position_handler || !ee_dnd_enter_handler
- || !ee_dnd_leave_handler || !ee_dnd_drop_handler
- || !ee_selection_notify_handler ||
!ee_selection_request_handler
- || !ee_mouse_down_handler
- || !ee_mouse_up_handler || !ee_mouse_move_handler
- || !ee_mouse_wheel_handler || !ee_mouse_out_handler
- || !ee_focus_in_handler || !ee_focus_out_handler)
+ || !ee_delete_request_handler
+ || !ee_key_down_handler || !ee_key_up_handler
+ || !ee_dnd_position_handler || !ee_dnd_enter_handler
+ || !ee_dnd_leave_handler || !ee_dnd_drop_handler
+ || !ee_selection_notify_handler ||
!ee_selection_request_handler
+ || !ee_mouse_down_handler
+ || !ee_mouse_up_handler || !ee_mouse_move_handler
+ || !ee_mouse_wheel_handler || !ee_mouse_out_handler
+ || !ee_focus_in_handler || !ee_focus_out_handler)
{
- ee_shutdown(EWL_ENGINE(engine));
+ ee_shutdown(EWL_ENGINE(engine));
- fprintf(stderr, "Unable to create Ecore X event handlers.\n");
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ fprintf(stderr, "Unable to create Ecore X event handlers.\n");
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
info = NEW(Ewl_Engine_Info, 1);
@@ -307,75 +307,75 @@
DCHECK_PARAM_PTR(engine);
if (ee_expose_handler)
- ecore_event_handler_del(ee_expose_handler);
+ ecore_event_handler_del(ee_expose_handler);
ee_expose_handler = NULL;
if (ee_configure_handler)
- ecore_event_handler_del(ee_configure_handler);
+ ecore_event_handler_del(ee_configure_handler);
ee_configure_handler = NULL;
if (ee_delete_request_handler)
- ecore_event_handler_del(ee_delete_request_handler);
+ ecore_event_handler_del(ee_delete_request_handler);
ee_delete_request_handler = NULL;
if (ee_key_down_handler)
- ecore_event_handler_del(ee_key_down_handler);
+ ecore_event_handler_del(ee_key_down_handler);
ee_key_down_handler = NULL;
if (ee_key_up_handler)
- ecore_event_handler_del(ee_key_up_handler);
+ ecore_event_handler_del(ee_key_up_handler);
ee_key_up_handler = NULL;
if (ee_dnd_position_handler)
- ecore_event_handler_del(ee_dnd_position_handler);
+ ecore_event_handler_del(ee_dnd_position_handler);
ee_dnd_position_handler = NULL;
if (ee_dnd_enter_handler)
- ecore_event_handler_del(ee_dnd_enter_handler);
+ ecore_event_handler_del(ee_dnd_enter_handler);
ee_dnd_enter_handler = NULL;
if (ee_dnd_leave_handler)
- ecore_event_handler_del(ee_dnd_leave_handler);
+ ecore_event_handler_del(ee_dnd_leave_handler);
ee_dnd_leave_handler = NULL;
if (ee_dnd_drop_handler)
- ecore_event_handler_del(ee_dnd_drop_handler);
+ ecore_event_handler_del(ee_dnd_drop_handler);
ee_dnd_drop_handler = NULL;
if (ee_selection_notify_handler)
- ecore_event_handler_del(ee_selection_notify_handler);
+ ecore_event_handler_del(ee_selection_notify_handler);
ee_selection_notify_handler = NULL;
if (ee_selection_request_handler)
- ecore_event_handler_del(ee_selection_request_handler);
+ ecore_event_handler_del(ee_selection_request_handler);
ee_selection_request_handler = NULL;
if (ee_mouse_down_handler)
- ecore_event_handler_del(ee_mouse_down_handler);
+ ecore_event_handler_del(ee_mouse_down_handler);
ee_mouse_down_handler = NULL;
if (ee_mouse_up_handler)
- ecore_event_handler_del(ee_mouse_up_handler);
+ ecore_event_handler_del(ee_mouse_up_handler);
ee_mouse_up_handler = NULL;
if (ee_mouse_move_handler)
- ecore_event_handler_del(ee_mouse_move_handler);
+ ecore_event_handler_del(ee_mouse_move_handler);
ee_mouse_move_handler = NULL;
if (ee_mouse_wheel_handler)
- ecore_event_handler_del(ee_mouse_wheel_handler);
+ ecore_event_handler_del(ee_mouse_wheel_handler);
ee_mouse_wheel_handler = NULL;
if (ee_mouse_out_handler)
- ecore_event_handler_del(ee_mouse_out_handler);
+ ecore_event_handler_del(ee_mouse_out_handler);
ee_mouse_out_handler = NULL;
if (ee_focus_in_handler)
- ecore_event_handler_del(ee_focus_in_handler);
+ ecore_event_handler_del(ee_focus_in_handler);
ee_focus_in_handler = NULL;
if (ee_focus_out_handler)
- ecore_event_handler_del(ee_focus_out_handler);
+ ecore_event_handler_del(ee_focus_out_handler);
ee_focus_out_handler = NULL;
ecore_x_shutdown();
@@ -395,21 +395,21 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_OVERRIDE)
- xwin = ecore_x_window_override_new(0,
- EWL_EMBED(win)->x, EWL_EMBED(win)->y,
- ewl_object_current_w_get(EWL_OBJECT(win)),
- ewl_object_current_h_get(EWL_OBJECT(win)));
+ xwin = ecore_x_window_override_new(0,
+ EWL_EMBED(win)->x, EWL_EMBED(win)->y,
+ ewl_object_current_w_get(EWL_OBJECT(win)),
+ ewl_object_current_h_get(EWL_OBJECT(win)));
else
- xwin = ecore_x_window_new(0,
- EWL_EMBED(win)->x, EWL_EMBED(win)->y,
- ewl_object_current_w_get(EWL_OBJECT(win)),
- ewl_object_current_h_get(EWL_OBJECT(win)));
+ xwin = ecore_x_window_new(0,
+ EWL_EMBED(win)->x, EWL_EMBED(win)->y,
+ ewl_object_current_w_get(EWL_OBJECT(win)),
+ ewl_object_current_h_get(EWL_OBJECT(win)));
ecore_x_icccm_protocol_set(xwin, ECORE_X_WM_PROTOCOL_DELETE_REQUEST,
1);
win->window = (void *)xwin;
if (win->flags & EWL_WINDOW_BORDERLESS)
- ee_window_borderless_set(win);
+ ee_window_borderless_set(win);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -439,8 +439,8 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_window_move((Ecore_X_Window)win->window,
- EWL_EMBED(win)->x,
- EWL_EMBED(win)->y);
+ EWL_EMBED(win)->x,
+ EWL_EMBED(win)->y);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -460,8 +460,8 @@
ecore_x_window_resize((Ecore_X_Window)win->window, width, height);
if (EWL_EMBED(win)->canvas_window != win->window)
-
ecore_x_window_resize((Ecore_X_Window)EWL_EMBED(win)->canvas_window,
- width, height);
+
ecore_x_window_resize((Ecore_X_Window)EWL_EMBED(win)->canvas_window,
+ width, height);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -474,14 +474,14 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_icccm_size_pos_hints_set((Ecore_X_Window)win->window,
- 0, ECORE_X_GRAVITY_NW,
-
ewl_object_minimum_w_get(EWL_OBJECT(win)),
-
ewl_object_minimum_h_get(EWL_OBJECT(win)),
-
ewl_object_maximum_w_get(EWL_OBJECT(win)),
-
ewl_object_maximum_h_get(EWL_OBJECT(win)),
- 0, 0, /* base */
- 0, 0, /* step */
- 0, 0); /* aspect */
+ 0, ECORE_X_GRAVITY_NW,
+
ewl_object_minimum_w_get(EWL_OBJECT(win)),
+
ewl_object_minimum_h_get(EWL_OBJECT(win)),
+
ewl_object_maximum_w_get(EWL_OBJECT(win)),
+
ewl_object_maximum_h_get(EWL_OBJECT(win)),
+ 0, 0, /* base */
+ 0, 0, /* step */
+ 0, 0); /* aspect */
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -536,7 +536,7 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_icccm_name_class_set((Ecore_X_Window)win->window, win->name,
- (win->classname ? win->classname : win->name));
+ (win->classname ? win->classname : win->name));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -549,7 +549,7 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_mwm_borderless_set((Ecore_X_Window)win->window,
- (!!(win->flags & EWL_WINDOW_BORDERLESS)));
+ (!!(win->flags & EWL_WINDOW_BORDERLESS)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -562,9 +562,9 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_x_netwm_window_type_set((Ecore_X_Window)win->window,
- ((!!(win->flags & EWL_WINDOW_DIALOG)) ?
- ECORE_X_WINDOW_TYPE_DIALOG :
- ECORE_X_WINDOW_TYPE_NORMAL));
+ ((!!(win->flags & EWL_WINDOW_DIALOG)) ?
+ ECORE_X_WINDOW_TYPE_DIALOG :
+ ECORE_X_WINDOW_TYPE_NORMAL));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -582,9 +582,9 @@
if (!diff) DRETURN(DLEVEL_STABLE);
if (REALIZED(win))
- ee_window_state_request(win, diff);
+ ee_window_state_request(win, diff);
else
- ee_window_states_set_helper(win);
+ ee_window_states_set_helper(win);
win->old_flags = win->flags;
@@ -593,8 +593,8 @@
static void
ee_window_state_handle(Ewl_Window *win, int states,
- Ewl_Window_Flags ewl_flag,
- Ecore_X_Window_State ecore_flag)
+ Ewl_Window_Flags ewl_flag,
+ Ecore_X_Window_State ecore_flag)
{
int state = 0;
@@ -604,9 +604,9 @@
if (states & ewl_flag)
{
- state = (!!(win->flags & ewl_flag));
- ecore_x_netwm_state_request_send((Ecore_X_Window)win->window,
- 0, ecore_flag, ECORE_X_WINDOW_STATE_UNKNOWN, state);
+ state = (!!(win->flags & ewl_flag));
+ ecore_x_netwm_state_request_send((Ecore_X_Window)win->window,
+ 0, ecore_flag, ECORE_X_WINDOW_STATE_UNKNOWN, state);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -620,15 +620,15 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ee_window_state_handle(win, states, EWL_WINDOW_FULLSCREEN,
- ECORE_X_WINDOW_STATE_FULLSCREEN);
+ ECORE_X_WINDOW_STATE_FULLSCREEN);
ee_window_state_handle(win, states, EWL_WINDOW_SKIP_TASKBAR,
- ECORE_X_WINDOW_STATE_SKIP_TASKBAR);
+ ECORE_X_WINDOW_STATE_SKIP_TASKBAR);
ee_window_state_handle(win, states, EWL_WINDOW_SKIP_PAGER,
- ECORE_X_WINDOW_STATE_SKIP_PAGER);
+ ECORE_X_WINDOW_STATE_SKIP_PAGER);
ee_window_state_handle(win, states, EWL_WINDOW_MODAL,
- ECORE_X_WINDOW_STATE_MODAL);
+ ECORE_X_WINDOW_STATE_MODAL);
ee_window_state_handle(win, states, EWL_WINDOW_DEMANDS_ATTENTION,
- ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION);
+
ECORE_X_WINDOW_STATE_DEMANDS_ATTENTION);
win->flags &= ~EWL_WINDOW_DEMANDS_ATTENTION;
@@ -649,19 +649,19 @@
* only relevant if the window has been realized */
if (!win->window)
- DRETURN(DLEVEL_STABLE);
+ DRETURN(DLEVEL_STABLE);
if (!!(win->flags & EWL_WINDOW_FULLSCREEN))
- states[count++] = ECORE_X_WINDOW_STATE_FULLSCREEN;
+ states[count++] = ECORE_X_WINDOW_STATE_FULLSCREEN;
if (!!(win->flags & EWL_WINDOW_SKIP_TASKBAR))
- states[count++] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
+ states[count++] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
if (!!(win->flags & EWL_WINDOW_SKIP_PAGER))
- states[count++] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
+ states[count++] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
if (!!(win->flags & EWL_WINDOW_MODAL))
- states[count++] = ECORE_X_WINDOW_STATE_MODAL;
+ states[count++] = ECORE_X_WINDOW_STATE_MODAL;
ecore_x_netwm_window_state_set((Ecore_X_Window)win->window, states,
count);
@@ -679,23 +679,23 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_LEADER)
- win_group = win->leader.ewl->window;
+ win_group = win->leader.ewl->window;
else if (win->flags & EWL_WINDOW_LEADER_FOREIGN)
- win_group = win->leader.foreign;
+ win_group = win->leader.foreign;
else
- win_group = NULL;
+ win_group = NULL;
if (win->flags & EWL_WINDOW_URGENT)
- urgent = TRUE;
+ urgent = TRUE;
ecore_x_icccm_hints_set((Ecore_X_Window) win->window,
- 1, // accepts focus
- 0, // initial states
- 0, // icon pixmap
- 0, // icon mask
- 0, // icon window
- (Ecore_X_Window) win_group, // window group
- urgent); // is urgent
+ 1, // accepts focus
+ 0, // initial states
+ 0, // icon pixmap
+ 0, // icon mask
+ 0, // icon window
+ (Ecore_X_Window) win_group, // window group
+ urgent); // is urgent
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -708,13 +708,13 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_TRANSIENT)
- ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window,
- (Ecore_X_Window)win->transient.ewl->window);
+ ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window,
+ (Ecore_X_Window)win->transient.ewl->window);
else if (win->flags & EWL_WINDOW_TRANSIENT_FOREIGN)
- ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window,
- (Ecore_X_Window)win->transient.foreign);
+ ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window,
+
(Ecore_X_Window)win->transient.foreign);
else
- ecore_x_icccm_transient_for_unset((Ecore_X_Window)win->window);
+ ecore_x_icccm_transient_for_unset((Ecore_X_Window)win->window);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -729,16 +729,16 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
if (win->flags & EWL_WINDOW_LEADER)
- leader = win->leader.ewl->window;
+ leader = win->leader.ewl->window;
else if (win->flags & EWL_WINDOW_LEADER_FOREIGN)
- leader = win->leader.foreign;
+ leader = win->leader.foreign;
else
- /* according to the icccm specs a client leader
- * sets itself to the leader */
- leader = win->window;
+ /* according to the icccm specs a client leader
+ * sets itself to the leader */
+ leader = win->window;
ecore_x_icccm_client_leader_set((Ecore_X_Window)win->window,
- (Ecore_X_Window)leader);
+ (Ecore_X_Window)leader);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -778,13 +778,13 @@
if ((!!(win->flags & EWL_WINDOW_GRAB_KEYBOARD)))
{
- ret = ecore_x_keyboard_grab((Ecore_X_Window)win->window);
- ee_current_key_grab_window = win;
+ ret = ecore_x_keyboard_grab((Ecore_X_Window)win->window);
+ ee_current_key_grab_window = win;
}
else if (ee_current_key_grab_window == win)
{
- ecore_x_keyboard_ungrab();
- ee_current_key_grab_window = NULL;
+ ecore_x_keyboard_ungrab();
+ ee_current_key_grab_window = NULL;
}
DRETURN_INT(ret, DLEVEL_STABLE);
@@ -814,13 +814,13 @@
if ((!!(win->flags & EWL_WINDOW_GRAB_POINTER)))
{
- ret = ecore_x_pointer_grab((Ecore_X_Window)win->window);
- ee_current_pointer_grab_window = win;
+ ret = ecore_x_pointer_grab((Ecore_X_Window)win->window);
+ ee_current_pointer_grab_window = win;
}
else if (ee_current_pointer_grab_window == win)
{
- ecore_x_pointer_ungrab();
- ee_current_pointer_grab_window = NULL;
+ ecore_x_pointer_ungrab();
+ ee_current_pointer_grab_window = NULL;
}
DRETURN_INT(ret, DLEVEL_STABLE);
@@ -848,11 +848,11 @@
DCHECK_TYPE(emb, EWL_EMBED_TYPE);
if (txt)
- ecore_x_selection_primary_set(
- (Ecore_X_Window)emb->canvas_window,
- (unsigned char *)txt, strlen(txt) + 1);
+ ecore_x_selection_primary_set(
+ (Ecore_X_Window)emb->canvas_window,
+ (unsigned char *)txt, strlen(txt) + 1);
else
- ecore_x_selection_primary_clear();
+ ecore_x_selection_primary_clear();
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -863,7 +863,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
ecore_x_window_geometry_get((win ? (Ecore_X_Window)win->window :
(Ecore_X_Window)0),
- NULL, NULL, width,
height);
+ NULL, NULL, width,
height);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -900,7 +900,7 @@
DCHECK_TYPE(embed, EWL_EMBED_TYPE);
ecore_x_dnd_aware_set((Ecore_X_Window)embed->canvas_window,
- (num > 0 ? 1 : 0));
+ (num > 0 ? 1 : 0));
ecore_x_dnd_types_set((Ecore_X_Window)embed->canvas_window, (char
**)types, num);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -941,11 +941,11 @@
DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, FALSE);
ecore_x_window_prop_property_set(request->requestor, request->property,
- request->target, 8, data, len);
+ request->target, 8, data, len);
DRETURN_INT(ecore_x_selection_notify_send(request->requestor,
- request->selection, request->target,
- request->property, request->time),
DLEVEL_STABLE);
+ request->selection, request->target,
+ request->property, request->time),
DLEVEL_STABLE);
}
static int
@@ -956,7 +956,7 @@
DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, 0);
DRETURN_INT(ecore_x_cursor_new((Ecore_X_Window)embed->canvas_window,
- data, w, h, 0, 0), DLEVEL_STABLE);
+ data, w, h, 0, 0), DLEVEL_STABLE);
}
static void
@@ -995,9 +995,9 @@
DCHECK_TYPE(embed, EWL_EMBED_TYPE);
if (pointer >= EWL_MOUSE_CURSOR_MAX)
- cur = pointer;
+ cur = pointer;
else
- cur = ecore_x_cursor_shape_get(pointer);
+ cur = ecore_x_cursor_shape_get(pointer);
ecore_x_window_cursor_set((Ecore_X_Window)embed->canvas_window, cur);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -1020,7 +1020,7 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
event.x = ev->x;
event.y = ev->y;
@@ -1051,19 +1051,19 @@
embed = ewl_embed_canvas_window_find((void *)ev->win);
if (!embed)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
/*
* Save coords and queue a configure event if the window is moved.
*/
if ((ev->from_wm) && (ev->x != embed->x)) {
- embed->x = ev->x;
- config = 1;
+ embed->x = ev->x;
+ config = 1;
}
if ((ev->from_wm) && (ev->y != embed->y)) {
- embed->y = ev->y;
- config = 1;
+ embed->y = ev->y;
+ config = 1;
}
window = ewl_window_window_find((void *)ev->win);
@@ -1071,27 +1071,27 @@
* we can finish when the embed is not a window
*/
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
if (config)
- ewl_widget_configure(EWL_WIDGET(window));
+ ewl_widget_configure(EWL_WIDGET(window));
/*
* Configure events really only need to occur on resize.
*/
if ((ewl_object_current_w_get(EWL_OBJECT(window)) != ev->w)
- || (ewl_object_current_h_get(EWL_OBJECT(window)) !=
ev->h)) {
+ || (ewl_object_current_h_get(EWL_OBJECT(window)) !=
ev->h)) {
- /*
- * Right now this is commented out, as it was preventing windows
- * from resizing when WE were the ones setting the size
- * (mainly on initial show of the window). It would be nice to
- * add this back in to limit the # of window resizes occuring.
- * (As long as it doesn't break initial size.)
- */
- if (ev->from_wm) window->flags |= EWL_WINDOW_USER_CONFIGURE;
- ewl_object_geometry_request(EWL_OBJECT(window), 0, 0, ev->w,
- ev->h);
+ /*
+ * Right now this is commented out, as it was preventing
windows
+ * from resizing when WE were the ones setting the size
+ * (mainly on initial show of the window). It would be nice to
+ * add this back in to limit the # of window resizes occuring.
+ * (As long as it doesn't break initial size.)
+ */
+ if (ev->from_wm) window->flags |= EWL_WINDOW_USER_CONFIGURE;
+ ewl_object_geometry_request(EWL_OBJECT(window), 0, 0, ev->w,
+ ev->h);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -1113,7 +1113,7 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
ewl_callback_call(EWL_WIDGET(window), EWL_CALLBACK_DELETE_WINDOW);
@@ -1133,28 +1133,28 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
key_modifiers = ewl_ev_modifiers_get();
if (strstr(ev->keyname, "Shift_"))
- key_modifiers |= EWL_KEY_MODIFIER_SHIFT;
+ key_modifiers |= EWL_KEY_MODIFIER_SHIFT;
else if (strstr(ev->keyname, "Control_"))
- key_modifiers |= EWL_KEY_MODIFIER_CTRL;
+ key_modifiers |= EWL_KEY_MODIFIER_CTRL;
else if (strstr(ev->keyname, "Alt_"))
- key_modifiers |= EWL_KEY_MODIFIER_ALT;
+ key_modifiers |= EWL_KEY_MODIFIER_ALT;
else if (strstr(ev->keyname, "Mod_"))
- key_modifiers |= EWL_KEY_MODIFIER_MOD;
+ key_modifiers |= EWL_KEY_MODIFIER_MOD;
else if (strstr(ev->keyname, "Super_"))
- key_modifiers |= EWL_KEY_MODIFIER_WIN;
+ key_modifiers |= EWL_KEY_MODIFIER_WIN;
else if (strstr(ev->keyname, "Hyper_"))
- key_modifiers |= EWL_KEY_MODIFIER_WIN;
+ key_modifiers |= EWL_KEY_MODIFIER_WIN;
else if (!ev->key_compose || iscntrl(*ev->key_compose))
- ewl_embed_key_down_feed(EWL_EMBED(window), ev->keyname,
- key_modifiers);
+ ewl_embed_key_down_feed(EWL_EMBED(window), ev->keyname,
+ key_modifiers);
else
- ewl_embed_key_down_feed(EWL_EMBED(window), ev->key_compose,
- key_modifiers);
+ ewl_embed_key_down_feed(EWL_EMBED(window), ev->key_compose,
+ key_modifiers);
ewl_ev_modifiers_set(key_modifiers);
@@ -1174,28 +1174,28 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
key_modifiers = ewl_ev_modifiers_get();
if (strstr(ev->keyname, "Shift_"))
- key_modifiers &= ~EWL_KEY_MODIFIER_SHIFT;
+ key_modifiers &= ~EWL_KEY_MODIFIER_SHIFT;
else if (strstr(ev->keyname, "Control_"))
- key_modifiers &= ~EWL_KEY_MODIFIER_CTRL;
+ key_modifiers &= ~EWL_KEY_MODIFIER_CTRL;
else if (strstr(ev->keyname, "Alt_"))
- key_modifiers &= ~EWL_KEY_MODIFIER_ALT;
+ key_modifiers &= ~EWL_KEY_MODIFIER_ALT;
else if (strstr(ev->keyname, "Mod_"))
- key_modifiers &= ~EWL_KEY_MODIFIER_MOD;
+ key_modifiers &= ~EWL_KEY_MODIFIER_MOD;
else if (strstr(ev->keyname, "Super_"))
- key_modifiers &= ~EWL_KEY_MODIFIER_WIN;
+ key_modifiers &= ~EWL_KEY_MODIFIER_WIN;
else if (strstr(ev->keyname, "Hyper_"))
- key_modifiers &= ~EWL_KEY_MODIFIER_WIN;
+ key_modifiers &= ~EWL_KEY_MODIFIER_WIN;
else if (!ev->key_compose || iscntrl(*ev->key_compose))
- ewl_embed_key_up_feed(EWL_EMBED(window), ev->keyname,
- key_modifiers);
+ ewl_embed_key_up_feed(EWL_EMBED(window), ev->keyname,
+ key_modifiers);
else
- ewl_embed_key_up_feed(EWL_EMBED(window), ev->key_compose,
- key_modifiers);
+ ewl_embed_key_up_feed(EWL_EMBED(window), ev->key_compose,
+ key_modifiers);
ewl_ev_modifiers_set(key_modifiers);
@@ -1216,16 +1216,16 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
if (ev->double_click)
- clicks = 2;
+ clicks = 2;
if (ev->triple_click)
- clicks = 3;
+ clicks = 3;
key_modifiers = ewl_ev_modifiers_get();
ewl_embed_mouse_down_feed(EWL_EMBED(window), ev->button, clicks,
- ev->x, ev->y, key_modifiers);
+ ev->x, ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1243,12 +1243,12 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
key_modifiers = ewl_ev_modifiers_get();
ewl_embed_mouse_up_feed(EWL_EMBED(window), ev->button, ev->x,
- ev->y, key_modifiers);
+ ev->y, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1266,11 +1266,11 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
key_modifiers = ewl_ev_modifiers_get();
ewl_embed_mouse_move_feed(EWL_EMBED(window), ev->x, ev->y,
- key_modifiers);
+ key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1286,11 +1286,11 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
key_modifiers = ewl_ev_modifiers_get();
ewl_embed_mouse_out_feed(EWL_EMBED(window), ev->x, ev->y,
- key_modifiers);
+ key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1306,11 +1306,11 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
key_modifiers = ewl_ev_modifiers_get();
ewl_embed_mouse_wheel_feed(EWL_EMBED(window), ev->x, ev->y,
- ev->z, ev->direction, key_modifiers);
+ ev->z, ev->direction, key_modifiers);
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1326,7 +1326,7 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
ewl_callback_call(EWL_WIDGET(window), EWL_CALLBACK_FOCUS_IN);
@@ -1343,7 +1343,7 @@
window = ewl_window_window_find((void *)ev->win);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
ewl_callback_call(EWL_WIDGET(window), EWL_CALLBACK_FOCUS_OUT);
@@ -1362,43 +1362,43 @@
/* Handle everything *except* XDND selection */
if (ev->selection != ECORE_X_SELECTION_XDND)
- printf("Paste event received\n");
+ printf("Paste event received\n");
else
{
- Ewl_Embed *embed;
- Ecore_X_Selection_Data *data = ev->data;
+ Ewl_Embed *embed;
+ Ecore_X_Selection_Data *data = ev->data;
- embed = ewl_embed_canvas_window_find((void *)ev->win);
- if (embed)
- {
- if (data->content == ECORE_X_SELECTION_CONTENT_FILES)
- {
- Ecore_X_Selection_Data_Files *files = ev->data;
- ewl_embed_dnd_data_received_feed(embed,
- ev->target,
- files->files,
- files->num_files,
- data->format);
- }
- else if (data->content ==
ECORE_X_SELECTION_CONTENT_TEXT)
- {
- Ecore_X_Selection_Data_Text *text = ev->data;
- ewl_embed_dnd_data_received_feed(embed,
- ev->target, text->text,
- data->length,
- data->format);
- }
- else
- {
- ewl_embed_dnd_data_received_feed(embed,
- ev->target, data->data,
- data->length,
- data->format);
- }
- }
+ embed = ewl_embed_canvas_window_find((void *)ev->win);
+ if (embed)
+ {
+ if (data->content == ECORE_X_SELECTION_CONTENT_FILES)
+ {
+ Ecore_X_Selection_Data_Files *files = ev->data;
+ ewl_embed_dnd_data_received_feed(embed,
+ ev->target,
+ files->files,
+ files->num_files,
+ data->format);
+ }
+ else if (data->content ==
ECORE_X_SELECTION_CONTENT_TEXT)
+ {
+ Ecore_X_Selection_Data_Text *text = ev->data;
+ ewl_embed_dnd_data_received_feed(embed,
+ ev->target, text->text,
+ data->length,
+ data->format);
+ }
+ else
+ {
+ ewl_embed_dnd_data_received_feed(embed,
+ ev->target, data->data,
+ data->length,
+ data->format);
+ }
+ }
- ecore_x_dnd_send_finished();
+ ecore_x_dnd_send_finished();
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -1417,24 +1417,24 @@
/* Handle everything *except* XDND selection */
if (ev->selection != ECORE_X_ATOM_SELECTION_XDND)
{
- char *rec, *dnd;
+ char *rec, *dnd;
- rec = XGetAtomName(ecore_x_display_get(), ev->selection);
- dnd = XGetAtomName(ecore_x_display_get(),
ECORE_X_ATOM_SELECTION_XDND);
- printf("Data request event received: %s not %s\n", rec, dnd);
- XFree(rec);
- XFree(dnd);
+ rec = XGetAtomName(ecore_x_display_get(), ev->selection);
+ dnd = XGetAtomName(ecore_x_display_get(),
ECORE_X_ATOM_SELECTION_XDND);
+ printf("Data request event received: %s not %s\n", rec, dnd);
+ XFree(rec);
+ XFree(dnd);
}
else if (ev->selection == ECORE_X_ATOM_SELECTION_XDND)
{
- Ewl_Embed *embed;
- char *atom;
+ Ewl_Embed *embed;
+ char *atom;
- embed = ewl_embed_canvas_window_find((void *)ev->owner);
- atom = XGetAtomName(ecore_x_display_get(), ev->target);
- ewl_embed_dnd_data_request_feed(embed, ev, atom);
- XFree(atom);
+ embed = ewl_embed_canvas_window_find((void *)ev->owner);
+ atom = XGetAtomName(ecore_x_display_get(), ev->target);
+ ewl_embed_dnd_data_request_feed(embed, ev, atom);
+ XFree(atom);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -1457,38 +1457,38 @@
window = ewl_window_window_find((void *)ev->win);
if (window) {
- Ewl_Embed *embed;
+ Ewl_Embed *embed;
- ewl_embed_window_position_get(EWL_EMBED(window), &wx, &wy);
- x = ev->position.x - wx;
- y = ev->position.y - wy;
-
- /*
- * Look for the child here
- */
- embed = ewl_embed_canvas_window_find((void *)ev->win);
- if (embed) {
- /* First see if we need to send an 'enter'
- * to the widget */
- if (ewl_embed_dnd_position_feed(embed, x, y, &px,
- &py, &pw, &ph))
- will_accept = 1;
-
- if (embed->last.drop_widget) {
- rect.x = px;
- rect.y = py;
- rect.width = pw;
- rect.height = ph;
- } else {
- rect.x = 0;
- rect.y = 0;
- rect.width = 0;
- rect.height = 0;
- }
-
- /* Don't send status for windows we don't own */
- ecore_x_dnd_send_status(will_accept, 0, rect,
ECORE_X_DND_ACTION_PRIVATE);
- }
+ ewl_embed_window_position_get(EWL_EMBED(window), &wx, &wy);
+ x = ev->position.x - wx;
+ y = ev->position.y - wy;
+
+ /*
+ * Look for the child here
+ */
+ embed = ewl_embed_canvas_window_find((void *)ev->win);
+ if (embed) {
+ /* First see if we need to send an 'enter'
+ * to the widget */
+ if (ewl_embed_dnd_position_feed(embed, x, y, &px,
+ &py, &pw, &ph))
+ will_accept = 1;
+
+ if (embed->last.drop_widget) {
+ rect.x = px;
+ rect.y = py;
+ rect.width = pw;
+ rect.height = ph;
+ } else {
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = 0;
+ rect.height = 0;
+ }
+
+ /* Don't send status for windows we don't own */
+ ecore_x_dnd_send_status(will_accept, 0, rect,
ECORE_X_DND_ACTION_PRIVATE);
+ }
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -1508,11 +1508,11 @@
embed = ewl_embed_canvas_window_find((void *)ev->win);
if (embed) {
- embed->dnd_types.num_types = ev->num_types;
- embed->dnd_types.types = malloc(sizeof(char*) * ev->num_types);
+ embed->dnd_types.num_types = ev->num_types;
+ embed->dnd_types.types = malloc(sizeof(char*) * ev->num_types);
- for (i = 0; i < ev->num_types; i++)
- embed->dnd_types.types[i] = strdup(ev->types[i]);
+ for (i = 0; i < ev->num_types; i++)
+ embed->dnd_types.types[i] = strdup(ev->types[i]);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1531,15 +1531,15 @@
embed = ewl_embed_canvas_window_find((void *)ev->win);
if (embed) {
- if (embed->dnd_types.num_types > 0) {
- for (i = 0; i < embed->dnd_types.num_types; i++)
- FREE(embed->dnd_types.types[i]);
-
- FREE(embed->dnd_types.types);
- embed->dnd_types.types = NULL;
- embed->dnd_types.num_types = 0;
+ if (embed->dnd_types.num_types > 0) {
+ for (i = 0; i < embed->dnd_types.num_types; i++)
+ FREE(embed->dnd_types.types[i]);
+
+ FREE(embed->dnd_types.types);
+ embed->dnd_types.types = NULL;
+ embed->dnd_types.num_types = 0;
- }
+ }
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
@@ -1558,20 +1558,20 @@
embed = ewl_embed_canvas_window_find((void *)ev->win);
if (embed) {
- int x, y, wx, wy;
- const char *type;
+ int x, y, wx, wy;
+ const char *type;
- ewl_embed_window_position_get(embed, &wx, &wy);
+ ewl_embed_window_position_get(embed, &wx, &wy);
- if (ev->source == (Ecore_X_Window)embed->canvas_window)
- internal = 1;
+ if (ev->source == (Ecore_X_Window)embed->canvas_window)
+ internal = 1;
- x = ev->position.x - wx;
- y = ev->position.y - wy;
+ x = ev->position.x - wx;
+ y = ev->position.y - wy;
- type = ewl_embed_dnd_drop_feed(embed, x, y, internal);
- if (type)
- ecore_x_selection_xdnd_request(ev->win, (char *)type);
+ type = ewl_embed_dnd_drop_feed(embed, x, y, internal);
+ if (type)
+ ecore_x_selection_xdnd_request(ev->win, (char *)type);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
