Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h Makefile.am setup.c x.c
Log Message:
Portability fixes and auto* cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -3 -r1.251 -r1.252
--- E.h 23 Apr 2004 22:23:18 -0000 1.251
+++ E.h 24 Apr 2004 13:16:29 -0000 1.252
@@ -50,11 +50,6 @@
#endif
#endif
-#define ESetColor(pxc, r, g, b) \
- ({ (pxc)->red = ((r)<<8)|r; (pxc)->green = ((g)<<8)|g; (pxc)->blue =
((b)<<8)|b; })
-#define EGetColor(pxc, pr, pg, pb) \
- ({ *(pr) = ((pxc)->red)>>8; *(pg) = ((pxc)->green)>>8; *(pb) =
((pxc)->blue)>>8; })
-
#if USE_IMLIB2
#include <Imlib2.h>
@@ -2717,6 +2712,8 @@
int h);
Window ECreateFocusWindow(Window parent, int x, int y, int w,
int h);
+void ESetColor(XColor * pxc, int r, int g, int b);
+void EGetColor(XColor * pxc, int *pr, int *pg, int *pb);
void GrabX(void);
void UngrabX(void);
void GetWinXY(Window win, int *x, int *y);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- Makefile.am 10 Apr 2004 19:36:48 -0000 1.36
+++ Makefile.am 24 Apr 2004 13:16:37 -0000 1.37
@@ -94,11 +94,12 @@
$(TTF_LIBS) \
$(ESD_LIBS) \
$(IMLIB_LIBS) \
- $(XTST_LIBS) \
- $(XVM_LIBS) \
$(DL_LIBS) \
- $(XINERAMA_LIBS) \
$(X_PRE_LIBS) \
+ $(X_LIBS) \
+ $(X_EXTRA_LIBS) \
+ $(XINERAMA_LIBS) \
+ $(E_X_LIBS) \
-lX11 -lm
INCLUDES = $(ESD_CFLAGS) $(IMLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir)/intl
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- setup.c 7 Apr 2004 14:32:36 -0000 1.122
+++ setup.c 24 Apr 2004 13:16:38 -0000 1.123
@@ -25,6 +25,7 @@
#if !USE_IMLIB2
#include <X11/cursorfont.h>
#endif
+#include <sys/time.h>
void
MapUnmap(int start)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- x.c 8 Apr 2004 12:54:46 -0000 1.68
+++ x.c 24 Apr 2004 13:16:38 -0000 1.69
@@ -707,6 +707,22 @@
}
void
+ESetColor(XColor * pxc, int r, int g, int b)
+{
+ pxc->red = (r << 8) | r;
+ pxc->green = (g << 8) | g;
+ pxc->blue = (b << 8) | b;
+}
+
+void
+EGetColor(XColor * pxc, int *pr, int *pg, int *pb)
+{
+ *pr = pxc->red >> 8;
+ *pg = pxc->green >> 8;
+ *pb = pxc->blue >> 8;
+}
+
+void
GrabX()
{
EDBUG(6, "GrabX");
-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
