aaxkbd.c   aaxkbd.c 
skipping to change at line 13 skipping to change at line 13
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "config.h" #include "config.h"
#ifdef X11_KBDDRIVER #ifdef X11_KBDDRIVER
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "aalib.h" #include "aalib.h"
#include "aaxint.h" #include "aaxint.h"
#define dr (d->pixmapmode?d->pi:d->wi) #define dr (d->pixmapmode?d->pi:d->wi)
extern void __aa_X_redraw(aa_context *c);
static int X_init(aa_context * c, int mode) static int X_init(aa_context * c, int mode)
{ {
struct xdriverdata *d=c->driverdata; struct xdriverdata *d=c->driverdata;
if(c->driver!=&X11_d) return 0; if(c->driver!=&X11_d) return 0;
d->attr.event_mask |= StructureNotifyMask | KeyPressMask | (mode & AA_S ENDRELEASE ? KeyReleaseMask : 0); d->attr.event_mask |= StructureNotifyMask | KeyPressMask | (mode & AA_S ENDRELEASE ? KeyReleaseMask : 0);
XSelectInput(d->dp, d->wi, d->attr.event_mask); XSelectInput(d->dp, d->wi, d->attr.event_mask);
aa_recommendlowmouse("X11"); aa_recommendlowmouse("X11");
return 1; return 1;
} }
skipping to change at line 83 skipping to change at line 84
case ButtonRelease: case ButtonRelease:
ev.xbutton.state &= ~(1 << (ev.xbutton.button + 7)); ev.xbutton.state &= ~(1 << (ev.xbutton.button + 7));
skip:; skip:;
case MotionNotify: case MotionNotify:
__X_mousex = ev.xbutton.x; __X_mousex = ev.xbutton.x;
__X_mousey = ev.xbutton.y; __X_mousey = ev.xbutton.y;
__X_buttons = ev.xbutton.state; __X_buttons = ev.xbutton.state;
return (AA_MOUSE); return (AA_MOUSE);
case Expose: case Expose:
XSync(d->dp, 0); XSync(d->dp, 0);
XClearWindow(d->dp, d->wi); __aa_X_redraw(c);
break; break;
case ConfigureNotify: case ConfigureNotify:
if (__X_getsize(c,d)) if (__X_getsize(c,d))
return (AA_RESIZE); return (AA_RESIZE);
break; break;
case KeyPress: case KeyPress:
return (decodekey(&ev)); return (decodekey(&ev));
case KeyRelease: case KeyRelease:
return (decodekey(&ev) | AA_RELEASE); return (decodekey(&ev) | AA_RELEASE);
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/