From 923c9f8936be6a656e3f9b6607c69a820b411330 Mon Sep 17 00:00:00 2001
From: oga
Date: Mon, 14 Jan 2008 15:21:10 +0000
Subject: Rewrite most of grab_menu in grab.c (it was partly 9wm code). This
 should work functionally the same, with a few simplifications.

Changes:
- we don't care if you're holding another button when you release the
  menu key if you don't want to select anything, move off the menu.
- remove the hysteresis from the menu selection (before you had to move
  more than three pixels onto a new menu entry before it selected it)
- simplify a lot of the selection code
- kill dead code.
- do what the XXX comment said and cache the screensize (i may tweak
  this later).

As far as I can tell, the only code remaining from 9wm is the list of
fonts in calmwm.c. Others appear to concur.

ok marc@, looked over and tested by a few others. Reminders from okan@.
---
 calmwm.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'calmwm.h')

diff --git a/calmwm.h b/calmwm.h
index 7d2670f..a212218 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.17 2008/01/11 16:06:44 oga Exp $
+ * $Id: calmwm.h,v 1.18 2008/01/14 15:21:10 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -79,6 +79,10 @@ struct screen_ctx {
 
 	int		 altpersist;
 
+	int		 maxinitialised;
+	int		 xmax;
+	int		 ymax;
+
         FILE            *notifier;
 
 	struct cycle_entry_q mruq;
@@ -276,7 +280,6 @@ struct menu {
 	char  text[MENU_MAXENTRY + 1];
 	char  print[MENU_MAXENTRY + 1];
 	void *ctx;
-	short lasthit;
 	short dummy;
 };
 
@@ -399,7 +402,6 @@ int   grab_drag(struct client_ctx *);
 void  grab_menuinit(struct screen_ctx *);
 void *grab_menu(XButtonEvent *, struct menu_q *);
 void  grab_label(struct client_ctx *);
-void  grab_exec(void);
 
 void  xfree(void *);
 void *xmalloc(size_t);
-- 
cgit v1.2.3-2-gb3c3