pinosaur
/
dmenu.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied Alexis Hildebrandts patches
[dmenu.git]
/
main.c
diff --git
a/main.c
b/main.c
index
9ef0bae
..
115fbde
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1,5
+1,5
@@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
+/* (C)opyright MMVI
-MMVII
Anselm R. Garbe <garbeam at gmail dot com>
+ * (C)opyright MMVI
-MMVII
Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details.
*/
#include "dmenu.h"
* See LICENSE file for license details.
*/
#include "dmenu.h"
@@
-164,6
+164,8
@@
kpress(XKeyEvent * e) {
switch (ksym) {
default: /* ignore other control sequences */
return;
switch (ksym) {
default: /* ignore other control sequences */
return;
+ case XK_bracketleft:
+ ksym = XK_Escape;
break;
case XK_h:
case XK_H:
break;
case XK_h:
case XK_H:
@@
-175,7
+177,6
@@
kpress(XKeyEvent * e) {
match(text);
drawmenu();
return;
match(text);
drawmenu();
return;
- break;
}
}
if(e->state & Mod1Mask) {
}
}
if(e->state & Mod1Mask) {
@@
-348,37
+349,37
@@
main(int argc, char *argv[]) {
timeout.tv_sec = 3;
/* command line args */
for(i = 1; i < argc; i++)
timeout.tv_sec = 3;
/* command line args */
for(i = 1; i < argc; i++)
- if(!strncmp(argv[i], "-b
ottom", 8
)) {
+ if(!strncmp(argv[i], "-b
", 3
)) {
bottom = True;
}
bottom = True;
}
- else if(!strncmp(argv[i], "-f
ont", 6
)) {
+ else if(!strncmp(argv[i], "-f
n", 4
)) {
if(++i < argc) font = argv[i];
}
if(++i < argc) font = argv[i];
}
- else if(!strncmp(argv[i], "-n
ormbg", 8
)) {
+ else if(!strncmp(argv[i], "-n
b", 4
)) {
if(++i < argc) normbg = argv[i];
}
if(++i < argc) normbg = argv[i];
}
- else if(!strncmp(argv[i], "-n
ormfg", 8
)) {
+ else if(!strncmp(argv[i], "-n
f", 4
)) {
if(++i < argc) normfg = argv[i];
}
if(++i < argc) normfg = argv[i];
}
- else if(!strncmp(argv[i], "-selbg", 7)) {
+ else if(!strncmp(argv[i], "-p", 3)) {
+ if(++i < argc) prompt = argv[i];
+ }
+ else if(!strncmp(argv[i], "-sb", 4)) {
if(++i < argc) selbg = argv[i];
}
if(++i < argc) selbg = argv[i];
}
- else if(!strncmp(argv[i], "-s
elfg", 7
)) {
+ else if(!strncmp(argv[i], "-s
f", 4
)) {
if(++i < argc) selfg = argv[i];
}
if(++i < argc) selfg = argv[i];
}
- else if(!strncmp(argv[i], "-p", 3)) {
- if(++i < argc) prompt = argv[i];
- }
else if(!strncmp(argv[i], "-t", 3)) {
if(++i < argc) timeout.tv_sec = atoi(argv[i]);
}
else if(!strncmp(argv[i], "-v", 3)) {
else if(!strncmp(argv[i], "-t", 3)) {
if(++i < argc) timeout.tv_sec = atoi(argv[i]);
}
else if(!strncmp(argv[i], "-v", 3)) {
- fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+ fputs("dmenu-"VERSION", (C)opyright MMVI
-MMVII
Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);
}
else
exit(EXIT_SUCCESS);
}
else
- eprint("usage: dmenu [-b
ottom] [-font <name>] [-{norm,sel}{bg,fg} <color
>]\n"
- " [-
p <prompt
>] [-t <seconds>] [-v]\n", stdout);
+ eprint("usage: dmenu [-b
] [-fn <font>] [-nb <color>] [-nf <color>] [-p <prompt
>]\n"
+ " [-
sb <color>] [-sf <color
>] [-t <seconds>] [-v]\n", stdout);
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)