storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for tab browsing. [w3m-dev 04266]

Browse Source
This commit is contained in:
Dai Sato
2007-05-30 04:47:24 +00:00
parent 4f490b306e
commit 8917c3d381
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6 -1
View File
@@ -1,3 +1,8 @@
2007-05-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 04266] Bug fix when tab browsing
* fm.h, main.c: fix for tab browsing.
2007-05-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> 2007-05-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 04265] compile error when #undef USE_BG_COLOR * [w3m-dev 04265] compile error when #undef USE_BG_COLOR
@@ -8895,4 +8900,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.995 2007/05/30 04:43:59 inu Exp $ $Id: ChangeLog,v 1.996 2007/05/30 04:47:24 inu Exp $
fm.h
+8 -1
View File
@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.137 2007/05/23 13:07:44 inu Exp $ */ /* $Id: fm.h,v 1.138 2007/05/30 04:47:24 inu Exp $ */
/* /*
* w3m: WWW wo Miru utility * w3m: WWW wo Miru utility
* *
@@ -523,6 +523,13 @@ typedef struct _DownloadList {
} DownloadList; } DownloadList;
#define DOWNLOAD_LIST_TITLE "Download List Panel" #define DOWNLOAD_LIST_TITLE "Download List Panel"
#define COPY_BUFROOT(dstbuf, srcbuf) {\
(dstbuf)->rootX = (srcbuf)->rootX; \
(dstbuf)->rootY = (srcbuf)->rootY; \
(dstbuf)->COLS = (srcbuf)->COLS; \
(dstbuf)->LINES = (srcbuf)->LINES; \
}
#define COPY_BUFPOSITION(dstbuf, srcbuf) {\ #define COPY_BUFPOSITION(dstbuf, srcbuf) {\
(dstbuf)->topLine = (srcbuf)->topLine; \ (dstbuf)->topLine = (srcbuf)->topLine; \
(dstbuf)->currentLine = (srcbuf)->currentLine; \ (dstbuf)->currentLine = (srcbuf)->currentLine; \
main.c
+13 -4
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.256 2007/05/29 12:07:02 inu Exp $ */ /* $Id: main.c,v 1.257 2007/05/30 04:47:24 inu Exp $ */
#define MAINPROGRAM #define MAINPROGRAM
#include "fm.h" #include "fm.h"
#include <signal.h> #include <signal.h>
@@ -4717,8 +4717,10 @@ DEFUN(reload, RELOAD, "Reload buffer")
buf->linkBuffer[LB_N_FRAME] = fbuf; buf->linkBuffer[LB_N_FRAME] = fbuf;
pushBuffer(buf); pushBuffer(buf);
Currentbuf = buf; Currentbuf = buf;
if (Currentbuf->firstLine) if (Currentbuf->firstLine) {
COPY_BUFROOT(Currentbuf, &sbuf);
restorePosition(Currentbuf, &sbuf); restorePosition(Currentbuf, &sbuf);
}
displayBuffer(Currentbuf, B_FORCE_REDRAW); displayBuffer(Currentbuf, B_FORCE_REDRAW);
return; return;
} }
@@ -4783,8 +4785,10 @@ DEFUN(reload, RELOAD, "Reload buffer")
} }
Currentbuf->search_header = sbuf.search_header; Currentbuf->search_header = sbuf.search_header;
Currentbuf->form_submit = sbuf.form_submit; Currentbuf->form_submit = sbuf.form_submit;
if (Currentbuf->firstLine) if (Currentbuf->firstLine) {
COPY_BUFROOT(Currentbuf, &sbuf);
restorePosition(Currentbuf, &sbuf); restorePosition(Currentbuf, &sbuf);
}
displayBuffer(Currentbuf, B_FORCE_REDRAW); displayBuffer(Currentbuf, B_FORCE_REDRAW);
} }
@@ -5215,6 +5219,9 @@ do_mouse_action(int btn, int x, int y)
cursorXY(Currentbuf, cx, cy); cursorXY(Currentbuf, cx, cy);
} }
} }
else {
return;
}
if (!(map && map->func)) if (!(map && map->func))
map = &mouse_action.default_map[btn]; map = &mouse_action.default_map[btn];
if (map && map->func) { if (map && map->func) {
@@ -6555,8 +6562,10 @@ DEFUN(ldDL, DOWNLOAD_LIST, "Display download list panel")
return; return;
} }
buf->bufferprop |= (BP_INTERNAL | BP_NO_URL); buf->bufferprop |= (BP_INTERNAL | BP_NO_URL);
if (replace) if (replace) {
COPY_BUFROOT(buf, Currentbuf);
restorePosition(buf, Currentbuf); restorePosition(buf, Currentbuf);
}
if (!replace && open_tab_dl_list) { if (!replace && open_tab_dl_list) {
_newT(); _newT();
new_tab = TRUE; new_tab = TRUE;