Changeset 810 for libcaca/trunk/caca/driver_slang.cTweet

Timestamp:

Apr 18, 2006, 2:59:07 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Renamed cucul_t into cucul_canvas_t. Eh ouais mon con.

File:

• libcaca/trunk/caca/driver_slang.c (modified) (7 diffs)

libcaca/trunk/caca/driver_slang.c

@@ -165 +165 @@
 #endif
 
-    _cucul_set_size(kk->qq, SLtt_Screen_Cols, SLtt_Screen_Rows);
+    _cucul_set_size(kk->c, SLtt_Screen_Cols, SLtt_Screen_Rows);
 
     return 0;
@@ -189 +189 @@
 {
     /* Fallback to a 6x10 font */
-    return kk->qq->width * 6;
+    return kk->c->width * 6;
 }
 
@@ -195 +195 @@
 {
     /* Fallback to a 6x10 font */
-    return kk->qq->height * 10;
+    return kk->c->height * 10;
 }
 
@@ -201 +201 @@
 {
     int x, y;
-    uint32_t *attr = kk->qq->attr;
-    uint32_t *chars = kk->qq->chars;
-    for(y = 0; y < (int)kk->qq->height; y++)
+    uint32_t *attr = kk->c->attr;
+    uint32_t *chars = kk->c->chars;
+    for(y = 0; y < (int)kk->c->height; y++)
     {
         SLsmg_gotorc(y, 0);
-        for(x = kk->qq->width; x--; )
+        for(x = kk->c->width; x--; )
         {
             uint32_t c = *chars++;
@@ -249 +249 @@
     kk->resize.h = SLtt_Screen_Rows;
 
-    if(kk->resize.w != kk->qq->width || kk->resize.h != kk->qq->height)
+    if(kk->resize.w != kk->c->width || kk->resize.h != kk->c->height)
         SLsmg_reinit_smg();
 }
@@ -278 +278 @@
     {
         ev->type = CACA_EVENT_KEY_PRESS;
-        ev->data.key.c = intkey;
+        ev->data.key.ch = intkey;
         return 1;
     }
@@ -308 +308 @@
     switch(intkey)
     {
-        case SL_KEY_UP: ev->data.key.c = CACA_KEY_UP; break;
-        case SL_KEY_DOWN: ev->data.key.c = CACA_KEY_DOWN; break;
-        case SL_KEY_LEFT: ev->data.key.c = CACA_KEY_LEFT; break;
-        case SL_KEY_RIGHT: ev->data.key.c = CACA_KEY_RIGHT; break;
-
-        case SL_KEY_IC: ev->data.key.c = CACA_KEY_INSERT; break;
-        case SL_KEY_DELETE: ev->data.key.c = CACA_KEY_DELETE; break;
-        case SL_KEY_HOME: ev->data.key.c = CACA_KEY_HOME; break;
-        case SL_KEY_END: ev->data.key.c = CACA_KEY_END; break;
-        case SL_KEY_PPAGE: ev->data.key.c = CACA_KEY_PAGEUP; break;
-        case SL_KEY_NPAGE: ev->data.key.c = CACA_KEY_PAGEDOWN; break;
-
-        case SL_KEY_F(1): ev->data.key.c = CACA_KEY_F1; break;
-        case SL_KEY_F(2): ev->data.key.c = CACA_KEY_F2; break;
-        case SL_KEY_F(3): ev->data.key.c = CACA_KEY_F3; break;
-        case SL_KEY_F(4): ev->data.key.c = CACA_KEY_F4; break;
-        case SL_KEY_F(5): ev->data.key.c = CACA_KEY_F5; break;
-        case SL_KEY_F(6): ev->data.key.c = CACA_KEY_F6; break;
-        case SL_KEY_F(7): ev->data.key.c = CACA_KEY_F7; break;
-        case SL_KEY_F(8): ev->data.key.c = CACA_KEY_F8; break;
-        case SL_KEY_F(9): ev->data.key.c = CACA_KEY_F9; break;
-        case SL_KEY_F(10): ev->data.key.c = CACA_KEY_F10; break;
-        case SL_KEY_F(11): ev->data.key.c = CACA_KEY_F11; break;
-        case SL_KEY_F(12): ev->data.key.c = CACA_KEY_F12; break;
+        case SL_KEY_UP: ev->data.key.ch = CACA_KEY_UP; break;
+        case SL_KEY_DOWN: ev->data.key.ch = CACA_KEY_DOWN; break;
+        case SL_KEY_LEFT: ev->data.key.ch = CACA_KEY_LEFT; break;
+        case SL_KEY_RIGHT: ev->data.key.ch = CACA_KEY_RIGHT; break;
+
+        case SL_KEY_IC: ev->data.key.ch = CACA_KEY_INSERT; break;
+        case SL_KEY_DELETE: ev->data.key.ch = CACA_KEY_DELETE; break;
+        case SL_KEY_HOME: ev->data.key.ch = CACA_KEY_HOME; break;
+        case SL_KEY_END: ev->data.key.ch = CACA_KEY_END; break;
+        case SL_KEY_PPAGE: ev->data.key.ch = CACA_KEY_PAGEUP; break;
+        case SL_KEY_NPAGE: ev->data.key.ch = CACA_KEY_PAGEDOWN; break;
+
+        case SL_KEY_F(1): ev->data.key.ch = CACA_KEY_F1; break;
+        case SL_KEY_F(2): ev->data.key.ch = CACA_KEY_F2; break;
+        case SL_KEY_F(3): ev->data.key.ch = CACA_KEY_F3; break;
+        case SL_KEY_F(4): ev->data.key.ch = CACA_KEY_F4; break;
+        case SL_KEY_F(5): ev->data.key.ch = CACA_KEY_F5; break;
+        case SL_KEY_F(6): ev->data.key.ch = CACA_KEY_F6; break;
+        case SL_KEY_F(7): ev->data.key.ch = CACA_KEY_F7; break;
+        case SL_KEY_F(8): ev->data.key.ch = CACA_KEY_F8; break;
+        case SL_KEY_F(9): ev->data.key.ch = CACA_KEY_F9; break;
+        case SL_KEY_F(10): ev->data.key.ch = CACA_KEY_F10; break;
+        case SL_KEY_F(11): ev->data.key.ch = CACA_KEY_F11; break;
+        case SL_KEY_F(12): ev->data.key.ch = CACA_KEY_F12; break;
 
         default: ev->type = CACA_EVENT_NONE; return 0;