From 82901953d32cc52a688be47d0594e2df0395b2cc Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Fri, 22 Nov 2002 15:43:13 +0000
Subject: [w3m-dev 03458] Re: mouse menu * display.c (displayBuffer): nTab2 ->
 nTab, mouse_menu * fm.h (nTab2): deleted 	(MouseMenuMap): added 
 (MouseMenu): added 	(LIMIT_MOUSE_MENU): added * func.c (initMouseMenu):
 delete mouse_menu_map initialization 		conv_from_system 	
 mouse_menu->width * main.c (main): mouse_menu->in_action = FALSE 
 (posTab): check mouse_menu 	(mouse_menu_action): add y arg 	
 mouse_menu_width check 	(process_mouse): nTab2 -> nTab, mouse_menu 
 (nTabLine): deleted 	(calcTabPos): check mouse_menu * menu.c (mainMn): x, y
 	(selMn): mouse_menu check 	(tabMn): mosue_menu check * proto.h
 (nTabLine): deleted From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

---
 fm.h | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'fm.h')

diff --git a/fm.h b/fm.h
index f01face..2e05b5d 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.86 2002/11/21 17:05:01 ukai Exp $ */
+/* $Id: fm.h,v 1.87 2002/11/22 15:43:14 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -808,7 +808,6 @@ global int open_tab_blank init(FALSE);
 global int open_tab_dl_list init(FALSE);
 global int close_tab_back init(FALSE);
 global int nTab;
-#define nTab2 (mouse_menu ? (nTab + 1) : nTab)
 global int TabCols init(10);
 #define NO_TABBUFFER ((TabBuffer *)1)
 #define Currentbuf (CurrentTab->currentBuffer)
@@ -994,12 +993,23 @@ global int reverse_mouse init(FALSE);
 global int relative_wheel_scroll init(FALSE);
 global int fixed_wheel_scroll_count init(5);
 global int relative_wheel_scroll_ratio init(30);
-struct _MouseMenu {
+typedef struct _MouseMenuMap {
     void (*func) ();
     char *data;
-} mouse_menu_map[3][10];
+} MouseMenuMap;
+typedef struct _MouseMenu {
+    char *str;
+    int width;
+    int in_action;
+    int cursorX;
+    int cursorY;
+    MouseMenuMap *map[3];
+} MouseMenu;
+global MouseMenu *mouse_menu init(NULL);
+#define LIMIT_MOUSE_MENU 100
+#else
+#define mouse_menu NULL
 #endif				/* USE_MOUSE */
-global char *mouse_menu init(NULL);
 
 #ifdef USE_COOKIE
 global int default_use_cookie init(TRUE);
-- 
cgit v1.2.3