Apply scratchpad patch
This commit is contained in:
parent
1a12b6718b
commit
da484a83ac
16
config.def.h
16
config.def.h
|
|
@ -21,10 +21,11 @@ static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You ca
|
|||
static int log_level = WLR_ERROR;
|
||||
|
||||
static const Rule rules[] = {
|
||||
/* app_id title tags mask isfloating monitor */
|
||||
/* app_id title tags mask isfloating monitor scratchkey */
|
||||
/* examples: */
|
||||
{ "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
|
||||
{ "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
|
||||
//{ "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */
|
||||
//{ "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */
|
||||
{ NULL, "scratchpad", 0, 1, -1, 's' },
|
||||
};
|
||||
|
||||
/* layout(s) */
|
||||
|
|
@ -39,7 +40,7 @@ static const Layout layouts[] = {
|
|||
/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
|
||||
static const MonitorRule monrules[] = {
|
||||
/* name mfact nmaster scale layout rotate/reflect x y */
|
||||
{ "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
|
||||
{ "eDP-1", 0.5f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
|
||||
/* defaults */
|
||||
{ NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
|
||||
};
|
||||
|
|
@ -117,11 +118,18 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA
|
|||
static const char *termcmd[] = { "foot", NULL };
|
||||
static const char *menucmd[] = { "wmenu-run", NULL };
|
||||
|
||||
/* named scratchpads - First arg only serves to match against key in rules*/
|
||||
static const char *scratchpadcmd[] = { "s", "alacritty", "-t", "scratchpad", NULL };
|
||||
|
||||
static const Key keys[] = {
|
||||
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
|
||||
/* modifier key function argument */
|
||||
{ MODKEY, XKB_KEY_p, spawn, {.v = menucmd} },
|
||||
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} },
|
||||
//{ MODKEY, XKB_KEY_grave, togglescratch, {.v = scratchpadcmd } },
|
||||
//{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_grave, focusortogglescratch, {.v = scratchpadcmd } },
|
||||
//{ MODKEY, XKB_KEY_grave, focusortogglescratch, {.v = scratchpadcmd } },
|
||||
{ MODKEY, XKB_KEY_x, focusortogglematchingscratch, {.v = scratchpadcmd } },
|
||||
{ MODKEY, XKB_KEY_b, togglebar, {0} },
|
||||
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} },
|
||||
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} },
|
||||
|
|
|
|||
126
dwl.c
126
dwl.c
|
|
@ -140,6 +140,7 @@ typedef struct {
|
|||
uint32_t tags;
|
||||
int isfloating, isurgent, isfullscreen;
|
||||
uint32_t resize; /* configure serial of a pending resize */
|
||||
char scratchkey;
|
||||
} Client;
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -236,6 +237,7 @@ typedef struct {
|
|||
uint32_t tags;
|
||||
int isfloating;
|
||||
int monitor;
|
||||
const char scratchkey;
|
||||
} Rule;
|
||||
|
||||
typedef struct {
|
||||
|
|
@ -345,6 +347,7 @@ static void setpsel(struct wl_listener *listener, void *data);
|
|||
static void setsel(struct wl_listener *listener, void *data);
|
||||
static void setup(void);
|
||||
static void spawn(const Arg *arg);
|
||||
static void spawnscratch(const Arg *arg);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
|
|
@ -352,6 +355,9 @@ static void tile(Monitor *m);
|
|||
static void togglebar(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglefullscreen(const Arg *arg);
|
||||
static void togglescratch(const Arg *arg);
|
||||
static void focusortogglescratch(const Arg *arg);
|
||||
static void focusortogglematchingscratch(const Arg *arg);
|
||||
static void toggletag(const Arg *arg);
|
||||
static void toggleview(const Arg *arg);
|
||||
static void unlocksession(struct wl_listener *listener, void *data);
|
||||
|
|
@ -476,6 +482,7 @@ applyrules(Client *c)
|
|||
Monitor *mon = selmon, *m;
|
||||
|
||||
c->isfloating = client_is_float_type(c);
|
||||
c->scratchkey = 0;
|
||||
if (!(appid = client_get_appid(c)))
|
||||
appid = broken;
|
||||
if (!(title = client_get_title(c)))
|
||||
|
|
@ -485,6 +492,7 @@ applyrules(Client *c)
|
|||
if ((!r->title || strstr(title, r->title))
|
||||
&& (!r->id || strstr(appid, r->id))) {
|
||||
c->isfloating = r->isfloating;
|
||||
c->scratchkey = r->scratchkey;
|
||||
newtags |= r->tags;
|
||||
i = 0;
|
||||
wl_list_for_each(m, &mons, link) {
|
||||
|
|
@ -2719,6 +2727,16 @@ spawn(const Arg *arg)
|
|||
}
|
||||
}
|
||||
|
||||
void spawnscratch(const Arg *arg)
|
||||
{
|
||||
if (fork() == 0) {
|
||||
dup2(STDERR_FILENO, STDOUT_FILENO);
|
||||
setsid();
|
||||
execvp(((char **)arg->v)[1], ((char **)arg->v)+1);
|
||||
die("dwl: execvp %s failed:", ((char **)arg->v)[1]);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
startdrag(struct wl_listener *listener, void *data)
|
||||
{
|
||||
|
|
@ -2809,6 +2827,114 @@ togglefullscreen(const Arg *arg)
|
|||
setfullscreen(sel, !sel->isfullscreen);
|
||||
}
|
||||
|
||||
void
|
||||
togglescratch(const Arg *arg)
|
||||
{
|
||||
Client *c;
|
||||
unsigned int found = 0;
|
||||
|
||||
/* search for first window that matches the scratchkey */
|
||||
wl_list_for_each(c, &clients, link)
|
||||
if (c->scratchkey == ((char**)arg->v)[0][0]) {
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (found) {
|
||||
c->tags = VISIBLEON(c, selmon) ? 0 : selmon->tagset[selmon->seltags];
|
||||
|
||||
focusclient(c->tags == 0 ? focustop(selmon) : c, 1);
|
||||
arrange(selmon);
|
||||
} else{
|
||||
spawnscratch(arg);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
focusortogglescratch(const Arg *arg)
|
||||
{
|
||||
Client *c;
|
||||
unsigned int found = 0;
|
||||
|
||||
/* search for first window that matches the scratchkey */
|
||||
wl_list_for_each(c, &clients, link)
|
||||
if (c->scratchkey == ((char**)arg->v)[0][0]) {
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (found) {
|
||||
if (VISIBLEON(c, selmon)) {
|
||||
if (focustop(selmon) == c) {
|
||||
// hide
|
||||
c->tags = 0;
|
||||
focusclient(focustop(selmon), 1);
|
||||
} else {
|
||||
// focus
|
||||
focusclient(c, 1);
|
||||
}
|
||||
} else {
|
||||
// show
|
||||
c->tags = selmon->tagset[selmon->seltags];
|
||||
focusclient(c, 1);
|
||||
}
|
||||
arrange(selmon);
|
||||
} else{
|
||||
spawnscratch(arg);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
focusortogglematchingscratch(const Arg *arg)
|
||||
{
|
||||
Client *c;
|
||||
unsigned int found = 0;
|
||||
unsigned int hide = 0;
|
||||
|
||||
wl_list_for_each(c, &clients, link) {
|
||||
if (c->scratchkey == 0) {
|
||||
continue;
|
||||
}
|
||||
if (c->scratchkey == ((char**)arg->v)[0][0]) {
|
||||
if (VISIBLEON(c, selmon)) {
|
||||
if (found == 1) {
|
||||
if (hide == 1) {
|
||||
c->tags = 0;
|
||||
focusclient(focustop(selmon), 1);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (focustop(selmon) == c) {
|
||||
// hide
|
||||
c->tags = 0;
|
||||
focusclient(focustop(selmon), 1);
|
||||
hide = 1;
|
||||
} else {
|
||||
// focus
|
||||
focusclient(c, 1);
|
||||
}
|
||||
} else {
|
||||
// show
|
||||
c->tags = selmon->tagset[selmon->seltags];
|
||||
// focus
|
||||
focusclient(c, 1);
|
||||
}
|
||||
found = 1;
|
||||
continue;
|
||||
}
|
||||
if (VISIBLEON(c, selmon)) {
|
||||
// hide
|
||||
c->tags = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (found) {
|
||||
arrange(selmon);
|
||||
} else {
|
||||
spawnscratch(arg);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
toggletag(const Arg *arg)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue