ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge keybinding and mousebinding queues into using the same merged

Browse Source 
struct, binding; they were essentially the same accept for what was
'pressed', keysym or button.
This commit is contained in:
okan
2014-01-29 21:13:52 +00:00
parent 4438970b64
commit db0b2fde5c
3 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
calmwm.h
View File

@@ -94,6 +94,11 @@ union arg {
int i;
};
union press {
KeySym keysym;
unsigned int button;
};
enum cursor_font {
CF_DEFAULT,
CF_MOVE,
@@ -247,26 +252,17 @@ struct screen_ctx {
};
TAILQ_HEAD(screen_ctx_q, screen_ctx);
struct keybinding {
TAILQ_ENTRY(keybinding) entry;
struct binding {
TAILQ_ENTRY(binding) entry;
void (*callback)(struct client_ctx *, union arg *);
union arg argument;
unsigned int modmask;
KeySym keysym;
union press press;
int flags;
int argtype;
};
TAILQ_HEAD(keybinding_q, keybinding);
struct mousebinding {
TAILQ_ENTRY(mousebinding) entry;
void (*callback)(struct client_ctx *, union arg *);
union arg argument;
unsigned int modmask;
unsigned int button;
int flags;
};
TAILQ_HEAD(mousebinding_q, mousebinding);
TAILQ_HEAD(keybinding_q, binding);
TAILQ_HEAD(mousebinding_q, binding);
struct cmd {
TAILQ_ENTRY(cmd) entry;
@@ -290,10 +286,10 @@ TAILQ_HEAD(menu_q, menu);
struct conf {
struct keybinding_q keybindingq;
struct mousebinding_q mousebindingq;
struct autogroupwin_q autogroupq;
struct winmatch_q ignoreq;
struct cmd_q cmdq;
struct mousebinding_q mousebindingq;
#define CONF_STICKY_GROUPS 0x0001
int flags;
#define CONF_BWIDTH 1