cacalabs
/
libcaca
mirror of https://github.com/cacalabs/libcaca.git
1
0
Fork 0
Code Issues 0 Releases 7 Wiki Activity
Browse Source

* src/io.c: 

+ Mouse support under X11.
    + Split the mouse motion and mouse click events.
  * examples/demo.c:
    + Mouse motion support.
tags/v0.99.beta14
Sam Hocevar sam 21 years ago
parent
acfb880085
commit
0bc76c5432
3 changed files with 167 additions and 145 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +80
    -76
      examples/demo.c
  2. +6
    -4
      src/caca.h
  3. +81
    -65
      src/io.c

+ 80
- 76
examples/demo.c View File

@@ -71,91 +71,95 @@ int main(int argc, char **argv)
/* Go ! */
while(!quit)
{
int event = caca_get_event();
int menu = 0, mouse = 0, xmouse = 0, ymouse = 0;
int event;

if(event && demo)
while((event = caca_get_event()))
{
display_menu();
caca_refresh();
demo = NULL;
}
else if(event & CACA_EVENT_KEY_PRESS)
{
handle_key:
switch(event & 0xffff)
if(demo && (event & CACA_EVENT_KEY_PRESS))
{
case 'q':
case 'Q':
menu = 1;
demo = NULL;
quit = 1;
break;
case 'o':
case 'O':
outline = (outline + 1) % 3;
display_menu();
break;
case 'b':
case 'B':
bounds = (bounds + 1) % 2;
display_menu();
break;
case 'd':
case 'D':
dithering = (dithering + 1) % 5;
caca_set_dithering(dithering);
display_menu();
break;
case 'c':
demo = demo_color;
break;
case 'f':
case 'F':
demo = demo_all;
break;
case '1':
demo = demo_dots;
break;
case '2':
demo = demo_lines;
break;
case '3':
demo = demo_boxes;
break;
case '4':
demo = demo_triangles;
break;
case '5':
demo = demo_ellipses;
break;
case 's':
case 'S':
if(sprite)
demo = demo_sprites;
break;
case 'r':
case 'R':
demo = demo_render;
break;
}

handle_event:
event = caca_get_event();
if(event & CACA_EVENT_KEY_PRESS)
goto handle_key;
else if(event)
goto handle_event;

caca_refresh();

if(demo)
caca_clear();
else if(event & CACA_EVENT_KEY_PRESS)
{
switch(event & 0xffff)
{
case 'q':
case 'Q':
demo = NULL;
quit = 1;
break;
case 'o':
case 'O':
outline = (outline + 1) % 3;
display_menu();
break;
case 'b':
case 'B':
bounds = (bounds + 1) % 2;
display_menu();
break;
case 'd':
case 'D':
dithering = (dithering + 1) % 5;
caca_set_dithering(dithering);
display_menu();
break;
case 'c':
demo = demo_color;
break;
case 'f':
case 'F':
demo = demo_all;
break;
case '1':
demo = demo_dots;
break;
case '2':
demo = demo_lines;
break;
case '3':
demo = demo_boxes;
break;
case '4':
demo = demo_triangles;
break;
case '5':
demo = demo_ellipses;
break;
case 's':
case 'S':
if(sprite)
demo = demo_sprites;
break;
case 'r':
case 'R':
demo = demo_render;
break;
}

if(demo)
caca_clear();
}
else if(event & CACA_EVENT_MOUSE_MOTION)
{
mouse = 1;
xmouse = (event & 0xfff000) >> 12;
ymouse = event & 0xfff;
}
}
else if(event & CACA_EVENT_MOUSE_CLICK)

if(menu || (mouse && !demo))
{
display_menu();
caca_set_color(CACA_COLOR_RED, CACA_COLOR_BLACK);
caca_putstr((event & 0xff00) >> 8, event & 0xff, "|\\");
if(mouse && !demo)
{
caca_set_color(CACA_COLOR_RED, CACA_COLOR_BLACK);
caca_putstr(xmouse, ymouse, "|\\");
}
caca_refresh();
mouse = menu = 0;
}

if(demo)


+ 6
- 4
src/caca.h View File

@@ -175,10 +175,12 @@ enum caca_feature
*/
enum caca_event
{
CACA_EVENT_NONE = 0x00000000, /**< No event. */
CACA_EVENT_KEY_PRESS = 0x01000000, /**< A key was pressed. */
CACA_EVENT_KEY_RELEASE = 0x02000000, /**< A key was released. */
CACA_EVENT_MOUSE_CLICK = 0x04000000 /**< A mouse button was clicked. */
CACA_EVENT_NONE = 0x00000000, /**< No event. */
CACA_EVENT_KEY_PRESS = 0x01000000, /**< A key was pressed. */
CACA_EVENT_KEY_RELEASE = 0x02000000, /**< A key was released. */
CACA_EVENT_MOUSE_PRESS = 0x04000000, /**< A mouse button was pressed. */
CACA_EVENT_MOUSE_RELEASE = 0x08000000, /**< A mouse button was released. */
CACA_EVENT_MOUSE_MOTION = 0x10000000 /**< The mouse was moved. */
};

/** \brief Special key values.


+ 81
- 65
src/io.c View File

@@ -70,6 +70,85 @@ unsigned int caca_get_event(void)
{
unsigned int event = 0;

#if defined(USE_X11)
if(_caca_driver == CACA_DRIVER_X11)
{
XEvent xevent;
static unsigned int x11_x = 0, x11_y = 0;
long int xevent_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask
| ButtonReleaseMask | PointerMotionMask;
char key;

while(XCheckWindowEvent(x11_dpy, x11_window, xevent_mask, &xevent)
== True)
{
KeySym keysym;

if(xevent.type == MotionNotify)
{
unsigned int x = xevent.xmotion.x / x11_font_width;
unsigned int y = xevent.xmotion.y / x11_font_height;

if(x11_x == x && x11_y == y)
continue;

if(x >= _caca_width)
x = _caca_width - 1;
if(y >= _caca_height)
y = _caca_height - 1;

x11_x = x & 0xfff;
x11_y = y & 0xfff;

return CACA_EVENT_MOUSE_MOTION | (x << 12) | (y << 0);
}

if(xevent.type == ButtonPress)
return CACA_EVENT_MOUSE_PRESS | 1;

if(xevent.type == ButtonPress)
return CACA_EVENT_MOUSE_RELEASE | 1;

if(xevent.type == KeyPress)
event |= CACA_EVENT_KEY_PRESS;
else if(xevent.type == KeyRelease)
event |= CACA_EVENT_KEY_RELEASE;
else
return 0;

if(XLookupString(&xevent.xkey, &key, 1, NULL, NULL))
return event | key;

keysym = XKeycodeToKeysym(x11_dpy, xevent.xkey.keycode, 0);
switch(keysym)
{
case XK_F1: return event | CACA_KEY_F1;
case XK_F2: return event | CACA_KEY_F2;
case XK_F3: return event | CACA_KEY_F3;
case XK_F4: return event | CACA_KEY_F4;
case XK_F5: return event | CACA_KEY_F5;
case XK_F6: return event | CACA_KEY_F6;
case XK_F7: return event | CACA_KEY_F7;
case XK_F8: return event | CACA_KEY_F8;
case XK_F9: return event | CACA_KEY_F9;
case XK_F10: return event | CACA_KEY_F10;
case XK_F11: return event | CACA_KEY_F11;
case XK_F12: return event | CACA_KEY_F12;
case XK_F13: return event | CACA_KEY_F13;
case XK_F14: return event | CACA_KEY_F14;
case XK_F15: return event | CACA_KEY_F15;
case XK_Left: return event | CACA_KEY_LEFT;
case XK_Right: return event | CACA_KEY_RIGHT;
case XK_Up: return event | CACA_KEY_UP;
case XK_Down: return event | CACA_KEY_DOWN;
default: return 0;
}
}

return 0;
}
#endif

/* Read all available key events and push them into the buffer */
while(keys < KEY_BUFLEN)
{
@@ -96,7 +175,7 @@ unsigned int caca_get_event(void)
event |= (mevent.x) << 8;
event |= (mevent.y) << 0;

return CACA_EVENT_MOUSE_CLICK | event;
return CACA_EVENT_MOUSE_PRESS | event;
}

switch(keybuf[0])
@@ -168,7 +247,7 @@ unsigned int caca_get_event(void)
event |= (_pop_key() - '!') << 8;
event |= (_pop_key() - '!') << 0;

return CACA_EVENT_MOUSE_CLICK | event;
return CACA_EVENT_MOUSE_PRESS | event;
}
else if(keybuf[0] == '[' && keybuf[1] == '1' && keybuf[3] == '~' &&
keybuf[2] >= '5' && keybuf[2] != '6' && keybuf[2] <= '9')
@@ -251,10 +330,6 @@ static unsigned int _read_key(void)
int intkey;
#endif
#if defined(USE_X11)
XEvent event;
static int x11_x = 0, x11_y = 0;
long int event_mask = KeyPressMask | ButtonPressMask | PointerMotionMask;
char key;
#endif

switch(_caca_driver)
@@ -274,65 +349,6 @@ static unsigned int _read_key(void)
#endif
#if defined(USE_X11)
case CACA_DRIVER_X11:
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)
continue;

if(XLookupString(&event.xkey, &key, 1, NULL, NULL))
return key;

keysym = XKeycodeToKeysym(x11_dpy, event.xkey.keycode, 0);
switch(keysym)
{
case XK_F1: return CACA_KEY_F1;
case XK_F2: return CACA_KEY_F2;
case XK_F3: return CACA_KEY_F3;
case XK_F4: return CACA_KEY_F4;
case XK_F5: return CACA_KEY_F5;
case XK_F6: return CACA_KEY_F6;
case XK_F7: return CACA_KEY_F7;
case XK_F8: return CACA_KEY_F8;
case XK_F9: return CACA_KEY_F9;
case XK_F10: return CACA_KEY_F10;
case XK_F11: return CACA_KEY_F11;
case XK_F12: return CACA_KEY_F12;
case XK_F13: return CACA_KEY_F13;
case XK_F14: return CACA_KEY_F14;
case XK_F15: return CACA_KEY_F15;
case XK_Left: return CACA_KEY_LEFT;
case XK_Right: return CACA_KEY_RIGHT;
case XK_Up: return CACA_KEY_UP;
case XK_Down: return CACA_KEY_DOWN;
default: return 0;
}
}

return 0;
#endif
default:
break;


Write Preview
Loading…
Cancel
Save