summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2007-12-31 12:40:51 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2007-12-31 12:40:51 +0800
commit70dfe52e0ce1739dab5daff7308892d828c705c4 (patch)
treee64e07e614e2eec0c7d69d8b6f4938070841325e
parent314a95259dcccb82415c41b590ed36eb96719144 (diff)
downloadpttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.tar
pttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.tar.gz
pttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.tar.bz2
pttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.tar.lz
pttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.tar.xz
pttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.tar.zst
pttbbs-70dfe52e0ce1739dab5daff7308892d828c705c4.zip
- better flush/synchronization flow
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3767 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/io.c2
-rw-r--r--mbbsd/pfterm.c3
-rw-r--r--mbbsd/pmore.c9
-rw-r--r--sample/pttbbs.conf10
4 files changed, 18 insertions, 6 deletions
diff --git a/mbbsd/io.c b/mbbsd/io.c
index c35af7c7..8cf3999c 100644
--- a/mbbsd/io.c
+++ b/mbbsd/io.c
@@ -88,6 +88,8 @@ oflush(void)
szLastOutput = 0;
}
#endif // DBG_OUTRPT
+
+ fsync(1);
}
void
diff --git a/mbbsd/pfterm.c b/mbbsd/pfterm.c
index a7c81105..162e2459 100644
--- a/mbbsd/pfterm.c
+++ b/mbbsd/pfterm.c
@@ -863,8 +863,9 @@ refresh(void)
}
}
- fterm_dupe2bk();
+ // doing rawcursor() earlier to enable max display time
fterm_rawcursor();
+ fterm_dupe2bk();
ft.dirty = 0;
}
diff --git a/mbbsd/pmore.c b/mbbsd/pmore.c
index ae360c1f..44a405c6 100644
--- a/mbbsd/pmore.c
+++ b/mbbsd/pmore.c
@@ -1838,6 +1838,11 @@ pmore(char *fpath, int promptend)
mf_moviePromptPlaying(0);
+ // doing refresh() here is better,
+ // to prevent that we forgot to refresh
+ // in SyncFrame.
+ refresh();
+
if(mf_movieSyncFrame())
{
/* user did not hit anything.
@@ -3481,14 +3486,14 @@ int mf_movieSyncFrame()
if(dv.tv_sec < 0)
return 1;
- return !pmore_wait_key(&dv, 1);
+ return !pmore_wait_key(&dv, 0);
} else {
/* synchronize each frame clock model */
/* because Linux will change the timeval passed to select,
* let's use a temp value here.
*/
struct timeval dv = mfmovie.frameclk;
- return !pmore_wait_key(&dv, 1);
+ return !pmore_wait_key(&dv, 0);
}
}
diff --git a/sample/pttbbs.conf b/sample/pttbbs.conf
index 734bf743..b54c4c5d 100644
--- a/sample/pttbbs.conf
+++ b/sample/pttbbs.conf
@@ -47,7 +47,7 @@
#define GLOBAL_BUGREPORT BBSMNAME "Bug"
/* 法律訴訟的板 */
#define GLOBAL_LAW BBSMNAME "Law"
-/* 新手板 */
+/* 新手板(會自動進我的最愛) */
#define GLOBAL_NEWBIE BBSMNAME "NewHand"
/* 外國板 */
#define GLOBAL_FOREIGN BBSMNAME "Foreign"
@@ -72,7 +72,11 @@
/* 最大編輯行數, 以防有惡意使用者 post 巨大文章 */
-#define MAX_EDIT_LINE 2048
+#define MAX_EDIT_LINE (2048)
+#define MAX_EDIT_LINE_LARGE (32000)
+
+/* 若定義則啟用修文自動合併系統 */
+#define EDITPOST_SMARTMERGE
/* 若定義, 則可以免費隱形 */
#define HAVE_FREECLOAK 1
@@ -248,7 +252,7 @@
/* 若定義, 新板設定自動開記錄,不過 USE_AUTOCPLOG 還是要開才有用 */
#define DEFAULT_AUTOCPLOG
-/* 若定義,少於此數目的金錢將不開發票 */
+/* 若定義,少於此數目的金錢將不開發票,也不能對獎 */
#define VICE_MIN (100)
/* 贈送信箱 */