1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
From db596234b244382e984228791e840190d82967ea Mon Sep 17 00:00:00 2001
From: NRK <nrk@disroot.org>
Date: Fri, 3 Sep 2021 11:11:14 +0600
Subject: [PATCH] patch: seperator
---
dmenu.1 | 12 ++++++++++++
dmenu.c | 31 +++++++++++++++++++++++++++----
2 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/dmenu.1 b/dmenu.1
index 323f93c..d511148 100644
--- a/dmenu.1
+++ b/dmenu.1
@@ -22,6 +22,10 @@ dmenu \- dynamic menu
.IR color ]
.RB [ \-w
.IR windowid ]
+.RB [ \-d
+.IR separator ]
+.RB [ \-D
+.IR separator ]
.P
.BR dmenu_run " ..."
.SH DESCRIPTION
@@ -80,6 +84,14 @@ prints version information to stdout, then exits.
.TP
.BI \-w " windowid"
embed into windowid.
+.TP
+.BI \-d " separator"
+separate the input into two halves on the first occurrence of the given charcter.
+Display only the first half in dmenu and print the second half to stdout upon selection.
+Appending '|' to the separator reverses the display/printing order.
+.TP
+.BI \-D " separator"
+same as \-d but separate based on the last occurrence.
.SH USAGE
dmenu is completely controlled by the keyboard. Items are selected using the
arrow keys, page up, page down, home, and end.
diff --git a/dmenu.c b/dmenu.c
index 7cf253b..a8eb321 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -30,12 +30,15 @@ enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
struct item {
char *text;
+ char *text_output;
struct item *left, *right;
int out;
};
static char text[BUFSIZ] = "";
static char *embed;
+static char separator, separator_reverse;
+static char * (*sepchr)(const char *, int);
static int bh, mw, mh;
static int inputw = 0, promptw;
static int lrpad; /* sum of left and right padding */
@@ -105,7 +108,7 @@ cleanup(void)
for (i = 0; i < SchemeLast; i++)
free(scheme[i]);
for (i = 0; items && items[i].text; ++i)
- free(items[i].text);
+ free(separator_reverse ? items[i].text_output : items[i].text);
free(items);
drw_free(drw);
XSync(dpy, False);
@@ -490,7 +493,7 @@ insert:
break;
case XK_Return:
case XK_KP_Enter:
- puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+ puts((sel && !(ev->state & ShiftMask)) ? sel->text_output : text);
if (!(ev->state & ControlMask)) {
cleanup();
exit(0);
@@ -549,7 +552,7 @@ paste(void)
static void
readstdin(void)
{
- char *line = NULL;
+ char *p, *line = NULL;
size_t i, junk, size = 0;
ssize_t len;
@@ -561,6 +564,19 @@ readstdin(void)
if (line[len - 1] == '\n')
line[len - 1] = '\0';
items[i].text = line;
+
+ if (separator && (p = sepchr(items[i].text, separator)) != NULL) {
+ *p = '\0';
+ items[i].text_output = ++p;
+ } else {
+ items[i].text_output = items[i].text;
+ }
+ if (separator_reverse) {
+ p = items[i].text;
+ items[i].text = items[i].text_output;
+ items[i].text_output = p;
+ }
+
items[i].out = 0;
}
if (items)
@@ -711,7 +727,8 @@ static void
usage(void)
{
die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
- " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
+ " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n"
+ " [-d separator] [-D separator]");
}
int
@@ -753,6 +770,12 @@ main(int argc, char *argv[])
colors[SchemeSel][ColFg] = argv[++i];
else if (!strcmp(argv[i], "-w")) /* embedding window id */
embed = argv[++i];
+ else if (!strcmp(argv[i], "-d") || /* field separator */
+ !strcmp(argv[i], "-D")) {
+ sepchr = argv[i][1] == 'D' ? strrchr : strchr;
+ separator = argv[++i][0];
+ separator_reverse = argv[i][1] == '|';
+ }
else
usage();
--
2.35.1
|
