p
/
desktop-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: p:135e279ca15c6050d4cedafcb0ea7623cd3a9550
Branches Tags
p:master
...
compare: p:c6a93b5d9e27bc40f7e066a117e2209966a02be0
Branches Tags
p:master

3 Commits
135e279ca1 ... c6a93b5d9e

Author SHA1 Message Date
Přemysl Eric Janouch c6a93b5d9e
Bump liberty 2021-11-05 14:29:23 +01:00
Přemysl Eric Janouch 4a0e756235
wmstatus: rebind function keys 
They sucked on OLKBs, now we're appropriating F1-F5 with modifiers.
 2021-11-05 14:15:31 +01:00
Přemysl Eric Janouch 9dc1187b1c
input-switch: add a Thunderbolt magic constant 2021-11-05 13:38:46 +01:00
3 changed files with 26 additions and 15 deletions
Show Stats Expand all files Collapse all files

1
input-switch.c
View File

@ -116,6 +116,7 @@ g_inputs[] =
{ 0x10, "dp", 2, }, // DisplayPort 2
{ 0x11, "hdmi", 1, }, // Digital Video (TMDS) 3 HDMI 1
{ 0x12, "hdmi", 2, }, // Digital Video (TMDS) 4 HDMI 2
{ 0x15, "tb", 1, }, // Thunderbolt on BenQ PD3220U (no spec)
};
int

2
liberty

@ -1 +1 @@
Subproject commit 69101eb1554ad2fca6de30cdbaccac076210d7e3
Subproject commit 34f86651f6220038c0ee07d3f422a52d9b081f02

38
wmstatus.c
View File

@ -2305,8 +2305,11 @@ static void
on_input_switch (struct app_context *ctx, int arg)
{
(void) ctx;
char *values[] = { "vga", "dvi", "dp", "hdmi" };
char *argv[] = { "input-switch", values[arg], NULL };
char *values[] = { "vga", "dvi", "hdmi", "dp", "tb" },
*numbers[] = { "1", "2" };
char *argv[] = { "input-switch",
values[arg & 0xf], numbers[arg >> 4], NULL };
spawn (argv);
}
@ -2424,17 +2427,24 @@ g_keys[] =
{ 0, XF86XK_AudioPrev, on_mpd_prev, 0 },
{ 0, XF86XK_AudioNext, on_mpd_next, 0 },
// Display input sources
{ Mod4Mask, XK_F5, on_input_switch, 0 },
{ Mod4Mask, XK_F6, on_input_switch, 1 },
{ Mod4Mask, XK_F7, on_input_switch, 2 },
{ Mod4Mask, XK_F8, on_input_switch, 3 },
// Keyboard groups
{ Mod4Mask, XK_F9, on_lock_group, 0 },
{ Mod4Mask, XK_F10, on_lock_group, 1 },
{ Mod4Mask, XK_F11, on_lock_group, 2 },
{ Mod4Mask, XK_F12, on_lock_group, 3 },
{ Mod4Mask, XK_F1, on_lock_group, 0 },
{ Mod4Mask, XK_F2, on_lock_group, 1 },
{ Mod4Mask, XK_F3, on_lock_group, 2 },
{ Mod4Mask, XK_F4, on_lock_group, 3 },
#define CSMask (ControlMask | ShiftMask)
// Display input sources
{ Mod4Mask | ControlMask, XK_F1, on_input_switch, 0 },
{ Mod4Mask | CSMask, XK_F1, on_input_switch, 16 | 0 },
{ Mod4Mask | ControlMask, XK_F2, on_input_switch, 1 },
{ Mod4Mask | CSMask, XK_F2, on_input_switch, 16 | 1 },
{ Mod4Mask | ControlMask, XK_F3, on_input_switch, 2 },
{ Mod4Mask | CSMask, XK_F3, on_input_switch, 16 | 2 },
{ Mod4Mask | ControlMask, XK_F4, on_input_switch, 3 },
{ Mod4Mask | CSMask, XK_F4, on_input_switch, 16 | 3 },
{ Mod4Mask | ControlMask, XK_F5, on_input_switch, 4 },
// Brightness
{ Mod4Mask, XK_Home, on_brightness, 10 },
@ -2442,8 +2452,8 @@ g_keys[] =
{ 0, XF86XK_MonBrightnessUp, on_brightness, 10 },
{ 0, XF86XK_MonBrightnessDown, on_brightness, -10 },
{ Mod4Mask, XK_F4, on_standby, 0 },
{ Mod4Mask | ShiftMask, XK_F4, on_insomnia, 0 },
{ Mod4Mask, XK_F5, on_standby, 0 },
{ Mod4Mask | ShiftMask, XK_F5, on_insomnia, 0 },
{ Mod4Mask, XK_Pause, on_standby, 0 },
{ Mod4Mask | ShiftMask, XK_Pause, on_insomnia, 0 },