Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/engines/win32
Modified Files:
ewl_engine_win32.c
Log Message:
- tabs are a tricky beast. looks like I missed some.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/engines/win32/ewl_engine_win32.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_engine_win32.c 6 May 2008 20:20:37 -0000 1.2
+++ ewl_engine_win32.c 7 May 2008 13:38:22 -0000 1.3
@@ -53,8 +53,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_Win32_Window_State ecore_flag);
+ Ewl_Window_Flags ewl_flag,
+ Ecore_Win32_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);
@@ -71,43 +71,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,
- NULL,
- 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,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- ee_window_geometry_set,
- NULL,
- ee_desktop_size_get,
- NULL,
- NULL,
- NULL,
- NULL,
+ 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,
+ NULL,
+ 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,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ ee_window_geometry_set,
+ NULL,
+ ee_desktop_size_get,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
};
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 *
@@ -127,12 +127,12 @@
engine = NEW(Ewl_Engine_Win32, 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);
@@ -149,53 +149,53 @@
printf (" **** ee_init\n");
/* 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);
printf (" **** ee_init : ecore_win32_init\n");
if (!ecore_win32_init())
{
- fprintf(stderr, "Unable to initialize Ecore Win32.\n"
- "Is your DISPLAY variable set correctly?\n\n");
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ fprintf(stderr, "Unable to initialize Ecore Win32.\n"
+ "Is your DISPLAY variable set correctly?\n\n");
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
printf (" **** ee_init : events : damage, configure, delete\n");
ee_expose_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_WINDOW_DAMAGE,
- ewl_ev_win32_window_expose, NULL);
+ ECORE_WIN32_EVENT_WINDOW_DAMAGE,
+ ewl_ev_win32_window_expose, NULL);
ee_configure_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_WINDOW_CONFIGURE,
- ewl_ev_win32_window_configure, NULL);
+ ECORE_WIN32_EVENT_WINDOW_CONFIGURE,
+ ewl_ev_win32_window_configure, NULL);
ee_delete_request_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST,
- ewl_ev_win32_window_delete, NULL);
+
ECORE_WIN32_EVENT_WINDOW_DELETE_REQUEST,
+ ewl_ev_win32_window_delete, NULL);
/*
* Register dispatching functions for keyboard events.
*/
ee_key_down_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_KEY_DOWN,
- ewl_ev_win32_key_down, NULL);
+ ECORE_WIN32_EVENT_KEY_DOWN,
+ ewl_ev_win32_key_down, NULL);
ee_key_up_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_KEY_UP,
- ewl_ev_win32_key_up, NULL);
+ ECORE_WIN32_EVENT_KEY_UP,
+ ewl_ev_win32_key_up, NULL);
/*
* Register dispatching functions for DND events
*/
/*
ee_dnd_position_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_XDND_POSITION,
- ewl_ev_dnd_position, NULL);
+
ECORE_WIN32_EVENT_XDND_POSITION,
+ ewl_ev_dnd_position, NULL);
ee_dnd_enter_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_XDND_ENTER,
- ewl_ev_dnd_enter, NULL);
+ ECORE_WIN32_EVENT_XDND_ENTER,
+ ewl_ev_dnd_enter, NULL);
ee_dnd_leave_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_XDND_LEAVE,
- ewl_ev_dnd_leave, NULL);
+ ECORE_WIN32_EVENT_XDND_LEAVE,
+ ewl_ev_dnd_leave, NULL);
ee_dnd_drop_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_XDND_DROP,
- ewl_ev_dnd_drop, NULL);
+ ECORE_WIN32_EVENT_XDND_DROP,
+ ewl_ev_dnd_drop, NULL);
*/
/*
@@ -203,8 +203,8 @@
*/
/*
ee_selection_notify_handler = ecore_event_handler_add(
-
ECORE_WIN32_EVENT_SELECTION_NOTIFY,
- ewl_ev_win32_data_received,
NULL);
+
ECORE_WIN32_EVENT_SELECTION_NOTIFY,
+ ewl_ev_win32_data_received,
NULL);
*/
/*
@@ -212,47 +212,47 @@
*/
/*
ee_selection_request_handler = ecore_event_handler_add(
-
ECORE_WIN32_EVENT_SELECTION_REQUEST,
- ewl_ev_win32_data_request,
NULL);
+
ECORE_WIN32_EVENT_SELECTION_REQUEST,
+ ewl_ev_win32_data_request,
NULL);
*/
/*
* Finally, register dispatching functions for mouse events.
*/
ee_mouse_down_handler = ecore_event_handler_add(
-
ECORE_WIN32_EVENT_MOUSE_BUTTON_DOWN,
- ewl_ev_win32_mouse_down, NULL);
+
ECORE_WIN32_EVENT_MOUSE_BUTTON_DOWN,
+ ewl_ev_win32_mouse_down, NULL);
ee_mouse_up_handler = ecore_event_handler_add(
-
ECORE_WIN32_EVENT_MOUSE_BUTTON_UP,
- ewl_ev_win32_mouse_up, NULL);
+
ECORE_WIN32_EVENT_MOUSE_BUTTON_UP,
+ ewl_ev_win32_mouse_up, NULL);
ee_mouse_move_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_MOUSE_MOVE,
- ewl_ev_win32_mouse_move, NULL);
+ ECORE_WIN32_EVENT_MOUSE_MOVE,
+ ewl_ev_win32_mouse_move, NULL);
ee_mouse_wheel_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_MOUSE_WHEEL,
- ewl_ev_win32_mouse_wheel, NULL);
+ ECORE_WIN32_EVENT_MOUSE_WHEEL,
+ ewl_ev_win32_mouse_wheel,
NULL);
ee_mouse_out_handler = ecore_event_handler_add(
- ECORE_WIN32_EVENT_MOUSE_OUT,
- ewl_ev_win32_mouse_out, NULL);
+ ECORE_WIN32_EVENT_MOUSE_OUT,
+ ewl_ev_win32_mouse_out, NULL);
ee_focus_in_handler = ecore_event_handler_add(
-
ECORE_WIN32_EVENT_WINDOW_FOCUS_IN,
- ewl_ev_win32_focus_in, NULL);
+
ECORE_WIN32_EVENT_WINDOW_FOCUS_IN,
+ ewl_ev_win32_focus_in, NULL);
ee_focus_out_handler = ecore_event_handler_add(
-
ECORE_WIN32_EVENT_WINDOW_FOCUS_OUT,
- ewl_ev_win32_focus_out, NULL);
+
ECORE_WIN32_EVENT_WINDOW_FOCUS_OUT,
+ ewl_ev_win32_focus_out, NULL);
if (!ee_expose_handler || !ee_configure_handler
- || !ee_delete_request_handler
- || !ee_key_down_handler || !ee_key_up_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_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 Win32 event
handlers.\n");
- DRETURN_INT(FALSE, DLEVEL_STABLE);
+ fprintf(stderr, "Unable to create Ecore Win32 event
handlers.\n");
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
}
info = NEW(Ewl_Engine_Info, 1);
@@ -274,77 +274,77 @@
printf (" **** ee_shutdown\n");
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_win32_shutdown();
@@ -368,20 +368,20 @@
ewl_object_current_h_get(EWL_OBJECT(win)));
if (win->flags & EWL_WINDOW_OVERRIDE)
- xwin = ecore_win32_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_win32_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_win32_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_win32_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)));
win->window = (void *)xwin;
printf ("flags : %d %d\n", win->flags & EWL_WINDOW_OVERRIDE,
win->flags & EWL_WINDOW_BORDERLESS);
if (win->flags & EWL_WINDOW_BORDERLESS)
- ee_window_borderless_set(win);
+ ee_window_borderless_set(win);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -411,8 +411,8 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_win32_window_move(win->window,
- EWL_EMBED(win)->x,
- EWL_EMBED(win)->y);
+ EWL_EMBED(win)->x,
+ EWL_EMBED(win)->y);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -433,8 +433,8 @@
ecore_win32_window_resize(win->window, width, height);
if (EWL_EMBED(win)->canvas_window != win->window)
- ecore_win32_window_resize(EWL_EMBED(win)->canvas_window,
- width, height);
+ ecore_win32_window_resize(EWL_EMBED(win)->canvas_window,
+ width, height);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -448,11 +448,11 @@
printf ("ee_window_min_max_size_set %p\n", win->window);
ecore_win32_window_size_min_set(win->window,
-
ewl_object_minimum_w_get(EWL_OBJECT(win)),
-
ewl_object_minimum_h_get(EWL_OBJECT(win)));
+
ewl_object_minimum_w_get(EWL_OBJECT(win)),
+
ewl_object_minimum_h_get(EWL_OBJECT(win)));
ecore_win32_window_size_max_set(win->window,
-
ewl_object_maximum_w_get(EWL_OBJECT(win)),
-
ewl_object_maximum_h_get(EWL_OBJECT(win)));
+
ewl_object_maximum_w_get(EWL_OBJECT(win)),
+
ewl_object_maximum_h_get(EWL_OBJECT(win)));
ecore_win32_window_size_base_set(win->window, 0, 0);
ecore_win32_window_size_step_set(win->window, 0, 0);
@@ -506,7 +506,7 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_win32_window_borderless_set(win->window,
- (!!(win->flags & EWL_WINDOW_BORDERLESS)));
+ (!!(win->flags & EWL_WINDOW_BORDERLESS)));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -519,9 +519,9 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ecore_win32_window_type_set(win->window,
- ((!!(win->flags & EWL_WINDOW_DIALOG)) ?
- ECORE_WIN32_WINDOW_TYPE_DIALOG :
- ECORE_WIN32_WINDOW_TYPE_NORMAL));
+ ((!!(win->flags & EWL_WINDOW_DIALOG)) ?
+ ECORE_WIN32_WINDOW_TYPE_DIALOG :
+ ECORE_WIN32_WINDOW_TYPE_NORMAL));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -539,9 +539,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;
@@ -550,8 +550,8 @@
static void
ee_window_state_handle(Ewl_Window *win, int states,
- Ewl_Window_Flags ewl_flag,
- Ecore_Win32_Window_State ecore_flag)
+ Ewl_Window_Flags ewl_flag,
+ Ecore_Win32_Window_State ecore_flag)
{
int state = 0;
@@ -561,9 +561,9 @@
if (states & ewl_flag)
{
- state = (!!(win->flags & ewl_flag));
- ecore_win32_window_state_request_send(win->window,
- ecore_flag, state);
+ state = (!!(win->flags & ewl_flag));
+ ecore_win32_window_state_request_send(win->window,
+ ecore_flag, state);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -577,11 +577,11 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
ee_window_state_handle(win, states, EWL_WINDOW_FULLSCREEN,
- ECORE_WIN32_WINDOW_STATE_FULLSCREEN);
+ ECORE_WIN32_WINDOW_STATE_FULLSCREEN);
ee_window_state_handle(win, states, EWL_WINDOW_MODAL,
- ECORE_WIN32_WINDOW_STATE_MODAL);
+ ECORE_WIN32_WINDOW_STATE_MODAL);
ee_window_state_handle(win, states, EWL_WINDOW_DEMANDS_ATTENTION,
-
ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION);
+
ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION);
win->flags &= ~EWL_WINDOW_DEMANDS_ATTENTION;
@@ -602,13 +602,13 @@
* 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_WIN32_WINDOW_STATE_FULLSCREEN;
+ states[count++] = ECORE_WIN32_WINDOW_STATE_FULLSCREEN;
if (!!(win->flags & EWL_WINDOW_MODAL))
- states[count++] = ECORE_WIN32_WINDOW_STATE_MODAL;
+ states[count++] = ECORE_WIN32_WINDOW_STATE_MODAL;
ecore_win32_window_state_set(win->window, states, count);
@@ -626,23 +626,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( win->window, */
-/* 1, // accepts focus */
-/* 0, // initial states */
-/* 0, // icon pixmap */
-/* 0, // icon mask */
-/* 0, // icon window */
-/* win_group, // window group */
-/* urgent); // is urgent */
+/* 1, // accepts focus */
+/* 0, // initial states */
+/* 0, // icon pixmap */
+/* 0, // icon mask */
+/* 0, // icon window */
+/* win_group, // window group */
+/* urgent); // is urgent */
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -655,13 +655,13 @@
DCHECK_TYPE(win, EWL_WINDOW_TYPE);
/* if (win->flags & EWL_WINDOW_TRANSIENT) */
-/* ecore_x_icccm_transient_for_set(win->window, */
-/* win->transient.ewl->window); */
+/* ecore_x_icccm_transient_for_set(win->window, */
+/* win->transient.ewl->window); */
/* else if (win->flags & EWL_WINDOW_TRANSIENT_FOREIGN) */
-/* ecore_x_icccm_transient_for_set(win->window, */
-/* win->transient.foreign); */
+/* ecore_x_icccm_transient_for_set(win->window, */
+/* win->transient.foreign); */
/* else */
-/* ecore_x_icccm_transient_for_unset(win->window); */
+/* ecore_x_icccm_transient_for_unset(win->window); */
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -676,16 +676,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(win->window, */
-/* leader); */
+/* leader); */
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -721,7 +721,7 @@
printf ("ee_window_geometry_set\n");
ecore_win32_window_size_get((win ? win->window : NULL),
- width, height);
+ width, height);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -747,7 +747,7 @@
DCHECK_TYPE_RET(embed, EWL_EMBED_TYPE, 0);
DRETURN_INT((int)ecore_win32_cursor_new(embed->canvas_window,
- data, w, h, 0, 0),
DLEVEL_STABLE);
+ data, w, h, 0, 0),
DLEVEL_STABLE);
}
static void
@@ -865,7 +865,7 @@
window = ewl_window_window_find((void *)ev->window);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
printf (" **** ewl_ev_win32_window_expose\n");
event.x = ev->x;
@@ -900,19 +900,19 @@
embed = ewl_embed_canvas_window_find((void *)ev->window);
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->x != embed->x) {
- embed->x = ev->x;
- config = 1;
+ embed->x = ev->x;
+ config = 1;
}
if (ev->y != embed->y) {
- embed->y = ev->y;
- config = 1;
+ embed->y = ev->y;
+ config = 1;
}
if (!ev->window)
@@ -923,28 +923,28 @@
* 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));
printf (" **** ewl_ev_win32_window_configure\n");
/*
* Configure events really only need to occur on resize.
*/
if ((ewl_object_current_w_get(EWL_OBJECT(window)) != ev->width)
- || (ewl_object_current_h_get(EWL_OBJECT(window)) !=
ev->height)) {
+ || (ewl_object_current_h_get(EWL_OBJECT(window)) !=
ev->height)) {
- /*
- * 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.)
- */
- window->flags |= EWL_WINDOW_USER_CONFIGURE;
- ewl_object_geometry_request(EWL_OBJECT(window), 0, 0, ev->width,
-
ev->height);
+ /*
+ * 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.)
+ */
+ window->flags |= EWL_WINDOW_USER_CONFIGURE;
+ ewl_object_geometry_request(EWL_OBJECT(window), 0, 0,
ev->width,
+
ev->height);
}
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -966,7 +966,7 @@
window = ewl_window_window_find((void *)ev->window);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
ewl_callback_call(EWL_WIDGET(window), EWL_CALLBACK_DELETE_WINDOW);
@@ -986,28 +986,28 @@
window = ewl_window_window_find((void *)ev->window);
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->keycompose || iscntrl(*ev->keycompose))
- 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->keycompose,
- key_modifiers);
+ ewl_embed_key_down_feed(EWL_EMBED(window), ev->keycompose,
+ key_modifiers);
ewl_ev_modifiers_set(key_modifiers);
@@ -1027,28 +1027,28 @@
window = ewl_window_window_find((void *)ev->window);
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->keycompose || iscntrl(*ev->keycompose))
- 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->keycompose,
- key_modifiers);
+ ewl_embed_key_up_feed(EWL_EMBED(window), ev->keycompose,
+ key_modifiers);
ewl_ev_modifiers_set(key_modifiers);
@@ -1069,16 +1069,16 @@
window = ewl_window_window_find((void *)ev->window);
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);
}
@@ -1096,12 +1096,12 @@
window = ewl_window_window_find((void *)ev->window);
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);
}
@@ -1119,11 +1119,11 @@
window = ewl_window_window_find((void *)ev->window);
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);
}
@@ -1139,11 +1139,11 @@
window = ewl_window_window_find((void *)ev->window);
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);
}
@@ -1159,11 +1159,11 @@
window = ewl_window_window_find((void *)ev->window);
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);
}
@@ -1179,7 +1179,7 @@
window = ewl_window_window_find((void *)ev->window);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
ewl_callback_call(EWL_WIDGET(window), EWL_CALLBACK_FOCUS_IN);
@@ -1196,7 +1196,7 @@
window = ewl_window_window_find((void *)ev->window);
if (!window)
- DRETURN_INT(TRUE, DLEVEL_STABLE);
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
ewl_callback_call(EWL_WIDGET(window), EWL_CALLBACK_FOCUS_OUT);
-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
