2 Commits
1.5 ... round

Author SHA1 Message Date
Dylan Araps
7215a4915d sowm: Rounded corners 2020-02-21 18:12:32 +02:00
Dylan Araps
f201a467ea sowm: Fix linker errors. Closes #61 2020-02-21 18:08:47 +02:00
4 changed files with 45 additions and 1 deletions

View File

@@ -10,7 +10,7 @@ config.h:
cp config.def.h config.h cp config.def.h config.h
sowm: sowm:
$(CC) -O3 $(CFLAGS) -lX11 $(LDFLAGS) -o sowm sowm.c $(CC) -O3 $(CFLAGS) -o sowm sowm.c -lX11 -lXext $(LDFLAGS)
install: all install: all
install -Dm755 sowm $(DESTDIR)$(BINDIR)/sowm install -Dm755 sowm $(DESTDIR)$(BINDIR)/sowm

View File

@@ -2,6 +2,7 @@
#define CONFIG_H #define CONFIG_H
#define MOD Mod4Mask #define MOD Mod4Mask
#define ROUND_CORNERS 20
const char* menu[] = {"dmenu_run", 0}; const char* menu[] = {"dmenu_run", 0};
const char* term[] = {"st", 0}; const char* term[] = {"st", 0};

42
sowm.c
View File

@@ -4,6 +4,7 @@
#include <X11/XF86keysym.h> #include <X11/XF86keysym.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/extensions/shape.h>
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
@@ -61,6 +62,9 @@ void notify_motion(XEvent *e) {
wy + (mouse.button == 1 ? yd : 0), wy + (mouse.button == 1 ? yd : 0),
MAX(1, ww + (mouse.button == 3 ? xd : 0)), MAX(1, ww + (mouse.button == 3 ? xd : 0)),
MAX(1, wh + (mouse.button == 3 ? yd : 0))); MAX(1, wh + (mouse.button == 3 ? yd : 0)));
if (mouse.button == 3)
win_round_corners(mouse.subwindow, ROUND_CORNERS);
} }
void key_press(XEvent *e) { void key_press(XEvent *e) {
@@ -142,6 +146,41 @@ void win_fs(const Arg arg) {
} else { } else {
XMoveResizeWindow(d, cur->w, cur->wx, cur->wy, cur->ww, cur->wh); XMoveResizeWindow(d, cur->w, cur->wx, cur->wy, cur->ww, cur->wh);
} }
win_round_corners(cur->w, cur->f ? 0 : ROUND_CORNERS);
}
void win_round_corners(Window w, int rad) {
unsigned int ww, wh, dia = 2 * rad;
win_size(w, &(int){1}, &(int){1}, &ww, &wh);
if (ww < dia || wh < dia) return;
Pixmap mask = XCreatePixmap(d, w, ww, wh, 1);
if (!mask) return;
XGCValues xgcv;
GC shape_gc = XCreateGC(d, mask, 0, &xgcv);
if (!shape_gc) {
XFreePixmap(d, mask);
return;
}
XSetForeground(d, shape_gc, 0);
XFillRectangle(d, mask, shape_gc, 0, 0, ww, wh);
XSetForeground(d, shape_gc, 1);
XFillArc(d, mask, shape_gc, 0, 0, dia, dia, 0, 23040);
XFillArc(d, mask, shape_gc, ww-dia-1, 0, dia, dia, 0, 23040);
XFillArc(d, mask, shape_gc, 0, wh-dia-1, dia, dia, 0, 23040);
XFillArc(d, mask, shape_gc, ww-dia-1, wh-dia-1, dia, dia, 0, 23040);
XFillRectangle(d, mask, shape_gc, rad, 0, ww-dia, wh);
XFillRectangle(d, mask, shape_gc, 0, rad, ww, wh-dia);
XShapeCombineMask(d, w, ShapeBounding, 0, 0, mask, ShapeSet);
XFreePixmap(d, mask);
XFreeGC(d, shape_gc);
} }
void win_to_ws(const Arg arg) { void win_to_ws(const Arg arg) {
@@ -205,6 +244,8 @@ void configure_request(XEvent *e) {
.sibling = ev->above, .sibling = ev->above,
.stack_mode = ev->detail .stack_mode = ev->detail
}); });
win_round_corners(ev->window, ROUND_CORNERS);
} }
void map_request(XEvent *e) { void map_request(XEvent *e) {
@@ -217,6 +258,7 @@ void map_request(XEvent *e) {
if (wx + wy == 0) win_center((Arg){0}); if (wx + wy == 0) win_center((Arg){0});
win_round_corners(w, ROUND_CORNERS);
XMapWindow(d, w); XMapWindow(d, w);
win_focus(list->prev); win_focus(list->prev);
} }

1
sowm.h
View File

@@ -51,6 +51,7 @@ void win_focus(client *c);
void win_kill(const Arg arg); void win_kill(const Arg arg);
void win_prev(const Arg arg); void win_prev(const Arg arg);
void win_next(const Arg arg); void win_next(const Arg arg);
void win_round_corners(Window w, int rad);
void win_to_ws(const Arg arg); void win_to_ws(const Arg arg);
void ws_go(const Arg arg); void ws_go(const Arg arg);