tminor fixes; hide some routines - plan9port - [fork] Plan 9 from user space (HTM) git clone git://src.adamsgaard.dk/plan9port (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 1818ce0f288ed4ffdd64ef595693cd3e481e84f9 (DIR) parent ba3de3806066744cd57b0d2829255d9990a8afe7 (HTM) Author: rsc <devnull@localhost> Date: Tue, 4 Jan 2005 22:20:14 +0000 minor fixes; hide some routines Diffstat: M src/libdraw/devdraw.c | 6 ++---- M src/libdraw/x11-event.c | 2 ++ M src/libdraw/x11-init.c | 6 +++--- M src/libdraw/x11-itrans.c | 2 +- M src/libdraw/x11-keysym2ucs.c | 2 +- M src/libdraw/x11-keysym2ucs.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) --- (DIR) diff --git a/src/libdraw/devdraw.c b/src/libdraw/devdraw.c t@@ -13,8 +13,6 @@ #define NHASH (1<<5) #define HASHMASK (NHASH-1) -extern void flushmemscreen(Rectangle); - typedef struct Client Client; typedef struct Draw Draw; typedef struct DImage DImage; t@@ -257,7 +255,7 @@ addflush(Rectangle r) } /* emit current state */ if(flushrect.min.x < flushrect.max.x) - flushmemscreen(flushrect); + _flushmemscreen(flushrect); flushrect = r; waste = 0; } t@@ -294,7 +292,7 @@ void drawflush(void) { if(flushrect.min.x < flushrect.max.x) - flushmemscreen(flushrect); + _flushmemscreen(flushrect); flushrect = Rect(10000, 10000, -10000, -10000); } (DIR) diff --git a/src/libdraw/x11-event.c b/src/libdraw/x11-event.c t@@ -53,6 +53,8 @@ eread(ulong keys, Event *e) } } + xmask |= EnterWindowMask|LeaveWindowMask; + XSelectInput(_x.display, _x.drawable, xmask); again: XWindowEvent(_x.display, _x.drawable, xmask, &xevent); (DIR) diff --git a/src/libdraw/x11-init.c b/src/libdraw/x11-init.c t@@ -359,7 +359,7 @@ xattach(char *label) geom = smprint("%s.geometry", label); if(geom && XrmGetResource(database, geom, nil, &geomrestype, &geomres)) - mask = XParseGeometry(geomres.addr, &x, &y, &width, &height); + mask = XParseGeometry(geomres.addr, &x, &y, (uint*)&width, (uint*)&height); free(geom); if((mask & WidthValue) && (mask & HeightValue)){ t@@ -552,7 +552,7 @@ fprint(2, "%r\n"); } int -drawsetlabel(Display *d, char *label) +drawsetlabel(char *label) { char *argv[2]; XClassHint classhint; t@@ -775,7 +775,7 @@ setupcmap(XWindow w) } void -flushmemscreen(Rectangle r) +_flushmemscreen(Rectangle r) { if(_x.nextscreenpm != _x.screenpm){ qlock(&_x.screenlock); (DIR) diff --git a/src/libdraw/x11-itrans.c b/src/libdraw/x11-itrans.c t@@ -103,7 +103,7 @@ __xtoplan9kbd(XEvent *e) break; default: /* not ISO-1 or tty control */ if(k>0xff) { - k = keysym2ucs(k); + k = _p9keysym2ucs(k); if(k==-1) return -1; } } (DIR) diff --git a/src/libdraw/x11-keysym2ucs.c b/src/libdraw/x11-keysym2ucs.c t@@ -824,7 +824,7 @@ static struct codepair { }; VISIBLE -long keysym2ucs(KeySym keysym) +long _p9keysym2ucs(KeySym keysym) { int min = 0; int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; (DIR) diff --git a/src/libdraw/x11-keysym2ucs.h b/src/libdraw/x11-keysym2ucs.h t@@ -6,4 +6,4 @@ #include <X11/X.h> -long keysym2ucs(KeySym keysym); +long _p9keysym2ucs(KeySym keysym);