Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_events.c ewl_misc.c ewl_private.h ewl_window.c
Log Message:
add more control/flexibilty to ecore/evas detection
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_events.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_events.c 5 Sep 2005 14:12:15 -0000 1.6
+++ ewl_events.c 20 Oct 2005 05:38:08 -0000 1.7
@@ -12,7 +12,7 @@
extern Ecore_List *ewl_embed_list;;
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
int ewl_ev_x_window_expose(void *data, int type, void *_ev);
int ewl_ev_x_window_configure(void *data, int type, void *_ev);
int ewl_ev_x_window_delete(void *data, int type, void *_ev);
@@ -27,7 +27,7 @@
int ewl_ev_x_paste(void *data, int type, void *_ev);
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
int ewl_ev_fb_key_down(void *data, int type, void *_ev);
int ewl_ev_fb_key_up(void *data, int type, void *_ev);
int ewl_ev_fb_mouse_down(void *data, int type, void *_ev);
@@ -46,7 +46,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
engine = ewl_engine_mask_get();
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
/*
* Register dispatching functions for window events.
*/
@@ -88,7 +88,7 @@
}
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
if (engine & EWL_ENGINE_FB) {
ecore_event_handler_add(ECORE_FB_EVENT_KEY_DOWN,
ewl_ev_fb_key_down, NULL);
@@ -130,7 +130,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
/**
* @param data: user specified data passed to the function
@@ -494,7 +494,7 @@
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
/**
* @param data: user specified data passed to the function
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_misc.c 18 Oct 2005 15:00:53 -0000 1.19
+++ ewl_misc.c 20 Oct 2005 05:38:08 -0000 1.20
@@ -99,7 +99,7 @@
free_evas_object_list = ecore_list_new();
child_add_list = ecore_list_new();
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
/*
* Attempt to pick the correct engine by adjusting the bitmask
* relative to the success of each engines init routine.
@@ -112,7 +112,7 @@
}
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
/*
* Maybe the X11 engines arent' available or they failed, so see if
* we should load up the FB.
@@ -137,21 +137,21 @@
DRETURN_INT(_ewl_init_count, DLEVEL_STABLE);
}
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (use_engine == EWL_ENGINE_SOFTWARE_X11) {
IF_FREE(ewl_config.evas.render_method);
ewl_config.evas.render_method = strdup("software_x11");
}
else
#endif
-#ifdef HAVE_EVAS_ENGINE_GL_X11_H
+#ifdef ENABLE_EWL_GL_X11
if (use_engine == EWL_ENGINE_GL_X11) {
IF_FREE(ewl_config.evas.render_method);
ewl_config.evas.render_method = strdup("gl_x11");
}
else
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
if (use_engine == EWL_ENGINE_FB) {
IF_FREE(ewl_config.evas.render_method);
ewl_config.evas.render_method = strdup("fb");
@@ -251,12 +251,12 @@
edje_shutdown();
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (use_engine & EWL_ENGINE_X11)
ecore_x_shutdown();
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
if (use_engine & EWL_ENGINE_FB)
ecore_fb_shutdown();
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_private.h 5 Sep 2005 14:20:30 -0000 1.2
+++ ewl_private.h 20 Oct 2005 05:38:08 -0000 1.3
@@ -22,16 +22,17 @@
#include "ewl-config.h"
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
#include <Ecore_Fb.h>
#include <Evas_Engine_FB.h>
#endif
-#ifdef HAVE_EVAS_ENGINE_GL_X11_H
+#ifdef ENABLE_EWL_GL_X11
+#include <Ecore_X.h>
#include <Evas_Engine_GL_X11.h>
#endif
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
#include <Ecore_X.h>
#include <Evas_Engine_Software_X11.h>
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_window.c 23 Sep 2005 15:32:24 -0000 1.15
+++ ewl_window.c 20 Oct 2005 05:38:08 -0000 1.16
@@ -73,7 +73,7 @@
if (!REALIZED(win))
return;
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11")) {
ecore_x_icccm_title_set((Ecore_X_Window)win->window, title);
ecore_x_netwm_name_set((Ecore_X_Window)win->window, title);
@@ -123,7 +123,7 @@
if (!REALIZED(win))
return;
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_icccm_name_class_set((Ecore_X_Window)win->window,
name, win->name);
@@ -173,7 +173,7 @@
if (!REALIZED(win))
return;
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_icccm_name_class_set((Ecore_X_Window)win->window,
classname, win->classname);
@@ -212,7 +212,7 @@
win->flags |= EWL_WINDOW_BORDERLESS;
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (REALIZED(win) && strstr(win->render, "x11"))
ecore_x_mwm_borderless_set((Ecore_X_Window)win->window,
TRUE);
@@ -238,7 +238,7 @@
if (!REALIZED(win))
DRETURN(DLEVEL_STABLE);
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_window_move((Ecore_X_Window)win->window, x, y);
#endif
@@ -284,7 +284,7 @@
if (!REALIZED(win))
DRETURN(DLEVEL_STABLE);
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_window_raise((Ecore_X_Window)win->window);
#endif
@@ -308,7 +308,7 @@
if (!REALIZED(win))
DRETURN(DLEVEL_STABLE);
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_window_lower((Ecore_X_Window)win->window);
#endif
@@ -330,7 +330,7 @@
win->transient = forwin;
if (forwin && REALIZED(win)) {
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (REALIZED(forwin))
ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window,
(Ecore_X_Window)forwin->window);
@@ -444,7 +444,7 @@
* Prepare the base rendering region for the evas, such as the X
* window for the X11 based engines, or the surfaces for directfb.
*/
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(render, "x11") &&
(ewl_engine_mask_get() & (EWL_ENGINE_SOFTWARE_X11 |
EWL_ENGINE_GL_X11))) {
@@ -481,7 +481,7 @@
* Now perform engine specific info setup. This informs the evas of
* the drawing engine specific info it needs.
*/
-#ifdef HAVE_EVAS_ENGINE_GL_X11_H
+#ifdef ENABLE_EWL_GL_X11
if (!strcmp(render, "gl_x11") &&
(ewl_engine_mask_get() & EWL_ENGINE_GL_X11)) {
Evas_Engine_Info_GL_X11 *glinfo;
@@ -502,7 +502,7 @@
}
else
#endif
-#ifdef HAVE_EVAS_ENGINE_FB_H
+#ifdef ENABLE_EWL_FB
if (!strcmp(render, "fb") &&
(ewl_engine_mask_get() & EWL_ENGINE_FB)) {
Evas_Engine_Info_FB *fbinfo;
@@ -518,7 +518,7 @@
}
else
#endif
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (!strcmp(render, "software_x11") &&
(ewl_engine_mask_get() & EWL_ENGINE_SOFTWARE_X11)) {
Evas_Engine_Info_Software_X11 *sinfo;
@@ -609,7 +609,7 @@
embed = EWL_EMBED(w);
o = EWL_OBJECT(w);
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (REALIZED(w) && strstr(EWL_WINDOW(w)->render, "x11")) {
ecore_x_window_hide((Ecore_X_Window)embed->evas_window);
ecore_x_window_hide((Ecore_X_Window)EWL_WINDOW(w)->window);
@@ -637,7 +637,7 @@
if (!win->window)
DRETURN(DLEVEL_STABLE);
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11")) {
int width, height;
@@ -676,7 +676,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("widget", widget);
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(EWL_WINDOW(widget)->render, "x11")) {
ecore_x_window_hide((Ecore_X_Window)EWL_EMBED(widget)->evas_window);
ecore_x_window_hide((Ecore_X_Window)EWL_WINDOW(widget)->window);
@@ -734,7 +734,7 @@
if (win->flags & EWL_WINDOW_USER_CONFIGURE)
win->flags &= ~EWL_WINDOW_USER_CONFIGURE;
else {
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_window_resize((Ecore_X_Window)win->window,
width, height);
@@ -743,7 +743,7 @@
}
if (EWL_EMBED(win)->evas_window != win->window) {
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11"))
ecore_x_window_resize((Ecore_X_Window)
EWL_EMBED(win)->evas_window, width,
@@ -761,7 +761,7 @@
* Do this after the resize to prevent early mapping, and the object
* keeps the bounds respected.
*/
-#ifdef HAVE_EVAS_ENGINE_SOFTWARE_X11_H
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (strstr(win->render, "x11")) {
ecore_x_icccm_size_pos_hints_set((Ecore_X_Window)win->window,
0, ECORE_X_GRAVITY_NW,
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
