Changeset 33

Timestamp:

02/08/06 19:36:45 (3 years ago)

Author:

krobillard

Message:

GL version compiles again.

Location:

trunk/orca/gl

Files:

• dlist.c (modified) (1 diff)
• gx.c (modified) (4 diffs)
• gx.h (modified) (1 diff)

trunk/orca/gl/dlist.c

@@ -144 +144 @@
 {
     uint32_t key = 0;
-    OString* str = orAtomString( atom );
-    char* cp  = str->charArray;
-    char* end = cp + str->used;
-
-    if( str->used > 5 )
+    char* cp = orAtomCString( atom );
+    char* end;
+
+    end = cp;
+    while( *end )
+        ++end;
+
+    if( (end - cp) > 5 )
         return 0;
 

trunk/orca/gl/gx.c

@@ -803 +803 @@
     int code;
     int ch;
+    int strLen;
     const char* cp;
-    OString* str;
     OValue* it  = blk->values;
     OValue* end = blk->values + blk->used;
@@ -814 +814 @@
         if( it->type == OT_WORD )
         {
-            str = orAtomString( it->word.atom );
-            cp = str->charArray;
-            ch = (str->used == 1) ? *cp : 0;
+            cp = orAtomCString( it->word.atom );
+            strLen = 0;
+            while( cp[ strLen ] )
+                ++strLen;
+            ch = (strLen == 1) ? *cp : 0;
         }
         else if( it->type == OT_CHAR )
@@ -881 +883 @@
             }
         }
-        else if( str->used == 2 )
+        else if( strLen == 2 )
         {
                  if( strnequ( cp, "up", 2 ) ) code = KEY_Up;
@@ -894 +896 @@
             else if( strnequ( cp, "f9", 2 ) ) code = KEY_F9;
         }
-        else if( str->used == 3 )
+        else if( strLen == 3 )
         {
                  if( strnequ( cp, "spc", 3 ) ) code = KEY_Space;

trunk/orca/gl/gx.h

@@ -109 +109 @@
 extern struct GxEnv gEnv;
 extern GLView* gView;
+extern const char* orAtomCString( OAtom atom );
 
 extern void gxInitEnv();