diff options
| author | okan <okan> | 2017-05-09 13:40:18 +0000 |
|---|---|---|
| committer | okan <okan> | 2017-05-09 13:40:18 +0000 |
| commit | 113ffcf47e3988730f393eb2ce8de734f8f22e89 (patch) | |
| tree | 9a30bb342aca07c7c8f89d060417e7be5c1d51e0 /xevents.c | |
| parent | 189a735eaa16a01b491518fc5db5183ef0c6d76b (diff) | |
| download | cwm-113ffcf47e3988730f393eb2ce8de734f8f22e89.tar.gz cwm-113ffcf47e3988730f393eb2ce8de734f8f22e89.tar.xz cwm-113ffcf47e3988730f393eb2ce8de734f8f22e89.zip | |
Alter callbacks to take a struct instead of a growing number of arguments;
greatly simplifies upcoming work.
Diffstat (limited to 'xevents.c')
| -rw-r--r-- | xevents.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xevents.c b/xevents.c index 946ea98..cc3515a 100644 --- a/xevents.c +++ b/xevents.c @@ -233,22 +233,23 @@ xev_handle_buttonpress(XEvent *ee) if (mb == NULL) return; + mb->cargs->xev = CWM_XEV_BTN; switch (mb->context) { case CWM_CONTEXT_CC: if (((cc = client_find(e->window)) == NULL) && (cc = client_current()) == NULL) return; - (*mb->callback)(cc, &mb->argument, CWM_XEV_BTN); + (*mb->callback)(cc, mb->cargs); break; case CWM_CONTEXT_SC: if (e->window != e->root) return; if ((sc = screen_find(e->window)) == NULL) return; - (*mb->callback)(sc, &mb->argument, CWM_XEV_BTN); + (*mb->callback)(sc, mb->cargs); break; case CWM_CONTEXT_NONE: - (*mb->callback)(NULL, &mb->argument, CWM_XEV_BTN); + (*mb->callback)(NULL, mb->cargs); break; } } @@ -295,20 +296,21 @@ xev_handle_keypress(XEvent *ee) if (kb == NULL) return; + kb->cargs->xev = CWM_XEV_KEY; switch (kb->context) { case CWM_CONTEXT_CC: if (((cc = client_find(e->window)) == NULL) && (cc = client_current()) == NULL) return; - (*kb->callback)(cc, &kb->argument, CWM_XEV_KEY); + (*kb->callback)(cc, kb->cargs); break; case CWM_CONTEXT_SC: if ((sc = screen_find(e->window)) == NULL) return; - (*kb->callback)(sc, &kb->argument, CWM_XEV_KEY); + (*kb->callback)(sc, kb->cargs); break; case CWM_CONTEXT_NONE: - (*kb->callback)(NULL, &kb->argument, CWM_XEV_KEY); + (*kb->callback)(NULL, kb->cargs); break; } } |