diff options
@@ -240,6 +240,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); @@ -300,6 +306,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, @@ -437,6 +447,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); @@ -1822,6 +1837,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; |