mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
117 lines
3.3 KiB
Diff
117 lines
3.3 KiB
Diff
diff --git a/config.def.h b/config.def.h
|
|
index 835581f..5f9606e 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -7,6 +7,7 @@ static const unsigned int gappx = 10; /* default gap between windows i
|
|
static const unsigned int snap = 32; /* snap pixel */
|
|
static const int showbar = 1; /* 0 means no bar */
|
|
static const int topbar = 1; /* 0 means bottom bar */
|
|
+static const int focusonwheel = 0;
|
|
static const int vertpad = 10; /* vertical padding of bar */
|
|
static const int sidepad = 10; /* horizontal padding of bar */
|
|
static const char *fonts[] = { "monospace:size=10" };
|
|
diff --git a/dwm.c b/dwm.c
|
|
index f125a4d..61ca793 100644
|
|
--- a/dwm.c
|
|
+++ b/dwm.c
|
|
@@ -168,7 +168,6 @@ static void detachstack(Client *c);
|
|
static Monitor *dirtomon(int dir);
|
|
static void drawbar(Monitor *m);
|
|
static void drawbars(void);
|
|
-static void enternotify(XEvent *e);
|
|
static void expose(XEvent *e);
|
|
static void focus(Client *c);
|
|
static void focusin(XEvent *e);
|
|
@@ -187,7 +186,6 @@ static void manage(Window w, XWindowAttributes *wa);
|
|
static void mappingnotify(XEvent *e);
|
|
static void maprequest(XEvent *e);
|
|
static void monocle(Monitor *m);
|
|
-static void motionnotify(XEvent *e);
|
|
static void movemouse(const Arg *arg);
|
|
static Client *nexttiled(Client *c);
|
|
static void pop(Client *c);
|
|
@@ -259,13 +257,11 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|
[ConfigureRequest] = configurerequest,
|
|
[ConfigureNotify] = configurenotify,
|
|
[DestroyNotify] = destroynotify,
|
|
- [EnterNotify] = enternotify,
|
|
[Expose] = expose,
|
|
[FocusIn] = focusin,
|
|
[KeyPress] = keypress,
|
|
[MappingNotify] = mappingnotify,
|
|
[MapRequest] = maprequest,
|
|
- [MotionNotify] = motionnotify,
|
|
[PropertyNotify] = propertynotify,
|
|
[UnmapNotify] = unmapnotify
|
|
};
|
|
@@ -436,7 +432,8 @@ buttonpress(XEvent *e)
|
|
|
|
click = ClkRootWin;
|
|
/* focus monitor if necessary */
|
|
- if ((m = wintomon(ev->window)) && m != selmon) {
|
|
+ if ((m = wintomon(ev->window)) && m != selmon
|
|
+ && (focusonwheel || (ev->button != Button4 && ev->button != Button5))) {
|
|
unfocus(selmon->sel, 1);
|
|
selmon = m;
|
|
focus(NULL);
|
|
@@ -456,8 +453,8 @@ buttonpress(XEvent *e)
|
|
else
|
|
click = ClkWinTitle;
|
|
} else if ((c = wintoclient(ev->window))) {
|
|
- focus(c);
|
|
- restack(selmon);
|
|
+ if (focusonwheel || (ev->button != Button4 && ev->button != Button5))
|
|
+ focus(c);
|
|
XAllowEvents(dpy, ReplayPointer, CurrentTime);
|
|
click = ClkClientWin;
|
|
}
|
|
@@ -769,25 +766,6 @@ drawbars(void)
|
|
drawbar(m);
|
|
}
|
|
|
|
-void
|
|
-enternotify(XEvent *e)
|
|
-{
|
|
- Client *c;
|
|
- Monitor *m;
|
|
- XCrossingEvent *ev = &e->xcrossing;
|
|
-
|
|
- if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
|
|
- return;
|
|
- c = wintoclient(ev->window);
|
|
- m = c ? c->mon : wintomon(ev->window);
|
|
- if (m != selmon) {
|
|
- unfocus(selmon->sel, 1);
|
|
- selmon = m;
|
|
- } else if (!c || c == selmon->sel)
|
|
- return;
|
|
- focus(c);
|
|
-}
|
|
-
|
|
void
|
|
expose(XEvent *e)
|
|
{
|
|
@@ -1136,23 +1114,6 @@ monocle(Monitor *m)
|
|
resize(c, m->wx - c->bw, m->wy, m->ww, m->wh, False);
|
|
}
|
|
|
|
-void
|
|
-motionnotify(XEvent *e)
|
|
-{
|
|
- static Monitor *mon = NULL;
|
|
- Monitor *m;
|
|
- XMotionEvent *ev = &e->xmotion;
|
|
-
|
|
- if (ev->window != root)
|
|
- return;
|
|
- if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
|
|
- unfocus(selmon->sel, 1);
|
|
- selmon = m;
|
|
- focus(NULL);
|
|
- }
|
|
- mon = m;
|
|
-}
|
|
-
|
|
void
|
|
movemouse(const Arg *arg)
|
|
{
|