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 /display.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 'display.c')
| -rw-r--r-- | display.c | 26 |
1 files changed, 15 insertions, 11 deletions
@@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.38 2002/11/22 15:43:13 ukai Exp $ */ +/* $Id: display.c,v 1.39 2002/11/25 16:57:16 ukai Exp $ */ #include <signal.h> #include "fm.h" @@ -254,7 +254,11 @@ displayBuffer(Buffer *buf, int mode) else buf->rootX = 0; buf->COLS = COLS - buf->rootX; - if (nTab > 1 || mouse_menu) { + if (nTab > 1 +#ifdef USE_MOUSE + || mouse_action.menu_str +#endif + ) { ny = LastTab->y + 2; if (ny > LASTLINE) ny = LASTLINE; @@ -318,12 +322,8 @@ displayBuffer(Buffer *buf, int mode) #endif #ifdef USE_MOUSE - if (use_mouse) -#if LANG == JA - msg = Strnew_charp("ΆγΆ¬Ά"); -#else /* LANG != JA */ - msg = Strnew_charp("<=UpDn "); -#endif /* LANG != JA */ + if (use_mouse && mouse_action.lastline_str) + msg = Strnew_charp(mouse_action.lastline_str); else #endif /* not USE_MOUSE */ msg = Strnew(); @@ -445,14 +445,18 @@ redrawNLine(Buffer *buf, int n) #endif /* USE_BG_COLOR */ } #endif /* USE_COLOR */ - if (nTab > 1 || mouse_menu) { + if (nTab > 1 +#ifdef USE_MOUSE + || mouse_action.menu_str +#endif + ) { TabBuffer *t; int l; move(0, 0); #ifdef USE_MOUSE - if (mouse_menu && mouse_menu->str) - addstr(mouse_menu->str); + if (mouse_action.menu_str) + addstr(mouse_action.menu_str); #endif clrtoeolx(); for (t = FirstTab; t; t = t->nextTab) { |