diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-25 16:57:16 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-25 16:57:16 +0000 |
| commit | 0ab7c1236a1061df6a6e0cf57b136e641210dcb1 (patch) | |
| tree | 7191eba8a27828ad988eb937add16f68b2b2f687 /menu.c | |
| parent | [w3m-dev 03476] Re: Bug#170506: w3m: Unable to use mozilla bugzilla (diff) | |
| download | w3m-0ab7c1236a1061df6a6e0cf57b136e641210dcb1.tar.gz w3m-0ab7c1236a1061df6a6e0cf57b136e641210dcb1.zip | |
[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>
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $Id: menu.c,v 1.19 2002/11/22 15:43:14 ukai Exp $ */ +/* $Id: menu.c,v 1.20 2002/11/25 16:57:17 ukai Exp $ */ /* * w3m menu.c */ @@ -1263,9 +1263,9 @@ mainMn(void) menu = w3mMenuList[n].menu; } #ifdef USE_MOUSE - if (mouse_menu && mouse_menu->in_action) { - x = mouse_menu->cursorX - FRAME_WIDTH - 1; - y = mouse_menu->cursorY; + if (mouse_action.in_action) { + x = mouse_action.cursorX; + y = mouse_action.cursorY; } #endif popupMenu(x, y, menu); @@ -1282,9 +1282,9 @@ selMn(void) y = Currentbuf->cursorY + Currentbuf->rootY; #ifdef USE_MOUSE - if (mouse_menu && mouse_menu->in_action) { - x = mouse_menu->cursorX - FRAME_WIDTH - 1; - y = mouse_menu->cursorY; + if (mouse_action.in_action) { + x = mouse_action.cursorX; + y = mouse_action.cursorY; } #endif popupMenu(x, y, &SelectMenu); @@ -1427,9 +1427,9 @@ tabMn(void) y = Currentbuf->cursorY + Currentbuf->rootY; #ifdef USE_MOUSE - if (mouse_menu && mouse_menu->in_action) { - x = mouse_menu->cursorX - FRAME_WIDTH - 1; - y = mouse_menu->cursorY; + if (mouse_action.in_action) { + x = mouse_action.cursorX; + y = mouse_action.cursorY; } #endif popupMenu(x, y, &SelTabMenu); @@ -1599,7 +1599,10 @@ initMenu(void) w3mMenuList[1].id = "Select"; w3mMenuList[1].menu = &SelectMenu; w3mMenuList[1].item = NULL; - w3mMenuList[2].id = NULL; + w3mMenuList[2].id = "SelectTab"; + w3mMenuList[2].menu = &SelTabMenu; + w3mMenuList[2].item = NULL; + w3mMenuList[3].id = NULL; if ((mf = fopen(rcFile(MENU_FILE), "rt")) == NULL) goto create_menu; |