JehanneOS/drawterm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More fixes.

Browse Source
This commit is contained in:
Russ Cox 2005-10-17 16:39:16 +00:00
parent 54ca86f879
commit 82b1d4d6c2
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui-x11/screen.c
View File

@ -116,7 +116,9 @@ screeninit(void)
memimageinit(); memimageinit();
terminit(); terminit();
drawqlock();
flushmemscreen(gscreen->r); flushmemscreen(gscreen->r);
drawqunlock();
} }
uchar* uchar*
@ -1115,9 +1117,12 @@ xselect(XEvent *e, Display *xd)
XSelectionRequestEvent *xe; XSelectionRequestEvent *xe;
Atom a[4]; Atom a[4];
if(e->xany.type != SelectionRequest)
return;
memset(&r, 0, sizeof r); memset(&r, 0, sizeof r);
xe = (XSelectionRequestEvent*)e; xe = (XSelectionRequestEvent*)e;
if(0) fprint(2, "xselect target=%d requestor=%d property=%d selection=%d\n", if(0) iprint("xselect target=%d requestor=%d property=%d selection=%d\n",
xe->target, xe->requestor, xe->property, xe->selection); xe->target, xe->requestor, xe->property, xe->selection);
r.xselection.property = xe->property; r.xselection.property = xe->property;
if(xe->target == targets){ if(xe->target == targets){
@ -1135,9 +1140,12 @@ if(0) fprint(2, "xselect target=%d requestor=%d property=%d selection=%d\n",
8, PropModeReplace, (uchar*)clip.buf, strlen(clip.buf)); 8, PropModeReplace, (uchar*)clip.buf, strlen(clip.buf));
qunlock(&clip.lk); qunlock(&clip.lk);
}else{ }else{
iprint("get %d\n", xe->target);
name = XGetAtomName(xd, xe->target); name = XGetAtomName(xd, xe->target);
if(strcmp(name, "TIMESTAMP") != 0) if(name == nil)
fprint(2, "%s: cannot handle selection request for '%s' (%d)\n", argv0, name, (int)xe->target); iprint("XGetAtomName failed\n");
else if(strcmp(name, "TIMESTAMP") != 0)
iprint("%s: cannot handle selection request for '%s' (%d)\n", argv0, name, (int)xe->target);
r.xselection.property = None; r.xselection.property = None;
} }

10
kern/term.c
View File

@ -55,6 +55,7 @@ screenwin(void)
char *greet; char *greet;
Memimage *grey; Memimage *grey;
drawqlock();
back = memwhite; back = memwhite;
conscol = memblack; conscol = memblack;
memfillcolor(gscreen, 0x444488FF); memfillcolor(gscreen, 0x444488FF);
@ -88,6 +89,7 @@ screenwin(void)
curpos = window.min; curpos = window.min;
window.max.y = window.min.y+((window.max.y-window.min.y)/h)*h; window.max.y = window.min.y+((window.max.y-window.min.y)/h)*h;
flushmemscreen(gscreen->r); flushmemscreen(gscreen->r);
drawqunlock();
} }
void void
@ -108,6 +110,7 @@ scroll(void)
Point p; Point p;
Rectangle r; Rectangle r;
drawqlock();
o = 8*h; o = 8*h;
r = Rpt(window.min, Pt(window.max.x, window.max.y-o)); r = Rpt(window.min, Pt(window.max.x, window.max.y-o));
p = Pt(window.min.x, window.min.y+o); p = Pt(window.min.x, window.min.y+o);
@ -115,8 +118,8 @@ scroll(void)
r = Rpt(Pt(window.min.x, window.max.y-o), window.max); r = Rpt(Pt(window.min.x, window.max.y-o), window.max);
memimagedraw(gscreen, r, back, ZP, nil, ZP, S); memimagedraw(gscreen, r, back, ZP, nil, ZP, S);
flushmemscreen(gscreen->r); flushmemscreen(gscreen->r);
curpos.y -= o; curpos.y -= o;
drawqunlock();
} }
static void static void
@ -181,11 +184,12 @@ screenputc(char *buf)
static void static void
termscreenputs(char *s, int n) termscreenputs(char *s, int n)
{ {
int i; int i, locked;
Rune r; Rune r;
char buf[4]; char buf[4];
lock(&screenlock); lock(&screenlock);
locked = drawcanqlock();
while(n > 0){ while(n > 0){
i = chartorune(&r, s); i = chartorune(&r, s);
if(i == 0){ if(i == 0){
@ -199,6 +203,8 @@ termscreenputs(char *s, int n)
s += i; s += i;
screenputc(buf); screenputc(buf);
} }
if(locked)
drawqunlock();
screenflush(); screenflush();
unlock(&screenlock); unlock(&screenlock);
} }