From 0ab7c1236a1061df6a6e0cf57b136e641210dcb1 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Mon, 25 Nov 2002 16:57:16 +0000
Subject: [w3m-dev 03478] mouse action configuration * display.c
 (displayBuffer): mouse_menu -> mouse_action.menu_str 		
 mouse_action.lastline_str 		(redrawNLine): mouse_menu ->
 mouse_action.menu_str * fm.h (MouseMenuMap): deleted 	(MouseActionMap):
 added 	(MouseAction): added 	(mouse_action): added * func.c
 (default_mouse_action): added 	(setMouseAction0): added 
 (setMouseAction1): added 	(setMouseAction2): added 
 (initMouseMenu): deleted 	(initMouseAction): added * funcname.tab
 (CLOSE_TAB_MOUSE): added 	(MENU_MOUSE): added 	(MOVE_MOUSE): added 
 (TAB_MOUSE): added * main.c (main): initMouseMenu() -> initMouseAction() 
 	mouse_menu -> mouse_action 	(posTab): mouse_menu -> mouse_action 
 	check y > LastTab->y 	(mouse_menu_action): deleted 
 (do_mouse_action): added 	(process_mouse): mouse_menu -> mouse_action 
 	do_mouse_action() 	(movMs): added 	(menuMs): added 
 (tabMs): added 	(closeTMs): added 	(reinit): initMouseMenu() ->
 initMouseAction() 		resource: MOUSE_MENU -> MOUSE 	(calcTabPos):
 mouse_menu -> mouse_action * menu.c (mainMn): mouse_menu -> mouse_action 
 (selMn): mouse_menu -> mouse_action 	(tabMn): mouse_menu -> mouse_action 
 (initMenu): add SelectTag to w3mMenuList * proto.h (movMs): added 
 (menuMs): added 	(tabMs): added 	(closeTMs): added 
 (initMouseMenu): deleted 	(initMouseAction): added * rc.c
 (sync_with_option): initMouseMenu() -> initMouseAction() * doc/README.func
 (CLOSE_TAB_MOUSE): added 	(MENU_MOUSE): added 	(MOVE_MOUSE): added 
 (TAB_MOUSE): added * doc-jp/README.func (CLOSE_TAB_MOUSE): added 
 (MENU_MOUSE): added 	(MOVE_MOUSE): added 	(TAB_MOUSE): added From:
 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

---
 fm.h | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'fm.h')

diff --git a/fm.h b/fm.h
index 2e05b5d..bdd135e 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.87 2002/11/22 15:43:14 ukai Exp $ */
+/* $Id: fm.h,v 1.88 2002/11/25 16:57:17 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -993,22 +993,27 @@ 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);
-typedef struct _MouseMenuMap {
+typedef struct _MouseActionMap {
     void (*func) ();
     char *data;
-} MouseMenuMap;
-typedef struct _MouseMenu {
-    char *str;
-    int width;
+} MouseActionMap;
+typedef struct _MouseAction {
+    char *menu_str;
+    char *lastline_str;
+    int menu_width;
+    int lastline_width;
     int in_action;
     int cursorX;
     int cursorY;
-    MouseMenuMap *map[3];
-} MouseMenu;
-global MouseMenu *mouse_menu init(NULL);
+    MouseActionMap default_map[3];
+    MouseActionMap anchor_map[3];
+    MouseActionMap active_map[3];
+    MouseActionMap tab_map[3];
+    MouseActionMap *menu_map[3];
+    MouseActionMap *lastline_map[3];
+} MouseAction;
+global MouseAction mouse_action;
 #define LIMIT_MOUSE_MENU 100
-#else
-#define mouse_menu NULL
 #endif				/* USE_MOUSE */
 
 #ifdef USE_COOKIE
-- 
cgit v1.2.3