o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: do not interpret alt-tab as alt for compose

Browse source 
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5132050
This commit is contained in:
Justin Davis 2011-09-28 14:11:32 -04:00 • committed by Russ Cox
parent 6135b41c7d
commit 4b58d45707
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/devdraw/devdraw.h
View file

@ -4,4 +4,6 @@ void _initdisplaymemimage(Memimage*);
int _latin1(Rune*, int);
int parsewinsize(char*, Rectangle*, int*);
int mouseswap(int);
void abortcompose(void);

10
src/cmd/devdraw/x11-itrans.c
View file

@ -137,12 +137,20 @@ __xtoplan9kbd(XEvent *e)
return k+0;
}
int alting;
void
abortcompose(void)
{
alting = 0;
}
extern int _latin1(Rune*, int);
static Rune*
xtoplan9latin1(XEvent *e)
{
static Rune k[10];
static int alting, nk;
static int nk;
int n;
int r;

6
src/cmd/devdraw/x11-srv.c
View file

@ -36,7 +36,7 @@
Button2MotionMask|\
Button3MotionMask)
#define Mask MouseMask|ExposureMask|StructureNotifyMask|KeyPressMask|EnterWindowMask|LeaveWindowMask
#define Mask MouseMask|ExposureMask|StructureNotifyMask|KeyPressMask|EnterWindowMask|LeaveWindowMask|FocusChangeMask
typedef struct Kbdbuf Kbdbuf;
typedef struct Mousebuf Mousebuf;
@ -549,6 +549,10 @@ runxevent(XEvent *xev)
matchkbd();
break;
case FocusOut:
abortcompose();
break;
case SelectionRequest:
_xselect(xev);
break;