Enlightenment CVS committal
Author : swielinga
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/bin
Modified Files:
imlib2_bumpmap.c imlib2_colorspace.c imlib2_poly.c
imlib2_show.c imlib2_test.c imlib2_view.c
Log Message:
Made imlib2's tests and demos open the display correctly.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_bumpmap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- imlib2_bumpmap.c 1 Nov 2004 09:45:30 -0000 1.1
+++ imlib2_bumpmap.c 29 Jan 2005 20:57:54 -0000 1.2
@@ -34,6 +34,7 @@
int i, j, w, h, x, y;
Imlib_Image im = NULL, im_bg = NULL;
XEvent ev;
+ const char *display_name = getenv("DISPLAY");
/**
* Initialization according to options
@@ -43,7 +44,14 @@
/**
* First tests to determine which rendering task to perform
*/
- disp = XOpenDisplay(NULL);
+ if (display_name == NULL)
+ display_name = ":0";
+ disp = XOpenDisplay(display_name);
+ if (disp == NULL)
+ {
+ fprintf(stderr, "Can't open display %s\n", display_name);
+ return 1;
+ }
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_colorspace.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- imlib2_colorspace.c 1 Nov 2004 09:45:30 -0000 1.1
+++ imlib2_colorspace.c 29 Jan 2005 20:57:54 -0000 1.2
@@ -29,11 +29,19 @@
static char kbuf[20];
Imlib_Font font;
Imlib_Color_Range range;
+ const char *display_name = getenv("DISPLAY");
/**
* First tests to determine which rendering task to perform
*/
- disp = XOpenDisplay(NULL);
+ if (display_name == NULL)
+ display_name = ":0";
+ disp = XOpenDisplay(display_name);
+ if (disp == NULL)
+ {
+ fprintf(stderr, "Can't open display %s\n", display_name);
+ return 1;
+ }
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_poly.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- imlib2_poly.c 1 Nov 2004 09:45:30 -0000 1.1
+++ imlib2_poly.c 29 Jan 2005 20:57:54 -0000 1.2
@@ -28,11 +28,19 @@
KeySym keysym;
static char kbuf[20];
ImlibPolygon poly, poly1, poly2;
+ const char *display_name = getenv("DISPLAY");
/**
* First tests to determine which rendering task to perform
*/
- disp = XOpenDisplay(NULL);
+ if (display_name == NULL)
+ display_name = ":0";
+ disp = XOpenDisplay(display_name);
+ if (disp == NULL)
+ {
+ fprintf(stderr, "Can't open display %s\n", display_name);
+ return 1;
+ }
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_show.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- imlib2_show.c 1 Nov 2004 09:45:30 -0000 1.1
+++ imlib2_show.c 29 Jan 2005 20:57:54 -0000 1.2
@@ -264,7 +264,15 @@
*/
if (!blendtest)
{
- disp = XOpenDisplay(NULL);
+ const char *display_name = getenv("DISPLAY");
+ if (display_name == NULL)
+ display_name = ":0";
+ disp = XOpenDisplay(display_name);
+ if (disp == NULL)
+ {
+ fprintf(stderr, "Can't open display %s\n", display_name);
+ return 1;
+ }
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- imlib2_test.c 1 Nov 2004 09:45:30 -0000 1.1
+++ imlib2_test.c 29 Jan 2005 20:57:54 -0000 1.2
@@ -3,8 +3,10 @@
#include <X11/Xlib.h>
/* include Imlib2 stuff */
#include <Imlib2.h>
-/* sprintf include */
+/* needed for sprintf and fprintf */
#include <stdio.h>
+/* needed for getenv */
+#include <stdlib.h>
/* some globals for our window & X display */
Display *disp;
@@ -35,8 +37,17 @@
/* our mouse x, y coordinates */
int mouse_x = 0, mouse_y = 0;
+ const char *display_name = getenv("DISPLAY");
+
/* connect to X */
- disp = XOpenDisplay(NULL);
+ if (display_name == NULL)
+ display_name = ":0";
+ disp = XOpenDisplay(display_name);
+ if (disp == NULL)
+ {
+ fprintf(stderr, "Can't open display %s\n", display_name);
+ return 1;
+ }
/* get default visual , colormap etc. you could ask imlib2 for what it */
/* thinks is the best, but this example is intended to be simple */
vis = DefaultVisual(disp, DefaultScreen(disp));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/bin/imlib2_view.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- imlib2_view.c 21 Nov 2004 17:35:22 -0000 1.2
+++ imlib2_view.c 29 Jan 2005 20:57:54 -0000 1.3
@@ -101,12 +101,20 @@
Imlib_Image *im = NULL;
char *file = NULL;
int no = 1;
+ const char *display_name = getenv("DISPLAY");
if (argc < 2)
return 1;
file = argv[no];
- disp = XOpenDisplay(NULL);
+ if (display_name == NULL)
+ display_name = ":0";
+ disp = XOpenDisplay(display_name);
+ if (disp == NULL)
+ {
+ fprintf(stderr, "Can't open display %s\n", display_name);
+ return 1;
+ }
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
