Changeset 16243

Timestamp:

07/24/08 21:25:03 (5 years ago)

Author:

saturday06

Message:

commitwasure

Location:

lang/cplusplus/i3

Files:

• src/mol/include/mol/os-windows/Common.h (added)
• src/os-windows/CygwinPty.cpp (modified) (1 diff)
• src/os-windows/CygwinPty.h (modified) (1 diff)
• src/os-windows/Os.cpp (modified) (1 diff)
• src/os-windows/OsTest1.cpp (modified) (2 diffs)
• windows/i3_test.vcproj (modified) (7 diffs)
• windows/resources/fakecygpty.ico (added)
• windows/resources/fakecygpty.rc (added)
• windows/resources/fakecygpty.xcf (added)

lang/cplusplus/i3/src/os-windows/CygwinPty.cpp

@@ -6 +6 @@
     }
 
-    bool CygwinPty::sigint() {
+    bool CygwinPty::sendSigInt() {
         BOOL result = GenerateConsoleCtrlEvent(CTRL_C_EVENT, pi.dwProcessId);
         return (result != 0);
+        //return write("\003", 1);
     }
 

lang/cplusplus/i3/src/os-windows/CygwinPty.h

@@ -17 +17 @@
             return true;        
         }
-        bool sigint();
+        bool sendSigInt();
     private:
         HANDLE hStdInput;

lang/cplusplus/i3/src/os-windows/Os.cpp

@@ -7 +7 @@
         init_windows_gettext();
     }
+    extern HINSTANCE hInstance;
 }
 

lang/cplusplus/i3/src/os-windows/OsTest1.cpp

@@ -4 +4 @@
 #include "Common.h"
 #include "CygwinPty.h"
+
+using namespace i3;
 
 BOOST_AUTO_TEST_CASE(aaaab) {
@@ -18 +20 @@
     BOOST_REQUIRE(pty.write("echo baz\n"));
     BOOST_REQUIRE(pty.write("/bin\t\t"));
-    BOOST_REQUIRE(pty.sigint());
-    BOOST_REQUIRE(pty.write("echo hoge\n"));
-    BOOST_REQUIRE(pty.sigint());
+    BOOST_REQUIRE(pty.sendSigInt());
+    BOOST_REQUIRE(pty.sendSigInt());
+    BOOST_REQUIRE(pty.write("echo foo\n"));
+    BOOST_REQUIRE(pty.sendSigInt());
+    BOOST_REQUIRE(pty.sendSigInt());
+    BOOST_REQUIRE(pty.write("while true\ndo\necho\ndone\n"));
+    Sleep(3000);
+    BOOST_REQUIRE(pty.sendSigInt());
     BOOST_REQUIRE(pty.write("echo hage\n"));
 }

lang/cplusplus/i3/windows/i3_test.vcproj

@@ -289 +289 @@
                         >
                         <File
+                                RelativePath="..\src\BoostTestMain.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\CompletionWindow.cpp"
                                 >
@@ -309 +313 @@
                         </File>
                         <File
+                                RelativePath="..\src\gui-windows\GuiTest1.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\gui-windows\GuiTest2.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\InputWindow.cpp"
                                 >
@@ -326 +338 @@
                         <File
                                 RelativePath="..\src\os-windows\Os.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\os-windows\OsTest1.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\os-windows\OsTest2.cpp"
                                 >
                         </File>
@@ -357 +377 @@
                         </File>
                         <File
-                                RelativePath="..\src\TestMain.cpp"
+                                RelativePath="..\src\os-windows\WindowsCommon.cpp"
                                 >
                         </File>
@@ -375 +395 @@
                         </File>
                         <File
+                                RelativePath="..\src\gui-windows\CompletionWindowCore.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\windows\CompletionWindowCore.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\gui-windows\CompletionWindowCore.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\os-windows\CygwinPty.h"
                                 >
@@ -407 +427 @@
                         </File>
                         <File
+                                RelativePath="..\src\gui-windows\InputWindowCore.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\windows\InputWindowCore.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\gui-windows\InputWindowCore.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\LibintlUtf16le.h"
                                 >
@@ -436 +456 @@
                         <File
                                 RelativePath="..\src\ShellManager.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\src\os-windows\WindowsCommon.h"
                                 >
                         </File>