From b20f06ab9cc0058a7e5b5e434d412db19ea7e2b8 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Sun, 26 Dec 2004 23:24:32 +0000
Subject: use new thread library

---
 src/libdraw/x11-keyboard.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/libdraw/x11-keyboard.c')

diff --git a/src/libdraw/x11-keyboard.c b/src/libdraw/x11-keyboard.c
index bee0f410..1a4d0a3b 100644
--- a/src/libdraw/x11-keyboard.c
+++ b/src/libdraw/x11-keyboard.c
@@ -45,9 +45,7 @@ _ioproc(void *arg)
 	fd = XConnectionNumber(_x.kbdcon);
 	XSelectInput(_x.kbdcon, _x.drawable, KeyPressMask);
 	for(;;){
-		while(XCheckWindowEvent(_x.kbdcon, _x.drawable, KeyPressMask, &xevent) == False){
-			threadfdwait(fd, 'r');
-		}
+		XWindowEvent(_x.kbdcon, _x.drawable, KeyPressMask, &xevent);
 		switch(xevent.type){
 		case KeyPress:
 			i = _xtoplan9kbd(&xevent);
@@ -69,12 +67,12 @@ initkeyboard(char *file)
 {
 	Keyboardctl *kc;
 
-	threadfdwaitsetup();
 	kc = mallocz(sizeof(Keyboardctl), 1);
 	if(kc == nil)
 		return nil;
 	kc->c = chancreate(sizeof(Rune), 20);
-	threadcreate(_ioproc, kc, 32768);
+	chansetname(kc->c, "kbdc");
+	proccreate(_ioproc, kc, 32768);
 	return kc;
 }
 
-- 
cgit v1.2.3