fix window drag for small uxn windows; remove debug flag for build; bump to v1.2.2

This commit is contained in:
Iris Lightshard 2022-02-25 22:35:58 -07:00
parent 69eb379b68
commit 4981ffdc8c
Signed by: Iris Lightshard
GPG key ID: 3B7FBC22144E6398
3 changed files with 8 additions and 6 deletions

9
grab.c
View file

@ -599,10 +599,11 @@ int sweepdrag(
// XGrabServer(dpy); // XGrabServer(dpy);
idle = 0; idle = 0;
} }
if (e0 || bl != BorderUnknown) if (e0 || bl != BorderUnknown) {
notmoved = recalc(c, rx, ry, bl, notmoved); notmoved = recalc(c, rx, ry, bl, notmoved);
else } else {
notmoved = recalc(c, rx - cx, ry - cy, bl, notmoved); notmoved = recalc(c, rx - cx, ry - cy, bl, notmoved);
}
cx = rx; cx = rx;
cy = ry; cy = ry;
drawbound(c, 1); drawbound(c, 1);
@ -632,7 +633,9 @@ int sweepdrag(
c->y += BORDER; c->y += BORDER;
c->dx -= 2 * BORDER; c->dx -= 2 * BORDER;
c->dy -= 2 * BORDER; c->dy -= 2 * BORDER;
if (c->dx < 4 || c->dy < 4 || c->dx < c->min_dx || c->dy < c->min_dy) if (
recalc != dragcalc &&
(c->dx < 4 || c->dy < 4 || c->dx < c->min_dx || c->dy < c->min_dy))
goto bad; goto bad;
return 1; return 1;
} }

2
main.c
View file

@ -21,7 +21,7 @@
#include "patchlevel.h" #include "patchlevel.h"
char* version[] = { char* version[] = {
"ryudo version 1.2.1\nCopyright (c) 1994-1996 David Hogan,\n(c) 2004 Russ " "ryudo version 1.2.2\nCopyright (c) 1994-1996 David Hogan,\n(c) 2004 Russ "
"Cox,\n(c) 2019-2022 Derek Stevens", "Cox,\n(c) 2019-2022 Derek Stevens",
0}; 0};

3
mkfile
View file

@ -13,7 +13,6 @@ RIOFILES=\
manage.$O\ manage.$O\
menu.$O\ menu.$O\
CFLAGS=$CFLAGS -DDEBUG
HFILES=dat.h fns.h HFILES=dat.h fns.h
TARG=rio xshove TARG=rio xshove
@ -29,7 +28,7 @@ LDFLAGS=-L$X11/lib$L64/ -Llibnotify/ -lnotify -lXext -lX11 $LDFLAGS
$O.rio: $RIOFILES $O.rio: $RIOFILES
CFLAGS=$CFLAGS -DSHAPE -DDEBUG_EV -DDEBUG -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -I/usr/include/gdk-pixbuf-2.0/ CFLAGS=$CFLAGS -DSHAPE -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -I/usr/include/gdk-pixbuf-2.0/
$O.xevents: xevents.$O printevent.$O $O.xevents: xevents.$O printevent.$O
$LD -o $target $prereq $LDFLAGS $LD -o $target $prereq $LDFLAGS