コミット: 916725e807bdd6f4fdf0b26ba6985a20928bc1b5 - mfiler4 (git)

mfiler4のgitリポジトリ

コミットメタ情報

• リビジョン: 916725e807bdd6f4fdf0b26ba6985a20928bc1b5 (tree)
• 日時: 2012-12-14 15:19:13
• 作者: ab25cq <ab25cq@gmai...>
• コミッター: ab25cq

ログメッセージ

1.0.5b

変更サマリ

• modified: CHANGELOG
• modified: src/commands.c
• modified: src/common.h
• modified: src/gui.c
• modified: src/isearch.c
• modified: src/main.c
• modified: src/menu.c

差分

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,12 @@
 
+2012 14th December version 1.0.5b
+
+	1. Got good way to refresh screen on cygwin.
+
+2012 12月14日 1.0.5b
+
+	1. cygwinで画面のちらつきを抑えました。
+
 2012 14th December version 1.0.5a
 
 	1. Maybe got good way to refresh screen on cygwin.

--- a/src/commands.c
+++ b/src/commands.c
@@ -2991,7 +2991,7 @@ BOOL cmd_mclear_immediately(sObject* nextin, sObject* nextout, sRunInfo* runinfo
         return FALSE;
     }
 
-    mclear_immediately();
+    xclear_immediately();
     runinfo->mRCode = 0;
 
     return TRUE;

--- a/src/common.h
+++ b/src/common.h
@@ -127,6 +127,9 @@ void ISearchClear();
 int xgetch(int* meta);
 void xinitscr();
 void xendwin();
+void xclear();
+void xclear_immediately();
+void mclear_lastline();
 char* choise(char* msg, char* str[], int len, int cancel);
 void merr_msg(char* msg, ...);
 void msg_nonstop(char* msg, ...);

--- a/src/gui.c
+++ b/src/gui.c
@@ -18,7 +18,7 @@ void xinitscr()
     raw();
     noecho();
     keypad(stdscr, TRUE);
-    curs_set(0);
+    //curs_set(0);
 
     int background = COLOR_BLACK;
 
@@ -98,6 +98,12 @@ void merr_msg(char* msg, ...)
             refresh();
 
             (void)getch();
+
+#if defined(__CYGWIN__)
+            xclear_immediately();       // 画面の再描写
+            view();
+            refresh();
+#endif
         }
         else {
             fprintf(stderr, "%s", msg2);
@@ -129,7 +135,7 @@ void msg_nonstop(char* msg, ...)
     const int maxy = mgetmaxy();
     const int maxx = mgetmaxx();
 
-    clear();
+    xclear();
     view();
     mclear_online(maxy-2);
     mclear_online(maxy-1);
@@ -192,7 +198,7 @@ char* choise(char* msg, char* str[], int len, int cancel)
             if(cursor < 0) cursor= 0;
         }
         else if(key == 12) {            // CTRL-L
-            mclear_immediately();
+            xclear_immediately();
         }
         else if(key == 3 || key == 7 || key == 27) { // CTRL-C -G Escape
             return NULL;
@@ -209,6 +215,12 @@ char* choise(char* msg, char* str[], int len, int cancel)
     }
 finished:
 
+#if defined(__CYGWIN__)
+    xclear_immediately();       // 画面の再描写
+    view();
+    refresh();
+#endif
+
     return str[cursor];
 }
 
@@ -391,7 +403,7 @@ int input_box(char* msg, char* result, int result_size, char* def_input, int def
             break;
         }
         else if(key == 12) {            // CTRL-L
-            mclear_immediately();
+            xclear_immediately();
         }
         else {
             if(meta == 0 && !(key >= 0 && key <= 27)) {
@@ -413,6 +425,12 @@ int input_box(char* msg, char* result, int result_size, char* def_input, int def
 
     mmove_immediately(maxy -2, 0);
 
+#if defined(__CYGWIN__)
+    xclear_immediately();       // 画面の再描写
+    view();
+    refresh();
+#endif
+
     return result2;
 }
 
@@ -488,7 +506,7 @@ int select_str(char* msg, char* str[], int len, int cancel)
             if(gSelectStrCursor < 0) gSelectStrCursor= 0;
         }
         else if(key == 12) {            // CTRL-L
-            mclear_immediately();
+            xclear_immediately();
         }
         else if(key == 3 || key == 7 | key == 27) { // CTRL-C -G Escape
             gSelectStrCursor = cancel;
@@ -508,6 +526,12 @@ finished:
     
     gView = NULL;
 
+#if defined(__CYGWIN__)
+    xclear_immediately();       // 画面の再描写
+    view();
+    refresh();
+#endif
+
     return gSelectStrCursor;
 }
 
@@ -542,7 +566,7 @@ int select_str2(char* msg, char* str[], int len, int cancel)
             if(gSelectStrCursor < 0) gSelectStrCursor= 0;
         }
         else if(key == 12) {            // CTRL-L
-            mclear_immediately();
+            xclear_immediately();
         }
         else if(key == 3 || key == 7 || key == 27) { // CTRL-C -G Escape
             gSelectStrCursor = cancel;
@@ -562,5 +586,55 @@ finished:
     
     gView = NULL;
 
+#if defined(__CYGWIN__)
+    xclear_immediately();       // 画面の再描写
+    view();
+    refresh();
+#endif
+
     return gSelectStrCursor;
 }
+
+void xclear_immediately()
+{
+#if defined(__CYGWIN__)
+    int y;
+    for(y=0; y<mgetmaxy(); y++) {
+        mclear_online(y);
+    }
+    refresh();
+#else
+    mclear_immediately();
+#endif
+}
+
+void mclear_lastline()
+{
+    char space[1024];
+    int x;
+
+    const int maxx = mgetmaxx();
+    const int maxy = mgetmaxy();
+
+    for(x=0; x<maxx-1; x++) {
+        space[x] = ' ';
+    }
+    space[x] = 0;
+
+    attron(0);
+    mvprintw(maxy-1, 0, space);
+}
+
+void xclear()
+{
+#if defined(__CYGWIN__)
+    int y;
+    for(y=0; y<mgetmaxy()-1; y++) {
+        mclear_online(y);
+    }
+    mclear_lastline();
+#else
+    clear();
+#endif
+}
+

--- a/src/isearch.c
+++ b/src/isearch.c
@@ -619,6 +619,16 @@ void isearch_input(int meta, int key)
 ///////////////////////////////////////////////////
 // インクリメンタルサーチ描写
 ///////////////////////////////////////////////////
+#if defined(__CYGWIN__)
+void isearch_view()
+{
+    const int maxx = mgetmaxx();
+    const int maxy = mgetmaxy();
+
+    mbox(maxy/2, maxx/3, maxx/3, 3);
+    mvprintw(maxy/2+1, maxx/3+1, "/%s", string_c_str(gInputFileName));
+}
+#else
 void isearch_view()
 {
     const int maxx = mgetmaxx();
@@ -644,4 +654,5 @@ void isearch_view()
     buf[i] = 0;
     printw(buf);
 }
+#endif
 

--- a/src/main.c
+++ b/src/main.c
@@ -280,6 +280,9 @@ void view()
         job_view();
 
         isearch_view();
+#if defined(__CYGWIN__)
+        cmdline_view_filer();
+#endif
     }
     else if(gActiveMenu) {
         filer_view(0);
@@ -341,7 +344,7 @@ static void atexit_fun()
 static void sig_winch(int s)
 {
     if(gMainLoop == -1) {
-        mclear_immediately();       // 画面の再描写
+        xclear_immediately();       // 画面の再描写
         view();
         refresh();
     }
@@ -350,7 +353,7 @@ static void sig_winch(int s)
 static void sig_cont(int s)
 {
     if(gMainLoop == -1) {
-        mclear_immediately();       // 画面の再描写
+        xclear_immediately();       // 画面の再描写
         view();
         refresh();
     }
@@ -908,7 +911,7 @@ int main(int argc, char* argv[])
     CHECKML_BEGIN(FALSE);
 
     /// ファイラでもスクリプトでも共通の環境変数を初期化 ///
-    setenv("VERSION", "1.0.5a", 1);
+    setenv("VERSION", "1.0.5b", 1);
     setenv("MFILER4_DATAROOTDIR", DATAROOTDIR, 1);
 
     /// mfiler4のホームディレクトリを保存しておく ///
@@ -1133,7 +1136,7 @@ int main(int argc, char* argv[])
 
     while(gMainLoop == -1) {
         /// 描写 ///
-        clear();
+        xclear();
         view();
         refresh();
 

--- a/src/menu.c
+++ b/src/menu.c
@@ -205,7 +205,7 @@ void menu_input(sMenu* self, int meta, int key)
         clear();
     }
     else if(key == 12) {// CTRL-L
-        mclear_immediately();
+        xclear_immediately();
     }
     else {
         gActiveMenu = NULL;