mirror of
https://github.com/dylanaraps/sowm.git
synced 2025-07-30 19:51:57 -07:00
100 lines
3.4 KiB
Diff
100 lines
3.4 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 8573837..72e9542 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,5 +1,5 @@
|
|
CFLAGS+= -std=c99 -Wall -Wextra -pedantic
|
|
-LDADD+= -lX11
|
|
+LDADD+= -lX11 -lXinerama
|
|
LDFLAGS=
|
|
PREFIX?= /usr
|
|
BINDIR?= $(PREFIX)/bin
|
|
diff --git a/sowm.c b/sowm.c
|
|
index 0cc1293..ead3f6c 100644
|
|
--- a/sowm.c
|
|
+++ b/sowm.c
|
|
@@ -4,6 +4,7 @@
|
|
#include <X11/XF86keysym.h>
|
|
#include <X11/keysym.h>
|
|
#include <X11/XKBlib.h>
|
|
+#include <X11/extensions/Xinerama.h>
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
#include <unistd.h>
|
|
@@ -48,7 +49,7 @@ static void ws_go(const Arg arg);
|
|
static int xerror() { return 0;}
|
|
|
|
static client *list = {0}, *ws_list[10] = {0}, *cur;
|
|
-static int ws = 1, sw, sh, wx, wy;
|
|
+static int ws = 1, sw, sh, wx, wy, monitors;
|
|
static unsigned int ww, wh;
|
|
|
|
static Display *d;
|
|
@@ -97,6 +98,7 @@ void notify_enter(XEvent *e) {
|
|
|
|
void notify_motion(XEvent *e) {
|
|
if (!mouse.subwindow) return;
|
|
+ if (cur->f == 1) return;
|
|
|
|
while(XCheckTypedEvent(d, MotionNotify, e));
|
|
|
|
@@ -108,6 +110,7 @@ void notify_motion(XEvent *e) {
|
|
wy + (mouse.button == 1 ? yd : 0),
|
|
ww + (mouse.button == 3 ? xd : 0),
|
|
wh + (mouse.button == 3 ? yd : 0));
|
|
+ win_size(cur->w, &cur->wx, &cur->wy, &cur->ww, &cur->wh);
|
|
}
|
|
|
|
void key_press(XEvent *e) {
|
|
@@ -172,12 +175,28 @@ void win_kill() {
|
|
if (cur) XKillClient(d, cur->w);
|
|
}
|
|
|
|
+int coords_in_box (int x, int y, int box_x, int box_y, int box_w, int box_h) {
|
|
+ return ((x >= box_x && x < box_x + box_w) && (y >= box_y && y < box_y + box_h));
|
|
+}
|
|
+
|
|
void win_center() {
|
|
if (!cur) return;
|
|
|
|
win_size(cur->w, &(int){0}, &(int){0}, &ww, &wh);
|
|
|
|
- XMoveWindow(d, cur->w, (sw - ww) / 2, (sh - wh) / 2);
|
|
+ if (XineramaIsActive(d)) {
|
|
+ XineramaScreenInfo *screen_info = XineramaQueryScreens(d, &monitors);
|
|
+ for (int i = 0; i < monitors; i++) {
|
|
+ if (coords_in_box(cur->wx + (cur->ww / 2), cur->wy + (cur->wh / 2),
|
|
+ screen_info[i].x_org, screen_info[i].y_org,
|
|
+ screen_info[i].width, screen_info[i].height))
|
|
+ XMoveWindow(d, cur->w,
|
|
+ screen_info[i].x_org + ((screen_info[i].width - ww) / 2),
|
|
+ screen_info[i].y_org + ((screen_info[i].height - wh) / 2));
|
|
+ }
|
|
+ } else
|
|
+ XMoveWindow(d, cur->w, (sw - ww) / 2, (sh - wh) / 2);
|
|
+ win_size(cur->w, &cur->wx, &cur->wy, &cur->ww, &cur->wh);
|
|
}
|
|
|
|
void win_fs() {
|
|
@@ -185,8 +204,18 @@ void win_fs() {
|
|
|
|
if ((cur->f = cur->f ? 0 : 1)) {
|
|
win_size(cur->w, &cur->wx, &cur->wy, &cur->ww, &cur->wh);
|
|
- XMoveResizeWindow(d, cur->w, 0, 0, sw, sh);
|
|
-
|
|
+ if (XineramaIsActive(d)) {
|
|
+ XineramaScreenInfo *screen_info = XineramaQueryScreens(d, &monitors);
|
|
+ for (int i = 0; i < monitors; i++) {
|
|
+ if (coords_in_box(cur->wx + (cur->ww / 2), cur->wy + (cur->wh / 2),
|
|
+ screen_info[i].x_org, screen_info[i].y_org,
|
|
+ screen_info[i].width, screen_info[i].height))
|
|
+ XMoveResizeWindow(d, cur->w,
|
|
+ screen_info[i].x_org, screen_info[i].y_org,
|
|
+ screen_info[i].width, screen_info[i].height);
|
|
+ }
|
|
+ } else
|
|
+ XMoveResizeWindow(d, cur->w, 0, 0, sw, sh);
|
|
} else
|
|
XMoveResizeWindow(d, cur->w, cur->wx, cur->wy, cur->ww, cur->wh);
|
|
}
|