Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_clipboard.c etk_dnd.c etk_drag.c etk_main.c
etk_popup_window.c etk_selection.c etk_tree.c etk_window.c
Log Message:
- first stage for splitting off ecore_x calls
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_clipboard.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_clipboard.c 12 Feb 2006 13:13:45 -0000 1.1
+++ etk_clipboard.c 4 Jul 2006 17:35:33 -0000 1.2
@@ -3,9 +3,14 @@
#include <stdlib.h>
#include <string.h>
#include <Ecore.h>
+
+#include "config.h"
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
+#endif
+
#include "etk_window.h"
-#include "config.h"
extern Etk_Widget *_etk_selection_widget;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_dnd.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_dnd.c 4 May 2006 22:05:55 -0000 1.12
+++ etk_dnd.c 4 Jul 2006 17:35:33 -0000 1.13
@@ -4,13 +4,19 @@
#include <string.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
+
+#include "config.h"
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
+#endif
+
#include "etk_main.h"
#include "etk_widget.h"
#include "etk_toplevel_widget.h"
#include "etk_window.h"
#include "etk_drag.h"
-#include "config.h"
+
/* Some notes for when we're developing this:
* Signals:
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_drag.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_drag.c 4 Mar 2006 18:04:10 -0000 1.6
+++ etk_drag.c 4 Jul 2006 17:35:33 -0000 1.7
@@ -4,10 +4,14 @@
#include <string.h>
#include <Ecore.h>
#include <Ecore_Evas.h>
+#include "config.h"
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
+#endif
+
#include "etk_widget.h"
#include "etk_window.h"
-#include "config.h"
/**
* @addtogroup Etk_Ddrag
@@ -82,6 +86,7 @@
void etk_drag_begin(Etk_Drag *drag)
{
+#if HAVE_ECORE_X
_etk_drag_widget = drag;
etk_widget_drag_begin(drag->widget);
@@ -90,7 +95,8 @@
ecore_x_dnd_types_set((ETK_WINDOW(drag))->x_window, drag->types,
drag->num_types);
ecore_x_dnd_begin((ETK_WINDOW(drag))->x_window, drag->data,
drag->data_size);
_etk_drag_mouse_move_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _etk_drag_mouse_move_cb,
drag);
- _etk_drag_mouse_up_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _etk_drag_mouse_up_cb,
drag);
+ _etk_drag_mouse_up_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _etk_drag_mouse_up_cb,
drag);
+#endif
}
/**
@@ -128,6 +134,7 @@
/* Initializes the members */
static void _etk_drag_constructor(Etk_Drag *drag)
{
+#if HAVE_ECORE_X
if (!drag)
return;
@@ -142,6 +149,7 @@
etk_window_skip_pager_hint_set(ETK_WINDOW(drag), ETK_TRUE);
etk_window_skip_taskbar_hint_set(ETK_WINDOW(drag), ETK_TRUE);
ecore_x_dnd_aware_set((ETK_WINDOW(drag))->x_window, 1);
+#endif
}
/* Sets the property whose id is "property_id" to the value "value" */
@@ -182,6 +190,7 @@
static int _etk_drag_mouse_up_cb(void *data, int type, void *event)
{
+#if HAVE_ECORE_X
Etk_Drag *drag;
drag = data;
@@ -191,11 +200,13 @@
ecore_x_dnd_drop();
etk_widget_drag_end(ETK_WIDGET(drag));
etk_toplevel_widget_pointer_push(etk_widget_toplevel_parent_get(drag->widget),
ETK_POINTER_DEFAULT);
+#endif
return 1;
}
static int _etk_drag_mouse_move_cb(void *data, int type, void *event)
{
+#if HAVE_ECORE_X
Ecore_X_Event_Mouse_Move *ev;
Etk_Drag *drag;
@@ -203,6 +214,7 @@
ev = event;
etk_window_move(ETK_WINDOW(drag), ev->root.x + 2, ev->root.y + 2);
+#endif
return 1;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- etk_main.c 25 Jun 2006 02:22:04 -0000 1.23
+++ etk_main.c 4 Jul 2006 17:35:33 -0000 1.24
@@ -2,7 +2,11 @@
#include "etk_main.h"
#include <locale.h>
#include <Ecore.h>
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
+#endif
+
#include <Ecore_Job.h>
#include <Ecore_Evas.h>
#include <Evas.h>
@@ -64,11 +68,13 @@
ETK_WARNING("Ecore_Evas initialization failed!");
return ETK_FALSE;
}
+#if HAVE_ECORE_X
if (!ecore_x_init(NULL))
{
ETK_WARNING("Ecore_X initialization failed!");
return ETK_FALSE;
}
+#endif
if (!edje_init())
{
ETK_WARNING("Edje initialization failed!");
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_popup_window.c 2 Jun 2006 18:46:34 -0000 1.4
+++ etk_popup_window.c 4 Jul 2006 17:35:33 -0000 1.5
@@ -2,7 +2,13 @@
#include "etk_popup_window.h"
#include <stdlib.h>
#include <Ecore.h>
+
+#include "config.h"
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
+#endif
+
#include "etk_utils.h"
#include "etk_signal.h"
#include "etk_signal_callback.h"
@@ -42,7 +48,10 @@
static void _etk_popup_window_slide_timer_update(Etk_Popup_Window
*popup_window);
static int _etk_popup_window_slide_timer_cb(void *data);
+#if HAVE_ECORE_X
static Ecore_X_Window _etk_popup_window_input_window = 0;
+#endif
+
static Evas_List *_etk_popup_window_popped_windows = NULL;
static Etk_Popup_Window *_etk_popup_window_focused_window = NULL;
static int _etk_popup_window_popup_timestamp = 0;
@@ -93,6 +102,7 @@
*/
void etk_popup_window_popup_at_xy(Etk_Popup_Window *popup_window, int x, int y)
{
+#if HAVE_ECORE_X
if (!popup_window)
return;
@@ -130,6 +140,7 @@
_etk_popup_window_slide_timer_update(popup_window);
etk_signal_emit(_etk_popup_window_signals[ETK_POPUP_WINDOW_POPPED_UP_SIGNAL],
ETK_OBJECT(popup_window), NULL);
+#endif
}
/**
@@ -138,10 +149,12 @@
*/
void etk_popup_window_popup(Etk_Popup_Window *popup_window)
{
+#if HAVE_ECORE_X
int x, y;
ecore_x_pointer_last_xy_get(&x, &y);
etk_popup_window_popup_at_xy(popup_window, x + 1, y + 1);
+#endif
}
/**
@@ -150,6 +163,7 @@
*/
void etk_popup_window_popdown(Etk_Popup_Window *popup_window)
{
+#if HAVE_ECORE_X
Evas_List *l;
Etk_Popup_Window *last_focused;
@@ -180,6 +194,7 @@
}
etk_signal_emit(_etk_popup_window_signals[ETK_POPUP_WINDOW_POPPED_DOWN_SIGNAL],
ETK_OBJECT(popup_window), NULL);
+#endif
}
@@ -245,7 +260,9 @@
etk_window_decorated_set(ETK_WINDOW(popup_window), ETK_FALSE);
etk_window_skip_taskbar_hint_set(ETK_WINDOW(popup_window), ETK_TRUE);
etk_window_skip_pager_hint_set(ETK_WINDOW(popup_window), ETK_TRUE);
+#if HAVE_ECORE_X
ecore_x_netwm_window_type_set(ETK_WINDOW(popup_window)->x_window,
ECORE_X_WINDOW_TYPE_MENU);
+#endif
}
/**************************
@@ -254,9 +271,10 @@
*
**************************/
-/* Called wgen the user presses a key on the input window: we just feed it */
+/* Called when the user presses a key on the input window: we just feed it */
static int _etk_popup_window_key_down_cb(void *data, int type, void *event)
{
+#if HAVE_ECORE_X
Etk_Popup_Window *popup_window;
Ecore_X_Event_Key_Down *key_event;
@@ -267,12 +285,14 @@
evas_event_feed_key_down(ETK_TOPLEVEL_WIDGET(_etk_popup_window_focused_window)->evas,
key_event->keyname,
key_event->keysymbol, key_event->key_compose, NULL, key_event->time,
NULL);
+#endif
return 1;
}
/* Called wgen the user releases a key on the input window: we just feed it */
static int _etk_popup_window_key_up_cb(void *data, int type, void *event)
{
+#if HAVE_ECORE_X
Etk_Popup_Window *popup_window;
Ecore_X_Event_Key_Up *key_event;
@@ -283,6 +303,7 @@
evas_event_feed_key_up(ETK_TOPLEVEL_WIDGET(_etk_popup_window_focused_window)->evas,
key_event->keyname,
key_event->keysymbol, key_event->key_compose, NULL, key_event->time,
NULL);
+#endif
return 1;
}
@@ -292,6 +313,7 @@
*/
static int _etk_popup_window_mouse_up_cb(void *data, int type, void *event)
{
+#if HAVE_ECORE_X
Etk_Popup_Window *popup_window, *pwin;
Evas_List *l;
Ecore_X_Event_Mouse_Button_Up *mouse_event;
@@ -317,7 +339,7 @@
/* Otherwize, we pop down all the popup windows */
if (!pointer_over_window && (mouse_event->time -
_etk_popup_window_popup_timestamp) >= ETK_POPUP_WINDOW_MIN_POP_TIME)
etk_popup_window_popdown_all();
-
+#endif
return 1;
}
@@ -327,6 +349,7 @@
*/
static int _etk_popup_window_mouse_move_cb(void *data, int type, void *event)
{
+#if HAVE_ECORE_X
Etk_Popup_Window *popup_window, *pwin;
Evas_List *l;
Ecore_X_Event_Mouse_Move *mouse_event;
@@ -347,7 +370,7 @@
/* Start to make the popup window slide if needed */
_etk_popup_window_slide_timer_update(pwin);
}
-
+#endif
return 1;
}
@@ -360,9 +383,10 @@
/* Returns a flag incating on which edges of the screen the popup window is
over */
static Etk_Popup_Window_Screen_Edge
_etk_popup_window_over_screen_edge_get(Etk_Popup_Window *popup_window)
{
+ Etk_Popup_Window_Screen_Edge result = ETK_POPUP_WINDOW_NO_EDGE;
+#if HAVE_ECORE_X
int rx, ry, rw, rh;
int px, py, pw, ph;
- Etk_Popup_Window_Screen_Edge result = ETK_POPUP_WINDOW_NO_EDGE;
if (!popup_window || _etk_popup_window_input_window == 0)
return ETK_POPUP_WINDOW_NO_EDGE;
@@ -378,15 +402,16 @@
result |= ETK_POPUP_WINDOW_TOP_EDGE;
if (py + ph > ry + rh)
result |= ETK_POPUP_WINDOW_BOTTOM_EDGE;
-
+#endif
return result;
}
/* Returns a flag incating on which edges of the screen the mouse pointer is */
static Etk_Popup_Window_Screen_Edge
_etk_popup_window_mouse_on_screen_edge_get()
{
+ Etk_Popup_Window_Screen_Edge result = ETK_POPUP_WINDOW_NO_EDGE;
+#if HAVE_ECORE_X
int rx, ry, rw, rh;
- Etk_Popup_Window_Screen_Edge result = ETK_POPUP_WINDOW_NO_EDGE;
if (_etk_popup_window_input_window == 0)
return ETK_POPUP_WINDOW_NO_EDGE;
@@ -400,7 +425,7 @@
result |= ETK_POPUP_WINDOW_BOTTOM_EDGE;
if (_etk_popup_window_mouse_y <= ry)
result |= ETK_POPUP_WINDOW_TOP_EDGE;
-
+#endif
return result;
}
@@ -421,6 +446,7 @@
/* Makes the popup windows slide (called every 1/60 sec) */
static int _etk_popup_window_slide_timer_cb(void *data)
{
+#if HAVE_ECORE_X
Etk_Popup_Window *popup_window = NULL, *pwin;
Evas_List *l;
Etk_Popup_Window_Screen_Edge mouse_edge, window_edge;
@@ -493,7 +519,7 @@
/* We feed a mouse move event since the relative position between the
mouse pointer and the popup window has changed */
evas_event_feed_mouse_move(ETK_TOPLEVEL_WIDGET(pwin)->evas,
_etk_popup_window_mouse_x - x, _etk_popup_window_mouse_y - y,
ecore_x_current_time_get(), NULL);
}
-
+#endif
return 1;
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_selection.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_selection.c 13 Feb 2006 00:00:01 -0000 1.1
+++ etk_selection.c 4 Jul 2006 17:35:33 -0000 1.2
@@ -3,9 +3,14 @@
#include <stdlib.h>
#include <string.h>
#include <Ecore.h>
+
+#include "config.h"
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
+#endif
+
#include "etk_window.h"
-#include "config.h"
Etk_Widget *_etk_selection_widget = NULL;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- etk_tree.c 14 May 2006 21:29:22 -0000 1.64
+++ etk_tree.c 4 Jul 2006 17:35:33 -0000 1.65
@@ -6,6 +6,12 @@
#include <math.h>
#include <Ecore_Data.h>
#include <Edje.h>
+#include "config.h"
+
+#if HAVE_ECORE_X
+#include <Ecore_X.h>
+#endif
+
#include "etk_theme.h"
#include "etk_tree_model.h"
#include "etk_scrolled_view.h"
@@ -16,7 +22,7 @@
#include "etk_utils.h"
#include "etk_window.h"
#include "etk_drag.h"
-#include "config.h"
+
/**
* @addtogroup Etk_Tree
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_window.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- etk_window.c 3 Jul 2006 17:22:25 -0000 1.23
+++ etk_window.c 4 Jul 2006 17:35:33 -0000 1.24
@@ -2,13 +2,18 @@
#include "etk_window.h"
#include <stdlib.h>
#include <string.h>
+
+#include "config.h"
+
+#if HAVE_ECORE_X
#include <Ecore_X.h>
#include <Ecore_X_Cursor.h>
+#endif
+
#include "etk_main.h"
#include "etk_utils.h"
#include "etk_signal.h"
#include "etk_signal_callback.h"
-#include "config.h"
/**
* @addtogroup Etk_Window
@@ -234,8 +239,10 @@
h = size_requisition.h;
}
}
+
else
{
+#if HAVE_ECORE_X
Ecore_X_Window root;
int screens;
@@ -266,7 +273,14 @@
for (root = window_to_center->x_window;
ecore_x_window_parent_get(root) != 0; root = ecore_x_window_parent_get(root));
ecore_x_window_geometry_get(root, &x, &y, &w, &h);
}
+#else
+ /* this is the case where we DONT have ecore_x and
+ * our window is NULL, we cant do anything.
+ */
+ return;
+#endif
}
+
END:
etk_window_geometry_get(window_to_center, NULL, NULL, &cw, &ch);
ecore_evas_move(window_to_center->ecore_evas, x + (w - cw) / 2, y + (h -
ch) / 2);
@@ -279,6 +293,7 @@
*/
void etk_window_move_to_mouse(Etk_Window *window)
{
+#if HAVE_ECORE_X
int x, y;
Ecore_X_Window root;
@@ -288,6 +303,7 @@
for (root = window->x_window; ecore_x_window_parent_get(root) != 0; root =
ecore_x_window_parent_get(root));
ecore_x_pointer_xy_get(root, &x, &y);
etk_window_move(window, x, y);
+#endif
}
/**
@@ -297,6 +313,7 @@
*/
void etk_window_modal_for_window(Etk_Window *window_to_modal, Etk_Window
*window)
{
+#if HAVE_ECORE_X
int x, y, w, h;
int cw, ch;
@@ -322,6 +339,7 @@
ecore_x_netwm_window_state_set(window_to_modal->x_window, states, 1);
}
}
+#endif
}
/**
@@ -559,6 +577,7 @@
*/
void etk_window_skip_taskbar_hint_set(Etk_Window *window, Etk_Bool
skip_taskbar_hint)
{
+#if HAVE_ECORE_X
if (!window || skip_taskbar_hint ==
etk_window_skip_taskbar_hint_get(window))
return;
@@ -590,6 +609,7 @@
ecore_x_netwm_window_state_set(window->x_window, NULL, 0);
}
etk_object_notify(ETK_OBJECT(window), "skip_taskbar");
+#endif
}
/**
@@ -599,6 +619,7 @@
*/
Etk_Bool etk_window_skip_taskbar_hint_get(Etk_Window *window)
{
+#if HAVE_ECORE_X
unsigned int num_states, i;
Ecore_X_Window_State *states;
@@ -616,6 +637,7 @@
}
if (num_states > 0)
free(states);
+#endif
return ETK_FALSE;
}
@@ -626,6 +648,7 @@
*/
void etk_window_skip_pager_hint_set(Etk_Window *window, Etk_Bool
skip_pager_hint)
{
+#if HAVE_ECORE_X
if (!window || skip_pager_hint == etk_window_skip_pager_hint_get(window))
return;
@@ -657,6 +680,7 @@
ecore_x_netwm_window_state_set(window->x_window, NULL, 0);
}
etk_object_notify(ETK_OBJECT(window), "skip_pager");
+#endif
}
/**
@@ -666,6 +690,7 @@
*/
Etk_Bool etk_window_skip_pager_hint_get(Etk_Window *window)
{
+#if HAVE_ECORE_X
unsigned int num_states, i;
Ecore_X_Window_State *states;
@@ -683,6 +708,7 @@
}
if (num_states > 0)
free(states);
+#endif
return ETK_FALSE;
}
@@ -693,7 +719,9 @@
*/
void etk_window_xdnd_aware_set(Etk_Window *window, Etk_Bool on)
{
+#if HAVE_ECORE_X
ecore_x_dnd_aware_set(window->x_window, on);
+#endif
}
/**
@@ -731,8 +759,10 @@
window->center_on_window = NULL;
window->modal = ETK_FALSE;
window->modal_for_window = NULL;
-
+
+#if HAVE_ECORE_X
ecore_x_dnd_aware_set(window->x_window, 1);
+#endif
ETK_TOPLEVEL_WIDGET(window)->evas = ecore_evas_get(window->ecore_evas);
ETK_TOPLEVEL_WIDGET(window)->pointer_set = _etk_window_pointer_set;
@@ -1007,6 +1037,7 @@
/* Sets the mouse pointer of the window */
static void _etk_window_pointer_set(Etk_Toplevel_Widget *toplevel_widget,
Etk_Pointer_Type pointer_type)
{
+#if HAVE_ECORE_X
Etk_Window *window;
int x_pointer_type = ECORE_X_CURSOR_LEFT_PTR;
Ecore_X_Cursor cursor;
@@ -1068,6 +1099,7 @@
ecore_x_window_cursor_set(ecore_evas_software_x11_window_get(window->ecore_evas),
cursor);
else
ETK_WARNING("Unable to find the X cursor \"%d\"", pointer_type);
+#endif
}
/** @} */
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
