Xinqi Bao's Git
projects
/
dmenu.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
reverted uint/ulong introduction
[dmenu.git]
/
dmenu.c
diff --git
a/dmenu.c
b/dmenu.c
index
fa7bbe8
..
33b1a89
100644
(file)
--- a/
dmenu.c
+++ b/
dmenu.c
@@
-1,4
+1,5
@@
/* See LICENSE file for copyright and license details. */
/* See LICENSE file for copyright and license details. */
+#define _BSD_SOURCE
#include <ctype.h>
#include <locale.h>
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
#include <stdarg.h>
@@
-21,12
+22,10
@@
enum { ColFG, ColBG, ColLast };
/* typedefs */
enum { ColFG, ColBG, ColLast };
/* typedefs */
-typedef unsigned int uint;
-typedef unsigned long ulong;
typedef struct {
int x, y, w, h;
typedef struct {
int x, y, w, h;
- ulong norm[ColLast];
- ulong sel[ColLast];
+ u
nsigned
long norm[ColLast];
+ u
nsigned
long sel[ColLast];
Drawable drawable;
GC gc;
struct {
Drawable drawable;
GC gc;
struct {
@@
-51,9
+50,9
@@
static void calcoffsets(void);
static char *cistrstr(const char *s, const char *sub);
static void cleanup(void);
static void drawmenu(void);
static char *cistrstr(const char *s, const char *sub);
static void cleanup(void);
static void drawmenu(void);
-static void drawtext(const char *text, ulong col[ColLast]);
+static void drawtext(const char *text, u
nsigned
long col[ColLast]);
static void eprint(const char *errstr, ...);
static void eprint(const char *errstr, ...);
-static ulong getcolor(const char *colstr);
+static u
nsigned
long getcolor(const char *colstr);
static Bool grabkeyboard(void);
static void initfont(const char *fontstr);
static void kpress(XKeyEvent * e);
static Bool grabkeyboard(void);
static void initfont(const char *fontstr);
static void kpress(XKeyEvent * e);
@@
-61,7
+60,7
@@
static void match(char *pattern);
static void readstdin(void);
static void run(void);
static void setup(Bool topbar);
static void readstdin(void);
static void run(void);
static void setup(Bool topbar);
-static int textnw(const char *text, uint len);
+static int textnw(const char *text, u
nsigned
int len);
static int textw(const char *text);
#include "config.h"
static int textw(const char *text);
#include "config.h"
@@
-74,8
+73,8
@@
static int cmdw = 0;
static int promptw = 0;
static int ret = 0;
static int screen;
static int promptw = 0;
static int ret = 0;
static int screen;
-static uint mw, mh;
-static uint numlockmask = 0;
+static u
nsigned
int mw, mh;
+static u
nsigned
int numlockmask = 0;
static Bool running = True;
static Display *dpy;
static DC dc = {0};
static Bool running = True;
static Display *dpy;
static DC dc = {0};
@@
-103,7
+102,7
@@
appenditem(Item *i, Item **list, Item **last) {
void
calcoffsets(void) {
int tw;
void
calcoffsets(void) {
int tw;
- uint w;
+ u
nsigned
int w;
if(!curr)
return;
if(!curr)
return;
@@
-130,7
+129,7
@@
calcoffsets(void) {
char *
cistrstr(const char *s, const char *sub) {
int c, csub;
char *
cistrstr(const char *s, const char *sub) {
int c, csub;
- uint len;
+ u
nsigned
int len;
if(!sub)
return (char *)s;
if(!sub)
return (char *)s;
@@
-212,10
+211,10
@@
drawmenu(void) {
}
void
}
void
-drawtext(const char *text, ulong col[ColLast]) {
+drawtext(const char *text, u
nsigned
long col[ColLast]) {
int x, y, w, h;
static char buf[256];
int x, y, w, h;
static char buf[256];
- uint len, olen;
+ u
nsigned
int len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[ColBG]);
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[ColBG]);
@@
-261,7
+260,7
@@
eprint(const char *errstr, ...) {
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
-ulong
+u
nsigned
long
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
@@
-273,7
+272,7
@@
getcolor(const char *colstr) {
Bool
grabkeyboard(void) {
Bool
grabkeyboard(void) {
- uint len;
+ u
nsigned
int len;
for(len = 1000; len; len--) {
if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
for(len = 1000; len; len--) {
if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
@@
-329,7
+328,7
@@
void
kpress(XKeyEvent * e) {
char buf[32];
int i, num;
kpress(XKeyEvent * e) {
char buf[32];
int i, num;
- uint len;
+ u
nsigned
int len;
KeySym ksym;
len = strlen(text);
KeySym ksym;
len = strlen(text);
@@
-497,7
+496,7
@@
kpress(XKeyEvent * e) {
void
match(char *pattern) {
void
match(char *pattern) {
- uint plen;
+ u
nsigned
int plen;
Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
if(!pattern)
Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
if(!pattern)
@@
-539,7
+538,7
@@
match(char *pattern) {
void
readstdin(void) {
char *p, buf[1024];
void
readstdin(void) {
char *p, buf[1024];
- uint len = 0, max = 0;
+ u
nsigned
int len = 0, max = 0;
Item *i, *new;
i = 0;
Item *i, *new;
i = 0;
@@
-658,7
+657,7
@@
setup(Bool topbar) {
}
int
}
int
-textnw(const char *text, uint len) {
+textnw(const char *text, u
nsigned
int len) {
XRectangle r;
if(dc.font.set) {
XRectangle r;
if(dc.font.set) {
@@
-675,7
+674,7
@@
textw(const char *text) {
int
main(int argc, char *argv[]) {
int
main(int argc, char *argv[]) {
- uint i;
+ u
nsigned
int i;
Bool topbar = True;
/* command line args */
Bool topbar = True;
/* command line args */
@@
-709,7
+708,8
@@
main(int argc, char *argv[]) {
else
eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
" [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
else
eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
" [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
- setlocale(LC_CTYPE, "");
+ if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+ fprintf(stderr, "warning: no locale support\n");
if(!(dpy = XOpenDisplay(0)))
eprint("dmenu: cannot open display\n");
screen = DefaultScreen(dpy);
if(!(dpy = XOpenDisplay(0)))
eprint("dmenu: cannot open display\n");
screen = DefaultScreen(dpy);