Changeset 273Tweet

Timestamp:

Dec 24, 2003, 4:35:07 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/io.c: + Mouse support in the X11 driver.

Location:

libcaca/trunk/src

Files:

• caca_internals.h (modified) (1 diff)
• graphics.c (modified) (3 diffs)
• io.c (modified) (3 diffs)

libcaca/trunk/src/caca_internals.h

@@ -68 +68 @@
 extern Display *x11_dpy;
 extern Window x11_window;
+extern int x11_font_width, x11_font_height;
 #endif
 

libcaca/trunk/src/graphics.c

@@ -82 +82 @@
 Display *x11_dpy;
 Window x11_window;
+int x11_font_width, x11_font_height;
 static GC x11_gc;
 static Pixmap x11_pixmap;
@@ -88 +89 @@
 static Font x11_font;
 static XFontStruct *x11_font_struct;
-static int x11_font_width, x11_font_height, x11_font_offset;
+static int x11_font_offset;
 #endif
 
@@ -605 +606 @@
         }
 
-        XSelectInput(x11_dpy, x11_window, KeyPressMask);
+        XSelectInput(x11_dpy, x11_window,
+                     KeyPressMask | ButtonPressMask | PointerMotionMask);
 
         XSync(x11_dpy, False);

libcaca/trunk/src/io.c

@@ -129 +129 @@
 #endif
 
+    /* If it's already a special event, return it */
+    if((keybuf[0] & ~0xff) != 0)
+        return _pop_key();
+
+    /* If it's not an escape sequence, return the key */
     if(keybuf[0] != '\x1b')
         return CACA_EVENT_KEY_PRESS | _pop_key();
@@ -248 +253 @@
 #if defined(USE_X11)
     XEvent event;
+    static int x11_x = 0, x11_y = 0;
+    long int event_mask = KeyPressMask | ButtonPressMask | PointerMotionMask;
     char key;
 #endif
@@ -268 +275 @@
 #if defined(USE_X11)
     case CACA_DRIVER_X11:
-        while(XCheckWindowEvent(x11_dpy, x11_window, KeyPressMask, &event)
+        while(XCheckWindowEvent(x11_dpy, x11_window, event_mask, &event)
                == True)
         {
             KeySym keysym;
+
+            if(event.type == MotionNotify)
+            {
+                x11_x = event.xmotion.x;
+                x11_y = event.xmotion.y;
+                continue;
+            }
+
+            if(event.type == ButtonPress)
+            {
+                unsigned int x = x11_x / x11_font_width;
+                unsigned int y = x11_y / x11_font_height;
+
+                if(x >= _caca_width)
+                    x = _caca_width - 1;
+                if(y >= _caca_height)
+                    y = _caca_height - 1;
+
+                return CACA_EVENT_MOUSE_CLICK
+                        | (1 << 16) | (x << 8) | (y << 0);
+            }
 
             if(event.type != KeyPress)