mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

cvsimport

Browse Source
This commit is contained in:
okan 2014-01-03 15:29:06 +00:00
commit 86b149ad25
9 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calmwm.c
View File

@ -165,7 +165,7 @@ x_errorhandler(Display *dpy, XErrorEvent *e)
XGetErrorDatabaseText(X_Dpy, "XRequest", number, XGetErrorDatabaseText(X_Dpy, "XRequest", number,
"<unknown>", req, sizeof(req)); "<unknown>", req, sizeof(req));
warnx("%s(0x%x): %s", req, (u_int)e->resourceid, msg); warnx("%s(0x%x): %s", req, (unsigned int)e->resourceid, msg);
#endif #endif
return (0); return (0);
} }

22
calmwm.h
View File

@ -149,7 +149,7 @@ struct client_ctx {
struct screen_ctx *sc; struct screen_ctx *sc;
Window win; Window win;
Colormap colormap; Colormap colormap;
u_int bwidth; /* border width */ unsigned int bwidth; /* border width */
struct geom geom, savegeom, fullgeom; struct geom geom, savegeom, fullgeom;
struct { struct {
long flags; /* defined hints */ long flags; /* defined hints */
@ -257,7 +257,7 @@ struct keybinding {
TAILQ_ENTRY(keybinding) entry; TAILQ_ENTRY(keybinding) entry;
void (*callback)(struct client_ctx *, union arg *); void (*callback)(struct client_ctx *, union arg *);
union arg argument; union arg argument;
u_int modmask; unsigned int modmask;
KeySym keysym; KeySym keysym;
#define KBFLAG_NEEDCLIENT 0x0001 #define KBFLAG_NEEDCLIENT 0x0001
int flags; int flags;
@ -269,8 +269,8 @@ struct mousebinding {
TAILQ_ENTRY(mousebinding) entry; TAILQ_ENTRY(mousebinding) entry;
void (*callback)(struct client_ctx *, union arg *); void (*callback)(struct client_ctx *, union arg *);
union arg argument; union arg argument;
u_int modmask; unsigned int modmask;
u_int button; unsigned int button;
#define MOUSEBIND_CTX_ROOT 0x0001 #define MOUSEBIND_CTX_ROOT 0x0001
#define MOUSEBIND_CTX_WIN 0x0002 #define MOUSEBIND_CTX_WIN 0x0002
int flags; int flags;
@ -323,9 +323,9 @@ struct conf {
/* MWM hints */ /* MWM hints */
struct mwm_hints { struct mwm_hints {
u_long flags; unsigned long flags;
u_long functions; unsigned long functions;
u_long decorations; unsigned long decorations;
}; };
#define MWM_NUMHINTS 3 #define MWM_NUMHINTS 3
#define PROP_MWM_HINTS_ELEMENTS 3 #define PROP_MWM_HINTS_ELEMENTS 3
@ -540,15 +540,15 @@ void conf_screen(struct screen_ctx *);
void xev_loop(void); void xev_loop(void);
void xu_btn_grab(Window, int, u_int); void xu_btn_grab(Window, int, unsigned int);
void xu_btn_ungrab(Window); void xu_btn_ungrab(Window);
int xu_getprop(Window, Atom, Atom, long, unsigned char **); int xu_getprop(Window, Atom, Atom, long, unsigned char **);
int xu_getstrprop(Window, Atom, char **); int xu_getstrprop(Window, Atom, char **);
void xu_key_grab(Window, u_int, KeySym); void xu_key_grab(Window, unsigned int, KeySym);
void xu_key_ungrab(Window); void xu_key_ungrab(Window);
void xu_ptr_getpos(Window, int *, int *); void xu_ptr_getpos(Window, int *, int *);
int xu_ptr_grab(Window, u_int, Cursor); int xu_ptr_grab(Window, unsigned int, Cursor);
int xu_ptr_regrab(u_int, Cursor); int xu_ptr_regrab(unsigned int, Cursor);
void xu_ptr_setpos(Window, int, int); void xu_ptr_setpos(Window, int, int);
void xu_ptr_ungrab(void); void xu_ptr_ungrab(void);
void xu_xft_draw(struct screen_ctx *, const char *, void xu_xft_draw(struct screen_ctx *, const char *,

16
conf.c
View File

@ -31,7 +31,7 @@
#include "calmwm.h" #include "calmwm.h"
static const char *conf_bind_getmask(const char *, u_int *); static const char *conf_bind_getmask(const char *, unsigned int *);
static void conf_unbind_kbd(struct conf *, struct keybinding *); static void conf_unbind_kbd(struct conf *, struct keybinding *);
static void conf_unbind_mouse(struct conf *, struct mousebinding *); static void conf_unbind_mouse(struct conf *, struct mousebinding *);
@ -100,7 +100,7 @@ static char *color_binds[] = {
void void
conf_screen(struct screen_ctx *sc) conf_screen(struct screen_ctx *sc)
{ {
u_int i; unsigned int i;
XftColor xc; XftColor xc;
sc->gap = Conf.gap; sc->gap = Conf.gap;
@ -224,7 +224,7 @@ mouse_binds[] = {
void void
conf_init(struct conf *c) conf_init(struct conf *c)
{ {
u_int i; unsigned int i;
(void)memset(c, 0, sizeof(*c)); (void)memset(c, 0, sizeof(*c));
@ -454,11 +454,11 @@ static struct {
}; };
static const char * static const char *
conf_bind_getmask(const char *name, u_int *mask) conf_bind_getmask(const char *name, unsigned int *mask)
{ {
char *dash; char *dash;
const char *ch; const char *ch;
u_int i; unsigned int i;
*mask = 0; *mask = 0;
if ((dash = strchr(name, '-')) == NULL) if ((dash = strchr(name, '-')) == NULL)
@ -477,7 +477,7 @@ conf_bind_kbd(struct conf *c, char *name, char *binding)
{ {
struct keybinding *current_binding; struct keybinding *current_binding;
const char *substring; const char *substring;
u_int i, mask; unsigned int i, mask;
current_binding = xcalloc(1, sizeof(*current_binding)); current_binding = xcalloc(1, sizeof(*current_binding));
substring = conf_bind_getmask(name, &mask); substring = conf_bind_getmask(name, &mask);
@ -564,7 +564,7 @@ conf_bind_mouse(struct conf *c, char *name, char *binding)
{ {
struct mousebinding *current_binding; struct mousebinding *current_binding;
const char *errstr, *substring; const char *errstr, *substring;
u_int button, i, mask; unsigned int button, i, mask;
current_binding = xcalloc(1, sizeof(*current_binding)); current_binding = xcalloc(1, sizeof(*current_binding));
substring = conf_bind_getmask(name, &mask); substring = conf_bind_getmask(name, &mask);
@ -634,7 +634,7 @@ static int cursor_binds[] = {
void void
conf_cursor(struct conf *c) conf_cursor(struct conf *c)
{ {
u_int i; unsigned int i;
for (i = 0; i < nitems(cursor_binds); i++) for (i = 0; i < nitems(cursor_binds); i++)
c->cursor[i] = XCreateFontCursor(X_Dpy, cursor_binds[i]); c->cursor[i] = XCreateFontCursor(X_Dpy, cursor_binds[i]);

2
kbfunc.c
View File

@ -58,7 +58,7 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
struct geom xine; struct geom xine;
int x, y, flags, amt; int x, y, flags, amt;
u_int mx, my; unsigned int mx, my;
if (cc->flags & CLIENT_FREEZE) if (cc->flags & CLIENT_FREEZE)
return; return;

4
menu.c
View File

@ -522,8 +522,8 @@ menu_calc_entry(struct menu_ctx *mc, int x, int y)
static int static int
menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr) menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
{ {
KeySym ks; KeySym ks;
u_int state = ev->state; unsigned int state = ev->state;
*ctl = CTL_NONE; *ctl = CTL_NONE;
chr[0] = '\0'; chr[0] = '\0';

4
screen.c
View File

@ -37,7 +37,7 @@ screen_init(int which)
Window *wins, w0, w1; Window *wins, w0, w1;
XWindowAttributes winattr; XWindowAttributes winattr;
XSetWindowAttributes rootattr; XSetWindowAttributes rootattr;
u_int nwins, i; unsigned int nwins, i;
sc = xcalloc(1, sizeof(*sc)); sc = xcalloc(1, sizeof(*sc));
@ -105,7 +105,7 @@ screen_updatestackingorder(struct screen_ctx *sc)
{ {
Window *wins, w0, w1; Window *wins, w0, w1;
struct client_ctx *cc; struct client_ctx *cc;
u_int nwins, i, s; unsigned int nwins, i, s;
if (!XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins)) if (!XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins))
return; return;

4
search.c
View File

@ -253,8 +253,8 @@ search_match_exec_path(struct menu_q *menuq, struct menu_q *resultq, char *searc
static int static int
strsubmatch(char *sub, char *str, int zeroidx) strsubmatch(char *sub, char *str, int zeroidx)
{ {
size_t len, sublen; size_t len, sublen;
u_int n, flen; unsigned int n, flen;
if (sub == NULL || str == NULL) if (sub == NULL || str == NULL)
return (0); return (0);

4
xevents.c
View File

@ -265,7 +265,7 @@ xev_handle_keypress(XEvent *ee)
struct client_ctx *cc = NULL, fakecc; struct client_ctx *cc = NULL, fakecc;
struct keybinding *kb; struct keybinding *kb;
KeySym keysym, skeysym; KeySym keysym, skeysym;
u_int modshift; unsigned int modshift;
keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0);
skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1); skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1);
@ -308,7 +308,7 @@ xev_handle_keyrelease(XEvent *ee)
XKeyEvent *e = &ee->xkey; XKeyEvent *e = &ee->xkey;
struct screen_ctx *sc; struct screen_ctx *sc;
KeySym keysym; KeySym keysym;
u_int i; unsigned int i;
sc = screen_fromroot(e->root); sc = screen_fromroot(e->root);

28
xutil.c
View File

@ -33,9 +33,9 @@
static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask }; static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
void void
xu_btn_grab(Window win, int mask, u_int btn) xu_btn_grab(Window win, int mask, unsigned int btn)
{ {
u_int i; unsigned int i;
for (i = 0; i < nitems(ign_mods); i++) for (i = 0; i < nitems(ign_mods); i++)
XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win, XGrabButton(X_Dpy, btn, (mask | ign_mods[i]), win,
@ -50,10 +50,10 @@ xu_btn_ungrab(Window win)
} }
void void
xu_key_grab(Window win, u_int mask, KeySym keysym) xu_key_grab(Window win, unsigned int mask, KeySym keysym)
{ {
KeyCode code; KeyCode code;
u_int i; unsigned int i;
code = XKeysymToKeycode(X_Dpy, keysym); code = XKeysymToKeycode(X_Dpy, keysym);
if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) && if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) &&
@ -72,7 +72,7 @@ xu_key_ungrab(Window win)
} }
int int
xu_ptr_grab(Window win, u_int mask, Cursor curs) xu_ptr_grab(Window win, unsigned int mask, Cursor curs)
{ {
return (XGrabPointer(X_Dpy, win, False, mask, return (XGrabPointer(X_Dpy, win, False, mask,
GrabModeAsync, GrabModeAsync, GrabModeAsync, GrabModeAsync,
@ -80,7 +80,7 @@ xu_ptr_grab(Window win, u_int mask, Cursor curs)
} }
int int
xu_ptr_regrab(u_int mask, Cursor curs) xu_ptr_regrab(unsigned int mask, Cursor curs)
{ {
return (XChangeActivePointerGrab(X_Dpy, mask, return (XChangeActivePointerGrab(X_Dpy, mask,
curs, CurrentTime) == GrabSuccess ? 0 : -1); curs, CurrentTime) == GrabSuccess ? 0 : -1);
@ -95,9 +95,9 @@ xu_ptr_ungrab(void)
void void
xu_ptr_getpos(Window win, int *x, int *y) xu_ptr_getpos(Window win, int *x, int *y)
{ {
Window w0, w1; Window w0, w1;
int tmp0, tmp1; int tmp0, tmp1;
u_int tmp2; unsigned int tmp2;
XQueryPointer(X_Dpy, win, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2); XQueryPointer(X_Dpy, win, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2);
} }
@ -111,9 +111,9 @@ xu_ptr_setpos(Window win, int x, int y)
int int
xu_getprop(Window win, Atom atm, Atom type, long len, unsigned char **p) xu_getprop(Window win, Atom atm, Atom type, long len, unsigned char **p)
{ {
Atom realtype; Atom realtype;
u_long n, extra; unsigned long n, extra;
int format; int format;
if (XGetWindowProperty(X_Dpy, win, atm, 0L, len, False, type, if (XGetWindowProperty(X_Dpy, win, atm, 0L, len, False, type,
&realtype, &format, &n, &extra, p) != Success || *p == NULL) &realtype, &format, &n, &extra, p) != Success || *p == NULL)
@ -321,7 +321,7 @@ void
xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action, xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action,
Atom first, Atom second) Atom first, Atom second)
{ {
u_int i; unsigned int i;
static struct handlers { static struct handlers {
int atom; int atom;
int property; int property;