Changeset 142 for Include/basic/prompt.sbp

Timestamp:

Mar 9, 2007, 10:15:34 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Environment, OperatingSystem, Versionの追加、Unicode対応修正ほか

File:

• Include/basic/prompt.sbp (modified) (16 diffs)

Include/basic/prompt.sbp

@@ -8 +8 @@
 #require <api_imm.sbp>
 #require <Classes/System/Math.ab>
+
+Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCSTR, cb As Long, ByRef Size As SIZE) As Long
+    _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32A(hdc, psz, cb, Size)
+End Function
+
+Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCWSTR, cb As Long, ByRef Size As SIZE) As Long
+    _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32W(hdc, psz, cb, Size)
+End Function
+
+Function _PromptSys_TextOut(hdc As HDC, x As Long, y As Long, psz As PCSTR, cb As Long) As Long
+    _PromptSys_TextOut = TextOutA(hdc, x, y, psz, cb)
+End Function
+
+Function _PromptSys_TextOut(hdc As HDC, x As Long, y As Long, psz As PCWSTR, cb As Long) As Long
+    _PromptSys_TextOut = TextOutW(hdc, x, y, psz, cb)
+End Function
+
+Function _PromptSys_ImmGetCompositionString(himc As HIMC, index As DWord, pBuf As PSTR, bufLen As DWord) As Long
+    _PromptSys_ImmGetCompositionString = ImmGetCompositionStringA(himc, index, pBuf, bufLen)
+End Function
+
+Function _PromptSys_ImmGetCompositionString(himc As HIMC, index As DWord, pBuf As PWSTR, bufLen As DWord) As Long
+    _PromptSys_ImmGetCompositionString = ImmGetCompositionStringW(himc, index, pBuf, bufLen)
+End Function
 
 Dim _PromptSys_hWnd As HWND
@@ -22 +46 @@
 Type _PromptSys_LineInformation
     Length As Long
-    Text As *Char
+    Text As *StrChar
     CharInfo As *_PromptSys_CharacterInformation
 End Type
@@ -29 +53 @@
 Dim _PromptSys_hFont As HFONT
 Dim _PromptSys_FontSize As SIZE
-Dim _PromptSys_InputStr[255] As Char
+Dim _PromptSys_InputStr[255] As StrChar
 Dim _PromptSys_InputLen As Long
 Dim _PromptSys_KeyChar As Byte
@@ -38 +62 @@
 Dim _PromptSys_SectionOfBufferAccess As CRITICAL_SECTION
 
+Dim _System_OSVersionInfo As OSVERSIONINFO
 
 _PromptSys_InputLen = -1
@@ -48 +73 @@
 
 _PromptSys_hInitFinish = CreateEvent(0, FALSE, FALSE, 0)
-CreateThread(0, 0, AddressOf(PromptMain) As LPTHREAD_START_ROUTINE, 0, 0, _PromptSys_dwThreadID)
+Dim _PromptSys_hThread As HANDLE
+_PromptSys_hThread = CreateThread(0, 0, AddressOf(PromptMain) As LPTHREAD_START_ROUTINE, 0, 0, _PromptSys_dwThreadID)
+If _PromptSys_hThread = 0 Then
+    Debug
+    ExitProcess(1)
+End If
 WaitForSingleObject(_PromptSys_hInitFinish, INFINITE)
 
@@ -68 +98 @@
         Next
         _PromptSys_TextLine[100].Length = 0
-        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (Char) * 255)
+        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (StrChar) * 255)
         _PromptSys_TextLine[100].CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         _PromptSys_CurPos.y--
@@ -83 +113 @@
             Dim sz As SIZE
             i3 = _PromptSys_TextLine[i].Length
-            GetTextExtentPoint32(hDC, _PromptSys_TextLine[i].Text, i3, sz)
+            _PromptSys_GetTextExtentPoint32(hDC, _PromptSys_TextLine[i].Text, i3, sz)
 
             BitBlt(hDC,_
@@ -106 +136 @@
                 End If
                 With _PromptSys_FontSize
-                    TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]), tempLen)
+                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *StrChar, tempLen)
                 End With
                 i2 += tempLen
@@ -127 +157 @@
         Dim doubleUnitChar = False As Boolean
         'Addition
-        Dim i2 = 0 As Long, i3 As Long' : Debug
+        Dim i2 = 0 As Long, i3 As Long
         For i2 = 0 To ELM(bufLen)
             If buf[i2] = &h0d Then 'CR \r
@@ -158 +188 @@
                             charLen = 1
                         EndIf
-                        GetTextExtentPoint32(hdc, VarPtr(buf.Chars[i2]), charLen, sz)
+                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(buf.Chars[i2]) As *StrChar, charLen, sz)
                         currentLineCharInfo[.x + 1].StartPos = currentLineCharInfo[.x].StartPos + sz.cx
 /*
@@ -305 +335 @@
             TempStr = Ex"\r\n"
         ElseIf wParam = &H16 Then
+/*
             'Paste Command(Use Clippboard)
             OpenClipboard(hwnd)
@@ -324 +355 @@
             GlobalUnlock(hGlobal)
             CloseClipboard()
+*/
         Else
             _PromptSys_InputStr[_PromptSys_InputLen] = wParam As Byte
@@ -337 +369 @@
     End If
 End Sub
+
+Function _PromptWnd_GetCompositionStringW(himc As HIMC, ByRef rpsz As PWSTR) As Long
+    Dim size = ImmGetCompositionStringW(himc, GCS_RESULTSTR, 0, 0) 'sizeはバイト単位
+    rpsz = _System_malloc(size) As PTSTR
+    If rpsz = 0 Then
+        'Debug
+        Return 0
+    End If
+    Return ImmGetCompositionStringW(himc, GCS_RESULTSTR, rpsz, size)
+End Function
+
+Function _PromptWnd_GetCompositionStringA(himc As HIMC, ByRef rpsz As PSTR) As Long
+    Dim size = ImmGetCompositionStringA(himc, GCS_RESULTSTR, 0, 0) 'sizeはバイト単位
+    rpsz = _System_malloc(size) As PTSTR
+    If rpsz = 0 Then
+        'Debug
+        Return 0
+    End If
+    Return ImmGetCompositionStringA(himc, GCS_RESULTSTR, rpsz, size)
+End Function
 
 Function _PromptWnd_OnImeCompostion(hwnd As HWND, wp As WPARAM, lp As LPARAM) As LRESULT
@@ -345 +397 @@
             Return 0
         End If
-        Dim size = ImmGetCompositionString(himc, GCS_RESULTSTR, 0, 0) 'sizeはバイト単位
-        Dim str = _System_malloc(size) As PTSTR
-        If str = 0 Then
-            'Debug
-            Return 0
-        End If
-        ImmGetCompositionString(himc, GCS_RESULTSTR, str, size)
+        Dim tempStr As String
+        Dim str As *StrChar
+#ifdef __STIRNG_IS_NOT_UNICODE
+        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
+        tempStr.Assign(str, size)
+#else
+        With _System_OSVersionInfo
+            ' GetCompositionStringW is not implimented in Windows 95 
+            If .dwMajorVersion = 4 And .dwMinorVersion = 0 And .dwPlatformId = VER_PLATFORM_WIN32_WINDOWS Then
+                Dim strA As PCSTR
+                Dim sizeA = _PromptWnd_GetCompositionStringA(himc, strA)
+                tempStr.AssignFromMultiByte(strA, sizeA)
+            Else
+                Dim size = _PromptWnd_GetCompositionStringW(himc, str)
+                tempStr.Assign(str, size \ SizeOf (WCHAR))
+            End If
+        End With
+#endif
         ImmReleaseContext(hwnd, himc)
-
-        memcpy(VarPtr(_PromptSys_InputStr[_PromptSys_InputLen]), str, size)
-        _PromptSys_InputLen += size \ SizeOf (Char)
-
-        Dim tempStr As String(str, size \ SizeOf (Char))
         _System_free(str)
 
-        SendMessage(hwnd, WM_KILLFOCUS, 0, 0)
+        memcpy(VarPtr(_PromptSys_InputStr[_PromptSys_InputLen]), tempStr.Chars, SizeOf (StrChar) * tempStr.Length)
+        _PromptSys_InputLen += tempStr.Length
+
+        SendMessage(hwnd, WM_KILLFOCUS, 0, 0) : Debug
         PRINT_ToPrompt(tempStr)
         SendMessage(hwnd, WM_SETFOCUS, 0, 0)
@@ -371 +432 @@
 
 Function PromptMain(dwData As Long) As Long
+    GetVersionEx(_System_OSVersionInfo)
+
     Dim i As Long
-
     'Allocate
     For i = 0 To 100
         With _PromptSys_TextLine[i]
             .Length = 0
-            .Text = _System_calloc(SizeOf (Char) * 255)
+            .Text = _System_calloc(SizeOf (StrChar) * 255)
             .CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         End With
@@ -515 +577 @@
 '----------------------------------------------
 Sub INPUT_FromPrompt(ShowStr As String)
-    Dim i As Long ,i2 As Long, i3 As Long
+    Dim i As Long, i2 As Long, i3 As Long
     Dim buf As String