xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vncv: adjust window size on desktop resize, fix canresize checks

Browse source
This commit is contained in:
cinap_lenrek 2018-08-21 02:02:50 +02:00
parent f8f677b48e
commit 37cbd6b632
3 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/vnc/draw.c
View file

@ -29,6 +29,9 @@ vncsetdim(Vnc *v, Rectangle dim)
pixbuf = realloc(pixbuf, v->dim.max.x * pixb * v->dim.max.y);
if(linebuf == nil || pixbuf == nil)
sysfatal("can't allocate pix decompression storage");
lockdisplay(display);
adjustwin(v, 0);
unlockdisplay(display);
}
static void
@ -79,7 +82,7 @@ requestupdate(Vnc *v, int incremental)
r = rectsubpt(screen->r, screen->r.min);
unlockdisplay(display);
vnclock(v);
if(incremental == 0 && v->canresize && !eqrect(r, v->dim)){
if(incremental == 0 && (v->canresize&2)!=0 && !eqrect(r, v->dim)){
vncwrchar(v, MSetDesktopSize);
vncwrchar(v, 0);
vncwrpoint(v, r.max);

1
sys/src/cmd/vnc/vncv.h
View file

@ -18,6 +18,7 @@ extern Vnc* vnc;
extern int mousefd;
/* wsys.c */
extern void adjustwin(Vnc*, int);
extern void readkbd(Vnc*);
extern void initmouse(void);
extern void mousewarp(Point);

49
sys/src/cmd/vnc/wsys.c
View file

@ -10,35 +10,46 @@ struct Mouse {
Point xy;
};
static void
resize(Vnc *v, int first)
void
adjustwin(Vnc *v, int force)
{
int fd;
Point d;
lockdisplay(display);
if(getwindow(display, Refnone) < 0)
sysfatal("internal error: can't get the window image");
if(!v->canresize){
if(force)
d = v->dim.max;
else {
/*
* limit the window to at most the vnc server's size
*/
d = addpt(v->dim.max, Pt(2*Borderwidth, 2*Borderwidth));
if(first || d.x < Dx(screen->r) || d.y < Dy(screen->r)){
fd = open("/dev/wctl", OWRITE);
if(fd >= 0){
fprint(fd, "resize -dx %d -dy %d", d.x, d.y);
close(fd);
}
d = subpt(screen->r.max, screen->r.min);
if(d.x > v->dim.max.x){
d.x = v->dim.max.x;
force = 1;
}
if(d.y > v->dim.max.y){
d.y = v->dim.max.y;
force = 1;
}
}
if(force) {
fd = open("/dev/wctl", OWRITE);
if(fd >= 0){
fprint(fd, "resize -dx %d -dy %d", d.x+2*Borderwidth, d.y+2*Borderwidth);
close(fd);
}
}
unlockdisplay(display);
}
static void
eresized(void)
resized(int first)
{
resize(vnc, 0);
lockdisplay(display);
if(getwindow(display, Refnone) < 0)
sysfatal("internal error: can't get the window image");
if((vnc->canresize&2) == 0)
adjustwin(vnc, first);
unlockdisplay(display);
requestupdate(vnc, 0);
}
@ -130,8 +141,7 @@ readmouse(Vnc *v)
memmove(curs+2*4, cs->clr, 2*2*16);
write(cursorfd, curs, sizeof curs);
resize(v, 1);
requestupdate(vnc, 0);
resized(1);
start = end = buf;
len = 0;
for(;;){
@ -155,8 +165,7 @@ readmouse(Vnc *v)
}
}
} else
eresized();
resized(0);
start += EventSize;
len -= EventSize;
}