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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
diff --git a/dmenu.c b/dmenu.c
index 77f424d..4c841d8 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -81,19 +81,6 @@ appenditem(struct item *item, struct item **list, struct item **last)
static void
calcoffsets(void)
{
- int i, n;
-
- if (lines > 0)
- n = lines * bh;
- else
- n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
- /* calculate which items will begin the next page and previous page */
- for (i = 0, next = curr; next; next = next->right)
- if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
- break;
- for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
- if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
- break;
}
static void
@@ -148,10 +135,10 @@ drawhighlights(struct item *item, int x, int y, int maxw)
// Move highlight str end, draw highlight, & restore
restorechar = highlight[strlen(token)];
highlight[strlen(token)] = '\0';
- if (indentx - (lrpad / 2) - 1 < maxw)
+ if (indentx - lrpad - 1 < maxw)
drw_text(
drw,
- x + indentx - (lrpad / 2) - 1,
+ x + indentx - lrpad - 1,
y,
MIN(maxw - indentx, TEXTW(highlight) - lrpad),
bh, 0, highlight, 0
@@ -174,7 +161,7 @@ drawitem(struct item *item, int x, int y, int w)
else
drw_setscheme(drw, scheme[SchemeNorm]);
- int r = drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+ int r = drw_text(drw, x, y, w, bh, lrpad, item->text, 0);
drawhighlights(item, x, y, w);
return r;
}
@@ -182,7 +169,6 @@ drawitem(struct item *item, int x, int y, int w)
static void
drawmenu(void)
{
- unsigned int curpos;
struct item *item;
int x = 0, y = 0, w;
@@ -191,17 +177,7 @@ drawmenu(void)
if (prompt && *prompt) {
drw_setscheme(drw, scheme[SchemeSel]);
- x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
- }
- /* draw input field */
- w = (lines > 0 || !matches) ? mw - x : inputw;
- drw_setscheme(drw, scheme[SchemeNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
-
- curpos = TEXTW(text) - TEXTW(&text[cursor]);
- if ((curpos += lrpad / 2 - 1) < w) {
- drw_setscheme(drw, scheme[SchemeNorm]);
- drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
+ x = drw_text(drw, x, 0, promptw, bh, lrpad, prompt, 0);
}
if (lines > 0) {
@@ -211,18 +187,18 @@ drawmenu(void)
} else if (matches) {
/* draw horizontal list */
x += inputw;
- w = TEXTW("<");
+ w = TEXTW("");
if (curr->left) {
drw_setscheme(drw, scheme[SchemeNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
+ drw_text(drw, x, 0, w, bh, lrpad, "", 0);
}
x += w;
for (item = curr; item != next; item = item->right)
- x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
+ x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW("")));
if (next) {
- w = TEXTW(">");
+ w = TEXTW("");
drw_setscheme(drw, scheme[SchemeNorm]);
- drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
+ drw_text(drw, mw - w, 0, w, bh, lrpad, "", 0);
}
}
drw_map(drw, win, 0, 0, mw, mh);
@@ -671,7 +647,7 @@ static void
readstdin(void)
{
char buf[sizeof text], *p;
- size_t i, imax = 0, size = 0;
+ size_t i, size = 0;
unsigned int tmpmax = 0;
/* read each line from stdin and add it to the item list */
@@ -687,12 +663,11 @@ readstdin(void)
drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
if (tmpmax > inputw) {
inputw = tmpmax;
- imax = i;
}
}
if (items)
items[i].text = NULL;
- inputw = items ? TEXTW(items[imax].text) : 0;
+ inputw = 0;
lines = MIN(lines, i);
}
@@ -805,7 +780,7 @@ setup(void)
y = topbar ? 0 : wa.height - mh;
mw = wa.width;
}
- promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
+ promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad : 0;
inputw = MIN(inputw, mw/3);
match();
@@ -972,7 +947,7 @@ main(int argc, char *argv[])
die("no fonts could be loaded.");
free((char *) fonts[0]);
- lrpad = drw->fonts->h;
+ lrpad = 10;
#ifdef __OpenBSD__
if (pledge("stdio rpath", NULL) == -1)
diff --git a/drw.c b/drw.c
index 4cdbcbe..176ac37 100644
--- a/drw.c
+++ b/drw.c
@@ -277,8 +277,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
d = XftDrawCreate(drw->dpy, drw->drawable,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen));
- x += lpad;
- w -= lpad;
+ x += 0;
+ w -= 0;
}
usedfont = drw->fonts;
|
