Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ed169c4cb |
BIN
KleinDwm/drw.o
BIN
KleinDwm/drw.o
Binary file not shown.
BIN
KleinDwm/dwm
BIN
KleinDwm/dwm
Binary file not shown.
BIN
KleinDwm/dwm-msg
BIN
KleinDwm/dwm-msg
Binary file not shown.
BIN
KleinDwm/dwm.o
BIN
KleinDwm/dwm.o
Binary file not shown.
@@ -1,57 +0,0 @@
|
|||||||
From 286ca3bb1af08b452bf8140abcc23d4ef61baaa2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: bakkeby <bakkeby@gmail.com>
|
|
||||||
Date: Tue, 7 Apr 2020 12:33:04 +0200
|
|
||||||
Subject: [PATCH] Activate a window in response to _NET_ACTIVE_WINDOW
|
|
||||||
|
|
||||||
By default, dwm response to client requests to _NET_ACTIVE_WINDOW client
|
|
||||||
messages by setting the urgency bit on the named window.
|
|
||||||
|
|
||||||
This patch activates the window instead.
|
|
||||||
|
|
||||||
Both behaviours are legitimate according to
|
|
||||||
https://specifications.freedesktop.org/wm-spec/wm-spec-latest.html#idm140200472702304
|
|
||||||
|
|
||||||
One should decide which of these one should perform based on the message
|
|
||||||
senders' untestable claims that it represents the end-user. Setting the
|
|
||||||
urgency bit is the conservative decision. This patch implements the more
|
|
||||||
trusting alternative.
|
|
||||||
|
|
||||||
It also allows dwm to work with `wmctrl -a` and other external window
|
|
||||||
management utilities
|
|
||||||
|
|
||||||
---
|
|
||||||
dwm.c | 11 +++++++++--
|
|
||||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 4465af1..3919d47 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -514,6 +514,7 @@ clientmessage(XEvent *e)
|
|
||||||
{
|
|
||||||
XClientMessageEvent *cme = &e->xclient;
|
|
||||||
Client *c = wintoclient(cme->window);
|
|
||||||
+ unsigned int i;
|
|
||||||
|
|
||||||
if (!c)
|
|
||||||
return;
|
|
||||||
@@ -523,8 +524,14 @@ clientmessage(XEvent *e)
|
|
||||||
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|
|
||||||
|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
|
|
||||||
} else if (cme->message_type == netatom[NetActiveWindow]) {
|
|
||||||
- if (c != selmon->sel && !c->isurgent)
|
|
||||||
- seturgent(c, 1);
|
|
||||||
+ for (i = 0; i < LENGTH(tags) && !((1 << i) & c->tags); i++);
|
|
||||||
+ if (i < LENGTH(tags)) {
|
|
||||||
+ const Arg a = {.ui = 1 << i};
|
|
||||||
+ selmon = c->mon;
|
|
||||||
+ view(&a);
|
|
||||||
+ focus(c);
|
|
||||||
+ restack(selmon);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
#include "colors/space.h"
|
#include "colors/space.h"
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
|
|
||||||
|
#define TERMINAL "alacritty" // default terminal appearance */
|
||||||
#define ICONSIZE 20 /* icon size */
|
#define ICONSIZE 20 /* icon size */
|
||||||
#define ICONSPACING 5 /* space between icon and title */
|
#define ICONSPACING 5 /* space between icon and title */
|
||||||
static const unsigned int borderpx = 2; /* border pixel of windows */
|
static const unsigned int borderpx = 2; /* border pixel of windows */
|
||||||
@@ -22,9 +23,7 @@ static const int user_bh = 8; /* 2 is the default spacing arou
|
|||||||
//static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
//static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||||
//static const char *tags[] = { " \u2680 ", " \u2681 ", " \u2682 ", " \u2683 ", " \u2684 ", " \u2685 ", " \u2661 ", " \u2665 ", "\u266c" }; // Dice Faces
|
//static const char *tags[] = { " \u2680 ", " \u2681 ", " \u2682 ", " \u2683 ", " \u2684 ", " \u2685 ", " \u2661 ", " \u2665 ", "\u266c" }; // Dice Faces
|
||||||
// tag1 tag2 tag3 tag4 tag5 tag6 tag7 tag8 tag9
|
// tag1 tag2 tag3 tag4 tag5 tag6 tag7 tag8 tag9
|
||||||
//static const char *tags[] = { " \uf17c ", " \uf1d8 ", " \uf0ac ", " \uf109 ", " \uf09b ", " \uf02d ", " \uf044 ", " \uf1bc ", " \uf120 " };
|
static const char *tags[] = { " \uf17c ", " \uf1d8 ", " \uf0ac ", " \uf109 ", " \uf09b ", " \uf02d ", " \uf044 ", " \uf1bc ", " \uf120 " };
|
||||||
|
|
||||||
static const char *tags[] = { "\uf17c", "\uf1d8", "\uf0ac", "\uf109", "\uf09b", "\uf02d", "\uf044", "\uf1bc", "\uf120" };
|
|
||||||
|
|
||||||
static const Rule rules[] = {
|
static const Rule rules[] = {
|
||||||
/* xprop(1):
|
/* xprop(1):
|
||||||
@@ -31,7 +31,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ${YAJLLIBS} -lXrender -
|
|||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
|
||||||
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
|
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -march=armv8-a ${INCS} ${CPPFLAGS}
|
||||||
LDFLAGS = ${LIBS}
|
LDFLAGS = ${LIBS}
|
||||||
|
|
||||||
# Solaris
|
# Solaris
|
||||||
BIN
KleinDwm/source/drw.o
Normal file
BIN
KleinDwm/source/drw.o
Normal file
Binary file not shown.
BIN
KleinDwm/source/dwm
Executable file
BIN
KleinDwm/source/dwm
Executable file
Binary file not shown.
@@ -33,7 +33,6 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <sys/epoll.h>
|
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
@@ -87,21 +86,9 @@ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms *
|
|||||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
|
||||||
typedef struct TagState TagState;
|
|
||||||
struct TagState {
|
|
||||||
int selected;
|
|
||||||
int occupied;
|
|
||||||
int urgent;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct ClientState ClientState;
|
|
||||||
struct ClientState {
|
|
||||||
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
long i;
|
int i;
|
||||||
unsigned long ui;
|
unsigned int ui;
|
||||||
float f;
|
float f;
|
||||||
const void *v;
|
const void *v;
|
||||||
} Arg;
|
} Arg;
|
||||||
@@ -130,7 +117,6 @@ struct Client {
|
|||||||
Client *snext;
|
Client *snext;
|
||||||
Monitor *mon;
|
Monitor *mon;
|
||||||
Window win;
|
Window win;
|
||||||
ClientState prevstate;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -149,7 +135,6 @@ typedef struct {
|
|||||||
typedef struct Pertag Pertag;
|
typedef struct Pertag Pertag;
|
||||||
struct Monitor {
|
struct Monitor {
|
||||||
char ltsymbol[16];
|
char ltsymbol[16];
|
||||||
char lastltsymbol[16];
|
|
||||||
float mfact;
|
float mfact;
|
||||||
int nmaster;
|
int nmaster;
|
||||||
int num;
|
int num;
|
||||||
@@ -160,17 +145,14 @@ struct Monitor {
|
|||||||
unsigned int seltags;
|
unsigned int seltags;
|
||||||
unsigned int sellt;
|
unsigned int sellt;
|
||||||
unsigned int tagset[2];
|
unsigned int tagset[2];
|
||||||
TagState tagstate;
|
|
||||||
int showbar;
|
int showbar;
|
||||||
int topbar;
|
int topbar;
|
||||||
Client *clients;
|
Client *clients;
|
||||||
Client *sel;
|
Client *sel;
|
||||||
Client *lastsel;
|
|
||||||
Client *stack;
|
Client *stack;
|
||||||
Monitor *next;
|
Monitor *next;
|
||||||
Window barwin;
|
Window barwin;
|
||||||
const Layout *lt[2];
|
const Layout *lt[2];
|
||||||
const Layout *lastlt;
|
|
||||||
Pertag *pertag;
|
Pertag *pertag;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -229,7 +211,6 @@ static unsigned int getsystraywidth();
|
|||||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
static void grabbuttons(Client *c, int focused);
|
static void grabbuttons(Client *c, int focused);
|
||||||
static void grabkeys(void);
|
static void grabkeys(void);
|
||||||
static int handlexevent(struct epoll_event *ev);
|
|
||||||
static void incnmaster(const Arg *arg);
|
static void incnmaster(const Arg *arg);
|
||||||
static void keypress(XEvent *e);
|
static void keypress(XEvent *e);
|
||||||
static void killclient(const Arg *arg);
|
static void killclient(const Arg *arg);
|
||||||
@@ -260,10 +241,8 @@ static void setclientstate(Client *c, long state);
|
|||||||
static void setfocus(Client *c);
|
static void setfocus(Client *c);
|
||||||
static void setfullscreen(Client *c, int fullscreen);
|
static void setfullscreen(Client *c, int fullscreen);
|
||||||
static void setlayout(const Arg *arg);
|
static void setlayout(const Arg *arg);
|
||||||
static void setlayoutsafe(const Arg *arg);
|
|
||||||
static void setmfact(const Arg *arg);
|
static void setmfact(const Arg *arg);
|
||||||
static void setup(void);
|
static void setup(void);
|
||||||
static void setupepoll(void);
|
|
||||||
static void seturgent(Client *c, int urg);
|
static void seturgent(Client *c, int urg);
|
||||||
static void showhide(Client *c);
|
static void showhide(Client *c);
|
||||||
static void sigchld(int unused);
|
static void sigchld(int unused);
|
||||||
@@ -338,8 +317,6 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|||||||
[UnmapNotify] = unmapnotify
|
[UnmapNotify] = unmapnotify
|
||||||
};
|
};
|
||||||
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
||||||
static int epoll_fd;
|
|
||||||
static int dpy_fd;
|
|
||||||
static int restart = 0;
|
static int restart = 0;
|
||||||
static int running = 1;
|
static int running = 1;
|
||||||
static Cur *cursor[CurLast];
|
static Cur *cursor[CurLast];
|
||||||
@@ -347,20 +324,13 @@ static Clr **scheme;
|
|||||||
static Clr **tagscheme;
|
static Clr **tagscheme;
|
||||||
static Display *dpy;
|
static Display *dpy;
|
||||||
static Drw *drw;
|
static Drw *drw;
|
||||||
static Monitor *mons, *selmon, *lastselmon;
|
static Monitor *mons, *selmon;
|
||||||
static Window root, wmcheckwin;
|
static Window root, wmcheckwin;
|
||||||
static KeySym keychain = -1;
|
static KeySym keychain = -1;
|
||||||
|
|
||||||
#include "ipc.h"
|
|
||||||
/* configuration, allows nested code to access above variables */
|
/* configuration, allows nested code to access above variables */
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifdef VERSION
|
|
||||||
#include "IPCClient.c"
|
|
||||||
#include "yajl_dumps.c"
|
|
||||||
#include "ipc.c"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct Pertag {
|
struct Pertag {
|
||||||
unsigned int curtag, prevtag; /* current and previous tag */
|
unsigned int curtag, prevtag; /* current and previous tag */
|
||||||
int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
|
int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
|
||||||
@@ -602,12 +572,6 @@ cleanup(void)
|
|||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
|
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
|
||||||
XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
|
XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
|
||||||
|
|
||||||
ipc_cleanup();
|
|
||||||
|
|
||||||
if (close(epoll_fd) < 0) {
|
|
||||||
fprintf(stderr, "Failed to close epoll file descriptor\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -633,7 +597,6 @@ clientmessage(XEvent *e)
|
|||||||
XSetWindowAttributes swa;
|
XSetWindowAttributes swa;
|
||||||
XClientMessageEvent *cme = &e->xclient;
|
XClientMessageEvent *cme = &e->xclient;
|
||||||
Client *c = wintoclient(cme->window);
|
Client *c = wintoclient(cme->window);
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
||||||
/* add systray icons */
|
/* add systray icons */
|
||||||
@@ -690,14 +653,8 @@ clientmessage(XEvent *e)
|
|||||||
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|
||||||
|| cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */));
|
|| cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */));
|
||||||
} else if (cme->message_type == netatom[NetActiveWindow]) {
|
} else if (cme->message_type == netatom[NetActiveWindow]) {
|
||||||
for (i = 0; i < LENGTH(tags) && !((1 << i) & c->tags); i++);
|
if (c != selmon->sel && !c->isurgent)
|
||||||
if (i < LENGTH(tags)) {
|
seturgent(c, 1);
|
||||||
const Arg a = {.ui = 1 << i};
|
|
||||||
selmon = c->mon;
|
|
||||||
view(&a);
|
|
||||||
focus(c);
|
|
||||||
restack(selmon);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1380,25 +1337,6 @@ grabkeys(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
handlexevent(struct epoll_event *ev)
|
|
||||||
{
|
|
||||||
if (ev->events & EPOLLIN) {
|
|
||||||
XEvent ev;
|
|
||||||
while (running && XPending(dpy)) {
|
|
||||||
XNextEvent(dpy, &ev);
|
|
||||||
if (handler[ev.type]) {
|
|
||||||
handler[ev.type](&ev); /* call handler */
|
|
||||||
ipc_send_events(mons, &lastselmon, selmon);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (ev-> events & EPOLLHUP) {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
incnmaster(const Arg *arg)
|
incnmaster(const Arg *arg)
|
||||||
{
|
{
|
||||||
@@ -1883,40 +1821,12 @@ restack(Monitor *m)
|
|||||||
void
|
void
|
||||||
run(void)
|
run(void)
|
||||||
{
|
{
|
||||||
int event_count = 0;
|
XEvent ev;
|
||||||
const int MAX_EVENTS = 10;
|
|
||||||
struct epoll_event events[MAX_EVENTS];
|
|
||||||
|
|
||||||
XSync(dpy, False);
|
|
||||||
|
|
||||||
/* main event loop */
|
/* main event loop */
|
||||||
while (running) {
|
XSync(dpy, False);
|
||||||
event_count = epoll_wait(epoll_fd, events, MAX_EVENTS, -1);
|
while (running && !XNextEvent(dpy, &ev))
|
||||||
|
if (handler[ev.type])
|
||||||
for (int i = 0; i < event_count; i++) {
|
handler[ev.type](&ev); /* call handler */
|
||||||
int event_fd = events[i].data.fd;
|
|
||||||
DEBUG("Got event from fd %d\n", event_fd);
|
|
||||||
|
|
||||||
if (event_fd == dpy_fd) {
|
|
||||||
// -1 means EPOLLHUP
|
|
||||||
if (handlexevent(events + i) == -1)
|
|
||||||
return;
|
|
||||||
} else if (event_fd == ipc_get_sock_fd()) {
|
|
||||||
ipc_handle_socket_epoll_event(events + i);
|
|
||||||
} else if (ipc_is_client_registered(event_fd)){
|
|
||||||
if (ipc_handle_client_epoll_event(events + i, mons, &lastselmon, selmon,
|
|
||||||
tags, LENGTH(tags), layouts, LENGTH(layouts)) < 0) {
|
|
||||||
fprintf(stderr, "Error handling IPC event on fd %d\n", event_fd);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
fprintf(stderr, "Got event from unknown fd %d, ptr %p, u32 %d, u64 %lu",
|
|
||||||
event_fd, events[i].data.ptr, events[i].data.u32,
|
|
||||||
events[i].data.u64);
|
|
||||||
fprintf(stderr, " with events %d\n", events[i].events);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -2134,18 +2044,6 @@ setlayout(const Arg *arg)
|
|||||||
drawbar(selmon);
|
drawbar(selmon);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
setlayoutsafe(const Arg *arg)
|
|
||||||
{
|
|
||||||
const Layout *ltptr = (Layout *)arg->v;
|
|
||||||
if (ltptr == 0)
|
|
||||||
setlayout(arg);
|
|
||||||
for (int i = 0; i < LENGTH(layouts); i++) {
|
|
||||||
if (ltptr == &layouts[i])
|
|
||||||
setlayout(arg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* arg > 1.0 will set mfact absolutely */
|
/* arg > 1.0 will set mfact absolutely */
|
||||||
void
|
void
|
||||||
setmfact(const Arg *arg)
|
setmfact(const Arg *arg)
|
||||||
@@ -2248,36 +2146,6 @@ setup(void)
|
|||||||
XSelectInput(dpy, root, wa.event_mask);
|
XSelectInput(dpy, root, wa.event_mask);
|
||||||
grabkeys();
|
grabkeys();
|
||||||
focus(NULL);
|
focus(NULL);
|
||||||
setupepoll();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
setupepoll(void)
|
|
||||||
{
|
|
||||||
epoll_fd = epoll_create1(0);
|
|
||||||
dpy_fd = ConnectionNumber(dpy);
|
|
||||||
struct epoll_event dpy_event;
|
|
||||||
|
|
||||||
// Initialize struct to 0
|
|
||||||
memset(&dpy_event, 0, sizeof(dpy_event));
|
|
||||||
|
|
||||||
DEBUG("Display socket is fd %d\n", dpy_fd);
|
|
||||||
|
|
||||||
if (epoll_fd == -1) {
|
|
||||||
fputs("Failed to create epoll file descriptor", stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
dpy_event.events = EPOLLIN;
|
|
||||||
dpy_event.data.fd = dpy_fd;
|
|
||||||
if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, dpy_fd, &dpy_event)) {
|
|
||||||
fputs("Failed to add display file descriptor to epoll", stderr);
|
|
||||||
close(epoll_fd);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ipc_init(ipcsockpath, epoll_fd, ipccommands, LENGTH(ipccommands)) < 0) {
|
|
||||||
fputs("Failed to initialize IPC\n", stderr);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@@ -2881,18 +2749,10 @@ updatesystray(void)
|
|||||||
void
|
void
|
||||||
updatetitle(Client *c)
|
updatetitle(Client *c)
|
||||||
{
|
{
|
||||||
char oldname[sizeof(c->name)];
|
|
||||||
strcpy(oldname, c->name);
|
|
||||||
|
|
||||||
if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
|
if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
|
||||||
gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
|
gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
|
||||||
if (c->name[0] == '\0') /* hack to mark broken clients */
|
if (c->name[0] == '\0') /* hack to mark broken clients */
|
||||||
strcpy(c->name, broken);
|
strcpy(c->name, broken);
|
||||||
|
|
||||||
for (Monitor *m = mons; m; m = m->next) {
|
|
||||||
if (m->sel == c && strcmp(oldname, c->name) != 0)
|
|
||||||
ipc_focused_title_change_event(m->num, c->win, oldname, c->name);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
BIN
KleinDwm/source/dwm.o
Normal file
BIN
KleinDwm/source/dwm.o
Normal file
Binary file not shown.
@@ -2,7 +2,7 @@
|
|||||||
#include "movestack.c"
|
#include "movestack.c"
|
||||||
#include <X11/XF86keysym.h>
|
#include <X11/XF86keysym.h>
|
||||||
|
|
||||||
#define TERMINAL "st" // default terminal
|
#define TERMINAL "alacritty" // default terminal
|
||||||
|
|
||||||
/* key definitions */
|
/* key definitions */
|
||||||
#define MODKEY Mod4Mask
|
#define MODKEY Mod4Mask
|
||||||
BIN
KleinDwm/source/util.o
Normal file
BIN
KleinDwm/source/util.o
Normal file
Binary file not shown.
BIN
KleinDwm/util.o
BIN
KleinDwm/util.o
Binary file not shown.
12
README.md
12
README.md
@@ -1,9 +1,3 @@
|
|||||||
# Custom Suckless Dynamic Window Manager with added patches.
|
# Suckless Installs - Programs associated with my window manager, and my window manager.
|
||||||
|
## Purpose
|
||||||
## Includes
|
I pretty much use this as my backup system.
|
||||||
- The DWM source.
|
|
||||||
- Statusbar with bash using status2d patches
|
|
||||||
- slstatus
|
|
||||||
- st (simple terminal with changes)
|
|
||||||
- pinentry-dmenu
|
|
||||||
- dmen
|
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Function to check if a command exists
|
|
||||||
command_exists() {
|
|
||||||
command -v "$1" >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
# DWM dependency check (uncomment if necessary)
|
|
||||||
# if ! pgrep -x "dwm" > /dev/null; then
|
|
||||||
# echo "DWM is not running. Please ensure that DWM is installed and is your window manager."
|
|
||||||
# exit 1
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# Check for the status2D dependency
|
|
||||||
if command_exists dwm; then
|
|
||||||
echo "DWM is installed. Make sure you have the status2D patch applied for proper rendering."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Required packages list
|
|
||||||
required_packages=("grep" "gawk" "procps" "coreutils" "lm-sensors" "network-manager" "x11-xserver-utils")
|
|
||||||
|
|
||||||
# Install required packages
|
|
||||||
for pkg in "${required_packages[@]}"; do
|
|
||||||
if ! dpkg -s "$pkg" >/dev/null 2>&1; then
|
|
||||||
echo "Package $pkg is not installed. Installing..."
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y "$pkg"
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
echo "Failed to install $pkg. Please install it manually, or its equivalent, and edit the source code."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Package $pkg is already installed."
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Copy statusbar.sh to /usr/local/bin and make it executable
|
|
||||||
sudo cp statusbar.sh /usr/local/bin/statusbar
|
|
||||||
sudo chmod +x /usr/local/bin/statusbar
|
|
||||||
|
|
||||||
# Create the directory and copy colorvars.sh
|
|
||||||
PREFIX="$HOME/.local/share/statusbar"
|
|
||||||
mkdir -p "$PREFIX"
|
|
||||||
cp colorvars.sh "$PREFIX"
|
|
||||||
|
|
||||||
# Setup the systemd service
|
|
||||||
SERVICE_DIR="$HOME/.config/systemd/user"
|
|
||||||
mkdir -p "$SERVICE_DIR"
|
|
||||||
cp statusbar.service "$SERVICE_DIR"
|
|
||||||
|
|
||||||
# Enable and restart the service
|
|
||||||
systemctl --user enable statusbar.service
|
|
||||||
systemctl --user restart statusbar.service
|
|
||||||
|
|
||||||
echo "Installation completed successfully. The statusbar is installed and the service has been enabled and restarted."
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=SystemBar for DWM from suckless
|
|
||||||
After=default.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
ExecStart=/usr/local/bin/statusbar
|
|
||||||
User=klein
|
|
||||||
Restart=on-failure
|
|
||||||
Environment=DISPLAY=:0
|
|
||||||
Environment=XAUTHORITY=/home/klein/.Xauthority
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=default.target
|
|
||||||
38
customstatusbar/statusbars/install.sh
Executable file
38
customstatusbar/statusbars/install.sh
Executable file
@@ -0,0 +1,38 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
#Check if command exits
|
||||||
|
command_exists() {
|
||||||
|
command -v "$1" >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
#DWM dependency is running
|
||||||
|
if ! pgrep -x "dwm" > /dev/null; then
|
||||||
|
echo "DWM is not running. Please ensure that you got that shit installed and its your window manager."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
#status2d dependency (update later if you find out how)
|
||||||
|
if command_exists dwm; then
|
||||||
|
echo "DWM is installed. Make sure you got status2D patch applied for properrendering."
|
||||||
|
fi
|
||||||
|
|
||||||
|
#Package dependcies
|
||||||
|
requires_packages=("grep" "gawk" "procps" "coreutils" "lm-sensors" "network-manager" "x11-xserver-utils")
|
||||||
|
|
||||||
|
for pkg in "${requires_packages[@]}"; do
|
||||||
|
if ! dpkg -s "$pkg" >/dev/null 2>&1; then
|
||||||
|
echo "Package $pkg is not installed. Installing..."
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install -y "$pkg"
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed to install $pkg. Install it manually, or its equivalent and edit source code"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Package $pkg is installed already. YAY"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
sudo chmod +x /home/klein/DynamicWindowManager/customstatusbar/statusbars/statusbar.sh
|
||||||
|
sudo ln -s /home/klein/DynamicWindowManager/customstatusbar/statusbars/statusbar.sh /usr/local/bin/statusbar
|
||||||
|
|
||||||
|
echo "Installation done. Run statusbar in shell. Installed to local bin"
|
||||||
328
customstatusbar/statusbars/oldstatus2dbar.sh
Normal file
328
customstatusbar/statusbars/oldstatus2dbar.sh
Normal file
@@ -0,0 +1,328 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# This is a relic of the old. Shit sucks
|
||||||
|
|
||||||
|
|
||||||
|
##Global Definitions
|
||||||
|
#Color definitions
|
||||||
|
color_black="#000000" #outline
|
||||||
|
color_white="#ffffff" #default
|
||||||
|
color_green="#00ff00"
|
||||||
|
color_yellow="#ffff00"
|
||||||
|
color_red="#ff0000"
|
||||||
|
color_grey="#555555"
|
||||||
|
|
||||||
|
#Primary scheme - medium orchid
|
||||||
|
color_scheme_1="#c067dd" #background
|
||||||
|
color_scheme_2="#a656c2"
|
||||||
|
color_scheme_3="#8B45A7"
|
||||||
|
color_scheme_4="#71348C" #highlight
|
||||||
|
color_scheme_5="#572371"
|
||||||
|
color_scheme_6="#3C1256"
|
||||||
|
color_scheme_7="#22013B" #default text color
|
||||||
|
|
||||||
|
#Complimentary scheme - pastel green
|
||||||
|
c_color_scheme_1="#84dd67" #Complimentary background color
|
||||||
|
c_color_scheme_2="#72c059"
|
||||||
|
c_color_scheme_3="#60a44b"
|
||||||
|
c_color_scheme_4="#4f883d" #Complimentary highlight
|
||||||
|
c_color_scheme_5="#3f6e30"
|
||||||
|
c_color_scheme_6="#2f5523"
|
||||||
|
c_color_scheme_7="#203d17" #Complimentary txt color
|
||||||
|
|
||||||
|
#GLobal basics
|
||||||
|
basic_y=27
|
||||||
|
basic_x=0
|
||||||
|
|
||||||
|
get_cpu() {
|
||||||
|
local cpu_stats=$(top -bn1 | rep "%pu(s)")
|
||||||
|
local us=$(echo $cpu_stats | awk '{print $2}' | tr -d '%')
|
||||||
|
local sy=$(echo $cpu_stats | awk '{print $4}' | tr -d '%')
|
||||||
|
local ni=$(echo $cpu_stats | awk '{print $6}' | tr -d '%')
|
||||||
|
local id=$(echo $cpu_stats | awk '{print $8}' | tr -d '%')
|
||||||
|
local wa=$(echo $cpu_stats | awk '{print $10}' | tr -d '%')
|
||||||
|
local hi=$(echo $cpu_stats | awk '{print $12}' | tr -d '%')
|
||||||
|
local si=$(echo $cpu_stats | awk '{print $14}' | tr -d '%')
|
||||||
|
local st=$(echo $cpu_stats | awk '{print $16}' | tr -d '%')
|
||||||
|
|
||||||
|
local top_cpu_consumer=$(ps -eo %cpu,comm --sort=-%cpu | head -n 2 | tail -n 1 | awk '{print $2}')
|
||||||
|
top_cpu_consumer="${top_cpu_consumer:0:8}"
|
||||||
|
|
||||||
|
local base_x=$basic_x
|
||||||
|
local base_y=$basic_y
|
||||||
|
local max_height=16
|
||||||
|
local bar_width=3
|
||||||
|
local status_line=""
|
||||||
|
local bg=$color_grey
|
||||||
|
|
||||||
|
declare -A colors=( [us]="#ffd700" [sy]="#ff4500" [ni]="#ff8c00" [id]="#008000"
|
||||||
|
[wa]="#0000ff" [hi]="#4b0082" [si]="#800080" [st]="#a0522d" )
|
||||||
|
|
||||||
|
for state in us sy ni id wa hi si st; do
|
||||||
|
local percentage=$(echo ${!state})
|
||||||
|
if [[ ! "$percentage" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
|
||||||
|
percentage=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
local bar_height=$(echo "$percentage * $max_height / 100" | bc)
|
||||||
|
|
||||||
|
status_line+="^c$bg^^r${base_x},$((base_y - max_height)),${bar_width},${max_height}^"
|
||||||
|
|
||||||
|
local upper_y=$((base_y - bar_height))
|
||||||
|
status_line+="^c${colors[$state]}^^r$base_x,$upper_y,$bar_width,$bar_height^"
|
||||||
|
base_x=$((base_x + bar_width + 2))
|
||||||
|
done
|
||||||
|
|
||||||
|
status_line+="^d^^f30^"
|
||||||
|
|
||||||
|
echo "{[$status_line][User:$us|Sys:$sy]$top_cpu_consumer]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_ram() {
|
||||||
|
local mem_info=$(free -m)
|
||||||
|
local total_mem=$(echo "$mem_info" | awk '/^Mem:/ {print $2}')
|
||||||
|
local used_mem=$(echo "$mem_info" | awk '/^Mem:/ {print $3}')
|
||||||
|
|
||||||
|
local mem_usage=$(awk "BEGIN {printf \"%.0f\", ($used_mem/$total_mem)*100}")
|
||||||
|
|
||||||
|
local max_height=20
|
||||||
|
local bar_height=$((max_height * mem_usage / 100))
|
||||||
|
local bar_width=5
|
||||||
|
local base_x=$basic_x
|
||||||
|
local base_y=$basic_y
|
||||||
|
local color=$color_white
|
||||||
|
local border=$color_black
|
||||||
|
local bg=$color_grey
|
||||||
|
|
||||||
|
local status_line=""
|
||||||
|
status_line+="^c$bg^"
|
||||||
|
status_line+="^r$base_x,$((base_y - max_height)),$((bar_width + 2)),$((max_height + 2))^"
|
||||||
|
status_line+="^c$color^"
|
||||||
|
status_line+="^r$((base_x + 1)),$((base_y - bar_height - 1)),${bar_width},${bar_height}^"
|
||||||
|
status_line+="^d^^f8^"
|
||||||
|
status_line+="${mem_usage}%"
|
||||||
|
|
||||||
|
echo "{[$status_line]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_df() {
|
||||||
|
# Fetch disk usage data
|
||||||
|
local usage_p2=$(df -h | grep '/dev/nvme0n1p2' | awk '{print $5}' | tr -d '%')
|
||||||
|
local usage_p4=$(df -h | grep '/dev/nvme0n1p4' | awk '{print $5}' | tr -d '%')
|
||||||
|
|
||||||
|
# Safeguard against malformed input
|
||||||
|
if [[ ! "$usage_p2" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
|
||||||
|
usage_p2=0
|
||||||
|
fi
|
||||||
|
if [[ ! "$usage_p4" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
|
||||||
|
usage_p4=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Base settings for drawing
|
||||||
|
local base_x=$basic_x
|
||||||
|
local base_y=$basic_y
|
||||||
|
local max_height=20
|
||||||
|
local bar_width=3
|
||||||
|
local status_line=""
|
||||||
|
local bg=$color_grey
|
||||||
|
|
||||||
|
# Define colors for each partition
|
||||||
|
declare -A colors=(
|
||||||
|
[p2]="#FFD700"
|
||||||
|
[p4]="#FF4500"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Define percentages
|
||||||
|
local -A usages=(
|
||||||
|
[p2]=$usage_p2
|
||||||
|
[p4]=$usage_p4
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create a vertical bar for each partition
|
||||||
|
for partition in p2 p4; do
|
||||||
|
local percentage=${usages[$partition]}
|
||||||
|
local bar_height=$(echo "$percentage * $max_height / 100" | bc)
|
||||||
|
|
||||||
|
# Draw the background rectangle for 100% capacity
|
||||||
|
status_line+="^c$bg^^r${base_x},$((base_y - max_height)),${bar_width},${max_height}^"
|
||||||
|
|
||||||
|
# Draw the usage bar on top of the background
|
||||||
|
local upper_y=$((base_y - bar_height))
|
||||||
|
status_line+="^c${colors[$partition]}^^r$base_x,$upper_y,$bar_width,$bar_height^"
|
||||||
|
base_x=$((base_x + bar_width + 2))
|
||||||
|
done
|
||||||
|
|
||||||
|
# Reset formatting and move forward
|
||||||
|
status_line+="^d^^f10^"
|
||||||
|
|
||||||
|
echo "{[$status_line][Sys:$usage_p2%|User:$usage_p4%]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_temperature() {
|
||||||
|
local temp=$(sensors | awk '/Package id 0/ {gsub(/[^0-9.]/, "", $4); print int($4)}')
|
||||||
|
local max_temp=70
|
||||||
|
|
||||||
|
local color=$color_white
|
||||||
|
local bg=$color_scheme_1
|
||||||
|
local outline=$color_white
|
||||||
|
|
||||||
|
if [ "$temp" -gt "$max_temp" ]; then
|
||||||
|
color=$color_red
|
||||||
|
elif [ "$temp" -lt "$max_temp" ]; then
|
||||||
|
color=$color_green
|
||||||
|
fi
|
||||||
|
|
||||||
|
local fill_height=$(($temp * 10 / $max_temp))
|
||||||
|
local base_y=$((basic_y - 22))
|
||||||
|
local temp_icon="^c$outline^"
|
||||||
|
temp_icon+="^r5,$base_y,4,11^"
|
||||||
|
temp_icon+="^c$bg^"
|
||||||
|
temp_icon+="^r6,$((base_y + 4)),2,9^"
|
||||||
|
temp_icon+="^c$color^"
|
||||||
|
temp_icon+="^r6,$((base_y + 7 - fill_height)),2,$fill_height^"
|
||||||
|
temp_icon+="^c$outline^"
|
||||||
|
temp_icon+="^r4,$((base_y + 8)),7,4^"
|
||||||
|
temp_icon+="^r5,$((base_y + 9)),5,4^"
|
||||||
|
temp_icon+="^d^^f10^"
|
||||||
|
echo "^c$color_white^{[^d^$temp_icon $temp°C^c$color_white^]}^d^"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_battery() {
|
||||||
|
local status=$(cat /sys/class/power_supply/BAT0/status)
|
||||||
|
local capacity=$(cat /sys/class/power_supply/BAT0/capacity)
|
||||||
|
local current_now=$(cat /sys/class/power_supply/BAT0/current_now)
|
||||||
|
local voltage_now=$(cat /sys/class/power_supply/BAT0/voltage_now)
|
||||||
|
local power_consumption=$(awk "BEGIN {printf \"%.2f\n\", ($current_now/1000000)*($voltage_now/1000000)}")
|
||||||
|
|
||||||
|
local color=$color_scheme_7
|
||||||
|
local bg=$color_scheme_1
|
||||||
|
local outline=$color_black
|
||||||
|
local color_status=$color_white
|
||||||
|
|
||||||
|
if [[ "$capacity" -le 15 ]]; then
|
||||||
|
color=$color_red
|
||||||
|
shutdown -h now
|
||||||
|
elif [[ "$capacity" -le 25 ]]; then
|
||||||
|
color=$color_yellow
|
||||||
|
else
|
||||||
|
color=$color_green
|
||||||
|
fi
|
||||||
|
|
||||||
|
local fill_width=$(($capacity * 20 / 100))
|
||||||
|
local base_y=$((basic_y - 20))
|
||||||
|
local battery_icon="^c$outline^"
|
||||||
|
battery_icon+="^r2,$base_y,22,10^"
|
||||||
|
battery_icon+="^c$bg^"
|
||||||
|
battery_icon+="^r3,$((base_y +1)),20,8^"
|
||||||
|
battery_icon+="^c$color^"
|
||||||
|
battery_icon+="^r3,$((base_y + 1)),$fill_width,8^"
|
||||||
|
battery_icon+="^c$outline^"
|
||||||
|
battery_icon+="^r0,$((base_y + 3)),2,4^"
|
||||||
|
battery_icon+="^d^^f24^"
|
||||||
|
|
||||||
|
if [[ "$status" == "Full" ]]; then
|
||||||
|
status="F"
|
||||||
|
color_status=$color_green
|
||||||
|
elif [[ "$status" == "Charging" ]]; then
|
||||||
|
status="C"
|
||||||
|
color_status=$c_color_scheme_1
|
||||||
|
elif [[ "$status" == "Discharging" ]]; then
|
||||||
|
status="D"
|
||||||
|
color_status=$color_yellow
|
||||||
|
elif [[ "$status" == "Not charging" ]]; then
|
||||||
|
status="NC"
|
||||||
|
color_status=$color_scheme_4
|
||||||
|
else
|
||||||
|
status="NA"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "{[$battery_icon^c$color^$capacity^d^%]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_wifi() {
|
||||||
|
local color=$color_black
|
||||||
|
local bg=$color_grey
|
||||||
|
local ssid=$(nmcli -t -f active,ssid dev wifi | grep '^yes' | cut -d':' -f2)
|
||||||
|
ssid="${ssid:-No WiFi}"
|
||||||
|
ssid="${ssid:0:15}"
|
||||||
|
|
||||||
|
local dwm=$(grep wlp0s20f3 /proc/net/wireless | awk '{ print int($4) }')
|
||||||
|
local signal_normalized=$(( (dwm + 90) * 100 / 60 ))
|
||||||
|
local signal
|
||||||
|
if [ $signal_normalized -gt 100 ]; then
|
||||||
|
signal=100
|
||||||
|
elif [ $signal_normalized -lt 0 ]; then
|
||||||
|
signal=0
|
||||||
|
else
|
||||||
|
signal=$signal_normalized
|
||||||
|
fi
|
||||||
|
|
||||||
|
local color=$color_white
|
||||||
|
if [ $signal -ge 66 ]; then
|
||||||
|
color=$color_green
|
||||||
|
elif [ $signal -le 33 ]; then
|
||||||
|
color=$color_red
|
||||||
|
elif [ $signal -gt 33 ] && [ $signal -lt 66 ]; then
|
||||||
|
color=$color_yellow
|
||||||
|
fi
|
||||||
|
|
||||||
|
local base_x=$basic_x
|
||||||
|
local base_y=$((basic_y - 7))
|
||||||
|
local max_bars=5
|
||||||
|
local bars_filled=$((signal / 20))
|
||||||
|
|
||||||
|
local wifi_icon="^c$color^"
|
||||||
|
for i in 1 2 3 4 5; do
|
||||||
|
local width=$((3 * i + 1))
|
||||||
|
local height=$((3 * i + 1))
|
||||||
|
local height_placement=$((base_y - height))
|
||||||
|
if [ $i -le $bars_filled ]; then
|
||||||
|
wifi_icon+="^c$color^"
|
||||||
|
else
|
||||||
|
wifi_icon+="^c$bg^"
|
||||||
|
fi
|
||||||
|
wifi_icon+="^r$((base_x + 3 * (i - 1))),$height_placement,$width,$height^"
|
||||||
|
done
|
||||||
|
wifi_icon+="^d^^f18^"
|
||||||
|
|
||||||
|
echo "{[$wifi_icon$ssid[$signal%]]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_screen_width() {
|
||||||
|
local screen_width_px=$(xdpyinfo | awk '/dimensions:/ {print $2}' | cut -dx -f1)
|
||||||
|
echo $((screen_width_px / 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
get_status() {
|
||||||
|
local screen_width=$(get_screen_width)
|
||||||
|
declare -A components=(
|
||||||
|
[cpu]="$(get_cpu)"
|
||||||
|
[ram]="$(get_ram)"
|
||||||
|
[df]="$(get_df)"
|
||||||
|
[temperature]="$(get_temperature)"
|
||||||
|
[battery]="$(get_battery)"
|
||||||
|
[wifi]="$(get_wifi)"
|
||||||
|
)
|
||||||
|
local status_line=""
|
||||||
|
local separator=""
|
||||||
|
local total_length=0
|
||||||
|
local sep_length=${#separator}
|
||||||
|
|
||||||
|
for component in date wifi battery temperature df ram cpu; do
|
||||||
|
local component_output="${components[$component]}"
|
||||||
|
local component_length=$(( ${#component_output} + sep_length ))
|
||||||
|
|
||||||
|
if [[ $((total_length + component_length)) -le $screen_width ]]; then
|
||||||
|
status_line="${component_output}${status_line}"
|
||||||
|
total_length=$((total_length + component_length))
|
||||||
|
else
|
||||||
|
echo "Skipped: $component due to space constraints"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "$status_line"
|
||||||
|
}
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
xsetroot -name "$(get_status)"
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# Source color vars
|
# Source color vars
|
||||||
source "$HOME/.local/share/statusbar/colorvars.sh"
|
source /home/klein/DynamicWindowManager/customstatusbar/statusbars/colorvars.sh
|
||||||
|
|
||||||
# Define Basic Dimentions
|
# Define Basic Dimentions
|
||||||
base_x=0
|
base_x=0
|
||||||
base_y=2
|
base_y=2
|
||||||
max_height=23
|
max_height=15
|
||||||
bar_width=5
|
bar_width=3
|
||||||
gap=5
|
gap=1
|
||||||
|
|
||||||
cpu() {
|
cpu() {
|
||||||
local cpu_line1=$(grep '^cpu ' /proc/stat)
|
local cpu_line1=$(grep '^cpu ' /proc/stat)
|
||||||
@@ -40,10 +40,10 @@ cpu() {
|
|||||||
local status_line=""
|
local status_line=""
|
||||||
status_line+="^c${grey}^^r${base_x},${base_y},${bar_width},${max_height}^"
|
status_line+="^c${grey}^^r${base_x},${base_y},${bar_width},${max_height}^"
|
||||||
status_line+="^c${color}^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
status_line+="^c${color}^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
||||||
status_line+="^d^^f7^"
|
status_line+="^d^^f4^" # buffer of 1
|
||||||
local topcon=$( ps -eo %cpu,comm --sort=-%cpu | head -n 2 | tail -n 1 | awk '{print $2}')
|
# local topcon=$( ps -eo %cpu,comm --sort=-%cpu | head -n 2 | tail -n 1 | awk '{print $2}')
|
||||||
topcon="${topcon:0:5}" # trunkate output
|
# topcon="${topcon:0:5}" # trunkate output
|
||||||
echo "{CPU:${status_line}${usage}% : ${topcon}}"
|
echo "{CPU:${status_line}${usage}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
ram() {
|
ram() {
|
||||||
@@ -56,9 +56,9 @@ ram() {
|
|||||||
local status_line=""
|
local status_line=""
|
||||||
status_line+="^c$grey^^r$base_x,${base_y},${bar_width},${max_height}^"
|
status_line+="^c$grey^^r$base_x,${base_y},${bar_width},${max_height}^"
|
||||||
status_line+="^c$white^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
status_line+="^c$white^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
||||||
status_line+="^d^^f7^"
|
status_line+="^d^^f4^" # buffer of 1
|
||||||
status_line+="${p_mem}%"
|
status_line+="${p_mem}%"
|
||||||
echo "{Mem:$status_line}"
|
echo "M:$status_line"
|
||||||
}
|
}
|
||||||
|
|
||||||
swap() {
|
swap() {
|
||||||
@@ -69,19 +69,19 @@ swap() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
local p_swap=$(awk "BEGIN {printf \"%.0f\", ($u_swap/$t_swap)*100}")
|
local p_swap=$(awk "BEGIN {printf \"%.0f\", ($u_swap/$t_swap)*100}")
|
||||||
local usage_height=$((max_height * p_swap / 100))
|
local usage_height=$((max_height * u_swap / 100))
|
||||||
local usage_y=$((base_y + max_height - usage_height))
|
local usage_y=$((base_y + max_height - usage_height))
|
||||||
local status_line=""
|
local status_line=""
|
||||||
status_line+="^c$grey^^r$base_x,${base_y},${bar_width},${max_height}^"
|
status_line+="^c$grey^^r$base_x,${base_y},${bar_width},${max_height}^"
|
||||||
status_line+="^c$white^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
status_line+="^c$white^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
||||||
status_line+="^d^^f7^"
|
status_line+="^d^^f4^" # buffer of 1
|
||||||
status_line+="${p_swap}%"
|
status_line+="${p_swap}%"
|
||||||
echo "{Swap:$status_line}|"
|
echo "|S:$status_line"
|
||||||
}
|
}
|
||||||
|
|
||||||
disk() {
|
disk() {
|
||||||
local usage_p2=$(df -h | grep '/dev/nvme0n1p2' | awk '{print $5}' | tr -d '%')
|
local usage_p2=$(df -h | grep '/dev/mmcblk0p2' | awk '{print $5}' | tr -d '%')
|
||||||
local usage_p4=$(df -h | grep '/dev/nvme0n1p4' | awk '{print $5}' | tr -d '%')
|
local usage_p4=$(df -h | grep '/dev/mmcblk0p1' | awk '{print $5}' | tr -d '%')
|
||||||
if [[ ! "$usage_p2" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
|
if [[ ! "$usage_p2" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
|
||||||
usage_p2=0
|
usage_p2=0
|
||||||
fi
|
fi
|
||||||
@@ -99,15 +99,15 @@ disk() {
|
|||||||
local usage_y=$((base_y + max_height - usage_height))
|
local usage_y=$((base_y + max_height - usage_height))
|
||||||
status_line+="^c$grey^^r${base_x},${base_y},${bar_width},${max_height}^"
|
status_line+="^c$grey^^r${base_x},${base_y},${bar_width},${max_height}^"
|
||||||
status_line+="^c$white^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
status_line+="^c$white^^r${base_x},${usage_y},${bar_width},${usage_height}^"
|
||||||
base_x=$((base_x + bar_width +2))
|
base_x=$((base_x + bar_width + gap))
|
||||||
done
|
done
|
||||||
status_line+="^d^^f15^"
|
status_line+="^d^^f8^" #Buffer of 1
|
||||||
echo "{Disk:${status_line}R:${usage_p2}%|U:${usage_p4}%}"
|
echo "DF:${status_line}R:${usage_p2}%-U:${usage_p4}%"
|
||||||
}
|
}
|
||||||
|
|
||||||
cpu_temperature(){
|
cpu_temperature(){
|
||||||
local temp=$(sensors | awk '/Package id 0/ {gsub(/[^0-9.]/, "", $4); print int($4)}')
|
local temp=$(awk '{print int($1 / 1000)}' /sys/class/thermal/thermal_zone0/temp)
|
||||||
local max_temp=70
|
local max_temp=80
|
||||||
local color=$white
|
local color=$white
|
||||||
if [ "$temp" -gt "$max_temp" ]; then
|
if [ "$temp" -gt "$max_temp" ]; then
|
||||||
color=$red
|
color=$red
|
||||||
@@ -115,62 +115,73 @@ cpu_temperature(){
|
|||||||
color=$green
|
color=$green
|
||||||
fi
|
fi
|
||||||
local adj_y=5
|
local adj_y=5
|
||||||
local usage_height=$(($temp * 10 / $max_temp))
|
local usage_height=$(($temp * $max_height / $max_temp))
|
||||||
local usage_y=$((adj_y + 10 - usage_height))
|
local usage_y=$((adj_y + 10 - usage_height))
|
||||||
local temp_icon="^c$black^"
|
local temp_icon="^c$black^"
|
||||||
temp_icon+="^r7,${base_y},5,15^" #Bar behind the fill
|
temp_icon+="^r5,14,8,5^" #two rectangles
|
||||||
|
temp_icon+="^r6,16,6,5^" #to mimic a circle
|
||||||
|
temp_icon+="^r7,${base_y},4,${max_height}^" #BG bar
|
||||||
temp_icon+="^c$color^"
|
temp_icon+="^c$color^"
|
||||||
temp_icon+="^r8,${usage_y},3,${usage_height}^" # Fill Bar
|
temp_icon+="^r8,${usage_y},2,${usage_height}^" #C bar
|
||||||
temp_icon+="^c$black^"
|
temp_icon+="^d^^f16^" #Buffer of 1
|
||||||
temp_icon+="^r4,17,11,5^"
|
echo "${temp_icon}${temp}°C"
|
||||||
temp_icon+="^r5,19,9,6^"
|
|
||||||
temp_icon+="^d^^f15^"
|
|
||||||
echo "^c$white^{^d^$temp_icon $temp°C^c$white^}^d^"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
battery() {
|
battery() {
|
||||||
local status=$(cat /sys/class/power_supply/BAT0/status)
|
local throttled=$(cat /sys/devices/platform/soc/soc:firmware/get_throttled)
|
||||||
local capacity=$(cat /sys/class/power_supply/BAT0/capacity)
|
local capacity=0
|
||||||
local color=$white
|
local status=""
|
||||||
if [[ "$capacity" -le 15 ]]; then
|
|
||||||
color=$red
|
if [ $((throttled & 0x1)) -ne 0 ]; then
|
||||||
elif [[ "$capacity" -le 25 ]]; then
|
status+="Under-voltage detected"
|
||||||
color=$yellow
|
|
||||||
else
|
|
||||||
color=$green
|
|
||||||
fi
|
|
||||||
local adj_y=7
|
|
||||||
local fill_width=$(($capacity * 20 / 100))
|
|
||||||
local battery_icon="^c$black^"
|
|
||||||
battery_icon+="^r2,10,24,12^"
|
|
||||||
battery_icon+="^c$grey^"
|
|
||||||
battery_icon+="^r4,12,20,8^"
|
|
||||||
battery_icon+="^c$color^"
|
|
||||||
battery_icon+="^r4,12,$fill_width,8^"
|
|
||||||
battery_icon+="^c$black^"
|
|
||||||
battery_icon+="^r26,13,4,6^"
|
|
||||||
battery_icon+="^d^^f35^"
|
|
||||||
local color_status=$white
|
|
||||||
if [[ "$status" == "Full" ]]; then
|
|
||||||
color_status=$green
|
|
||||||
elif [[ "$status" == "Charging" ]]; then
|
|
||||||
color_status=$green
|
|
||||||
elif [[ "$status" == "Discharging" ]]; then
|
|
||||||
color_status=$grey
|
|
||||||
elif [[ "$status" == "Not charging" ]]; then
|
|
||||||
color_status=$white
|
|
||||||
else
|
|
||||||
status="NA"
|
|
||||||
fi
|
fi
|
||||||
local volt=$(sensors | awk '/BAT0-acpi-0/ {getline; getline; print $2}')
|
if [ $((throttled & 0x2)) -ne 0 ]; then
|
||||||
echo "{${battery_icon}^c${color_status}^${capacity}^d^% ${volt}V}"
|
status+="ARM frequency capped"
|
||||||
|
fi
|
||||||
|
if [ $((throttled & 0x4)) -ne 0 ]; then
|
||||||
|
status+="Currently throttled"
|
||||||
|
fi
|
||||||
|
if [ $((throttled & 0x8)) -ne 0 ]; then
|
||||||
|
status+="Soft temperature limit active"
|
||||||
|
fi
|
||||||
|
if [ $((throttled & 0x10000)) -ne 0 ]; then
|
||||||
|
status+="Under-voltage has occurred since last reboot"
|
||||||
|
fi
|
||||||
|
if [ $((throttled & 0x20000)) -ne 0 ]; then
|
||||||
|
status+="ARM frequency capped has occurred since last reboot"
|
||||||
|
fi
|
||||||
|
if [ $((throttled & 0x40000)) -ne 0 ]; then
|
||||||
|
status+="Throttling has occurred since last reboot"
|
||||||
|
fi
|
||||||
|
if [ $((throttled & 0x80000)) -ne 0 ]; then
|
||||||
|
status+="Soft temperature limit has occurred since last reboot"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$throttled" -eq 0 ]; then
|
||||||
|
status+="No issues detected"
|
||||||
|
capacity=100
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check the core voltage using vcgencmd
|
||||||
|
local volt=$(vcgencmd measure_volts core | awk -F'=' '{print $2}')
|
||||||
|
local fill_width=$(($capacity * 9 / 100)) # corresponds to width of bar
|
||||||
|
local battery_icon="^c$black^"
|
||||||
|
battery_icon+="^r1,8,13,8^"
|
||||||
|
battery_icon+="^c$grey^"
|
||||||
|
battery_icon+="^r3,10,9,4^"
|
||||||
|
battery_icon+="^c$green^"
|
||||||
|
battery_icon+="^r3,10,$fill_width,4^"
|
||||||
|
battery_icon+="^c$black^"
|
||||||
|
battery_icon+="^r14,9,2,4^"
|
||||||
|
battery_icon+="^d^^f17^" #Buffer of 1
|
||||||
|
echo "${battery_icon}${volt}"
|
||||||
}
|
}
|
||||||
|
|
||||||
wifi() {
|
wifi() {
|
||||||
local iface=$(ip -o link show | grep -v "lo:" | awk -F': ' '{print $2}')
|
local iface=$(ip -o link show | grep -v "lo:" | awk -F': ' '{print $2}');
|
||||||
local ssid=$(nmcli -t -f active,ssid dev wifi | grep '^yes' | cut -d':' -f2)
|
local ssid=$(nmcli -t -f active,ssid dev wifi | grep '^yes' | cut -d':' -f2)
|
||||||
ssid="${ssid:-No WiFi}"
|
ssid="${ssid:-No WiFi}"
|
||||||
ssid="${ssid:0:15}"
|
ssid="${ssid:0:5}"
|
||||||
local dwm=$(grep "$iface" /proc/net/wireless | awk '{ print int($4) }')
|
local dwm=$(grep "$iface" /proc/net/wireless | awk '{ print int($4) }')
|
||||||
if [ "$ssid" = "No WiFi" ]; then
|
if [ "$ssid" = "No WiFi" ]; then
|
||||||
local signal=0
|
local signal=0
|
||||||
@@ -199,24 +210,24 @@ wifi() {
|
|||||||
|
|
||||||
local wifi_icon="^c$color^"
|
local wifi_icon="^c$color^"
|
||||||
for i in 1 2 3 4 5; do
|
for i in 1 2 3 4 5; do
|
||||||
local width=$((3 * i + 1))
|
local width=$(( (3 * i) ))
|
||||||
local height=$((3 * i + 1))
|
local height=$(( (3 * i) ))
|
||||||
local adj_y=$((max_height - height))
|
local adj_y=$((max_height - height + 2))
|
||||||
if [ $i -le $bars_filled ]; then
|
if [ $i -le $bars_filled ]; then
|
||||||
wifi_icon+="^c$color^"
|
wifi_icon+="^c$color^"
|
||||||
else
|
else
|
||||||
wifi_icon+="^c$grey^"
|
wifi_icon+="^c$grey^"
|
||||||
fi
|
fi
|
||||||
wifi_icon+="^r$((base_x + 4 * (i - 2))),$adj_y,$width,$height^"
|
wifi_icon+="^r$((base_x + 2 * ( i - 3 ))),$((adj_y + 2)),$width,$height^"
|
||||||
done
|
done
|
||||||
wifi_icon+="^d^^f17^"
|
wifi_icon+="^d^^f7^"
|
||||||
|
|
||||||
echo "{ $wifi_icon$ssid : $signal% }"
|
echo " ${wifi_icon}${ssid} ${signal}%}"
|
||||||
}
|
}
|
||||||
|
|
||||||
status(){
|
status(){
|
||||||
echo "$(cpu)|$(ram)|$(swap)$(disk)|$(cpu_temperature)|$(battery)|$(wifi)"
|
echo "$(cpu)|$(ram)|$(swap)$(disk)|$(cpu_temperature)|$(battery)|$(wifi)"
|
||||||
}
|
}
|
||||||
while true; do
|
while true; do
|
||||||
|
DISPLAY=:0
|
||||||
xsetroot -name "$(status)"
|
xsetroot -name "$(status)"
|
||||||
done
|
done
|
||||||
51
customstatusbar/systrays/brightnesssystray2.sh
Executable file
51
customstatusbar/systrays/brightnesssystray2.sh
Executable file
@@ -0,0 +1,51 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
icon_name="/usr/share/icons/Adwaita/16x16/status/display-brightness-symbolic.symbolic.png"
|
||||||
|
|
||||||
|
# Persistent loop to handle the system tray icon
|
||||||
|
while true
|
||||||
|
do
|
||||||
|
# Command to keep the icon in the systray and open the dialog on click
|
||||||
|
yad --notification --image="$icon_name" \
|
||||||
|
--command="bash -c '\
|
||||||
|
while : ; do \
|
||||||
|
current_brightness=\$(brightnessctl get 2>/dev/null); \
|
||||||
|
max_brightness=\$(brightnessctl max 2>/dev/null); \
|
||||||
|
brightness_percent=\$((current_brightness * 100 / max_brightness)); \
|
||||||
|
command_output=\$(yad --title \"Brightness Control\" --width=300 --height=150 --posx=810 --posy=575 \
|
||||||
|
--form --separator=\",\" --field=\"Set Brightness (0-100):NUM\" \"\$brightness_percent\"!0..100!1 \
|
||||||
|
--scale --value=\$brightness_percent --min-value=0 --max-value=100 --step=1 \
|
||||||
|
--button=\"Increase Brightness\":1 --button=\"Decrease Brightness\":2 --button=gtk-ok:0 --button=gtk-cancel:3 \
|
||||||
|
--fixed --undecorated --on-top --skip-taskbar --skip-pager 2>/dev/null); \
|
||||||
|
ret=\$?; \
|
||||||
|
case \$ret in \
|
||||||
|
0) \
|
||||||
|
new_brightness=\$(echo \$command_output | cut -d ',' -f 1); \
|
||||||
|
brightnessctl set \$new_brightness% > /dev/null 2>&1; \
|
||||||
|
break;; \
|
||||||
|
1) \
|
||||||
|
current_brightness=\$(brightnessctl get 2>/dev/null); \
|
||||||
|
max_brightness=\$(brightnessctl max 2>/dev/null); \
|
||||||
|
brightness_percent=\$((current_brightness * 100 / max_brightness)); \
|
||||||
|
new_brightness=\$((brightness_percent + 10)); \
|
||||||
|
[ \$new_brightness -gt 100 ] && new_brightness=100; \
|
||||||
|
brightnessctl set \$new_brightness% > /dev/null 2>&1; \
|
||||||
|
continue;; \
|
||||||
|
2) \
|
||||||
|
current_brightness=\$(brightnessctl get 2>/dev/null); \
|
||||||
|
max_brightness=\$(brightnessctl max 2>/dev/null); \
|
||||||
|
brightness_percent=\$((current_brightness * 100 / max_brightness)); \
|
||||||
|
new_brightness=\$((brightness_percent - 10)); \
|
||||||
|
[ \$new_brightness -lt 0 ] && new_brightness=0; \
|
||||||
|
brightnessctl set \$new_brightness% > /dev/null 2>&1; \
|
||||||
|
continue;; \
|
||||||
|
3) \
|
||||||
|
break;; \
|
||||||
|
*) \
|
||||||
|
break;; \
|
||||||
|
esac; \
|
||||||
|
done'"
|
||||||
|
|
||||||
|
# Sleep to ensure it doesn't respawn too quickly if closed
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
37
customstatusbar/systrays/brightnesssystray2.sh.bak
Executable file
37
customstatusbar/systrays/brightnesssystray2.sh.bak
Executable file
@@ -0,0 +1,37 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
icon_name="/usr/share/icons/Adwaita/16x16/status/display-brightness-symbolic.symbolic.png"
|
||||||
|
|
||||||
|
# Persistent loop to handle the system tray icon
|
||||||
|
while true
|
||||||
|
do
|
||||||
|
# Command to keep the icon in the systray and open the dialog on click
|
||||||
|
yad --notification --image="$icon_name" \
|
||||||
|
--command="bash -c '\
|
||||||
|
while : ; do \
|
||||||
|
current_brightness=\$(brightnessctl get 2>/dev/null); \
|
||||||
|
max_brightness=\$(brightnessctl max 2>/dev/null); \
|
||||||
|
brightness_percent=\$((current_brightness * 100 / max_brightness)); \
|
||||||
|
command_output=\$(yad --title \"Brightness Control\" --width=300 --height=50 --posx=810 --posy=575 \
|
||||||
|
--form --separator=\",\" --field=\"Set Brightness (0-100):NUM\" \"\$brightness_percent\"!0..100!1 \
|
||||||
|
--button=\"Apply\":0 --button=\"Increase Brightness:1\" --button=\"Decrease Brightness:2\" --button=gtk-cancel:3 \
|
||||||
|
--fixed --undecorated --on-top --skip-taskbar --skip-pager 2>/dev/null); \
|
||||||
|
ret=\$?; \
|
||||||
|
case \$ret in \
|
||||||
|
0) \
|
||||||
|
new_brightness=\$(echo \$command_output | cut -d ',' -f 1); \
|
||||||
|
brightnessctl set \$new_brightness% > /dev/null 2>&1;; \
|
||||||
|
1) \
|
||||||
|
brightnessctl set +10% > /dev/null 2>&1;; \
|
||||||
|
2) \
|
||||||
|
brightnessctl set 10%- > /dev/null 2>&1;; \
|
||||||
|
3) \
|
||||||
|
break;; \
|
||||||
|
*) \
|
||||||
|
break;; \
|
||||||
|
esac; \
|
||||||
|
done'"
|
||||||
|
|
||||||
|
# Sleep to ensure it doesn't respawn too quickly if closed
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
17
customstatusbar/systrays/expansivesystray.sh
Executable file
17
customstatusbar/systrays/expansivesystray.sh
Executable file
@@ -0,0 +1,17 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Icon path
|
||||||
|
icon_path="/usr/share/icons/Adwaita/16x16/devices/display-symbolic.symbolic.png"
|
||||||
|
|
||||||
|
# Persistent loop to handle the system tray icon
|
||||||
|
while true; do
|
||||||
|
yad --notification --image="$icon_path" \
|
||||||
|
--command="bash -c 'if pgrep -x conky > /dev/null; then killall conky; else conky & disown; fi'" &
|
||||||
|
|
||||||
|
# Wait for the tray icon to be closed
|
||||||
|
wait $!
|
||||||
|
|
||||||
|
# Sleep to ensure it doesn't respawn too quickly if closed
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
43
customstatusbar/systrays/screenshotsystray.sh
Executable file
43
customstatusbar/systrays/screenshotsystray.sh
Executable file
@@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Icon path
|
||||||
|
icon_path="/usr/share/icons/Adwaita/16x16/devices/camera-photo-symbolic.symbolic.png"
|
||||||
|
|
||||||
|
# Directory to save screenshots
|
||||||
|
screenshot_dir="/home/klein/Pictures/screenshots"
|
||||||
|
export screenshot_dir # Export the directory path
|
||||||
|
|
||||||
|
# Ensure directory exists
|
||||||
|
mkdir -p "$screenshot_dir"
|
||||||
|
|
||||||
|
# Persistent loop to handle the system tray icon
|
||||||
|
while true; do
|
||||||
|
yad --notification --image="$icon_path" \
|
||||||
|
--command="bash -c '\
|
||||||
|
while :; do \
|
||||||
|
yad --title \"Screenshot Tool\" --width=300 --height=50 \
|
||||||
|
--button=\"Full Screen:0\" --button=\"Select Window:1\" --button=\"Cancel:2\" \
|
||||||
|
--center; \
|
||||||
|
ret=\$?; \
|
||||||
|
counter=1; \
|
||||||
|
while true; do \
|
||||||
|
file_path=\"\$screenshot_dir/Screenshot_\${counter}.png\"; \
|
||||||
|
if [[ ! -f \"\$file_path\" ]]; then \
|
||||||
|
break; \
|
||||||
|
fi; \
|
||||||
|
((counter++)); \
|
||||||
|
done; \
|
||||||
|
case \$ret in \
|
||||||
|
0) \
|
||||||
|
scrot \"\$file_path\"; \
|
||||||
|
break; ;; \
|
||||||
|
1) \
|
||||||
|
scrot -s \"\$file_path\"; \
|
||||||
|
break; ;; \
|
||||||
|
2|*) \
|
||||||
|
break; ;; \
|
||||||
|
esac; \
|
||||||
|
done'" \
|
||||||
|
# Sleep to ensure it doesn't respawn too quickly if closed
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
BIN
dmenu/dmenu
BIN
dmenu/dmenu
Binary file not shown.
BIN
dmenu/dmenu.o
BIN
dmenu/dmenu.o
Binary file not shown.
BIN
dmenu/drw.o
BIN
dmenu/drw.o
Binary file not shown.
BIN
dmenu/stest
BIN
dmenu/stest
Binary file not shown.
BIN
dmenu/stest.o
BIN
dmenu/stest.o
Binary file not shown.
BIN
dmenu/util.o
BIN
dmenu/util.o
Binary file not shown.
Binary file not shown.
@@ -120,8 +120,8 @@ static const char *colorname[] = {
|
|||||||
/* more colors can be added after 255 to use with DefaultXX */
|
/* more colors can be added after 255 to use with DefaultXX */
|
||||||
"#cccccc",
|
"#cccccc",
|
||||||
"#555555",
|
"#555555",
|
||||||
"#ffb2b7", /* default foreground colour */
|
"gray90", /* default foreground colour */
|
||||||
"#011627", /* default background colour */
|
"black", /* default background colour */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -141,7 +141,7 @@ static unsigned int defaultrcs = 257;
|
|||||||
* 6: Bar ("|")
|
* 6: Bar ("|")
|
||||||
* 7: Snowman ("☃")
|
* 7: Snowman ("☃")
|
||||||
*/
|
*/
|
||||||
static unsigned int cursorshape = 4;
|
static unsigned int cursorshape = 2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Default columns and rows numbers
|
* Default columns and rows numbers
|
||||||
|
|||||||
Reference in New Issue
Block a user