fixed fonts, added newsboat
This commit is contained in:
parent
2a34895dbe
commit
79d3f56a64
23 changed files with 2892 additions and 37 deletions
|
@ -195,6 +195,11 @@ static void resizemouse(const Arg *arg);
|
|||
static void restack(Monitor *m);
|
||||
static void run(void);
|
||||
static void scan(void);
|
||||
static void scratchpad_hide();
|
||||
static void scratchpad_remove();
|
||||
static void scratchpad_show();
|
||||
static void scratchpad_show_client(Client *c);
|
||||
static void scratchpad_show_first(int scratchNum);
|
||||
static int sendevent(Client *c, Atom proto);
|
||||
static void sendmon(Client *c, Monitor *m);
|
||||
static void setclientstate(Client *c, long state);
|
||||
|
@ -269,11 +274,20 @@ static Drw *drw;
|
|||
static Monitor *mons, *selmon;
|
||||
static Window root, wmcheckwin;
|
||||
|
||||
/* scratchpad */
|
||||
#define SCRATCHPAD_MASK_1 (1u << sizeof tags / sizeof * tags)
|
||||
#define SCRATCHPAD_MASK_2 (1u << (sizeof tags / sizeof * tags + 1))
|
||||
#define SCRATCHPAD_MASK_3 (1u << (sizeof tags / sizeof * tags + 2))
|
||||
static int scratchpad_hide_flag = 0;
|
||||
static Client *scratchpad_last_showed_1 = NULL;
|
||||
static Client *scratchpad_last_showed_2 = NULL;
|
||||
static Client *scratchpad_last_showed_3 = NULL;
|
||||
|
||||
/* configuration, allows nested code to access above variables */
|
||||
#include "config.h"
|
||||
|
||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
||||
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
||||
struct NumTags { char limitexceeded[LENGTH(tags) > 28 ? -1 : 1]; };
|
||||
|
||||
/* function implementations */
|
||||
void
|
||||
|
@ -309,7 +323,9 @@ applyrules(Client *c)
|
|||
XFree(ch.res_class);
|
||||
if (ch.res_name)
|
||||
XFree(ch.res_name);
|
||||
if(c->tags != SCRATCHPAD_MASK_1 && c->tags != SCRATCHPAD_MASK_2 && c->tags != SCRATCHPAD_MASK_3) {
|
||||
c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
|
@ -1062,13 +1078,15 @@ manage(Window w, XWindowAttributes *wa)
|
|||
c->y = MAX(c->y, c->mon->wy);
|
||||
c->bw = borderpx;
|
||||
|
||||
wc.border_width = c->bw;
|
||||
wc.border_width = c->bw;
|
||||
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
|
||||
XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
|
||||
configure(c); /* propagates border_width, if size doesn't change */
|
||||
updatewindowtype(c);
|
||||
updatesizehints(c);
|
||||
updatewmhints(c);
|
||||
c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
|
||||
c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
|
||||
XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
|
||||
grabbuttons(c, 0);
|
||||
if (!c->isfloating)
|
||||
|
@ -1418,6 +1436,124 @@ scan(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void scratchpad_hide(const Arg *arg) {
|
||||
if(scratchpad_hide_flag < 4) {
|
||||
if(arg->i == 1) {
|
||||
if(selmon->sel) {
|
||||
selmon->sel->tags = SCRATCHPAD_MASK_1;
|
||||
selmon->sel->isfloating = 1;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
scratchpad_hide_flag++;
|
||||
}
|
||||
}
|
||||
else if(arg->i == 2) {
|
||||
if(selmon->sel) {
|
||||
selmon->sel->tags = SCRATCHPAD_MASK_2;
|
||||
selmon->sel->isfloating = 1;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
scratchpad_hide_flag++;
|
||||
}
|
||||
}
|
||||
else if(arg->i == 3) {
|
||||
if(selmon->sel) {
|
||||
selmon->sel->tags = SCRATCHPAD_MASK_3;
|
||||
selmon->sel->isfloating = 1;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
scratchpad_hide_flag++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void scratchpad_remove() {
|
||||
if(selmon->sel && (scratchpad_last_showed_1 != NULL || scratchpad_last_showed_2 != NULL ||scratchpad_last_showed_3 != NULL) && (selmon->sel == scratchpad_last_showed_1 || selmon->sel == scratchpad_last_showed_2 || selmon->sel == scratchpad_last_showed_3)) {
|
||||
if(scratchpad_last_showed_1 == selmon->sel) {
|
||||
scratchpad_last_showed_1 = NULL;
|
||||
scratchpad_hide_flag--;
|
||||
}
|
||||
else if(scratchpad_last_showed_2 == selmon->sel) {
|
||||
scratchpad_last_showed_2 = NULL;
|
||||
scratchpad_hide_flag--;
|
||||
}
|
||||
else if(scratchpad_last_showed_3 == selmon->sel) {
|
||||
scratchpad_last_showed_3 = NULL;
|
||||
scratchpad_hide_flag--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void scratchpad_show(const Arg *arg) {
|
||||
if(arg->i == 1) {
|
||||
if(scratchpad_last_showed_1 == NULL) {
|
||||
scratchpad_show_first(arg->i);
|
||||
}
|
||||
else {
|
||||
if(scratchpad_last_showed_1->tags != SCRATCHPAD_MASK_1) {
|
||||
scratchpad_last_showed_1->tags = SCRATCHPAD_MASK_1;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
}
|
||||
else {
|
||||
scratchpad_show_first(arg->i);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(arg->i == 2) {
|
||||
if(scratchpad_last_showed_2 == NULL) {
|
||||
scratchpad_show_first(arg->i);
|
||||
}
|
||||
else {
|
||||
if(scratchpad_last_showed_2->tags != SCRATCHPAD_MASK_2) {
|
||||
scratchpad_last_showed_2->tags = SCRATCHPAD_MASK_2;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
}
|
||||
else {
|
||||
scratchpad_show_first(arg->i);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(arg->i == 3) {
|
||||
if(scratchpad_last_showed_3 == NULL) {
|
||||
scratchpad_show_first(arg->i);
|
||||
}
|
||||
else {
|
||||
if(scratchpad_last_showed_3->tags != SCRATCHPAD_MASK_3) {
|
||||
scratchpad_last_showed_3->tags = SCRATCHPAD_MASK_3;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
}
|
||||
else {
|
||||
scratchpad_show_first(arg->i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void scratchpad_show_client(Client *c) {
|
||||
c->tags = selmon->tagset[selmon->seltags];
|
||||
focus(c);
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
static void scratchpad_show_first(int scratchNum) {
|
||||
for(Client *c = selmon->clients; c !=NULL; c = c->next) {
|
||||
if(c->tags == SCRATCHPAD_MASK_1 && scratchNum == 1) {
|
||||
scratchpad_last_showed_1 = c;
|
||||
scratchpad_show_client(c);
|
||||
} else if(c->tags == SCRATCHPAD_MASK_2 && scratchNum == 2) {
|
||||
scratchpad_last_showed_2 = c;
|
||||
scratchpad_show_client(c);
|
||||
} else if(c->tags == SCRATCHPAD_MASK_3 && scratchNum == 3) {
|
||||
scratchpad_last_showed_3 = c;
|
||||
scratchpad_show_client(c);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
sendmon(Client *c, Monitor *m)
|
||||
{
|
||||
|
@ -1803,6 +1939,16 @@ unmanage(Client *c, int destroyed)
|
|||
XSetErrorHandler(xerror);
|
||||
XUngrabServer(dpy);
|
||||
}
|
||||
if(scratchpad_last_showed_1 == c) {
|
||||
scratchpad_last_showed_1 = NULL;
|
||||
}
|
||||
if(scratchpad_last_showed_2 == c) {
|
||||
scratchpad_last_showed_2 = NULL;
|
||||
}
|
||||
if(scratchpad_last_showed_3 == c) {
|
||||
scratchpad_last_showed_3 = NULL;
|
||||
}
|
||||
|
||||
free(c);
|
||||
focus(NULL);
|
||||
updateclientlist();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue