diff options
| -rw-r--r-- | client.h | 6 | ||||
| -rw-r--r-- | config.def.h | 21 | ||||
| -rw-r--r-- | dwl.c | 195 |
3 files changed, 208 insertions, 14 deletions
@@ -319,6 +319,12 @@ client_set_border_color(Client *c, const float color[static 4]) } static inline void +client_set_dimmer_state(Client *c, const int dim) +{ + wlr_scene_node_set_enabled(&c->dimmer->node, DIMOPT && !c->neverdim && dim); +} + +static inline void client_set_fullscreen(Client *c, int fullscreen) { #ifdef XWAYLAND diff --git a/config.def.h b/config.def.h index 0f7d1c3..3ab5404 100644 --- a/config.def.h +++ b/config.def.h @@ -7,12 +7,12 @@ static const int sloppyfocus = 0; /* 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 unsigned int borderpx = 1; /* border pixel of windows */ - /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 0; /* 0 means bottom bar */ static const char *fonts[] = {"monospace:size=10"}; static const float rootcolor[] = COLOR(0x222222ff); +static const float unfocuseddim[] = COLOR(0x00000033); /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ static const float fullscreen_bg[] = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */ @@ -21,6 +21,7 @@ static uint32_t colors[][3] = { [SchemeNorm] = { 0xbbbbbbff, 0x222222ff, 0x444444ff }, [SchemeSel] = { 0xeeeeeeff, 0x005577ff, 0x005577ff }, [SchemeUrg] = { 0, 0, 0x770000ff }, + [SchemeTitle] = { 0x00CCEEff, 0x222222ff, 0x770000ff }, }; /* tagging - TAGCOUNT must be no greater than 31 */ @@ -30,10 +31,15 @@ static char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; /* logging */ static int log_level = WLR_ERROR; +static const Menu menus[] = { + /* command feed function action function */ + { "wmenu -i -l 10 -p Windows", menuwinfeed, menuwinaction }, +}; + static const Rule rules[] = { - /* app_id title tags mask isfloating monitor */ - { "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" */ + /* app_id title tags mask isfloating neverdim monitor */ + { "Gimp_EXAMPLE", NULL, 0, 1, 0, -1 }, /* Start on currently visible tags floating, not tiled */ + { "firefox_EXAMPLE", NULL, 1 << 8, 0, 0, -1 }, /* Start on ONLY tag "9" */ /* default/example rule: can be changed but cannot be eliminated; at least one rule must exist */ }; @@ -53,8 +59,8 @@ static const MonitorRule monrules[] = { /* name mfact nmaster scale layout rotate/reflect x y * example of a HiDPI laptop monitor: { "eDP-1", 0.5f, 1, 2, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, */ - { "eDP-1", 0.55f, 1, 1.7, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, - { "DP-3", 0.55f, 1, 1.7, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, + { "eDP-1", 0.55f, 1, 1.7f, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, + { "DP-3", 0.55f, 1, 1.7f, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, { NULL, 0.55f, 1, 1, &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 }, /* default monitor rule: can be changed but cannot be eliminated; at least one monitor rule must exist */ }; @@ -115,7 +121,7 @@ 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; /* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */ -#define MODKEY WLR_MODIFIER_ALT +#define MODKEY WLR_MODIFIER_LOGO #define TAGKEYS(KEY,SKEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ @@ -149,6 +155,7 @@ static const Key keys[] = { { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XKB_KEY_space, setlayout, {0} }, + { MODKEY, XKB_KEY_o, menu, {.v = &menus[0]} }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, @@ -88,7 +88,7 @@ #define TEXTW(mon, text) (drwl_font_getwidth(mon->drw, text) + mon->lrpad) /* enums */ -enum { SchemeNorm, SchemeSel, SchemeUrg }; /* color schemes */ +enum { SchemeNorm, SchemeSel, SchemeUrg, SchemeTitle }; /* color schemes */ enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */ enum { XDGShell, LayerShell, X11 }; /* client types */ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */ @@ -117,6 +117,7 @@ typedef struct { Monitor *mon; struct wlr_scene_tree *scene; struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ + struct wlr_scene_rect *dimmer; struct wlr_scene_tree *scene_surface; struct wl_list link; struct wl_list flink; @@ -146,7 +147,7 @@ typedef struct { #endif unsigned int bw; uint32_t tags; - int isfloating, isurgent, isfullscreen; + int isfloating, isurgent, isfullscreen, neverdim; uint32_t resize; /* configure serial of a pending resize */ } Client; @@ -253,6 +254,7 @@ typedef struct { const char *title; uint32_t tags; int isfloating; + int neverdim; int monitor; } Rule; @@ -265,6 +267,12 @@ typedef struct { struct wl_listener destroy; } SessionLock; +typedef struct { + const char *cmd; /* command to run a menu */ + void (*feed)(FILE *f); /* feed input to menu */ + void (*action)(char *line); /* do action based on menu output */ +} Menu; + /* function declarations */ static void applybounds(Client *c, struct wlr_box *bbox); static void applyrules(Client *c); @@ -334,6 +342,10 @@ static void killclient(const Arg *arg); static void locksession(struct wl_listener *listener, void *data); static void mapnotify(struct wl_listener *listener, void *data); static void maximizenotify(struct wl_listener *listener, void *data); +static void menu(const Arg *arg); +static int menuread(int fd, uint32_t mask, void *data); +static void menuwinfeed(FILE *f); +static void menuwinaction(char *line); static void monocle(Monitor *m); static void motionabsolute(struct wl_listener *listener, void *data); static void motionnotify(uint32_t time, struct wlr_input_device *device, double sx, @@ -384,6 +396,7 @@ static void urgent(struct wl_listener *listener, void *data); static void view(const Arg *arg); static void virtualkeyboard(struct wl_listener *listener, void *data); static void virtualpointer(struct wl_listener *listener, void *data); +static void warpcursor(const Client *c); 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); @@ -442,6 +455,7 @@ static struct wlr_output_layout *output_layout; static struct wlr_box sgeom; static struct wl_list mons; static Monitor *selmon; +static int DIMOPT = 1; static char stext[256]; static struct wl_event_source *status_event_source; @@ -482,6 +496,11 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag}; static struct wl_listener start_drag = {.notify = startdrag}; static struct wl_listener new_session_lock = {.notify = locksession}; +static const Menu *menu_current; +static int menu_fd; +static pid_t menu_pid; +static struct wl_event_source *menu_source; + #ifdef XWAYLAND static void activatex11(struct wl_listener *listener, void *data); static void associatex11(struct wl_listener *listener, void *data); @@ -536,6 +555,7 @@ applyrules(Client *c) if ((!r->title || strstr(title, r->title)) && (!r->id || strstr(appid, r->id))) { c->isfloating = r->isfloating; + c->neverdim = r-> neverdim; newtags |= r->tags; i = 0; wl_list_for_each(m, &mons, link) { @@ -587,6 +607,7 @@ arrange(Monitor *m) m->lt[m->sellt]->arrange(m); motionnotify(0, NULL, 0, 0, 0, 0); checkidleinhibitor(NULL); + warpcursor(focustop(selmon)); } void @@ -1615,7 +1636,7 @@ drawbar(Monitor *m) if ((w = m->b.width - tw - x) > m->b.height) { if (c) { - drwl_setscheme(m->drw, colors[m == selmon ? SchemeSel : SchemeNorm]); + drwl_setscheme(m->drw, colors[m == selmon ? SchemeTitle : SchemeNorm]); tw = TEXTW(selmon, client_get_title(c)); drwl_text(m->drw, x, 0, w, m->b.height, tw > w ? m->lrpad / 2 : (w - tw) / 2, @@ -1658,6 +1679,10 @@ focusclient(Client *c, int lift) if (locked) return; + /* Warp cursor to center of client if it is outside */ + if (lift) + warpcursor(c); + /* Raise client in stacking order if requested */ if (c && lift) wlr_scene_node_raise_to_top(&c->scene->node); @@ -1680,8 +1705,11 @@ focusclient(Client *c, int lift) /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ - if (!exclusive_focus && !seat->drag) + + if (!exclusive_focus && !seat->drag) { client_set_border_color(c, (float[])COLOR(colors[SchemeSel][ColBorder])); + client_set_dimmer_state(c, 0); + } } /* Deactivate old client if focus is changing */ @@ -1698,7 +1726,9 @@ focusclient(Client *c, int lift) /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg * and probably other clients */ } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { + client_set_border_color(old_c, (float[])COLOR(colors[SchemeNorm][ColBorder])); + client_set_dimmer_state(old_c, 1); client_activate_surface(old, 0); } } @@ -1985,8 +2015,7 @@ void mapnotify(struct wl_listener *listener, void *data) { /* Called when the surface is mapped, or ready to display on-screen. */ - Client *p = NULL; - Client *w, *c = wl_container_of(listener, c, map); + Client *p, *w, *d, *c = wl_container_of(listener, c, map); Monitor *m; int i; @@ -2020,6 +2049,10 @@ mapnotify(struct wl_listener *listener, void *data) c->border[i]->node.data = c; } + c->dimmer = wlr_scene_rect_create(c->scene, 0, 0, unfocuseddim); + c->dimmer->node.data = c; + client_set_dimmer_state(c, 1); + /* Initialize client geometry with room for border */ client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT); c->geom.width += 2 * c->bw; @@ -2038,6 +2071,10 @@ mapnotify(struct wl_listener *listener, void *data) setmon(c, p->mon, p->tags); } else { applyrules(c); + d = focustop(selmon); + if (d) { + client_set_dimmer_state(d, 0); + } } drawbars(); @@ -2068,6 +2105,125 @@ maximizenotify(struct wl_listener *listener, void *data) } void +menu(const Arg *arg) +{ + FILE *f; + int fd_right[2], fd_left[2]; + + if (menu_current != NULL) { + wl_event_source_remove(menu_source); + close(menu_fd); + kill(menu_pid, SIGTERM); + menu_current = NULL; + if (!arg->v) + return; + } + + if (pipe(fd_right) == -1 || pipe(fd_left) == -1) + return; + if ((menu_pid = fork()) == -1) + return; + if (menu_pid == 0) { + close(fd_right[1]); + close(fd_left[0]); + dup2(fd_right[0], STDIN_FILENO); + close(fd_right[0]); + dup2(fd_left[1], STDOUT_FILENO); + close(fd_left[1]); + execl("/bin/sh", "/bin/sh", "-c", ((Menu *)(arg->v))->cmd, NULL); + die("dwl: execl %s failed:", "/bin/sh"); + } + + close(fd_right[0]); + close(fd_left[1]); + menu_fd = fd_left[0]; + if (fd_set_nonblock(menu_fd) == -1) + return; + if (!(f = fdopen(fd_right[1], "w"))) + return; + menu_current = arg->v; + menu_current->feed(f); + fclose(f); + menu_source = wl_event_loop_add_fd(event_loop, + menu_fd, WL_EVENT_READABLE, menuread, NULL); +} + +int +menuread(int fd, uint32_t mask, void *data) +{ + char *s; + int n; + static char line[512]; + static int i = 0; + + if (mask & (WL_EVENT_HANGUP | WL_EVENT_ERROR)) { + i = 0; + menu(&(const Arg){ .v = NULL }); + return 0; + } + if ((n = read(menu_fd, line + i, LENGTH(line) - 1 - i)) == -1) { + if (errno != EAGAIN) { + i = 0; + menu(&(const Arg){ .v = NULL }); + } + return 0; + } + line[i + n] = '\0'; + if (!(s = strchr(line + i, '\n'))) { + i += n; + return 0; + } + i = 0; + *s = '\0'; + menu_current->action(line); + return 0; +} + +void +menuwinfeed(FILE *f) +{ + Client *c; + const char *title, *appid; + + wl_list_for_each(c, &fstack, flink) { + if (!(title = client_get_title(c))) + continue; + fprintf(f, "%s", title); + if ((appid = client_get_appid(c))) + fprintf(f, " | %s", appid); + fputc('\n', f); + } +} + +void +menuwinaction(char *line) +{ + Client *c; + const char *appid, *title; + static char buf[512]; + + wl_list_for_each(c, &fstack, flink) { + if (!(title = client_get_title(c))) + continue; + appid = client_get_appid(c); + snprintf(buf, LENGTH(buf) - 1, "%s%s%s", + title, appid ? " | " : "", appid ? appid : ""); + if (strcmp(line, buf) == 0) + goto found; + } + return; + +found: + if (!c->mon) + return; + wl_list_remove(&c->flink); + wl_list_insert(&fstack, &c->flink); + selmon = c->mon; + view(&(const Arg){ .ui = c->tags }); +} + + +void monocle(Monitor *m) { Client *c; @@ -2426,7 +2582,7 @@ resize(Client *c, struct wlr_box geo, int interact) c->geom = geo; applybounds(c, bbox); - /* Update scene-graph, including borders */ + /* Update scene-graph, including borders and dimmer*/ wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw); wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw); @@ -2436,6 +2592,8 @@ resize(Client *c, struct wlr_box geo, int interact) wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw); wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw); wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw); + wlr_scene_rect_set_size(c->dimmer, c->geom.width - 2*c->bw, c-> geom.height - 2*c->bw); + wlr_scene_node_set_position(&c->dimmer->node, c->bw, c->bw); /* this is a no-op if size hasn't changed */ c->resize = client_set_size(c, c->geom.width - 2 * c->bw, @@ -2615,6 +2773,8 @@ setmon(Client *c, Monitor *m, uint32_t newtags) /* Make sure window actually overlaps with the monitor */ resize(c, c->geom, 0); c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */ + c->prev.x = (m->w.width - c->prev.width) / 2 + m->m.x; + c->prev.y = (m->w.height - c->prev.height) / 2 + m->m.y; setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */ setfloating(c, c->isfloating); } @@ -3287,6 +3447,27 @@ virtualpointer(struct wl_listener *listener, void *data) wlr_cursor_map_input_to_output(cursor, device, event->suggested_output); } +void +warpcursor(const Client *c) { + if (cursor_mode != CurNormal) { + return; + } + if (!c && selmon) { + wlr_cursor_warp_closest(cursor, + NULL, + selmon->w.x + selmon->w.width / 2.0 , + selmon->w.y + selmon->w.height / 2.0); + } + else if ( c && (cursor->x < c->geom.x || + cursor->x > c->geom.x + c->geom.width || + cursor->y < c->geom.y || + cursor->y > c->geom.y + c->geom.height)) + wlr_cursor_warp_closest(cursor, + NULL, + c->geom.x + c->geom.width / 2.0, + c->geom.y + c->geom.height / 2.0); +} + Monitor * xytomon(double x, double y) { |