aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--grab.c9
-rw-r--r--main.c2
-rwxr-xr-xmkfile3
3 files changed, 8 insertions, 6 deletions
diff --git a/grab.c b/grab.c
index 136ab5f..6b53ff4 100644
--- a/grab.c
+++ b/grab.c
@@ -599,10 +599,11 @@ int sweepdrag(
// XGrabServer(dpy);
idle = 0;
}
- if (e0 || bl != BorderUnknown)
+ if (e0 || bl != BorderUnknown) {
notmoved = recalc(c, rx, ry, bl, notmoved);
- else
+ } else {
notmoved = recalc(c, rx - cx, ry - cy, bl, notmoved);
+ }
cx = rx;
cy = ry;
drawbound(c, 1);
@@ -632,7 +633,9 @@ int sweepdrag(
c->y += BORDER;
c->dx -= 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;
return 1;
}
diff --git a/main.c b/main.c
index a7a201f..6e08bc0 100644
--- a/main.c
+++ b/main.c
@@ -21,7 +21,7 @@
#include "patchlevel.h"
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",
0};
diff --git a/mkfile b/mkfile
index f3062aa..aef1123 100755
--- a/mkfile
+++ b/mkfile
@@ -13,7 +13,6 @@ RIOFILES=\
manage.$O\
menu.$O\
-CFLAGS=$CFLAGS -DDEBUG
HFILES=dat.h fns.h
TARG=rio xshove
@@ -29,7 +28,7 @@ LDFLAGS=-L$X11/lib$L64/ -Llibnotify/ -lnotify -lXext -lX11 $LDFLAGS
$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
$LD -o $target $prereq $LDFLAGS