From b88a96b97d0771cc038c69adae2212de41b5c7e5 Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 12 Jan 2008 05:43:03 +0000 Subject: - license text update - pmore: change lua hotkey to L - bbslua: don't grayout at exit git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3823 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbslua.c | 33 +++++++++++++++++++++++++++++---- mbbsd/pfterm.c | 8 +++++--- mbbsd/pmore.c | 17 ++++++++++++++--- 3 files changed, 48 insertions(+), 10 deletions(-) (limited to 'mbbsd') diff --git a/mbbsd/bbslua.c b/mbbsd/bbslua.c index fee3da02..0301703c 100644 --- a/mbbsd/bbslua.c +++ b/mbbsd/bbslua.c @@ -3,9 +3,34 @@ // // Author: Hung-Te Lin(piaip), Jan. 2008. // +// Create: 2008-01-04 22:02:58 +// $Id$ +// // This source is released in MIT License, same as Lua 5.0 // http://www.lua.org/license.html // +// Copyright 2008 Hung-Te Lin +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// // TODO: // BBSLUA 1.0 // 1. add quick key/val conversion [deprecated] @@ -13,9 +38,9 @@ // 3. remove i/o libraries [done] // 4. add system break key (Ctrl-C) [done] // 5. add version string and script tags [done] -// 6. provide local storage -// 7. standalone w32 sdk -// 8. syntax highlight in editor +// 6. standalone w32 sdk [done] +// 7. syntax highlight in editor [drop?] +// 8. provide local storage // 9. deal with loadfile, dofile // ?. modify bbs user data (eg, money) // ?. os.date(), os.exit(), abort(), os.time() @@ -1163,7 +1188,7 @@ bbslua(const char *fpath) runningBBSLua =0; drop_input(); - grayout(0, b_lines, GRAYOUT_DARK); + // grayout(0, b_lines, GRAYOUT_DARK); move(b_lines, 0); clrtoeol(); vmsgf("BBS-Lua 執行結束%s。", abortBBSLua ? " (使用者中斷)" : r ? " (程式錯誤)" : ""); diff --git a/mbbsd/pfterm.c b/mbbsd/pfterm.c index 1288fecb..faf2ffd0 100644 --- a/mbbsd/pfterm.c +++ b/mbbsd/pfterm.c @@ -83,11 +83,13 @@ // specific to any branch. // // Author: Hung-Te Lin (piaip), Dec. 2007. -// +// +// Copyright(c) 2007-2008 Hung-Te Lin // All Rights Reserved. // You are free to use, modify, redistribute this program -// in any non-commercial usage. -// You must keep these copyright information. +// in any non-commercial usage (including network service). +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. // // MAJOR IMPROVEMENTS: // - Interpret ANSI code and maintain a virtual terminal diff --git a/mbbsd/pmore.c b/mbbsd/pmore.c index 98b6b2f8..4f5af25b 100644 --- a/mbbsd/pmore.c +++ b/mbbsd/pmore.c @@ -11,11 +11,13 @@ * specific to any branch. * * Author: Hung-Te Lin (piaip), June 2005. - * + * + * Copyright(c) 2005-2008 Hung-Te Lin * All Rights Reserved. * You are free to use, modify, redistribute this program - * in any non-commercial usage. - * You must keep these copyright information. + * in any non-commercial usage (including network service). + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * * MAJOR IMPROVEMENTS: * - Clean source code, and more readable for mortal @@ -1814,6 +1816,10 @@ pmore(char *fpath, int promptend) #endif move(b_lines, 0); // clrtoeol(); // this shall be done in mf_display to speed up. + +#ifdef USE_BBSLUA + // TODO prompt BBS Lua status here. +#endif // USE_BBSLUA #ifdef PMORE_USE_ASCII_MOVIE switch (mfmovie.mode) @@ -2383,6 +2389,11 @@ pmore(char *fpath, int promptend) #if defined(USE_BBSLUA) && defined(RET_DOBBSLUA) case 'P': + vmsg("非常抱歉，BBS-Lua 的熱鍵已改為 L ，請改按 L"); + break; + + case 'L': + case 'l': flExit = 1, retval = RET_DOBBSLUA; break; #endif -- cgit v1.2.3