diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-07-09 01:24:50 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-07-09 01:24:50 +0000 |
| commit | 74a6bc2ce05ea78bb1da4c70a6cfd9af18a5a7b5 (patch) | |
| tree | 0931252ee0c7f9aaa6327dbe25a9ba3114a518d1 | |
| parent | 78fdbbe3616f2272381d4c6b2968febe387c2c0e (diff) | |
since the root and event window are the same in the case of a button
event on the screen's root window, there's no need to pass down the
entire XButtonEvent event, at least to group_menu(), the only callback
which takes an argument at this point; instead use the already populated
screen.
| -rw-r--r-- | app/cwm/calmwm.h | 4 | ||||
| -rw-r--r-- | app/cwm/group.c | 7 | ||||
| -rw-r--r-- | app/cwm/mousefunc.c | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index d5bf6dafa..e3543ceee 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.216 2013/07/08 18:39:20 okan Exp $ + * $OpenBSD: calmwm.h,v 1.217 2013/07/09 01:24:49 okan Exp $ */ #ifndef _CALMWM_H_ @@ -360,7 +360,7 @@ void group_autogroup(struct client_ctx *); void group_cycle(struct screen_ctx *, int); void group_hidetoggle(struct screen_ctx *, int); void group_init(struct screen_ctx *); -void group_menu(XButtonEvent *); +void group_menu(struct screen_ctx *); void group_movetogroup(struct client_ctx *, int); void group_only(struct screen_ctx *, int); void group_sticky(struct client_ctx *); diff --git a/app/cwm/group.c b/app/cwm/group.c index 9a66e7489..a5a04b2ea 100644 --- a/app/cwm/group.c +++ b/app/cwm/group.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: group.c,v 1.77 2013/07/08 15:48:16 okan Exp $ + * $OpenBSD: group.c,v 1.78 2013/07/09 01:24:49 okan Exp $ */ #include <sys/param.h> @@ -309,16 +309,13 @@ group_cycle(struct screen_ctx *sc, int flags) } void -group_menu(XButtonEvent *e) +group_menu(struct screen_ctx *sc) { - struct screen_ctx *sc; struct group_ctx *gc; struct menu *mi; struct menu_q menuq; int i; - sc = screen_fromroot(e->root); - TAILQ_INIT(&menuq); for (i = 0; i < CALMWM_NGROUPS; i++) { diff --git a/app/cwm/mousefunc.c b/app/cwm/mousefunc.c index 366ad9e90..12a0f814a 100644 --- a/app/cwm/mousefunc.c +++ b/app/cwm/mousefunc.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: mousefunc.c,v 1.55 2013/07/08 18:39:20 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.56 2013/07/09 01:24:49 okan Exp $ */ #include <sys/param.h> @@ -216,7 +216,7 @@ mousefunc_client_rcyclegroup(struct client_ctx *cc, void *arg) void mousefunc_menu_group(struct client_ctx *cc, void *arg) { - group_menu(arg); + group_menu(cc->sc); } void |