Changeset 251Tweet

Timestamp:

Dec 15, 2003, 11:38:03 AM (17 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c src/io.c: + Beginning of an X11 driver. Currently we merely open the window and

check keyboard events.

Location:

libcaca/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/caca.c (modified) (5 diffs)
• src/caca_internals.h (modified) (2 diffs)
• src/graphics.c (modified) (8 diffs)
• src/io.c (modified) (2 diffs)

libcaca/trunk/configure.ac

@@ -24 +24 @@
 AC_ARG_ENABLE(conio,
   [  --enable-conio          DOS conio.h graphics support (default disabled)])
+AC_ARG_ENABLE(x11,
+  [  --enable-x11            X11 support (default disabled)])
 
 AC_CHECK_HEADERS(inttypes.h endian.h)
@@ -42 +44 @@
   AC_DEFINE(USE_SLANG, 1, Define if the backend driver is slang)
   CACA_LIBS="${CACA_LIBS} -lslang"
+elif test "${enable_x11}" = "yes"; then
+  AC_PATH_X
+  AC_CHECK_LIB(X11, XOpenDisplay,
+   [ac_cv_my_have_x11=yes
+    X_CFLAGS="-I${x_includes}"
+    X_LIBS="-lX11 -L${x_libraries}"],
+   [ac_cv_my_have_x11=no],
+   [[-lXt -L${x_libraries}]])
+  if test "${ac_cv_my_have_x11}" != "yes"; then
+    AC_MSG_ERROR([cannot find X11 development files])
+  fi
+  AC_DEFINE(USE_X11, 1, Define if the backend driver is X11)
+  CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+  CACA_LIBS="${CACA_LIBS} ${X_LIBS}"
 elif test "${enable_ncurses}" != "no"; then
   AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([cannot find ncurses headers]))

libcaca/trunk/src/caca.c

@@ -39 +39 @@
 #   include <dos.h>
 #   include <conio.h>
+#elif defined(USE_X11)
+#   include <X11/Xlib.h>
 #else
 #   error "no graphics library detected"
@@ -113 +115 @@
     _setcursortype(_NOCURSOR);
     clrscr();
+
+#elif defined(USE_X11)
+    /* Nothing to do */
 
 #endif
@@ -230 +235 @@
 void caca_end(void)
 {
+    _caca_end_graphics();
+
 #if defined(USE_SLANG)
     SLtt_set_mouse_mode(0, 0);
@@ -246 +253 @@
     cputs("\r\n");
     _setcursortype(_NORMALCURSOR);
+#elif defined(USE_X11)
+    /* Nothing to do */
 #endif
 }
@@ -295 +304 @@
 static void caca_init_terminal(void)
 {
-#if defined(HAVE_GETENV) && defined(HAVE_PUTENV)
+#if defined(HAVE_GETENV) && defined(HAVE_PUTENV) \
+     && (defined(USE_SLANG) || defined(USE_NCURSES))
     char *term, *colorterm, *other;
 

libcaca/trunk/src/caca_internals.h

@@ -32 +32 @@
 
 extern int _caca_init_graphics(void);
+extern int _caca_end_graphics(void);
 
 /* Cached screen size */
@@ -42 +43 @@
 extern enum caca_feature _caca_antialiasing;
 
+#if defined(USE_X11)
+#include <X11/Xlib.h>
+extern Display *_caca_dpy;
+extern Window _caca_window;
+#endif
+
 #endif /* __CACA_INTERNALS_H__ */

libcaca/trunk/src/graphics.c

@@ -39 +39 @@
 #       include <pc.h>
 #   endif
+#elif defined(USE_X11)
+#   include <X11/Xlib.h>
 #else
 #   error "no graphics library detected"
@@ -76 +78 @@
 #endif
 
+#if defined(USE_X11)
+Display *_caca_dpy;
+Window _caca_window;
+GC _caca_gc;
+#endif
+
 static char *_caca_empty_line;
 static char *_caca_scratch_line;
@@ -99 +107 @@
     textbackground(bgcolor);
     textcolor(fgcolor);
+#elif defined(USE_X11)
+    /* FIXME */
 #endif
 }
@@ -133 +143 @@
 //    gotoxy(x + 1, y + 1);
 //    putch(c);
+#elif defined(USE_X11)
+    /* FIXME */
 #endif
 }
@@ -176 +188 @@
 //    gotoxy(x + 1, y + 1);
 //    cputs(s);
+#elif defined(USE_X11)
+    /* FIXME */
 #endif
 }
@@ -336 +350 @@
     _caca_height = ti.screenheight;
 
+#elif defined(USE_X11)
+    int black_color;
+    int white_color;
+
+    _caca_dpy = XOpenDisplay(NULL);
+    if(_caca_dpy == NULL)
+        return -1;
+
+    black_color = BlackPixel(_caca_dpy, DefaultScreen(_caca_dpy));
+    white_color = WhitePixel(_caca_dpy, DefaultScreen(_caca_dpy));
+
+    _caca_window = XCreateSimpleWindow(_caca_dpy, DefaultRootWindow(_caca_dpy),
+                                       0, 0, 400, 300, 0,
+                                       black_color, black_color);
+    XSelectInput(_caca_dpy, _caca_window, StructureNotifyMask);
+    XMapWindow(_caca_dpy, _caca_window);
+
+    _caca_gc = XCreateGC(_caca_dpy, _caca_window, 0, NULL);
+    XSetForeground(_caca_dpy, _caca_gc, white_color);
+
+    for(;;)
+    {
+        XEvent event;
+        XNextEvent(_caca_dpy, &event);
+        if (event.type == MapNotify)
+            break;
+    }
+
+    XSelectInput(_caca_dpy, _caca_window, KeyPressMask);
+
+    /* FIXME */
+    _caca_width = 80;
+    _caca_height = 24;
+
+    XSync(_caca_dpy, False);
+
 #endif
     _caca_empty_line = malloc(_caca_width + 1);
@@ -349 +399 @@
 }
 
+int _caca_end_graphics(void)
+{
+#if defined(USE_SLANG)
+    /* Nothing to do */
+#elif defined(USE_NCURSES)
+    /* Nothing to do */
+#elif defined(USE_CONIO)
+    free(_caca_screen);
+#elif defined(USE_X11)
+    XSync(_caca_dpy, False);
+    XFreeGC(_caca_dpy, _caca_gc);
+    XUnmapWindow(_caca_dpy, _caca_window);
+    XDestroyWindow(_caca_dpy, _caca_window);
+    XCloseDisplay(_caca_dpy);
+#endif
+    free(_caca_empty_line);
+
+    return 0;
+}
+
 void caca_set_delay(unsigned int usec)
 {
@@ -395 +465 @@
     /* FIXME */
 #   endif
+#elif defined(USE_X11)
+    /* FIXME */
+    XFlush(_caca_dpy);
 #endif
 

libcaca/trunk/src/io.c

@@ -36 +36 @@
 #elif defined(USE_CONIO)
 #   include <conio.h>
+#elif defined(USE_X11)
+#   include <X11/Xlib.h>
+#   include <X11/Xutil.h>
 #else
 #   error "no graphics library detected"
@@ -205 +208 @@
 #elif defined(USE_CONIO)
     return _conio_kbhit() ? getch() : 0;
+#elif defined(USE_X11)
+    XEvent event;
+    char key;
+
+    while(XCheckWindowEvent(_caca_dpy, _caca_window, KeyPressMask, &event)
+           == True)
+    {
+        if(event.type == KeyPress)
+        {
+            //KeySym keysym;
+            //keysym = XKeycodeToKeysym(_caca_dpy, event.xkey.keycode, 0);
+            if(XLookupString(&event.xkey, &key, 1, NULL, NULL))
+                return key;
+        }
+    }
+
+    return 0;
 #endif
 }