- (internal) code refine

- change pmore to non-official pager again. Explicitly #define USE_PMORE in pttbbs.conf to use it.
- add mini pager (minimore) as a default replacement of pmore for license issue.


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4224 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

5 files changed, 175 insertions, 24 deletions

diff --git a/include/config.h b/include/config.h
index 26e1acfd..7be9f806 100644
--- a/include/config.h
+++ b/include/config.h
@@ -234,10 +234,6 @@
 /* (deprecated) more.c 中文章頁數上限(lines/22), +4 for safe */
 #define MAX_PAGES         (MAX_EDIT_LINE / 22 + 4)
 
-/* piaip modules */
-#define USE_PMORE	(1)	// pmore is the only pager now.
-// #define USE_PFTERM	(1)	// pfterm is still experimental
-
 /* 以下還未整理 */
 #define MAX_FRIEND        (256)          /* 載入 cache 之最多朋友數目 */
 #define MAX_REJECT        (32)           /* 載入 cache 之最多壞人數目 */
diff --git a/mbbsd/more.c b/mbbsd/more.c
index 18244e6b..2a0f5009 100644
--- a/mbbsd/more.c
+++ b/mbbsd/more.c
@@ -1,6 +1,26 @@
 /* $Id$ */
 #include "bbs.h"
 
+/*
+ * more.c
+ * a mini pager in 130 lines of code, or stub of the huge pager pmore.
+ * Author: Hung-Te Lin (piaip), April 2008.
+ *
+ * Copyright (c) 2008 Hung-Te Lin <piaip@csie.ntu.edu.tw>
+ * All rights reserved.
+ * Distributed under BSD license (GPL compatible).
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ */
+
+#ifdef USE_PMORE
 /* use new pager: piaip's more. */
 int more(const char *fpath, int promptend)
 {
@@ -75,3 +95,138 @@ int more(const char *fpath, int promptend)
     return r;
 }
 
+#else  // !USE_PMORE
+
+// minimore: a mini pager in exactly 130 lines
+#define PAGER_MAXLINES (2048)
+int more(const char *fpath, int promptend)
+{
+    FILE *fp = fopen(fpath, "rt");
+    int  lineno = 0, lines = 0, oldlineno = -1;
+    int  i = 0, abort = 0, showall = 0, colorize = 0;
+    int  lpos[PAGER_MAXLINES] = {0}; // line position
+    char buf [ANSILINELEN];
+
+    if (!fp) return -1; 
+    clear();
+
+    if (promptend == NA) {	    // quick print one page
+	for (i = 0; i < t_lines-1; i++)
+	    if (!fgets(buf, sizeof(buf), fp)) 
+		break; 
+	    else 
+		outs(buf);
+	fclose(fp); 
+	return 0;
+    }
+    // YEA mode: pre-read
+    while (lines < PAGER_MAXLINES-1 && 
+	   fgets(buf, sizeof(buf), fp) != NULL)
+	lpos[++lines] = ftell(fp);
+    rewind(fp);
+
+    while (!abort) 
+    {
+	if (oldlineno != lineno)    // seek and print
+	{ 
+	    clear(); 
+	    showall = 0; 
+	    oldlineno = lineno;
+	    fseek(fp, lpos[lineno], SEEK_SET);
+
+	    for (i = 0, buf[0] = 0; i < t_lines-1; i++, buf[0] = 0) 
+	    {
+		if (!showall) 
+		{
+		    fgets(buf, sizeof(buf), fp);
+		    if (lineno + i == 0 && 
+			(strncmp(buf, STR_AUTHOR1, strlen(STR_AUTHOR1))==0 ||
+			 strncmp(buf, STR_AUTHOR2, strlen(STR_AUTHOR2))==0))
+			colorize = 1;
+		}
+
+		if (!buf[0]) 
+		{
+		    outs("\n");
+		    showall = 1;
+		} else {
+		    // dirty code to render heeader
+		    if (colorize && lineno+i < 4 && *buf && 
+			    *buf != '\n' && strchr(buf, ':'))
+		    {
+			char *q1 = strchr(buf, ':');
+			int    l = t_columns - 2 - strlen(buf);
+			char *q2 = strstr(buf, STR_POST1);
+
+			chomp(buf); 
+			if (q2 == NULL) q2 = strstr(buf, STR_POST2);
+			if (q2)	    { *(q2-1) = 0; q2 = strchr(q2, ':'); }
+			else q2 = q1;
+
+			*q1++ = 0;	*q2++ = 0; 
+			if (q1 == q2)	 q2 = NULL;
+
+			outs(ANSI_COLOR(34;47) " ");
+			outs(buf); outs(" " ANSI_COLOR(5)); 
+			outs(q1);  prints("%*s", l, ""); q1 += strlen(q1);
+
+			if (q2) {
+			    outs(ANSI_COLOR(0;34;47) " ");  outs(q1+1);
+			    outs(" " ANSI_COLOR(5));	    outs(q2);
+			}
+			outs(ANSI_RESET"\n");
+		    } else 
+			outs(buf);
+		}
+	    }
+	    if (lineno + i >= lines) 
+		showall = 1;
+
+	    // print prompt bar
+	    snprintf(buf, sizeof(buf),
+		    "  瀏覽 P.%d  ", 1 + (lineno / (t_lines-2)));
+	    vs_footer(buf, 
+	    " (→↓[PgUp][PgDn][Home][End])游標移動\t(←/q)結束");
+	}
+	// process key
+	switch(vkey()) {
+	    case KEY_UP: case 'j': case Ctrl('P'):
+		if (lineno == 0) abort = READ_PREV;
+		lineno--;		    
+		break;
+
+	    case KEY_PGUP: case Ctrl('B'):
+		if (lineno == 0) abort = READ_PREV;
+		lineno -= t_lines-2;	    
+		break;
+
+	    case KEY_PGDN: case Ctrl('F'): case ' ':
+	    case KEY_RIGHT:
+		if (showall) return READ_NEXT;
+		lineno += t_lines-2;	    
+		break;
+
+	    case KEY_DOWN: case 'k': case Ctrl('N'):
+		if (showall) return READ_NEXT;
+		lineno++;		    
+		break;
+	    case KEY_HOME: case Ctrl('A'):
+		lineno = 0;		    
+		break;
+	    case KEY_END: case Ctrl('E'):
+		lineno = lines - (t_lines-1); 
+		break;
+	    case KEY_LEFT: case 'q':
+		abort = -1;		    
+		break;
+	}
+	if (lineno + (t_lines-1) >= lines)
+	    lineno = lines-(t_lines-1);
+	if (lineno < 0)
+	    lineno = 0;
+    }
+    fclose(fp);
+    return abort > 0 ? abort : 0;
+}
+
+#endif // !USE_PMORE
diff --git a/mbbsd/register.c b/mbbsd/register.c
index 4bf70cb5..3e4e34ae 100644
--- a/mbbsd/register.c
+++ b/mbbsd/register.c
@@ -508,11 +508,11 @@ new_register(void)
 #ifdef HAVE_USERAGREEMENT
     more(HAVE_USERAGREEMENT, YEA);
     while( 1 ){
-	getdata(b_lines, 0, "請問您接受這份使用者條款嗎? (yes/no) ",
-		passbuf, 4, LCECHO);
-	if( passbuf[0] == 'y' )
+	int c = vans("請問您接受這份使用者條款嗎? (yes/no) " == 'y');
+	if (c == 'y')
 	    break;
-	if( passbuf[0] == 'n' ){
+	else if (c == 'n')
+	{
 	    vmsg("抱歉, 您須要接受使用者條款才能註冊帳號享受我們的服務唷!");
 	    exit(1);
 	}
diff --git a/sample/etc/editable b/sample/etc/editable
index d24e5f7b..21e76fa2 100644
--- a/sample/etc/editable
+++ b/sample/etc/editable
@@ -5,27 +5,30 @@
 #etc/confirm	身份確認信  # deprecated
 #etc/hint	系統功能精靈
 # ----------------------------------------
-# 一般檔案
+# 登出登入
 # ----------------------------------------
-etc/post.note	發文注意事項
-etc/expire.conf	看板期限
-etc/feast	節日
-etc/domain_name_query.cidr  故鄉
+etc/Welcome	歡迎畫面
+etc/Logout	出站畫面
+etc/goodbye	錯誤登入訊息
+etc/sysop	站長名單
 # ----------------------------------------
 # 進站畫面
 # ----------------------------------------
-etc/Welcome_login   進站畫面
+## 單一進站畫面用
+# etc/Welcome_login   進站畫面
+## 多重進站畫面用
+etc/Welcome_login.0 進站畫面0
 etc/Welcome_login.1 進站畫面1
 etc/Welcome_login.2 進站畫面2
 etc/Welcome_login.3 進站畫面3
 etc/Welcome_login.4 進站畫面4
 # ----------------------------------------
-# 登出登入
+# 一般檔案
 # ----------------------------------------
-etc/goodbye	錯誤登入訊息
-etc/Welcome	歡迎畫面
-etc/Logout	出站畫面
-etc/sysop	站長名單
+etc/post.note	發文注意事項
+etc/expire.conf	看板期限
+etc/feast	節日
+etc/domain_name_query.cidr  故鄉
 # ----------------------------------------
 # 註冊相關
 # ----------------------------------------
diff --git a/sample/pttbbs.conf b/sample/pttbbs.conf
index 278b4c91..31984f87 100644
--- a/sample/pttbbs.conf
+++ b/sample/pttbbs.conf
@@ -188,8 +188,8 @@
 /* 若定義，guest 帳號預設不顯示一字雙色 */
 // #define GUEST_DEFAULT_DBCS_NOINTRESC
 
-/* "不"使用新式的 pmore (piaip's more) 代替舊式 bug 抓不完的 more */
-//#define USE_TRADITIONAL_MORE
+/* 使用新式的 pmore (piaip's more) 代替舊式 bug 抓不完的 more 或是簡易的 minimore */
+//#define USE_PMORE
 
 /* 使用 rfork()取代 fork() . 目前只在 FreeBSD上有效 */
 //#define USE_RFORK
@@ -233,9 +233,6 @@
 /* 在轉信時附上的時區. 若在台灣, 中國大陸等地, 用預設的即可.          */
 //#define INNTIMEZONE "+0800 (CST)"
 
-/* 大學聯考查榜系統 */
-//#define HAVE_JCEE (1)
-
 /* 開啟小天使小主人功能 */
 //#define PLAY_ANGEL