Enlightenment CVS committal
Author : tilman
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h Makefile.am ecore_x.c ecore_x_private.h ecore_xcb.c
ecore_xcb_private.h
Added Files:
ecore_x_composite.c ecore_xcb_composite.c
Log Message:
Ecore now checks whether the composite extension is available before trying to
open an ARGB window.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- Ecore_X.h 5 Oct 2007 12:11:45 -0000 1.189
+++ Ecore_X.h 6 Oct 2007 08:37:32 -0000 1.190
@@ -1626,6 +1626,9 @@
EAPI void ecore_x_region_window_shape_set(Ecore_X_Region region,
Ecore_X_Window win, Ecore_X_Shape_Type type, int x_offset, int y_offset);
EAPI void ecore_x_region_picture_clip_set(Ecore_X_Region region,
Ecore_X_Picture picture, int x_origin, int y_origin);
+/* XComposite Extension Support */
+EAPI int ecore_x_composite_query(void);
+
/* XDamage Extension Support */
typedef Ecore_X_ID Ecore_X_Damage;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- Makefile.am 13 Apr 2007 17:12:09 -0000 1.38
+++ Makefile.am 6 Oct 2007 08:37:32 -0000 1.39
@@ -3,6 +3,7 @@
if BUILD_ECORE_X_XCB
INCLUDES = \
@XCB_DAMAGE_CFLAGS@ \
[EMAIL PROTECTED]@ \
@XCB_DPMS_CFLAGS@ \
@XCB_RANDR_CFLAGS@ \
@XCB_RENDER_CFLAGS@ \
@@ -21,6 +22,7 @@
INCLUDES = \
@Xcursor_cflags@ \
@XDAMAGE_CFLAGS@ \
[EMAIL PROTECTED]@ \
@XDPMS_CFLAGS@ \
@XFIXES_CFLAGS@ \
@XINERAMA_CFLAGS@ \
@@ -51,6 +53,7 @@
ecore_xcb_atom.c \
ecore_xcb_cursor.c \
ecore_xcb_damage.c \
+ecore_xcb_composite.c \
ecore_xcb_dnd.c \
ecore_xcb_dpms.c \
ecore_xcb_drawable.c \
@@ -76,6 +79,7 @@
libecore_x_la_LIBADD = \
@XCB_DAMAGE_LIBS@ \
[EMAIL PROTECTED]@ \
@XCB_DPMS_LIBS@ \
@XCB_RANDR_LIBS@ \
@XCB_RENDER_LIBS@ \
@@ -110,6 +114,7 @@
ecore_x_randr.c \
ecore_x_fixes.c \
ecore_x_damage.c \
+ecore_x_composite.c \
ecore_x_error.c \
ecore_x_events.c \
ecore_x_icccm.c \
@@ -132,6 +137,7 @@
libecore_x_la_LIBADD = \
@Xcursor_libs@ \
@XDAMAGE_LIBS@ \
[EMAIL PROTECTED]@ \
@XDPMS_LIBS@ \
@XFIXES_LIBS@ \
@XINERAMA_LIBS@ \
@@ -159,6 +165,7 @@
ecore_x_randr.c \
ecore_x_fixes.c \
ecore_x_damage.c \
+ecore_x_composite.c \
ecore_x_error.c \
ecore_x_events.c \
ecore_x_icccm.c \
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- ecore_x.c 16 Jun 2007 03:29:43 -0000 1.128
+++ ecore_x.c 6 Oct 2007 08:37:32 -0000 1.129
@@ -438,6 +438,7 @@
_ecore_x_dnd_init();
_ecore_x_fixes_init();
_ecore_x_damage_init();
+ _ecore_x_composite_init();
_ecore_x_dpms_init();
_ecore_x_init_count++;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_private.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- ecore_x_private.h 4 Apr 2007 11:43:29 -0000 1.61
+++ ecore_x_private.h 6 Oct 2007 08:37:33 -0000 1.62
@@ -40,6 +40,9 @@
#ifdef ECORE_XFIXES
#include <X11/extensions/Xfixes.h>
#endif
+#ifdef ECORE_XCOMPOSITE
+#include <X11/extensions/Xcomposite.h>
+#endif
#ifdef ECORE_XDAMAGE
#include <X11/extensions/Xdamage.h>
#endif
@@ -222,9 +225,10 @@
int _ecore_x_netwm_startup_info_begin(Ecore_X_Window win,
char *data);
int _ecore_x_netwm_startup_info(Ecore_X_Window win, char
*data);
-/* Fixes * Damage * DPMS */
+/* Fixes * Damage * Composite * DPMS */
void _ecore_x_fixes_init(void);
void _ecore_x_damage_init(void);
+void _ecore_x_composite_init(void);
void _ecore_x_dpms_init(void);
/* from sync */
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_xcb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_xcb.c 12 May 2007 13:37:16 -0000 1.4
+++ ecore_xcb.c 6 Oct 2007 08:37:34 -0000 1.5
@@ -155,6 +155,9 @@
#ifdef ECORE_XCB_DAMAGE
const xcb_query_extension_reply_t *reply_damage;
#endif /* ECORE_XCB_DAMAGE */
+#ifdef ECORE_XCB_COMPOSITE
+ const xcb_query_extension_reply_t *reply_composite;
+#endif /* ECORE_XCB_COMPOSITE */
#ifdef ECORE_XCB_DPMS
const xcb_query_extension_reply_t *reply_dpms;
#endif /* ECORE_XCB_DPMS */
@@ -219,6 +222,10 @@
xcb_prefetch_extension_data(_ecore_xcb_conn, &xcb_damage_id);
#endif /* ECORE_XCB_DAMAGE */
+#ifdef ECORE_XCB_COMPOSITE
+ xcb_prefetch_extension_data(_ecore_xcb_conn, &xcb_composite_id);
+#endif /* ECORE_XCB_COMPOSITE */
+
#ifdef ECORE_XCB_DPMS
xcb_prefetch_extension_data(_ecore_xcb_conn, &xcb_dpms_id);
#endif /* ECORE_XCB_DPMS */
@@ -293,9 +300,13 @@
_ecore_xcb_event_handlers_num = _ecore_xcb_event_damage_id + 1;
#endif /* ECORE_XCB_DAMAGE */
+#ifdef ECORE_XCB_COMPOSITE
+ reply_composite = xcb_get_extension_data(_ecore_xcb_conn,
&xcb_composite_id);
+#endif /* ECORE_XCB_COMPOSITE */
+
#ifdef ECORE_XCB_DPMS
reply_dpms = xcb_get_extension_data(_ecore_xcb_conn, &xcb_dpms_id);
-#endif /* ECORE_XCB_DAMAGE */
+#endif /* ECORE_XCB_DPMS */
#ifdef ECORE_XCB_RANDR
reply_randr = xcb_get_extension_data(_ecore_xcb_conn, &xcb_randr_id);
@@ -359,6 +370,7 @@
/* We ask for the QueryVersion request of the extensions */
_ecore_x_damage_init(reply_damage);
+ _ecore_x_composite_init(reply_composite);
_ecore_x_dpms_init(reply_dpms);
_ecore_x_randr_init(reply_randr);
_ecore_x_shape_init(reply_shape);
@@ -374,6 +386,7 @@
{
/* We get the replies of the QueryVersion request because we leave */
_ecore_x_damage_init_finalize();
+ _ecore_x_composite_init_finalize();
_ecore_x_dpms_init_finalize();
_ecore_x_randr_init_finalize();
_ecore_x_shape_init_finalize();
@@ -553,6 +566,7 @@
{
/* We get the replies of the QueryVersion request because we leave */
_ecore_x_damage_init_finalize();
+ _ecore_x_composite_init_finalize();
_ecore_x_dpms_init_finalize();
_ecore_x_randr_init_finalize();
_ecore_x_shape_init_finalize();
@@ -582,6 +596,7 @@
/* We finally get the replies of the QueryVersion request */
_ecore_x_damage_init_finalize();
+ _ecore_x_composite_init_finalize();
_ecore_x_dpms_init_finalize();
_ecore_x_randr_init_finalize();
_ecore_x_shape_init_finalize();
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_xcb_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_xcb_private.h 7 May 2007 18:21:53 -0000 1.2
+++ ecore_xcb_private.h 6 Oct 2007 08:37:34 -0000 1.3
@@ -23,6 +23,9 @@
#ifdef ECORE_XCB_DAMAGE
# include <xcb/damage.h>
#endif /* ECORE_XCB_DAMAGE */
+#ifdef ECORE_XCB_COMPOSITE
+# include <xcb/composite.h>
+#endif /* ECORE_XCB_COMPOSITE */
#ifdef ECORE_XCB_DPMS
# include <xcb/dpms.h>
#endif /* ECORE_XCB_DPMS */
@@ -237,6 +240,9 @@
void _ecore_x_damage_init (const xcb_query_extension_reply_t *reply);
void _ecore_x_damage_init_finalize (void);
+/* composite */
+void _ecore_x_composite_init (const xcb_query_extension_reply_t *reply);
+void _ecore_x_composite_init_finalize (void);
/* from dnd */
void _ecore_x_dnd_init (void);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
