Blame

Date:
Message:
Fighting the good fight. Move libfmt, libutf into subdirectories of lib9. Add poll-based socket i/o to libthread, so that we can avoid using multiple procs when possible, thus removing dependence on crappy pthreads implementations. Convert samterm, acme to the single-proc libthread. Bring libcomplete, acme up-to-date w.r.t. Plan 9 distribution.
Actions:
History | Blob | Raw File
 1 76193d7c 2003-09-30 devnull #include "x11-inc.h"

 2 76193d7c 2003-09-30 devnull #include <u.h>

 3 76193d7c 2003-09-30 devnull #include <libc.h>

 4 76193d7c 2003-09-30 devnull #include <draw.h>

 5 76193d7c 2003-09-30 devnull #include <thread.h>

 6 76193d7c 2003-09-30 devnull #include <memdraw.h>

 7 76193d7c 2003-09-30 devnull #include <keyboard.h>

 8 76193d7c 2003-09-30 devnull #include "x11-memdraw.h"

 9 76193d7c 2003-09-30 devnull 

10 76193d7c 2003-09-30 devnull void

11 76193d7c 2003-09-30 devnull closekeyboard(Keyboardctl *kc)

12 76193d7c 2003-09-30 devnull {

13 76193d7c 2003-09-30 devnull 	if(kc == nil)

14 76193d7c 2003-09-30 devnull 		return;

15 76193d7c 2003-09-30 devnull 

16 76193d7c 2003-09-30 devnull /*	postnote(PNPROC, kc->pid, "kill");

17 76193d7c 2003-09-30 devnull */

18 76193d7c 2003-09-30 devnull 

19 76193d7c 2003-09-30 devnull #ifdef BUG

20 76193d7c 2003-09-30 devnull 	/* Drain the channel */

21 76193d7c 2003-09-30 devnull 	while(?kc->c)

22 76193d7c 2003-09-30 devnull 		<-kc->c;

23 76193d7c 2003-09-30 devnull #endif

24 76193d7c 2003-09-30 devnull 

25 76193d7c 2003-09-30 devnull 	close(kc->ctlfd);

26 76193d7c 2003-09-30 devnull 	close(kc->consfd);

27 76193d7c 2003-09-30 devnull 	free(kc->file);

28 76193d7c 2003-09-30 devnull 	free(kc->c);

29 76193d7c 2003-09-30 devnull 	free(kc);

30 76193d7c 2003-09-30 devnull }

31 76193d7c 2003-09-30 devnull 

32 76193d7c 2003-09-30 devnull static

33 76193d7c 2003-09-30 devnull void

34 76193d7c 2003-09-30 devnull _ioproc(void *arg)

35 76193d7c 2003-09-30 devnull {

36 76193d7c 2003-09-30 devnull 	int i;

37 5a8e63b2 2004-02-29 devnull 	int fd;

38 76193d7c 2003-09-30 devnull 	Keyboardctl *kc;

39 76193d7c 2003-09-30 devnull 	Rune r;

40 76193d7c 2003-09-30 devnull 	XEvent xevent;

41 76193d7c 2003-09-30 devnull 

42 76193d7c 2003-09-30 devnull 	kc = arg;

43 76193d7c 2003-09-30 devnull 	threadsetname("kbdproc");

44 76193d7c 2003-09-30 devnull 	kc->pid = getpid();

45 5a8e63b2 2004-02-29 devnull 	fd = XConnectionNumber(_x.kbdcon);

46 161060a4 2003-10-11 devnull 	XSelectInput(_x.kbdcon, _x.drawable, KeyPressMask);

47 76193d7c 2003-09-30 devnull 	for(;;){

48 5a8e63b2 2004-02-29 devnull 		while(XCheckWindowEvent(_x.kbdcon, _x.drawable, KeyPressMask, &xevent) == False)

49 5a8e63b2 2004-02-29 devnull 			threadfdwait(fd, 'r');

50 76193d7c 2003-09-30 devnull 		switch(xevent.type){

51 76193d7c 2003-09-30 devnull 		case KeyPress:

52 32f69c36 2003-12-11 devnull 			i = _xtoplan9kbd(&xevent);

53 76193d7c 2003-09-30 devnull 			if(i == -1)

54 76193d7c 2003-09-30 devnull 				continue;

55 76193d7c 2003-09-30 devnull 			r = i;

56 76193d7c 2003-09-30 devnull 			send(kc->c, &r);

57 32f69c36 2003-12-11 devnull 			while((i=_xtoplan9kbd(nil)) >= 0){

58 16a70966 2003-11-23 devnull 				r = i;

59 16a70966 2003-11-23 devnull 				send(kc->c, &r);

60 16a70966 2003-11-23 devnull 			}

61 76193d7c 2003-09-30 devnull 			break;

62 76193d7c 2003-09-30 devnull 		}

63 76193d7c 2003-09-30 devnull 	}

64 76193d7c 2003-09-30 devnull }

65 76193d7c 2003-09-30 devnull 

66 76193d7c 2003-09-30 devnull Keyboardctl*

67 76193d7c 2003-09-30 devnull initkeyboard(char *file)

68 76193d7c 2003-09-30 devnull {

69 76193d7c 2003-09-30 devnull 	Keyboardctl *kc;

70 76193d7c 2003-09-30 devnull 

71 5a8e63b2 2004-02-29 devnull 	threadfdwaitsetup();

72 76193d7c 2003-09-30 devnull 	kc = mallocz(sizeof(Keyboardctl), 1);

73 76193d7c 2003-09-30 devnull 	if(kc == nil)

74 76193d7c 2003-09-30 devnull 		return nil;

75 76193d7c 2003-09-30 devnull 	kc->c = chancreate(sizeof(Rune), 20);

76 5a8e63b2 2004-02-29 devnull 	threadcreate(_ioproc, kc, 4096);

77 76193d7c 2003-09-30 devnull 	return kc;

78 76193d7c 2003-09-30 devnull }

79 76193d7c 2003-09-30 devnull