Changeset 14713 for lang/c

Timestamp:

06/27/08 20:28:03 (5 months ago)

Author:

itkz

Message:

update test

Files:

• lang/c/SDL_textmanager/test/main.c (modified) (8 diffs)

lang/c/SDL_textmanager/test/main.c

@@ -422 +422 @@
         FILE *testFp;
         Uint16 inputedChar;
-        TextManager_DeadChar previousDeadChar;
         
         if (SDL_Init(SDL_INIT_VIDEO) < 0) {
@@ -457 +456 @@
         SDL_FreeSurface(surface);
         
-        if (TextManager_Init() != INPUT_METHOD_SUCCESS) {
+        if (TextManager_Init() != TEXT_MANAGER_SUCCESS) {
                 printf("TextManager_Init(): %d\n", TextManager_Init());
                 printf("%s\n", SDL_GetError());
@@ -505 +504 @@
         inputedString[0] = 0x0000;
         inputedWidth = 0;
-        previousDeadChar = DEAD_CHAR_NON;
         while(1) {
                 if (SDL_PollEvent(&e) != 0){
@@ -523 +521 @@
                                 
                                 switch (TextManager_GetCurrentMessage()) {
-                                case INPUT_METHOD_MESSAGE_IM_ON:
+                                case TEXT_MANAGER_MESSAGE_IM_ON:
                                         rect.x = 0;
                                         rect.y = 100;
@@ -535 +533 @@
                                         DrawCursor(back, font, inputedWidth);
                                         break;
-                                case INPUT_METHOD_MESSAGE_IM_CHANGE:
+                                case TEXT_MANAGER_MESSAGE_IM_CHANGE:
                                         MessageChange(back, font, inputedWidth);
                                         break;
-                                case INPUT_METHOD_MESSAGE_IM_RESULT:
+                                case TEXT_MANAGER_MESSAGE_IM_RESULT:
                                         stringLength =
                                                 GetUnicodeStringLength(inputedString) +
@@ -556 +554 @@
                                         DrawCursor(back, font, inputedWidth);
                                         break;
-                                case INPUT_METHOD_MESSAGE_CHAR:
+                                case TEXT_MANAGER_MESSAGE_CHAR:
                                         stringLength =
                                                 GetUnicodeStringLength(inputedString) + 1;
                                         needSize = stringLength * sizeof(Uint16) + sizeof(Uint16);
                                         inputedString = realloc(inputedString, needSize);
-                                        if (previousDeadChar == DEAD_CHAR_NON) {
-                                                inputedChar = TextManager_GetCurrentChar();
-                                        } else {
-                                                inputedChar = TextManager_CombineDeadKey(
-                                                        previousDeadChar, TextManager_GetCurrentChar());
-                                        }
+                                        inputedChar = TextManager_GetCurrentChar();
                                         inputedString[stringLength - 1] = inputedChar;
+printf("SHIT: %x\n", inputedChar);
                                         inputedString[stringLength] = 0x0000;
                                         
@@ -577 +571 @@
                                         DrawCursor(back, font, inputedWidth);
                                         break;
-                                case INPUT_METHOD_MESSAGE_IM_OFF:
+                                case TEXT_MANAGER_MESSAGE_IM_OFF:
                                         rect.x = 0;
                                         rect.y = 100;
@@ -592 +586 @@
                                 }
                                 switch (TextManager_GetCurrentMessage()) {
-                                case INPUT_METHOD_MESSAGE_DEAD_CHAR:
-                                        previousDeadChar = TextManager_GetCurrentDeadChar();
-                                        break;
                                 default:
-                                        previousDeadChar = DEAD_CHAR_NON;
                                         break;
                                 }