Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
f7615e220e | |||
e7ecae0d58 | |||
b661ca75de | |||
c02da9f87e | |||
14133be5bd | |||
3b590beda2 | |||
5c0d28e4ff | |||
e0fe9f2fca | |||
c9465859a6 | |||
1716159e05 | |||
11b6401668 | |||
81bcf078f6 | |||
0e5f467aa8 | |||
c51406b279 | |||
32f7fe4835 | |||
0fa5a339ff | |||
358f078c0b | |||
1f207893e6 | |||
1c5be1c553 | |||
32ea45084b | |||
cc7d863b6e | |||
04eade6a76 | |||
49ce444d32 | |||
2e9515ee27 |
5
.hgtags
5
.hgtags
@ -3,3 +3,8 @@ fcc8a282cb52c6a9343b461026b386825590cd31 0.1
|
|||||||
d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
|
d352e9dc112ee96aa5cad961a0ed880ae9ce7276 0.3
|
||||||
7acf0dde1120542917bae12e0e42293f9d2cc899 0.4
|
7acf0dde1120542917bae12e0e42293f9d2cc899 0.4
|
||||||
4a0ecd881c4fc15de4a0bebd79308b064be020ef 0.5
|
4a0ecd881c4fc15de4a0bebd79308b064be020ef 0.5
|
||||||
|
25f679fb19686140a907684ffcb423b9e9d44b53 0.6
|
||||||
|
5fc20d7158bd16b4d5f8d1c25e177680b6d54252 0.7
|
||||||
|
409667a57221f7e50ba8b5248f638915cd61b366 0.8
|
||||||
|
d046c818ea467555cc338751c9bf3024609f1f12 0.9
|
||||||
|
9e11140d4cc3eecac3b0ab752f91528fd5e04be8 1.0
|
||||||
|
9
Makefile
9
Makefile
@ -19,11 +19,7 @@ options:
|
|||||||
@echo CC $<
|
@echo CC $<
|
||||||
@${CC} -c ${CFLAGS} $<
|
@${CC} -c ${CFLAGS} $<
|
||||||
|
|
||||||
${OBJ}: dmenu.h config.h config.mk
|
${OBJ}: dmenu.h config.mk
|
||||||
|
|
||||||
config.h:
|
|
||||||
@echo creating $@ from config.default.h
|
|
||||||
@cp config.default.h $@
|
|
||||||
|
|
||||||
dmenu: ${OBJ}
|
dmenu: ${OBJ}
|
||||||
@echo LD $@
|
@echo LD $@
|
||||||
@ -37,8 +33,7 @@ clean:
|
|||||||
dist: clean
|
dist: clean
|
||||||
@echo creating dist tarball
|
@echo creating dist tarball
|
||||||
@mkdir -p dmenu-${VERSION}
|
@mkdir -p dmenu-${VERSION}
|
||||||
@cp -R LICENSE Makefile README config.*.h config.mk \
|
@cp -R LICENSE Makefile README config.mk dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
|
||||||
dmenu.1 dmenu.h ${SRC} dmenu-${VERSION}
|
|
||||||
@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
|
@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
|
||||||
@gzip dmenu-${VERSION}.tar
|
@gzip dmenu-${VERSION}.tar
|
||||||
@rm -rf dmenu-${VERSION}
|
@rm -rf dmenu-${VERSION}
|
||||||
|
10
README
10
README
@ -1,6 +1,6 @@
|
|||||||
dmenu - dynamic menu
|
dmenu - dynamic menu
|
||||||
--------------------
|
====================
|
||||||
dmenu is a generic, highly customizable, and efficient menu for X.
|
dmenu is a generic and efficient menu for X.
|
||||||
|
|
||||||
|
|
||||||
Requirements
|
Requirements
|
||||||
@ -22,9 +22,3 @@ necessary as root):
|
|||||||
Running dmenu
|
Running dmenu
|
||||||
-------------
|
-------------
|
||||||
See the man page for details.
|
See the man page for details.
|
||||||
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
The configuration of dmenu is done by creating a custom config.h
|
|
||||||
and (re)compiling the source code.
|
|
||||||
|
10
config.arg.h
10
config.arg.h
@ -1,10 +0,0 @@
|
|||||||
/*
|
|
||||||
* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
|
||||||
* See LICENSE file for license details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define FONT "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
|
|
||||||
#define SELBGCOLOR "#333366"
|
|
||||||
#define SELFGCOLOR "#eeeeee"
|
|
||||||
#define NORMBGCOLOR "#333333"
|
|
||||||
#define NORMFGCOLOR "#dddddd"
|
|
@ -1,10 +0,0 @@
|
|||||||
/*
|
|
||||||
* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
|
|
||||||
* See LICENSE file for license details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define FONT "fixed"
|
|
||||||
#define SELBGCOLOR "#666699"
|
|
||||||
#define SELFGCOLOR "#eeeeee"
|
|
||||||
#define NORMBGCOLOR "#333366"
|
|
||||||
#define NORMFGCOLOR "#cccccc"
|
|
@ -1,5 +1,5 @@
|
|||||||
# dmenu version
|
# dmenu version
|
||||||
VERSION = 0.6
|
VERSION = 1.1
|
||||||
|
|
||||||
# Customize below to fit your system
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
82
dmenu.1
82
dmenu.1
@ -3,62 +3,78 @@
|
|||||||
dmenu \- dynamic menu
|
dmenu \- dynamic menu
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B dmenu
|
.B dmenu
|
||||||
|
.RB [ \-font <name> ]
|
||||||
|
.RB [ \-normbg <color> ]
|
||||||
|
.RB [ \-normfg <color> ]
|
||||||
|
.RB [ \-selbg <color> ]
|
||||||
|
.RB [ \-selfg <color> ]
|
||||||
|
.RB [ \-t <seconds> ]
|
||||||
.RB [ \-v ]
|
.RB [ \-v ]
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.SS Overview
|
.SS Overview
|
||||||
.B dmenu
|
dmenu is a generic menu for X, originally designed for
|
||||||
is a generic, highly customizable, and efficient menu for X,
|
|
||||||
originally designed for
|
|
||||||
.BR dwm (1).
|
.BR dwm (1).
|
||||||
It supports arbitrary, user defined menu contents.
|
It manages huge amounts (up to 10.000 and more) of user defined menu items
|
||||||
|
efficiently.
|
||||||
.SS Options
|
.SS Options
|
||||||
.TP
|
.TP
|
||||||
|
.B \-font <name>
|
||||||
|
defines the font.
|
||||||
|
.TP
|
||||||
|
.B \-normbg <color>
|
||||||
|
defines the normal background color (#RGB, #RRGGBB, and color names are supported).
|
||||||
|
.TP
|
||||||
|
.B \-normfg <color>
|
||||||
|
defines the normal foreground color (#RGB, #RRGGBB, and color names are supported).
|
||||||
|
.TP
|
||||||
|
.B \-selbg <color>
|
||||||
|
defines the selected background color (#RGB, #RRGGBB, and color names are supported).
|
||||||
|
.TP
|
||||||
|
.B \-selfg <color>
|
||||||
|
defines the selected foreground color (#RGB, #RRGGBB, and color names are supported).
|
||||||
|
.TP
|
||||||
|
.B \-t <seconds>
|
||||||
|
defines the seconds to wait for standard input, before exiting (default is 3).
|
||||||
|
.TP
|
||||||
.B \-v
|
.B \-v
|
||||||
prints version information to standard output, then exits.
|
prints version information to standard output, then exits.
|
||||||
.SH USAGE
|
.SH USAGE
|
||||||
.B dmenu
|
dmenu reads a list of newline-separated items from standard input and creates a
|
||||||
reads a list of newline-separated items from standard input and creates a menu.
|
menu. When the user selects an item or enters any text and presses Return, his
|
||||||
When the user selects an item or enters any text and presses Return, his choice
|
choice is printed to standard output and dmenu terminates.
|
||||||
is printed to standard output and
|
.P
|
||||||
.B dmenu
|
dmenu is completely controlled by the keyboard. The following keys are recognized:
|
||||||
terminates.
|
|
||||||
.B dmenu
|
|
||||||
is completely controlled by the keyboard. The following keys are recognized:
|
|
||||||
.TP
|
.TP
|
||||||
Any printable character
|
.B Any printable character
|
||||||
Appends the character to the text in the input field. This works as a filter:
|
Appends the character to the text in the input field. This works as a filter:
|
||||||
only items containing this text will be displayed.
|
only items containing this text will be displayed.
|
||||||
.TP
|
.TP
|
||||||
Left/Right
|
.B Left/Right
|
||||||
Select the previous/next item.
|
Select the previous/next item.
|
||||||
.TP
|
.TP
|
||||||
Tab
|
.B Tab
|
||||||
Copy the selected item to the input field.
|
Copy the selected item to the input field.
|
||||||
.TP
|
.TP
|
||||||
Return
|
.B Return
|
||||||
Confirm selection and quit (print the selected item to standard output).
|
Confirm selection and quit (print the selected item to standard output). Returns
|
||||||
|
.B 0
|
||||||
|
on termination.
|
||||||
.TP
|
.TP
|
||||||
Shift-Return
|
.B Shift-Return
|
||||||
Confirm selection and quit (print the text in the input field to standard output).
|
Confirm selection and quit (print the text in the input field to standard output).
|
||||||
|
Returns
|
||||||
|
.B 0
|
||||||
|
on termination.
|
||||||
.TP
|
.TP
|
||||||
Escape
|
.B Escape
|
||||||
Quit without selecting an item.
|
Quit without selecting an item. Returns
|
||||||
|
.B 1
|
||||||
|
on termination.
|
||||||
.TP
|
.TP
|
||||||
Backspace (Control-h)
|
.B Backspace (Control-h)
|
||||||
Remove enough characters from the input field to change its filtering effect.
|
Remove enough characters from the input field to change its filtering effect.
|
||||||
.TP
|
.TP
|
||||||
Control-u
|
.B Control-u
|
||||||
Remove all characters from the input field.
|
Remove all characters from the input field.
|
||||||
.P
|
|
||||||
.B dmenu
|
|
||||||
returns
|
|
||||||
.B 0
|
|
||||||
if Return is pressed on termination,
|
|
||||||
.B 1
|
|
||||||
if Escape is pressed.
|
|
||||||
.SH CUSTOMIZATION
|
|
||||||
.B dmenu
|
|
||||||
is customized by creating a custom config.h and (re)compiling the source
|
|
||||||
code. This keeps it fast, secure and simple.
|
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
.BR dwm (1)
|
.BR dwm (1)
|
||||||
|
27
dmenu.h
27
dmenu.h
@ -3,10 +3,14 @@
|
|||||||
* See LICENSE file for license details.
|
* See LICENSE file for license details.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xlocale.h>
|
#include <X11/Xlocale.h>
|
||||||
|
|
||||||
|
#define FONT "fixed"
|
||||||
|
#define NORMBGCOLOR "#333366"
|
||||||
|
#define NORMFGCOLOR "#cccccc"
|
||||||
|
#define SELBGCOLOR "#666699"
|
||||||
|
#define SELFGCOLOR "#eeeeee"
|
||||||
#define SPACE 30 /* px */
|
#define SPACE 30 /* px */
|
||||||
|
|
||||||
/* color */
|
/* color */
|
||||||
@ -23,26 +27,27 @@ struct Fnt {
|
|||||||
int height;
|
int height;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DC { /* draw context */
|
struct DC {
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
unsigned long norm[ColLast];
|
unsigned long norm[ColLast];
|
||||||
unsigned long sel[ColLast];
|
unsigned long sel[ColLast];
|
||||||
Drawable drawable;
|
Drawable drawable;
|
||||||
Fnt font;
|
Fnt font;
|
||||||
GC gc;
|
GC gc;
|
||||||
};
|
}; /* draw context */
|
||||||
|
|
||||||
extern int screen;
|
extern int screen;
|
||||||
extern Display *dpy;
|
extern Display *dpy;
|
||||||
extern DC dc;
|
extern DC dc; /* global drawing context */
|
||||||
|
|
||||||
/* draw.c */
|
/* draw.c */
|
||||||
extern void drawtext(const char *text, unsigned long col[ColLast]);
|
extern void drawtext(const char *text,
|
||||||
extern unsigned long getcolor(const char *colstr);
|
unsigned long col[ColLast]); /* draws text with the defined color tuple */
|
||||||
extern void setfont(const char *fontstr);
|
extern unsigned long getcolor(const char *colstr); /* returns color of colstr */
|
||||||
extern unsigned int textw(const char *text);
|
extern void setfont(const char *fontstr); /* sets global font */
|
||||||
|
extern unsigned int textw(const char *text); /* returns width of text in px */
|
||||||
|
|
||||||
/* util.c */
|
/* util.c */
|
||||||
extern void *emalloc(unsigned int size);
|
extern void *emalloc(unsigned int size); /* allocates memory, exits on error */
|
||||||
extern void eprint(const char *errstr, ...);
|
extern void eprint(const char *errstr, ...); /* prints errstr and exits with 1 */
|
||||||
extern char *estrdup(const char *str);
|
extern char *estrdup(const char *str); /* duplicates str, exits on allocation error */
|
||||||
|
18
draw.c
18
draw.c
@ -10,8 +10,7 @@
|
|||||||
/* static */
|
/* static */
|
||||||
|
|
||||||
static unsigned int
|
static unsigned int
|
||||||
textnw(const char *text, unsigned int len)
|
textnw(const char *text, unsigned int len) {
|
||||||
{
|
|
||||||
XRectangle r;
|
XRectangle r;
|
||||||
|
|
||||||
if(dc.font.set) {
|
if(dc.font.set) {
|
||||||
@ -24,8 +23,7 @@ textnw(const char *text, unsigned int len)
|
|||||||
/* extern */
|
/* extern */
|
||||||
|
|
||||||
void
|
void
|
||||||
drawtext(const char *text, unsigned long col[ColLast])
|
drawtext(const char *text, unsigned long col[ColLast]) {
|
||||||
{
|
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
static char buf[256];
|
static char buf[256];
|
||||||
unsigned int len, olen;
|
unsigned int len, olen;
|
||||||
@ -78,18 +76,17 @@ drawtext(const char *text, unsigned long col[ColLast])
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned long
|
unsigned long
|
||||||
getcolor(const char *colstr)
|
getcolor(const char *colstr) {
|
||||||
{
|
|
||||||
Colormap cmap = DefaultColormap(dpy, screen);
|
Colormap cmap = DefaultColormap(dpy, screen);
|
||||||
XColor color;
|
XColor color;
|
||||||
|
|
||||||
XAllocNamedColor(dpy, cmap, colstr, &color, &color);
|
if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
|
||||||
|
eprint("error, cannot allocate color '%s'\n", colstr);
|
||||||
return color.pixel;
|
return color.pixel;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
setfont(const char *fontstr)
|
setfont(const char *fontstr) {
|
||||||
{
|
|
||||||
char **missing, *def;
|
char **missing, *def;
|
||||||
int i, n;
|
int i, n;
|
||||||
|
|
||||||
@ -137,7 +134,6 @@ setfont(const char *fontstr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
unsigned int
|
unsigned int
|
||||||
textw(const char *text)
|
textw(const char *text) {
|
||||||
{
|
|
||||||
return textnw(text, strlen(text)) + dc.font.height;
|
return textnw(text, strlen(text)) + dc.font.height;
|
||||||
}
|
}
|
||||||
|
91
main.c
91
main.c
@ -11,6 +11,8 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/time.h>
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/keysym.h>
|
#include <X11/keysym.h>
|
||||||
@ -40,8 +42,7 @@ static Window root;
|
|||||||
static Window win;
|
static Window win;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
calcoffsets()
|
calcoffsets(void) {
|
||||||
{
|
|
||||||
unsigned int tw, w;
|
unsigned int tw, w;
|
||||||
|
|
||||||
if(!curr)
|
if(!curr)
|
||||||
@ -69,8 +70,7 @@ calcoffsets()
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
drawmenu()
|
drawmenu(void) {
|
||||||
{
|
|
||||||
Item *i;
|
Item *i;
|
||||||
|
|
||||||
dc.x = 0;
|
dc.x = 0;
|
||||||
@ -108,8 +108,7 @@ drawmenu()
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
match(char *pattern)
|
match(char *pattern) {
|
||||||
{
|
|
||||||
unsigned int plen;
|
unsigned int plen;
|
||||||
Item *i, *j;
|
Item *i, *j;
|
||||||
|
|
||||||
@ -149,8 +148,7 @@ match(char *pattern)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
kpress(XKeyEvent * e)
|
kpress(XKeyEvent * e) {
|
||||||
{
|
|
||||||
char buf[32];
|
char buf[32];
|
||||||
int num, prev_nitem;
|
int num, prev_nitem;
|
||||||
unsigned int i, len;
|
unsigned int i, len;
|
||||||
@ -210,10 +208,8 @@ kpress(XKeyEvent * e)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case XK_Return:
|
case XK_Return:
|
||||||
if(e->state & ShiftMask) {
|
if((e->state & ShiftMask) && text)
|
||||||
if(text)
|
|
||||||
fprintf(stdout, "%s", text);
|
fprintf(stdout, "%s", text);
|
||||||
}
|
|
||||||
else if(sel)
|
else if(sel)
|
||||||
fprintf(stdout, "%s", sel->text);
|
fprintf(stdout, "%s", sel->text);
|
||||||
else if(text)
|
else if(text)
|
||||||
@ -249,8 +245,7 @@ kpress(XKeyEvent * e)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
readstdin()
|
readstdin(void) {
|
||||||
{
|
|
||||||
static char *maxname = NULL;
|
static char *maxname = NULL;
|
||||||
char *p, buf[1024];
|
char *p, buf[1024];
|
||||||
unsigned int len = 0, max = 0;
|
unsigned int len = 0, max = 0;
|
||||||
@ -287,19 +282,42 @@ Display *dpy;
|
|||||||
DC dc = {0};
|
DC dc = {0};
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[]) {
|
||||||
{
|
char *font = FONT;
|
||||||
char *maxname;
|
char *maxname;
|
||||||
Item *i;
|
char *normbg = NORMBGCOLOR;
|
||||||
|
char *normfg = NORMFGCOLOR;
|
||||||
|
char *selbg = SELBGCOLOR;
|
||||||
|
char *selfg = SELFGCOLOR;
|
||||||
|
fd_set rd;
|
||||||
|
int i;
|
||||||
|
struct timeval timeout;
|
||||||
|
Item *itm;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
XSetWindowAttributes wa;
|
XSetWindowAttributes wa;
|
||||||
|
|
||||||
if(argc == 2 && !strncmp("-v", argv[1], 3)) {
|
timeout.tv_usec = 0;
|
||||||
|
timeout.tv_sec = 3;
|
||||||
|
/* command line args */
|
||||||
|
for(i = 1; i < argc; i++)
|
||||||
|
if(!strncmp(argv[i], "-font", 6))
|
||||||
|
font = argv[++i];
|
||||||
|
else if(!strncmp(argv[i], "-normbg", 8))
|
||||||
|
normbg = argv[++i];
|
||||||
|
else if(!strncmp(argv[i], "-normfg", 8))
|
||||||
|
normfg = argv[++i];
|
||||||
|
else if(!strncmp(argv[i], "-selbg", 7))
|
||||||
|
selbg = argv[++i];
|
||||||
|
else if(!strncmp(argv[i], "-selfg", 7))
|
||||||
|
selfg = argv[++i];
|
||||||
|
else if(!strncmp(argv[i], "-t", 3))
|
||||||
|
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 Anselm R. Garbe\n", stdout);
|
||||||
exit(EXIT_SUCCESS);
|
exit(EXIT_SUCCESS);
|
||||||
}
|
}
|
||||||
else if(argc != 1)
|
else
|
||||||
eprint("usage: dmenu [-v]\n");
|
eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
|
||||||
|
|
||||||
dpy = XOpenDisplay(0);
|
dpy = XOpenDisplay(0);
|
||||||
if(!dpy)
|
if(!dpy)
|
||||||
@ -307,19 +325,27 @@ main(int argc, char *argv[])
|
|||||||
screen = DefaultScreen(dpy);
|
screen = DefaultScreen(dpy);
|
||||||
root = RootWindow(dpy, screen);
|
root = RootWindow(dpy, screen);
|
||||||
|
|
||||||
maxname = readstdin();
|
/* Note, the select() construction allows to grab all keypresses as
|
||||||
|
* early as possible, to not loose them. But if there is no standard
|
||||||
/* grab as early as possible, but after reading all items!!! */
|
* input supplied, we will make sure to exit after MAX_WAIT_STDIN
|
||||||
|
* seconds. This is convenience behavior for rapid typers.
|
||||||
|
*/
|
||||||
while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
|
while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
|
||||||
GrabModeAsync, CurrentTime) != GrabSuccess)
|
GrabModeAsync, CurrentTime) != GrabSuccess)
|
||||||
usleep(1000);
|
usleep(1000);
|
||||||
|
|
||||||
|
FD_ZERO(&rd);
|
||||||
|
FD_SET(STDIN_FILENO, &rd);
|
||||||
|
if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
|
||||||
|
goto UninitializedEnd;
|
||||||
|
maxname = readstdin();
|
||||||
|
|
||||||
/* style */
|
/* style */
|
||||||
dc.sel[ColBG] = getcolor(SELBGCOLOR);
|
dc.norm[ColBG] = getcolor(normbg);
|
||||||
dc.sel[ColFG] = getcolor(SELFGCOLOR);
|
dc.norm[ColFG] = getcolor(normfg);
|
||||||
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
|
dc.sel[ColBG] = getcolor(selbg);
|
||||||
dc.norm[ColFG] = getcolor(NORMFGCOLOR);
|
dc.sel[ColFG] = getcolor(selfg);
|
||||||
setfont(FONT);
|
setfont(font);
|
||||||
|
|
||||||
wa.override_redirect = 1;
|
wa.override_redirect = 1;
|
||||||
wa.background_pixmap = ParentRelative;
|
wa.background_pixmap = ParentRelative;
|
||||||
@ -354,6 +380,8 @@ main(int argc, char *argv[])
|
|||||||
/* main event loop */
|
/* main event loop */
|
||||||
while(running && !XNextEvent(dpy, &ev)) {
|
while(running && !XNextEvent(dpy, &ev)) {
|
||||||
switch (ev.type) {
|
switch (ev.type) {
|
||||||
|
default: /* ignore all crap */
|
||||||
|
break;
|
||||||
case KeyPress:
|
case KeyPress:
|
||||||
kpress(&ev.xkey);
|
kpress(&ev.xkey);
|
||||||
break;
|
break;
|
||||||
@ -361,17 +389,14 @@ main(int argc, char *argv[])
|
|||||||
if(ev.xexpose.count == 0)
|
if(ev.xexpose.count == 0)
|
||||||
drawmenu();
|
drawmenu();
|
||||||
break;
|
break;
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
XUngrabKeyboard(dpy, CurrentTime);
|
|
||||||
while(allitems) {
|
while(allitems) {
|
||||||
i = allitems->next;
|
itm = allitems->next;
|
||||||
free(allitems->text);
|
free(allitems->text);
|
||||||
free(allitems);
|
free(allitems);
|
||||||
allitems = i;
|
allitems = itm;
|
||||||
}
|
}
|
||||||
if(dc.font.set)
|
if(dc.font.set)
|
||||||
XFreeFontSet(dpy, dc.font.set);
|
XFreeFontSet(dpy, dc.font.set);
|
||||||
@ -380,6 +405,8 @@ main(int argc, char *argv[])
|
|||||||
XFreePixmap(dpy, dc.drawable);
|
XFreePixmap(dpy, dc.drawable);
|
||||||
XFreeGC(dpy, dc.gc);
|
XFreeGC(dpy, dc.gc);
|
||||||
XDestroyWindow(dpy, win);
|
XDestroyWindow(dpy, win);
|
||||||
|
UninitializedEnd:
|
||||||
|
XUngrabKeyboard(dpy, CurrentTime);
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
12
util.c
12
util.c
@ -13,16 +13,14 @@
|
|||||||
/* static */
|
/* static */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
badmalloc(unsigned int size)
|
badmalloc(unsigned int size) {
|
||||||
{
|
|
||||||
eprint("fatal: could not malloc() %u bytes\n", size);
|
eprint("fatal: could not malloc() %u bytes\n", size);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* extern */
|
/* extern */
|
||||||
|
|
||||||
void *
|
void *
|
||||||
emalloc(unsigned int size)
|
emalloc(unsigned int size) {
|
||||||
{
|
|
||||||
void *res = malloc(size);
|
void *res = malloc(size);
|
||||||
if(!res)
|
if(!res)
|
||||||
badmalloc(size);
|
badmalloc(size);
|
||||||
@ -30,8 +28,7 @@ emalloc(unsigned int size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
eprint(const char *errstr, ...)
|
eprint(const char *errstr, ...) {
|
||||||
{
|
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
va_start(ap, errstr);
|
va_start(ap, errstr);
|
||||||
@ -41,8 +38,7 @@ eprint(const char *errstr, ...)
|
|||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
estrdup(const char *str)
|
estrdup(const char *str) {
|
||||||
{
|
|
||||||
void *res = strdup(str);
|
void *res = strdup(str);
|
||||||
if(!res)
|
if(!res)
|
||||||
badmalloc(strlen(str));
|
badmalloc(strlen(str));
|
||||||
|
Reference in New Issue
Block a user