Fix move windows
This commit is contained in:
parent
bf6e6ab982
commit
79bfbfdf15
2
config.h
2
config.h
|
@ -37,7 +37,7 @@ static char *colors[][3] = {
|
||||||
static const char *tags[] = { "", "", "3", "", "5", "6", "7", "8", "" };
|
static const char *tags[] = { "", "", "3", "", "5", "6", "7", "8", "" };
|
||||||
|
|
||||||
/* launcher commands (They must be NULL terminated) */
|
/* launcher commands (They must be NULL terminated) */
|
||||||
static const char* grabc[] = { "grabc", "|", "tr", "-d", "'\n'", "|", "xclipboard", "-selection", "clipboard", NULL };
|
static const char* grabc[] = { "grabc", "|", "tr", "-d", "'\n'", "|", "xclip", "-selection", "clipboard", NULL };
|
||||||
static const char* bhev[] = { "firefox", "bhev.ru", NULL };
|
static const char* bhev[] = { "firefox", "bhev.ru", NULL };
|
||||||
static const char* youtube[] = { "firefox", "youtube.com", NULL };
|
static const char* youtube[] = { "firefox", "youtube.com", NULL };
|
||||||
|
|
||||||
|
|
38
dwm.c
38
dwm.c
|
@ -837,8 +837,8 @@ drawstatusbar(Monitor *m, int bh, int extra, char* stext) {
|
||||||
|
|
||||||
if (extra) {
|
if (extra) {
|
||||||
w = m->ww;
|
w = m->ww;
|
||||||
// w = m->ww - w - 2 * hpb;
|
w = m->ww - w - 2 * hpb;
|
||||||
ret = 1;
|
ret = m->ww - w;
|
||||||
x = 0 - 1;
|
x = 0 - 1;
|
||||||
x2 = m->ww - w2 - 2 * hpb;
|
x2 = m->ww - w2 - 2 * hpb;
|
||||||
} else {
|
} else {
|
||||||
|
@ -980,8 +980,6 @@ void
|
||||||
drawbar(Monitor *m)
|
drawbar(Monitor *m)
|
||||||
{
|
{
|
||||||
int x, w, tw = 0;
|
int x, w, tw = 0;
|
||||||
int boxs = drw->fonts->h / 9;
|
|
||||||
int boxw = drw->fonts->h / 6 + 2;
|
|
||||||
unsigned int i, occ = 0, urg = 0;
|
unsigned int i, occ = 0, urg = 0;
|
||||||
Client *c;
|
Client *c;
|
||||||
|
|
||||||
|
@ -1637,9 +1635,14 @@ void
|
||||||
resizemouse(const Arg *arg)
|
resizemouse(const Arg *arg)
|
||||||
{
|
{
|
||||||
int ocx, ocy, nw, nh;
|
int ocx, ocy, nw, nh;
|
||||||
|
int ocx2, ocy2, nx, ny;
|
||||||
Client *c;
|
Client *c;
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
int horizcorner, vertcorner;
|
||||||
|
int di;
|
||||||
|
unsigned int dui;
|
||||||
|
Window dummy;
|
||||||
Time lasttime = 0;
|
Time lasttime = 0;
|
||||||
|
|
||||||
if (!(c = selmon->sel))
|
if (!(c = selmon->sel))
|
||||||
|
@ -1649,10 +1652,19 @@ resizemouse(const Arg *arg)
|
||||||
restack(selmon);
|
restack(selmon);
|
||||||
ocx = c->x;
|
ocx = c->x;
|
||||||
ocy = c->y;
|
ocy = c->y;
|
||||||
|
ocx2 = c->x + c->w;
|
||||||
|
ocy2 = c->y + c->h;
|
||||||
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
|
||||||
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
|
||||||
return;
|
return;
|
||||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
// XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||||
|
if (!XQueryPointer (dpy, c->win, &dummy, &dummy, &di, &di, &nx, &ny, &dui))
|
||||||
|
return;
|
||||||
|
horizcorner = nx < c->w / 2;
|
||||||
|
vertcorner = ny < c->h / 2;
|
||||||
|
XWarpPointer (dpy, None, c->win, 0, 0, 0, 0,
|
||||||
|
horizcorner ? (-c->bw) : (c->w + c->bw -1),
|
||||||
|
vertcorner ? (-c->bw) : (c->h + c->bw -1));
|
||||||
do {
|
do {
|
||||||
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
|
||||||
switch(ev.type) {
|
switch(ev.type) {
|
||||||
|
@ -1666,8 +1678,12 @@ resizemouse(const Arg *arg)
|
||||||
continue;
|
continue;
|
||||||
lasttime = ev.xmotion.time;
|
lasttime = ev.xmotion.time;
|
||||||
|
|
||||||
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
// nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
|
||||||
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
// nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
|
||||||
|
nx = horizcorner ? ev.xmotion.x : c->x;
|
||||||
|
ny = vertcorner ? ev.xmotion.y : c->y;
|
||||||
|
nw = MAX(horizcorner ? (ocx2 - nx) : (ev.xmotion.x - ocx - 2 * c->bw + 1), 1);
|
||||||
|
nh = MAX(vertcorner ? (ocy2 - ny) : (ev.xmotion.y - ocy - 2 * c->bw + 1), 1);
|
||||||
|
|
||||||
if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
|
if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
|
||||||
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
|
||||||
|
@ -1677,11 +1693,15 @@ resizemouse(const Arg *arg)
|
||||||
togglefloating(NULL);
|
togglefloating(NULL);
|
||||||
}
|
}
|
||||||
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
|
||||||
resize(c, c->x, c->y, nw, nh, 1);
|
// resize(c, c->x, c->y, nw, nh, 1);
|
||||||
|
resize(c, nx, ny, nw, nh, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} while (ev.type != ButtonRelease);
|
} while (ev.type != ButtonRelease);
|
||||||
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
// XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
|
||||||
|
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
|
||||||
|
horizcorner ? (-c->bw) : (c->w + c->bw - 1),
|
||||||
|
vertcorner ? (-c->bw) : (c->h + c->bw - 1));
|
||||||
XUngrabPointer(dpy, CurrentTime);
|
XUngrabPointer(dpy, CurrentTime);
|
||||||
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||||
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
|
||||||
|
|
Loading…
Reference in New Issue