mirror/dwl
1
0
Fork 1
mirror of https://codeberg.org/dwl/dwl.git synced 2025-01-30 04:37:28 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

apply keycodes patch

Browse source
This commit is contained in:
korei999 2023-11-29 21:55:52 +02:00
parent 6adb5d7ae5
commit 1d60a3aece
2 changed files with 257 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

280
config.def.h
View file

@ -5,71 +5,93 @@
(hex & 0xFF) / 255.0f } (hex & 0xFF) / 255.0f }
/* appearance */ /* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */ static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ static const int bypass_surface_visibility = 1; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const unsigned int borderpx = 1; /* border pixel of windows */ static const int numlock = 1;
static const float bordercolor[] = COLOR(0x444444ff); static const int capslock = 0;
static const float focuscolor[] = COLOR(0x005577ff); static const int smartborders = 1;
static const float urgentcolor[] = COLOR(0xff0000ff); static const unsigned int borderpx = 3; /* border pixel of windows */
static const unsigned int gappih = 0; /* horiz inner gap between windows */
static const unsigned int gappiv = 0; /* vert inner gap between windows */
static const unsigned int gappoh = 0; /* horiz outer gap between windows and screen edge */
static const unsigned int gappov = 0; /* vert outer gap between windows and screen edge */
static const char *cursortheme = "Adwaita"; /* theme from ${XCURSOR_PATH} or /usr/share/cursors/xorg-x11 if emtpy*/
static const char cursorsize[] = "24";
static const float bordercolor[] = COLOR(0x00000000);
static const float focuscolor[] = COLOR(0x7aa6daff);
static const float urgentcolor[] = COLOR(0xd54e53ff);
static const float stickycolor[] = COLOR(0x8abeb7ff);
static const float mixedcolor[] = COLOR(0xb5bd68ff);
/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */ /* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can also use glsl colors */ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 0.0};
static const float default_opacity = 1.00;
enum { static const char *const autostart[] = {
VIEW_L = -1, "/home/korei/.config/dwl/dwlinit.sh", NULL,
VIEW_R = 1, NULL /* terminate */
SHIFT_L = -2, };
SHIFT_R = 2,
} RotateTags;
/* tagging - TAGCOUNT must be no greater than 31 */ /* tagging - tagcount must be no greater than 31 */
#define TAGCOUNT (9) #define TAGCOUNT (10)
/* logging */
static int log_level = WLR_ERROR; static int log_level = WLR_ERROR;
typedef enum {
VIEW_L = -1,
VIEW_R = 1,
SHIFT_L = -2,
SHIFT_R = 2,
} RotateTags;
/* keyboard layout change notification for status bar */
static const char kblayout_file[] = "/tmp/dwl-keymap";
static const char *kblayout_cmd[] = {"pkill", "-RTMIN+1", "someblocks", NULL};
static const int kblayout_perclient = 0;
static const Rule rules[] = { static const Rule rules[] = {
/* app_id title tags mask isfloating monitor */ /* app_id title tags mask isfloating opacity monitor */
/* examples: // { "firefox", NULL, 1 << 8, 0, -1, -1 },
{ "Gimp", NULL, 0, 1, -1 }, { "corectrl", NULL, 1 << 5, 0, 1, -1 },
*/
{ "firefox", NULL, 1 << 8, 0, -1 },
}; };
/* layout(s) */ /* layout(s) */
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "[]=", tile }, { "[]=", tile },
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
// { "[v]", vertile },
{ "><>", NULL } /* no layout function means floating behavior */
}; };
/* monitors */ /* monitors */
/* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */ /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */
static const MonitorRule monrules[] = { static const MonitorRule monrules[] = {
/* name mfact nmaster scale layout rotate/reflect x y */ /* name mfact nmaster scale layout rotate/reflect x y resx resy rate adaptive custom*/
/* example of a HiDPI laptop monitor: /* example of a HiDPI laptop monitor at 120Hz:
{ "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { "eDP-1", 0.5, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 120.000, 1, 0 },
*/ */
/* defaults */ /* defaults */
{ NULL, 0.55, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { NULL, 0.55, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0, 0, 0, 120.000999, 0, 0 },
}; };
/* keyboard */ /* keyboard */
static const struct xkb_rule_names xkb_rules = { static const struct xkb_rule_names xkb_rules = {
/* can specify fields: rules, model, layout, variant, options */ /* can specify fields: rules, model, layout, variant, options */
/* example: /* example:
.options = "ctrl:nocaps", .options = "ctrl:nocaps",
*/ */
.options = NULL, .layout = "us,ua",
.options = "grp:win_space_toggle,caps:escape",
}; };
static const int repeat_rate = 25; static const int repeat_rate = 60;
static const int repeat_delay = 600; static const int repeat_delay = 170;
/* Trackpad */ /* Trackpad */
static const int tap_to_click = 1; static const int tap_to_click = 1;
static const int tap_and_drag = 1; static const int tap_and_drag = 1;
static const int drag_lock = 1; static const int drag_lock = 1;
static const int natural_scrolling = 0; static const int natural_scrolling = 1;
static const int disable_while_typing = 1; static const int disable_while_typing = 1;
static const int left_handed = 0; static const int left_handed = 0;
static const int middle_button_emulation = 0; static const int middle_button_emulation = 0;
@ -99,80 +121,162 @@ static const uint32_t send_events_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT
LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
*/ */
static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE; static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
static const double accel_speed = 0.0; static const double accel_speed = -0.5;
/* separate variables for trackpad */
static const enum libinput_config_accel_profile accel_profile_trackpad = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
static const double accel_speed_trackpad = -0.0;
/* You can choose between: /* You can choose between:
LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle
LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
*/ */
static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM; static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */ static const int cursor_timeout = 2;
#define MODKEY WLR_MODIFIER_ALT
#define TAGKEYS(KEY,SKEY,TAG) \ /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
#define MODKEY WLR_MODIFIER_LOGO
#define SHIFT WLR_MODIFIER_SHIFT
#define ALT WLR_MODIFIER_ALT
#define CTRL WLR_MODIFIER_CTRL
#define SUPER WLR_MODIFIER_LOGO
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|WLR_MODIFIER_CTRL, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|WLR_MODIFIER_ALT, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|WLR_MODIFIER_SHIFT, SKEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|WLR_MODIFIER_SHIFT, KEY, tag, {.ui = 1 << TAG} }
{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
/* helper for spawning shell commands in the pre dwm-5.0 fashion */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */ /* commands */
static const char *termcmd[] = { "foot", NULL }; static const char* Term[] = { "footclient", NULL };
static const char *menucmd[] = { "bemenu-run", NULL }; static const char* TermAlt[] = { "foot", NULL };
static const char* Menu[] = { "fuzzel", NULL };
static const char* PowerMenu[] = { "powermenu.sh", NULL };
static const char* AudioUpdate[] = { "pkill", "-RTMIN+12", "someblocks", NULL };
static const char* AudioLower[] = { "wpctl", "set-volume", "-l", "1", "@DEFAULT_AUDIO_SINK@", "3%-", NULL };
static const char* AudioRaise[] = { "wpctl", "set-volume", "-l", "1", "@DEFAULT_AUDIO_SINK@", "3%+", NULL };
static const char* AudioMute[] = { "wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", "toggle", NULL };
static const char* MuteMic[] = { "MuteMic.sh", NULL };
static const char* AudioPlayPause[] = { "playerctl", "play-pause", NULL };
static const char* AudioPause[] = { "playerctl", "pause", NULL };
static const char* AudioNext[] = { "playerctl", "next", NULL };
static const char* AudioPrev[] = { "playerctl", "previous", NULL };
static const char* Mako[] = { "mako.sh", NULL };
static const char* Mixer[] = { "footclient", "pulsemixer", NULL };
static const char* Emoji[] = { "emoji.sh", NULL };
static const char* Calc[] = { "footclient", "-e", "qalc", NULL };
static const char* Print[] = { "PrintDwl.sh", NULL };
static const char* PrintSel[] = { "PrintDwl.sh", "Select", NULL };
static const char* PrintSave[] = { "PrintDwl.sh", "Save", NULL };
static const char* PrintSelSave[] = { "PrintDwl.sh", "SelectSave", NULL };
static const char* BMonUp[] = { "light", "-T", "1.4", NULL };
static const char* BMonDown[] = { "light", "-T", "0.72", NULL };
static const char* BufferSave[] = { "buffer-save.sh", NULL };
static const char* BufferToggle[] = { "buffer-toggle.sh", NULL };
static const char* RecToggle[] = { "rec-toggle.sh", NULL };
static const char* ScreenLock[] = { "Lock.sh", "lock", NULL };
static const char* Swayidle[] = { "Lock.sh", "toggle", NULL };
static const char* Thunar[] = { "Thunar", NULL };
static const char* VirtualKeyboard[] = { "VirtualKeyboard.sh", NULL };
#include "keys.h"
static const Key keys[] = { static const Key keys[] = {
/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */ /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XKB_KEY_p, spawn, {.v = menucmd} }, {SUPER, Key_b, togglebar, { 0 } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, { 0, Key_XF86AudioPlay, spawn, { .v = AudioPlayPause } },
{ MODKEY, XKB_KEY_b, togglebar, {0}}, { 0, Key_XF86AudioPause, spawn, { .v = AudioPause } },
{ MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { 0, Key_XF86AudioNext, spawn, { .v = AudioNext } },
{ MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, { 0, Key_XF86AudioPrev, spawn, { .v = AudioPrev } },
{ MODKEY, XKB_KEY_i, incnmaster, {.i = +1} }, { 0, Key_XF86AudioLowerVolume, spawn, { .v = AudioLower } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_i, incnmaster, {.i = -1} }, { 0, Key_XF86AudioRaiseVolume, spawn, { .v = AudioRaise } },
{ MODKEY, XKB_KEY_a, rotatetags, {.i = VIEW_L} }, { 0, Key_XF86AudioMute, spawn, { .v = AudioMute } },
{ MODKEY, XKB_KEY_d, rotatetags, {.i = VIEW_R} }, { 0, Key_XF86AudioMicMute, spawn, { .v = MuteMic } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_a, rotatetags, {.i = SHIFT_L} }, { SUPER, Key_n, spawn, { .v = MuteMic } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_d, rotatetags, {.i = SHIFT_R} }, { 0, Key_XF86AudioLowerVolume, spawn, { .v = AudioUpdate } },
{ MODKEY, XKB_KEY_h, setmfact, {.f = -0.05} }, { 0, Key_XF86AudioRaiseVolume, spawn, { .v = AudioUpdate } },
{ MODKEY, XKB_KEY_l, setmfact, {.f = +0.05} }, { 0, Key_XF86AudioMute, spawn, { .v = AudioUpdate } },
{ MODKEY, XKB_KEY_Return, zoom, {0} }, { 0, Key_XF86MonBrightnessUp, spawn, { .v = BMonUp } },
{ MODKEY, XKB_KEY_Tab, view, {0} }, { 0, Key_XF86MonBrightnessDown, spawn, { .v = BMonDown } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, { 0, Key_Print, spawn, { .v = Print } },
{ MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { SUPER, Key_Print, spawn, { .v = PrintSave } },
{ MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { SHIFT, Key_Print, spawn, { .v = PrintSel } },
{ MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, { SUPER | SHIFT, Key_Print, spawn, { .v = PrintSelSave } },
{ MODKEY, XKB_KEY_space, setlayout, {0} }, { SUPER | SHIFT, Key_Insert, spawn, { .v = Mako } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { SUPER, Key_Insert, spawn, { .v = Mixer } },
{ MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { SUPER | CTRL, Key_Insert, spawn, { .v = Swayidle } },
{ MODKEY, XKB_KEY_0, view, {.ui = ~0} }, { SUPER, Key_e, spawn, { .v = Calc } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, { SUPER, Key_t, spawn, { .v = Thunar } },
{ MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, { SUPER, Key_p, spawn, { .v = Menu } },
{ MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, { SUPER | CTRL, Key_p, spawn, { .v = Emoji } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less, tagmon, {.i = WLR_DIRECTION_LEFT} }, { SUPER, Key_Return, spawn, { .v = Term } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater, tagmon, {.i = WLR_DIRECTION_RIGHT} }, { SUPER | SHIFT, Key_Return, spawn, { .v = TermAlt } },
TAGKEYS( XKB_KEY_1, XKB_KEY_exclam, 0), { SUPER, Key_p, spawn, { .v = Menu } },
TAGKEYS( XKB_KEY_2, XKB_KEY_at, 1), { SUPER, Key_m, spawn, { .v = VirtualKeyboard } },
TAGKEYS( XKB_KEY_3, XKB_KEY_numbersign, 2), { SUPER, Key_j, focusstack, { .i = +1 } },
TAGKEYS( XKB_KEY_4, XKB_KEY_dollar, 3), { SUPER, Key_k, focusstack, { .i = -1 } },
TAGKEYS( XKB_KEY_5, XKB_KEY_percent, 4), { SUPER, Key_z, focusstack, { .i = +1 } },
TAGKEYS( XKB_KEY_6, XKB_KEY_asciicircum, 5), { SUPER, Key_x, focusstack, { .i = -1 } },
TAGKEYS( XKB_KEY_7, XKB_KEY_ampersand, 6), { SUPER, Key_i, incnmaster, { .i = +1 } },
TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), { SUPER | SHIFT, Key_i, incnmaster, { .i = -1 } },
TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), { SUPER, Key_h, setmfact, { .f = -0.05 } },
{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q, quit, {0} }, { SUPER, Key_l, setmfact, { .f = +0.05 } },
{ SUPER, Key_c, setlayout, { .v = &layouts[0] } },
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ { SUPER, Key_s, setlayout, { .v = &layouts[1] } },
{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} }, { SUPER, Key_v, setlayout, { .v = &layouts[2] } },
/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is { SUPER, Key_grave, togglefloating, { 0 } },
* do not remove them. // { SUPER | SHIFT, Key_s, togglesticky, { 0 } },
*/ { SUPER, Key_f, togglefullscreen, { 0 } },
#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} } { SUPER, Key_g, zoom, { 0 } },
CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6), { SUPER, Key_Tab, view, { 0 } },
CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12), { SUPER, Key_a, rotatetags, { .i = VIEW_L } },
{ SUPER, Key_d, rotatetags, { .i = VIEW_R } },
{ SUPER | SHIFT, Key_a, rotatetags, { .i = SHIFT_L } },
{ SUPER | SHIFT, Key_d, rotatetags, { .i = SHIFT_R } },
{ SUPER, Key_w, killclient, { 0 } },
{ ALT, Key_Escape, spawn, { .v = PowerMenu } },
{ ALT, Key_Caps_Lock, spawn, { .v = PowerMenu } },
{ SUPER, Key_Home, spawn, { .v = BufferToggle } },
{ SUPER, Key_End, spawn, { .v = BufferSave } },
{ SUPER, Key_F12, spawn, { .v = RecToggle } },
{ SUPER | SHIFT, Key_BackSpace, spawn, { .v = ScreenLock } },
{ SUPER, Key_comma, focusmon, { .i = WLR_DIRECTION_LEFT } },
{ SUPER, Key_period, focusmon, { .i = WLR_DIRECTION_RIGHT }},
{ SUPER | SHIFT, Key_comma, tagmon, { .i = WLR_DIRECTION_LEFT } },
{ SUPER | SHIFT, Key_period, tagmon, { .i = WLR_DIRECTION_RIGHT }},
TAGKEYS(Key_1, 0),
TAGKEYS(Key_2, 1),
TAGKEYS(Key_3, 2),
TAGKEYS(Key_4, 3),
TAGKEYS(Key_5, 4),
TAGKEYS(Key_6, 5),
TAGKEYS(Key_7, 6),
TAGKEYS(Key_8, 7),
TAGKEYS(Key_9, 8),
TAGKEYS(Key_0, 9),
{ SUPER | SHIFT, Key_q, quit, { 0 } },
/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
{ WLR_MODIFIER_CTRL | WLR_MODIFIER_ALT, XKB_KEY_Terminate_Server, quit, { 0 } },
#define CHVT(KEY, n) \
{ \
WLR_MODIFIER_CTRL | WLR_MODIFIER_ALT, KEY, chvt, { .ui = (n) } \
}
CHVT(Key_F1, 1),
CHVT(Key_F2, 2),
CHVT(Key_F3, 3),
CHVT(Key_F4, 4),
CHVT(Key_F5, 5),
CHVT(Key_F6, 6),
CHVT(Key_F7, 7),
CHVT(Key_F8, 8),
CHVT(Key_F9, 9),
CHVT(Key_F10, 10),
CHVT(Key_F11, 11),
CHVT(Key_F12, 12),
}; };
static const Button buttons[] = { static const Button buttons[] = {

91
dwl.c
View file

@ -143,7 +143,7 @@ typedef struct {
typedef struct { typedef struct {
uint32_t mod; uint32_t mod;
xkb_keysym_t keysym; xkb_keycode_t keycode;
void (*func)(const Arg *); void (*func)(const Arg *);
const Arg arg; const Arg arg;
} Key; } Key;
@ -152,9 +152,8 @@ typedef struct {
struct wl_list link; struct wl_list link;
struct wlr_keyboard *wlr_keyboard; struct wlr_keyboard *wlr_keyboard;
int nsyms; xkb_keycode_t keycode;
const xkb_keysym_t *keysyms; /* invalid if nsyms == 0 */ uint32_t mods; /* invalid if keycode == 0 */
uint32_t mods; /* invalid if nsyms == 0 */
struct wl_event_source *key_repeat_source; struct wl_event_source *key_repeat_source;
struct wl_listener modifiers; struct wl_listener modifiers;
@ -243,6 +242,7 @@ static void arrange(Monitor *m);
static void arrangelayer(Monitor *m, struct wl_list *list, static void arrangelayer(Monitor *m, struct wl_list *list,
struct wlr_box *usable_area, int exclusive); struct wlr_box *usable_area, int exclusive);
static void arrangelayers(Monitor *m); static void arrangelayers(Monitor *m);
static void autostartexec(void);
static void axisnotify(struct wl_listener *listener, void *data); static void axisnotify(struct wl_listener *listener, void *data);
static void buttonpress(struct wl_listener *listener, void *data); static void buttonpress(struct wl_listener *listener, void *data);
static void chvt(const Arg *arg); static void chvt(const Arg *arg);
@ -290,7 +290,7 @@ static void fullscreennotify(struct wl_listener *listener, void *data);
static void handlesig(int signo); static void handlesig(int signo);
static void incnmaster(const Arg *arg); static void incnmaster(const Arg *arg);
static void inputdevice(struct wl_listener *listener, void *data); static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t mods, xkb_keysym_t sym); static int keybinding(uint32_t mods, xkb_keycode_t keycode);
static void keypress(struct wl_listener *listener, void *data); static void keypress(struct wl_listener *listener, void *data);
static void keypressmod(struct wl_listener *listener, void *data); static void keypressmod(struct wl_listener *listener, void *data);
static int keyrepeat(void *data); static int keyrepeat(void *data);
@ -427,6 +427,9 @@ static xcb_atom_t netatom[NetLast];
/* attempt to encapsulate suck into one file */ /* attempt to encapsulate suck into one file */
#include "client.h" #include "client.h"
static pid_t *autostart_pids;
static size_t autostart_len;
/* function implementations */ /* function implementations */
void void
applybounds(Client *c, struct wlr_box *bbox) applybounds(Client *c, struct wlr_box *bbox)
@ -557,6 +560,27 @@ arrangelayers(Monitor *m)
} }
} }
void
autostartexec(void) {
const char *const *p;
size_t i = 0;
/* count entries */
for (p = autostart; *p; autostart_len++, p++)
while (*++p);
autostart_pids = calloc(autostart_len, sizeof(pid_t));
for (p = autostart; *p; i++, p++) {
if ((autostart_pids[i] = fork()) == 0) {
setsid();
execvp(*p, (char *const *)p);
die("dwl: execvp %s:", *p);
}
/* skip arguments */
while (*++p);
}
}
void void
axisnotify(struct wl_listener *listener, void *data) axisnotify(struct wl_listener *listener, void *data)
{ {
@ -652,10 +676,18 @@ checkidleinhibitor(struct wlr_surface *exclude)
void void
cleanup(void) cleanup(void)
{ {
size_t i;
#ifdef XWAYLAND #ifdef XWAYLAND
wlr_xwayland_destroy(xwayland); wlr_xwayland_destroy(xwayland);
xwayland = NULL; xwayland = NULL;
#endif #endif
/* kill child processes */
for (i = 0; i < autostart_len; i++) {
if (0 < autostart_pids[i]) {
kill(autostart_pids[i], SIGTERM);
waitpid(autostart_pids[i], NULL, 0);
}
wl_display_destroy_clients(dpy); wl_display_destroy_clients(dpy);
if (child_pid > 0) { if (child_pid > 0) {
kill(child_pid, SIGTERM); kill(child_pid, SIGTERM);
@ -664,6 +696,8 @@ cleanup(void)
wlr_xcursor_manager_destroy(cursor_mgr); wlr_xcursor_manager_destroy(cursor_mgr);
wlr_output_layout_destroy(output_layout); wlr_output_layout_destroy(output_layout);
wl_display_destroy(dpy); wl_display_destroy(dpy);
}
/* Destroy after the wayland display (when the monitors are already destroyed) /* Destroy after the wayland display (when the monitors are already destroyed)
to avoid destroying them with an invalid scene output. */ to avoid destroying them with an invalid scene output. */
wlr_scene_node_destroy(&scene->tree.node); wlr_scene_node_destroy(&scene->tree.node);
@ -1526,18 +1560,31 @@ void
handlesig(int signo) handlesig(int signo)
{ {
if (signo == SIGCHLD) { if (signo == SIGCHLD) {
#ifdef XWAYLAND
siginfo_t in; siginfo_t in;
/* wlroots expects to reap the XWayland process itself, so we /* wlroots expects to reap the XWayland process itself, so we
* use WNOWAIT to keep the child waitable until we know it's not * use WNOWAIT to keep the child waitable until we know it's not
* XWayland. * XWayland.
*/ */
while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid while (!waitid(P_ALL, 0, &in, WEXITED|WNOHANG|WNOWAIT) && in.si_pid
&& (!xwayland || in.si_pid != xwayland->server->pid)) #ifdef XWAYLAND
waitpid(in.si_pid, NULL, 0); && (!xwayland || in.si_pid != xwayland->server->pid)
#else
while (waitpid(-1, NULL, WNOHANG) > 0);
#endif #endif
) {
pid_t *p, *lim;
waitpid(in.si_pid, NULL, 0);
if (in.si_pid == child_pid)
child_pid = -1;
if (!(p = autostart_pids))
continue;
lim = &p[autostart_len];
for (; p < lim; p++) {
if (*p == in.si_pid) {
*p = -1;
break;
}
}
}
} else if (signo == SIGINT || signo == SIGTERM) { } else if (signo == SIGINT || signo == SIGTERM) {
quit(NULL); quit(NULL);
} }
@ -1583,7 +1630,7 @@ inputdevice(struct wl_listener *listener, void *data)
} }
int int
keybinding(uint32_t mods, xkb_keysym_t sym) keybinding(uint32_t mods, xkb_keycode_t keycode)
{ {
/* /*
* Here we handle compositor keybindings. This is when the compositor is * Here we handle compositor keybindings. This is when the compositor is
@ -1594,7 +1641,7 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
const Key *k; const Key *k;
for (k = keys; k < END(keys); k++) { for (k = keys; k < END(keys); k++) {
if (CLEANMASK(mods) == CLEANMASK(k->mod) && if (CLEANMASK(mods) == CLEANMASK(k->mod) &&
sym == k->keysym && k->func) { keycode == k->keycode && k->func) {
k->func(&k->arg); k->func(&k->arg);
handled = 1; handled = 1;
} }
@ -1605,17 +1652,12 @@ keybinding(uint32_t mods, xkb_keysym_t sym)
void void
keypress(struct wl_listener *listener, void *data) keypress(struct wl_listener *listener, void *data)
{ {
int i;
/* This event is raised when a key is pressed or released. */ /* This event is raised when a key is pressed or released. */
Keyboard *kb = wl_container_of(listener, kb, key); Keyboard *kb = wl_container_of(listener, kb, key);
struct wlr_keyboard_key_event *event = data; struct wlr_keyboard_key_event *event = data;
/* Translate libinput keycode -> xkbcommon */ /* Translate libinput keycode -> xkbcommon */
uint32_t keycode = event->keycode + 8; uint32_t keycode = event->keycode + 8;
/* Get a list of keysyms based on the keymap for this keyboard */
const xkb_keysym_t *syms;
int nsyms = xkb_state_key_get_syms(
kb->wlr_keyboard->xkb_state, keycode, &syms);
int handled = 0; int handled = 0;
uint32_t mods = wlr_keyboard_get_modifiers(kb->wlr_keyboard); uint32_t mods = wlr_keyboard_get_modifiers(kb->wlr_keyboard);
@ -1625,17 +1667,15 @@ keypress(struct wl_listener *listener, void *data)
/* On _press_ if there is no active screen locker, /* On _press_ if there is no active screen locker,
* attempt to process a compositor keybinding. */ * attempt to process a compositor keybinding. */
if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED) if (!locked && event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
for (i = 0; i < nsyms; i++) handled = keybinding(mods, keycode);
handled = keybinding(mods, syms[i]) || handled;
if (handled && kb->wlr_keyboard->repeat_info.delay > 0) { if (handled && kb->wlr_keyboard->repeat_info.delay > 0) {
kb->mods = mods; kb->mods = mods;
kb->keysyms = syms; kb->keycode = keycode;
kb->nsyms = nsyms;
wl_event_source_timer_update(kb->key_repeat_source, wl_event_source_timer_update(kb->key_repeat_source,
kb->wlr_keyboard->repeat_info.delay); kb->wlr_keyboard->repeat_info.delay);
} else { } else {
kb->nsyms = 0; kb->keycode = 0;
wl_event_source_timer_update(kb->key_repeat_source, 0); wl_event_source_timer_update(kb->key_repeat_source, 0);
} }
@ -1670,15 +1710,13 @@ int
keyrepeat(void *data) keyrepeat(void *data)
{ {
Keyboard *kb = data; Keyboard *kb = data;
int i; if (!kb->keycode || kb->wlr_keyboard->repeat_info.rate <= 0)
if (!kb->nsyms || kb->wlr_keyboard->repeat_info.rate <= 0)
return 0; return 0;
wl_event_source_timer_update(kb->key_repeat_source, wl_event_source_timer_update(kb->key_repeat_source,
1000 / kb->wlr_keyboard->repeat_info.rate); 1000 / kb->wlr_keyboard->repeat_info.rate);
for (i = 0; i < kb->nsyms; i++) keybinding(kb->mods, kb->keycode);
keybinding(kb->mods, kb->keysyms[i]);
return 0; return 0;
} }
@ -2191,6 +2229,7 @@ run(char *startup_cmd)
die("startup: backend_start"); die("startup: backend_start");
/* Now that the socket exists and the backend is started, run the startup command */ /* Now that the socket exists and the backend is started, run the startup command */
autostartexec();
if (startup_cmd) { if (startup_cmd) {
int piperw[2]; int piperw[2];
if (pipe(piperw) < 0) if (pipe(piperw) < 0)