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.
This commit is contained in:
parent
d51419bf43
commit
5a8e63b2f0
107 changed files with 665 additions and 6637 deletions
|
|
@ -454,7 +454,7 @@ _xselect(XEvent *e, XDisplay *xd)
|
|||
|
||||
memset(&r, 0, sizeof r);
|
||||
xe = (XSelectionRequestEvent*)e;
|
||||
if(0) fprint(2, "xselect target=%d requestor=%d property=%d selection=%d\n",
|
||||
if(1) fprint(2, "xselect target=%d requestor=%d property=%d selection=%d\n",
|
||||
xe->target, xe->requestor, xe->property, xe->selection);
|
||||
r.xselection.property = xe->property;
|
||||
if(xe->target == _x.targets){
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ void
|
|||
_ioproc(void *arg)
|
||||
{
|
||||
int i;
|
||||
int fd;
|
||||
Keyboardctl *kc;
|
||||
Rune r;
|
||||
XEvent xevent;
|
||||
|
|
@ -41,9 +42,11 @@ _ioproc(void *arg)
|
|||
kc = arg;
|
||||
threadsetname("kbdproc");
|
||||
kc->pid = getpid();
|
||||
fd = XConnectionNumber(_x.kbdcon);
|
||||
XSelectInput(_x.kbdcon, _x.drawable, KeyPressMask);
|
||||
for(;;){
|
||||
XWindowEvent(_x.kbdcon, _x.drawable, KeyPressMask, &xevent);
|
||||
while(XCheckWindowEvent(_x.kbdcon, _x.drawable, KeyPressMask, &xevent) == False)
|
||||
threadfdwait(fd, 'r');
|
||||
switch(xevent.type){
|
||||
case KeyPress:
|
||||
i = _xtoplan9kbd(&xevent);
|
||||
|
|
@ -65,11 +68,12 @@ initkeyboard(char *file)
|
|||
{
|
||||
Keyboardctl *kc;
|
||||
|
||||
threadfdwaitsetup();
|
||||
kc = mallocz(sizeof(Keyboardctl), 1);
|
||||
if(kc == nil)
|
||||
return nil;
|
||||
kc->c = chancreate(sizeof(Rune), 20);
|
||||
proccreate(_ioproc, kc, 4096);
|
||||
threadcreate(_ioproc, kc, 4096);
|
||||
return kc;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ static
|
|||
void
|
||||
_ioproc(void *arg)
|
||||
{
|
||||
int one;
|
||||
int fd, one;
|
||||
ulong mask;
|
||||
Mouse m;
|
||||
Mousectl *mc;
|
||||
|
|
@ -60,7 +60,10 @@ _ioproc(void *arg)
|
|||
mc->pid = getpid();
|
||||
mask = MouseMask|ExposureMask|StructureNotifyMask;
|
||||
XSelectInput(_x.mousecon, _x.drawable, mask);
|
||||
fd = XConnectionNumber(_x.mousecon);
|
||||
for(;;){
|
||||
while(XPending(_x.mousecon) == False)
|
||||
threadfdwait(fd, 'r');
|
||||
XNextEvent(_x.mousecon, &xevent);
|
||||
switch(xevent.type){
|
||||
case Expose:
|
||||
|
|
@ -105,12 +108,13 @@ initmouse(char *file, Image *i)
|
|||
{
|
||||
Mousectl *mc;
|
||||
|
||||
threadfdwaitsetup();
|
||||
mc = mallocz(sizeof(Mousectl), 1);
|
||||
if(i)
|
||||
mc->display = i->display;
|
||||
mc->c = chancreate(sizeof(Mouse), 0);
|
||||
mc->resizec = chancreate(sizeof(int), 2);
|
||||
proccreate(_ioproc, mc, 16384);
|
||||
threadcreate(_ioproc, mc, 16384);
|
||||
return mc;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue