Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
eobj.c ewins.c x.c xwin.h
Log Message:
Change some values to defines.
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- eobj.c 5 Jun 2008 17:42:59 -0000 1.103
+++ eobj.c 5 Jun 2008 17:45:01 -0000 1.104
@@ -159,9 +159,9 @@
#endif
#if USE_GLX
-#define WINTYPE(t) ((t == EOBJ_TYPE_GLX) ? 2 : 1)
+#define WINTYPE(t) ((t == EOBJ_TYPE_GLX) ? WIN_TYPE_GLX : WIN_TYPE_INTERNAL)
#else
-#define WINTYPE(t) 1
+#define WINTYPE(t) WIN_TYPE_INTERNAL
#endif
void
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -3 -r1.230 -r1.231
--- ewins.c 5 Jun 2008 17:42:59 -0000 1.230
+++ ewins.c 5 Jun 2008 17:45:01 -0000 1.231
@@ -219,6 +219,7 @@
{
XSetWindowAttributes att;
Win frame;
+ int type;
if (ewin->client.w <= 0)
ewin->client.w = 100;
@@ -231,9 +232,10 @@
frame = EoGetWin(ewin);
if (!frame)
{
+ type = WIN_TYPE_CLIENT;
frame =
ECreateObjectWindow(VROOT, ewin->client.x, ewin->client.y,
- ewin->client.w, ewin->client.h, 0, 0,
+ ewin->client.w, ewin->client.h, 0, type,
EwinGetClientWin(ewin));
ewin->win_container =
ECreateWindow(frame, 0, 0, ewin->client.w, ewin->client.h, 0);
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -3 -r1.177 -r1.178
--- x.c 5 Jun 2008 09:20:25 -0000 1.177
+++ x.c 5 Jun 2008 17:45:01 -0000 1.178
@@ -440,17 +440,18 @@
switch (type)
{
- case 0: /* Client window */
+ default:
+ break;
+ case WIN_TYPE_CLIENT:
if (Conf.testing.argb_clients || EVisualIsARGB(cwin->visual))
argb = 1;
break;
- default:
- case 1: /* Internal */
+ case WIN_TYPE_INTERNAL:
if (Conf.testing.argb_internal_objects)
argb = 1;
break;
#if USE_GLX
- case 2: /* Internal GL */
+ case WIN_TYPE_GLX: /* Internal GL */
argb = 1;
win =
ECreateWindowVD(parent, x, y, w, h, EGlGetVisual(), EGlGetDepth());
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- xwin.h 5 Jun 2008 08:55:21 -0000 1.47
+++ xwin.h 5 Jun 2008 17:45:01 -0000 1.48
@@ -164,6 +164,10 @@
Win ECreateWindowVD(Win parent, int x, int y, int w, int h,
Visual * vis, unsigned int depth);
Win ECreateClientWindow(Win parent, int x, int y, int w, int
h);
+
+#define WIN_TYPE_CLIENT 0
+#define WIN_TYPE_INTERNAL 1
+#define WIN_TYPE_GLX 2
Win ECreateObjectWindow(Win parent, int x, int y, int w,
int h, int saveunder, int type,
Win cwin);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
