From b278e79f2a21d29e7f75de35544e19dd6960fcbf Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 17 Jun 2009 12:30:17 +0000 Subject: move like defines to a central, logical location; no binary change. aok oga@ --- calmwm.h | 8 +++++++- menu.c | 5 ----- search.c | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/calmwm.h b/calmwm.h index 35b8db8..f0717fc 100644 --- a/calmwm.h +++ b/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. * - * $Id: calmwm.h,v 1.90 2009/05/18 00:17:46 oga Exp $ + * $Id: calmwm.h,v 1.91 2009/06/17 12:30:17 okan Exp $ */ #ifndef _CALMWM_H_ @@ -33,6 +33,12 @@ #define ChildMask (SubstructureRedirectMask|SubstructureNotifyMask) #define ButtonMask (ButtonPressMask|ButtonReleaseMask) #define MouseMask (ButtonMask|PointerMotionMask) +#define KeyMask (KeyPressMask|ExposureMask) +#define MenuMask (ButtonMask|ButtonMotionMask|ExposureMask| \ + PointerMotionMask) +#define MenuGrabMask (ButtonMask|ButtonMotionMask|StructureNotifyMask|\ + PointerMotionMask) +#define SearchMask (KeyPressMask|ExposureMask) enum cwmcolor { CWM_COLOR_BORDOR_ACTIVE, diff --git a/menu.c b/menu.c index a6cd6ae..16cf400 100644 --- a/menu.c +++ b/menu.c @@ -18,11 +18,6 @@ #include "headers.h" #include "calmwm.h" -#define KeyMask (KeyPressMask|ExposureMask) -#define MenuMask (ButtonMask|ButtonMotionMask|ExposureMask| \ - PointerMotionMask) -#define MenuGrabMask (ButtonMask|ButtonMotionMask|StructureNotifyMask|\ - PointerMotionMask) #define PROMPT_SCHAR '»' #define PROMPT_ECHAR '«' diff --git a/search.c b/search.c index 6a39bff..a3efec2 100644 --- a/search.c +++ b/search.c @@ -14,14 +14,12 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: search.c,v 1.15 2009/05/18 00:23:35 okan Exp $ + * $Id: search.c,v 1.16 2009/06/17 12:30:17 okan Exp $ */ #include "headers.h" #include "calmwm.h" -#define SearchMask (KeyPressMask|ExposureMask) - static int strsubmatch(char *, char *, int); /* -- cgit v1.2.3-2-gb3c3