~ruther/dwl

417110cf42f72e29e4c9140712a0f51bfa2c7a51 — wochap 1 year, 1 month ago 8c2c065
implement modes

like sway/river modes
2 files changed, 66 insertions(+), 0 deletions(-)

M config.def.h
M dwl.c
M config.def.h => config.def.h +20 -0
@@ 14,6 14,13 @@ static const float urgentcolor[]           = COLOR(0xff0000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */

enum {
	BROWSER,
};
const char *modes_labels[] = {
	"browser",
};

/* tagging - TAGCOUNT must be no greater than 31 */
#define TAGCOUNT (9)



@@ 159,6 166,8 @@ static const Key keys[] = {
	TAGKEYS(                     Key_9,                          8),
	{ MODKEY|WLR_MODIFIER_SHIFT, Key_q,          quit,           {0} },

	{ MODKEY,                    XKB_KEY_b,          entermode,      {.i = BROWSER} },

	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,Key_BackSpace, quit, {0} },
	/* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is


@@ 170,6 179,17 @@ static const Key keys[] = {
	CHVT(Key_F9, 9), CHVT(Key_F10, 10), CHVT(Key_F11, 11), CHVT(Key_F12, 12),
};

static const Modekey modekeys[] = {
	/* mode      modifier                  key                 function        argument */
	{ BROWSER, { 0, XKB_KEY_f, spawn, SHCMD("firefox") } },
	{ BROWSER, { 0, XKB_KEY_f, entermode, {.i = NORMAL} } },
	{ BROWSER, { 0, XKB_KEY_b, spawn, SHCMD("brave") } },
	{ BROWSER, { 0, XKB_KEY_b, entermode, {.i = NORMAL} } },
	{ BROWSER, { 0, XKB_KEY_g, spawn, SHCMD("google-chrome-stable") } },
	{ BROWSER, { 0, XKB_KEY_g, entermode, {.i = NORMAL} } },
	{ BROWSER, { 0, XKB_KEY_Escape, entermode, {.i = NORMAL} } },
};

static const Button buttons[] = {
	{ MODKEY, BTN_LEFT,   moveresize,     {.ui = CurMove} },
	{ MODKEY, BTN_MIDDLE, togglefloating, {0} },

M dwl.c => dwl.c +46 -0
@@ 151,6 151,11 @@ typedef struct {
} Key;

typedef struct {
	int mode_index;
	Key key;
} Modekey;

typedef struct {
	struct wl_list link;
	struct wlr_keyboard_group *wlr_group;



@@ 294,6 299,7 @@ static void handlesig(int signo);
static void incnmaster(const Arg *arg);
static void inputdevice(struct wl_listener *listener, void *data);
static int keybinding(uint32_t mods, xkb_keycode_t keycode);
static int modekeybinding(uint32_t mods, xkb_keysym_t sym);
static void keypress(struct wl_listener *listener, void *data);
static void keypressmod(struct wl_listener *listener, void *data);
static int keyrepeat(void *data);


@@ 354,6 360,7 @@ static Monitor *xytomon(double x, double y);
static void xytonode(double x, double y, struct wlr_surface **psurface,
		Client **pc, LayerSurface **pl, double *nx, double *ny);
static void zoom(const Arg *arg);
static void entermode(const Arg *arg);

/* variables */
static const char broken[] = "broken";


@@ 412,6 419,9 @@ static struct wlr_box sgeom;
static struct wl_list mons;
static Monitor *selmon;

static const int NORMAL = -1;
static int active_mode_index = NORMAL;

#ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data);
static void associatex11(struct wl_listener *listener, void *data);


@@ 1561,6 1571,11 @@ keybinding(uint32_t mods, xkb_keycode_t keycode)
	 * processing.
	 */
	const Key *k;

	if (active_mode_index >= 0) {
		return modekeybinding(mods, sym);
	}

	for (k = keys; k < END(keys); k++) {
		if (CLEANMASK(mods) == CLEANMASK(k->mod)
				&& keycode == k->keycode && k->func) {


@@ 1571,6 1586,29 @@ keybinding(uint32_t mods, xkb_keycode_t keycode)
	return 0;
}

int
modekeybinding(uint32_t mods, xkb_keysym_t sym)
{
	int handled = 0;
	const Modekey *mk;
	const Key *k;

	for (mk = modekeys; mk < END(modekeys); mk++) {
		if (active_mode_index != mk->mode_index) {
			continue;
		}

		k = &mk->key;
		if (CLEANMASK(mods) == CLEANMASK(k->mod) &&
				sym == k->keysym && k->func) {
			k->func(&k->arg);
			handled = 1;
		}
	}

	return handled;
}

void
keypress(struct wl_listener *listener, void *data)
{


@@ 2058,6 2096,7 @@ printstatus(void)
		printf("%s tags %"PRIu32" %"PRIu32" %"PRIu32" %"PRIu32"\n",
			m->wlr_output->name, occ, m->tagset[m->seltags], sel, urg);
		printf("%s layout %s\n", m->wlr_output->name, m->ltsymbol);
		printf("%s mode %s\n", m->wlr_output->name, modes_labels[active_mode_index] ? modes_labels[active_mode_index] : "");
	}
	fflush(stdout);
}


@@ 3043,6 3082,13 @@ zoom(const Arg *arg)
	arrange(selmon);
}

void
entermode(const Arg *arg)
{
	active_mode_index = arg->i;
	printstatus();
}

#ifdef XWAYLAND
void
activatex11(struct wl_listener *listener, void *data)

Do not follow this link