Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/dox
Modified Files:
Makefile.am dox.c dox.h
Log Message:
Portability fixes and auto* cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 11 Mar 2004 21:29:27 -0000 1.10
+++ Makefile.am 24 Apr 2004 13:16:28 -0000 1.11
@@ -5,7 +5,7 @@
edox_SOURCES = dox.c dox.h file.c format.c text.c ttfont.c
-LDADD = $(TTF_LIBS) $(FNLIB_LIBS) $(IMLIB_LIBS) $(XINERAMA_LIBS) -lm
+LDADD = $(TTF_LIBS) $(FNLIB_LIBS) $(IMLIB_LIBS) $(X_LIBS) $(XINERAMA_LIBS) -lX11 -lm
INCLUDES = $(IMLIB_CFLAGS) -I$(top_builddir) -I$(top_srcdir)/intl
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/dox.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- dox.c 21 Mar 2004 01:37:30 -0000 1.27
+++ dox.c 24 Apr 2004 13:16:28 -0000 1.28
@@ -691,3 +691,19 @@
}
}
}
+
+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;
+}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/dox/dox.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- dox.h 21 Mar 2004 01:37:30 -0000 1.29
+++ dox.h 24 Apr 2004 13:16:28 -0000 1.30
@@ -52,11 +52,6 @@
#include <sys/ipc.h>
#include <sys/shm.h>
-#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>
@@ -279,6 +274,9 @@
}
Link;
+void ESetColor(XColor * pxc, int r, int g, int b);
+void EGetColor(XColor * pxc, int *pr, int *pg, int *pb);
+
void Efont_extents(Efont * f, const char *text,
int *font_ascent_return,
int *font_descent_return, int *width_return,
-------------------------------------------------------
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
