gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-08-22 11:31:46 +02:00
Code Issues Projects Releases Wiki Activity

wmaker: dynamic vim-like window marking feature

Browse Source 
This patch is adding vim-like window marking, like in i3.
A window can be dynamically assigned a mark label.
Then a marked window can be pulled or jumped to.
Or the current focused window can be swapped with a marked window.

The mark label appears in the Window List in between the window
title and the workspace name.

Those new options in WindowMaker conf file are used to control
the actions: MarkSetKey, MarkUnsetKey, MarkBringKey, MarkJumpKey
and MarkSwapKey.

Those actions are set to None by default.
This commit is contained in:
David Maciejak
2026-04-02 08:57:25 +01:00
committed by Carlos R. Mafra
parent ac1fa7fc6d
commit 26a296db23
13 changed files with 326 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc.c
+35 -43
View File
@@ -847,6 +847,34 @@ static char *keysymToString(KeySym keysym, unsigned int state)
}
#endif
Bool GetCanonicalShortcutLabel(unsigned int modifiers, KeySym ksym, char *buf, size_t bufsz)
{
static const struct { unsigned int mask; const char *name; } mt[] = {
{ ShiftMask, "Shift+" },
{ ControlMask, "Control+" },
{ Mod1Mask, "Mod1+" },
{ Mod2Mask, "Mod2+" },
{ Mod3Mask, "Mod3+" },
{ Mod4Mask, "Mod4+" },
{ Mod5Mask, "Mod5+" },
{ 0, NULL }
};
const char *kname = XKeysymToString(ksym);
size_t i;
if (!kname)
return False;
buf[0] = '\0';
for (i = 0; mt[i].mask; i++) {
if (modifiers & mt[i].mask)
wstrlcat(buf, mt[i].name, bufsz);
}
wstrlcat(buf, kname, bufsz);
return True;
}
char *GetShortcutString(const char *shortcut)
{
char *buffer = NULL;
@@ -882,50 +910,12 @@ char *GetShortcutString(const char *shortcut)
char *GetShortcutKey(WShortKey key)
{
char buf[MAX_SHORTCUT_LENGTH];
char *wr, *result, *seg;
char *result, *seg;
int step;
void append_string(const char *text)
{
const char *s = text;
while (*s) {
if (wr >= buf + sizeof(buf) - 1)
break;
*wr++ = *s++;
}
}
void append_modifier(int modifier_index, const char *fallback_name)
{
if (wPreferences.modifier_labels[modifier_index])
append_string(wPreferences.modifier_labels[modifier_index]);
else
append_string(fallback_name);
}
Bool build_token(unsigned int mod, KeyCode kcode)
{
const char *kname = XKeysymToString(W_KeycodeToKeysym(dpy, kcode, 0));
if (!kname)
return False;
wr = buf;
if (mod & ControlMask) append_modifier(1, "Control+");
if (mod & ShiftMask) append_modifier(0, "Shift+");
if (mod & Mod1Mask) append_modifier(2, "Mod1+");
if (mod & Mod2Mask) append_modifier(3, "Mod2+");
if (mod & Mod3Mask) append_modifier(4, "Mod3+");
if (mod & Mod4Mask) append_modifier(5, "Mod4+");
if (mod & Mod5Mask) append_modifier(6, "Mod5+");
append_string(kname);
*wr = '\0';
return True;
}
if (!build_token(key.modifier, key.keycode))
if (!GetCanonicalShortcutLabel(key.modifier,
W_KeycodeToKeysym(dpy, key.keycode, 0),
buf, sizeof(buf)))
return NULL;
/* Convert the leader token to its display string */
@@ -938,7 +928,9 @@ char *GetShortcutKey(WShortKey key)
if (key.chain_keycodes[step] == 0)
break;
if (!build_token(key.chain_modifiers[step], key.chain_keycodes[step]))
if (!GetCanonicalShortcutLabel(key.chain_modifiers[step],
W_KeycodeToKeysym(dpy, key.chain_keycodes[step], 0),
buf, sizeof(buf)))
break;
seg = GetShortcutString(buf);