aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/rio
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2008-01-30 12:02:01 -0500
committerRuss Cox <rsc@swtch.com>2008-01-30 12:02:01 -0500
commite601e525deb6610eb7cb76546cde1db10c03317f (patch)
treeb8180cd8948f73a9f32dcbc55fee73c62abf1938 /src/cmd/rio
parent35288690ce41267ae9c6341e1d73f74c56726297 (diff)
downloadplan9port-e601e525deb6610eb7cb76546cde1db10c03317f.tar.gz
plan9port-e601e525deb6610eb7cb76546cde1db10c03317f.tar.bz2
plan9port-e601e525deb6610eb7cb76546cde1db10c03317f.zip
rio: more full-screen fixes.
Diffstat (limited to 'src/cmd/rio')
-rw-r--r--src/cmd/rio/event.c10
-rw-r--r--src/cmd/rio/main.c1
-rw-r--r--src/cmd/rio/showevent/ShowEvent.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/src/cmd/rio/event.c b/src/cmd/rio/event.c
index 36c0cdc0..b237cd1d 100644
--- a/src/cmd/rio/event.c
+++ b/src/cmd/rio/event.c
@@ -138,8 +138,14 @@ configurereq(XConfigureRequestEvent *e)
if(e->value_mask & CWBorderWidth)
c->border = e->border_width;
- if((e->value_mask & (CWX|CWY|CWWidth|CWHeight)) == (CWWidth|CWHeight)
- && c->dx >= c->screen->width && c->dy >= c->screen->height){
+ if(!(e->value_mask & (CWX|CWY))){
+ e->x = 0;
+ e->y = 0;
+ }
+
+ if((e->value_mask & (CWWidth|CWHeight)) == (CWWidth|CWHeight)
+ && c->dx >= c->screen->width && c->dy >= c->screen->height
+ && e->x == 0 && e->y == 0){
c->border = 0;
e->value_mask |= CWX|CWY;
}else
diff --git a/src/cmd/rio/main.c b/src/cmd/rio/main.c
index 2170340c..afb2bb8b 100644
--- a/src/cmd/rio/main.c
+++ b/src/cmd/rio/main.c
@@ -449,7 +449,6 @@ sendconfig(Client *c)
{
XConfigureEvent ce;
-fprintf(stderr, "send config: %p / %d %d %d %d\n", c);
ce.type = ConfigureNotify;
ce.event = c->window;
ce.window = c->window;
diff --git a/src/cmd/rio/showevent/ShowEvent.c b/src/cmd/rio/showevent/ShowEvent.c
index e73e8ccc..f29968fe 100644
--- a/src/cmd/rio/showevent/ShowEvent.c
+++ b/src/cmd/rio/showevent/ShowEvent.c
@@ -389,9 +389,7 @@ XKeyEvent *ev;
}
/* Returns the string equivalent of an atom or "None"*/
-static char *AtomName(dpy, atom)
-Display *dpy;
-Atom atom;
+static char *AtomName(Display *dpy, Atom atom)
{
static char buffer[256];
char *atom_name;