Change tinygl_text to have pos

apps/chooser/chooser.c

@@ -29,7 +29,7 @@ static void show_num (char ch, uint8_t count)
     buffer[1] = count / 10 + '0';
     buffer[2] = count % 10 + '0';
     buffer[3] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 
@@ -43,9 +43,9 @@ int main (void)
 
     tinygl_font_set (&font5x7_1);
     tinygl_text_speed_set (MESSAGE_RATE);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL_LEFT);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
-    tinygl_text ("NUM?");
+    tinygl_text ("NUM?", tinygl_point (0, 0));
 
     pacer_init (LOOP_RATE);
 

apps/fonttest1/fonttest1.c

@@ -37,18 +37,13 @@ static void choose_font (int font_num)
 }
 
 
-static char show_char (int font_num, char ch)
+static char show_char (char ch)
 {
     char string[2];
 
-    if (ch < FONT_FIRST (fonts[font_num]))
-        ch = FONT_LAST (fonts[font_num]);
-    else if (ch > FONT_LAST (fonts[font_num]))
-        ch = FONT_FIRST (fonts[font_num]);
-            
     string[0] = ch;
     string[1] = 0;
-    tinygl_text (string);
+    tinygl_text (string, tinygl_point (0, 0));
     return ch;
 }
 
@@ -68,7 +63,7 @@ int main (void)
     choose_font (font_num);
     tinygl_text_speed_set (10);
 
-    c = show_char (font_num, c);
+    c = show_char (c);
 
     /* Paced loop.  */
     while (1)
@@ -85,17 +80,19 @@ int main (void)
                 font_num = 0;
 
             choose_font (font_num);
-            c = show_char (font_num, c);
+            c = show_char (c);
         }
         else if (navswitch_push_event_p (NAVSWITCH_WEST)
                  || navswitch_push_event_p (NAVSWITCH_SOUTH))
         {
-            c = show_char (font_num, c - 1);
+            if (font_contains_p (fonts[font_num], c - 1))
+                c = show_char (c - 1);
         }
         else if (navswitch_push_event_p (NAVSWITCH_EAST)
                  || navswitch_push_event_p (NAVSWITCH_NORTH))
         {
-            c = show_char (font_num, c + 1);
+            if (font_contains_p (fonts[font_num], c + 1))
+                c = show_char (c + 1);
         }
 
         tinygl_update ();

apps/hello2/hello2.c

@@ -27,7 +27,7 @@ int main (void)
     tinygl_font_set (&font5x7_1);
     tinygl_text_speed_set (MESSAGE_RATE);
 
-    tinygl_text ("HELLO WORLD");
+    tinygl_text ("HELLO WORLD", tinygl_point (0, 0));
 
     pacer_init (LOOP_RATE);
 

apps/hello3/hello3.c

@@ -26,9 +26,9 @@ int main (void)
 
     tinygl_font_set (&font5x7_1);
     tinygl_text_speed_set (MESSAGE_RATE);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL_LEFT);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
-    tinygl_text ("HELLO WORLD");
+    tinygl_text ("HELLO WORLD", tinygl_point (0, 0));
 
     pacer_init (LOOP_RATE);
 

apps/hello4/hello4.c

@@ -29,8 +29,9 @@ int main (void)
 
     tinygl_font_set (&font5x7_1);
     tinygl_text_speed_set (MESSAGE_RATE);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
-    tinygl_text ("HELLO WORLD");
+    tinygl_text ("HELLO WORLD", tinygl_point (0, 0));
 
     pacer_init (LOOP_RATE);
 
@@ -48,7 +49,7 @@ int main (void)
             tinygl_text_mode_set (TINYGL_TEXT_MODE_STEP);
 
         if (navswitch_push_event_p (NAVSWITCH_EAST))
-            tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL_LEFT);
+            tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
 
     }
 

apps/ir_grab1/ir_grab1.c

@@ -85,7 +85,7 @@ static void show_char (char ch)
 
     buffer[0] = ch;
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 

apps/ir_grab2/ir_grab2.c

@@ -89,7 +89,7 @@ static void show_char (char ch)
 
     buffer[0] = ch;
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -99,7 +99,7 @@ static void show_num (char ch, uint8_t num)
 
     buffer[0] = ch;
     uint8toa (num, buffer + 1, 0);
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -112,7 +112,8 @@ int main (void)
     system_init ();
     tinygl_init (LOOP_RATE);
     tinygl_font_set (&font3x5_1);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_SCROLL_DOWN);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
     tinygl_text_speed_set (MESSAGE_RATE);
 
     navswitch_init ();

apps/ir_grab3/ir_grab3.c

@@ -156,7 +156,7 @@ int main (void)
 
     pacer_init (LOOP_RATE);
 
-    tinygl_text ("X");
+    tinygl_text ("X", tinygl_point (0, 0));
     led_set (LED1, 0);
 
     while (1)
@@ -176,7 +176,7 @@ int main (void)
 
             if (seq != -1)
             {
-                tinygl_text (strings[seq]);
+                tinygl_text (strings[seq], tinygl_point (0, 0));
                 transmit (&codeseqs[seq * CODESEQ_LEN_MAX]);
             }
                     
@@ -199,7 +199,7 @@ int main (void)
                 {
                     if (capture (codeseq, CODESEQ_LEN_MAX))
                     {
-                        tinygl_text ("?");
+                        tinygl_text ("?", tinygl_point (0, 0));
                         led_set (LED1, 1);
                         state = STATE_STORE;
                         break;
@@ -227,7 +227,7 @@ int main (void)
             {
                 memcpy (&codeseqs[seq * CODESEQ_LEN_MAX], codeseq, sizeof (codeseq));
                 codeseqs_write (codeseqs, CODESEQ_LEN_MAX, CODESEQ_NUM);
-                tinygl_text (strings[seq]);
+                tinygl_text (strings[seq], tinygl_point (0, 0));
                 led_set (LED1, 0);
                 state = STATE_NORMAL;
             }

apps/ir_serial_test1/ir_serial_test1.c

@@ -29,7 +29,7 @@ static void show_count (uint8_t count)
     buffer[0] = 'S';
     buffer[1] = count + '0';
     buffer[2] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -40,7 +40,7 @@ static void show_err (uint8_t err)
     buffer[0] = 'E';
     buffer[1] = err + '0';
     buffer[2] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -52,7 +52,8 @@ int main (void)
     tinygl_init (LOOP_RATE);
     tinygl_font_set (&font3x5_1);
     tinygl_text_speed_set (MESSAGE_RATE);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_SCROLL_DOWN);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
 
     navswitch_init ();
     ir_serial_init ();

apps/ir_serial_test2/ir_serial_test2.c

@@ -28,7 +28,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 

apps/ir_serial_test3/ir_serial_test3.c

@@ -28,7 +28,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 

apps/ir_uart_test1/ir_uart_test1.c

@@ -28,7 +28,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 

apps/ir_uart_test2/ir_uart_test2.c

@@ -27,7 +27,7 @@ static void show_char (char ch)
 
     buffer[0] = ch;
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 

apps/space10/space10.c

@@ -86,7 +86,7 @@ game_over_display (char *buffer)
     *str++ = 'F';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -99,7 +99,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -230,7 +230,8 @@ main (void)
     
     tinygl_init (LOOP_RATE);
     tinygl_font_set (&font3x5_1);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_SCROLL_DOWN);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
     tinygl_text_speed_set (10);
 
     spacey_init (GAME_UPDATE_RATE, TINYGL_WIDTH, TINYGL_HEIGHT, 
@@ -286,7 +287,8 @@ main (void)
                 break;
                 
             case STATE_INIT:
-                tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
+                tinygl_text ("SPACEY READY V" VERSION " BY MPH ",
+                             tinygl_point (0, TINYGL_HEIGHT - 1));
                 state = STATE_READY;
                 break;
                 

apps/space11/space11.c

@@ -91,7 +91,7 @@ game_over_display (char *buffer)
     *str++ = '/';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -104,7 +104,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -238,7 +238,8 @@ static void game_task (__unused__ void *data)
         break;
         
     case STATE_INIT:
-        tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
+        tinygl_text ("SPACEY READY V" VERSION " BY MPH ", 
+                     tinygl_point (0, TINYGL_HEIGHT - 1));
         state = STATE_READY;
         break;
         
@@ -277,7 +278,8 @@ static void display_task (__unused__ void *data)
 
         tinygl_init (DISPLAY_UPDATE_RATE);
         tinygl_font_set (&font3x5_1);
-        tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_SCROLL_DOWN);
+        tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+        tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
         tinygl_text_speed_set (10);
 
         for (i = 0; i < ARRAY_SIZE (flashers); i++)

apps/space12/space12.c

@@ -152,7 +152,7 @@ game_over_display (char *buffer)
     *str++ = '/';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -165,7 +165,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -304,7 +304,8 @@ static void game_task (__unused__ void *data)
         break;
         
     case STATE_INIT:
-        tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
+        tinygl_text ("SPACEY READY V" VERSION " BY MPH ",
+                      tinygl_point (0, TINYGL_HEIGHT - 1));
         mmelody_play (melody, game_intro_tune);
         state = STATE_READY;
         break;
@@ -344,7 +345,8 @@ static void display_task (__unused__ void *data)
 
         tinygl_init (DISPLAY_TASK_RATE);
         tinygl_font_set (&font3x5_1);
-        tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_SCROLL_DOWN);
+        tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+        tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
         tinygl_text_speed_set (10);
 
         for (i = 0; i < ARRAY_SIZE (flashers); i++)

apps/space9/space9.c

@@ -87,7 +87,7 @@ game_over_display (char *buffer)
     *str++ = '/';
     uint8toa (spacey_shells_fired_get (), str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -100,7 +100,7 @@ game_text_display (uint8_t num, char *buffer, char *msg)
         *str++ = *msg++;
     uint8toa (num, str, 0);
     tinygl_clear ();
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -241,7 +241,8 @@ main (void)
     
     tinygl_init (LOOP_RATE);
     tinygl_font_set (&font3x5_1);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_SCROLL_DOWN);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
     tinygl_text_speed_set (10);
 
     navswitch_init ();
@@ -302,7 +303,8 @@ main (void)
                 break;
                 
             case STATE_INIT:
-                tinygl_text ("SPACEY READY V" VERSION " BY MPH ");
+                tinygl_text ("SPACEY READY V" VERSION " BY MPH ",
+                             tinygl_point (0, TINYGL_HEIGHT - 1));
                 state = STATE_READY;
                 break;
                 

apps/spacey_remote1/spacey_remote1.c

@@ -38,7 +38,7 @@ int main (void)
 
     pacer_init (LOOP_RATE);
 
-    tinygl_text ("#");
+    tinygl_text ("#", tinygl_point (0, 0));
 
     /* Paced loop.  */
     while (1)
@@ -69,11 +69,11 @@ int main (void)
             switch (event)
             {
             case SPACEY_EVENT_ALIEN_HIT:
-                tinygl_text ("*");
+                tinygl_text ("*", tinygl_point (0, 0));
                 break;
 
             case SPACEY_EVENT_ALIEN_LANDED:
-                tinygl_text ("@");
+                tinygl_text ("@", tinygl_point (0, 0));
                 break;
             }
 

apps/squeak3/squeak3.c

@@ -77,7 +77,7 @@ static void button_task_init (void)
 static void display_note (void)
 {
     tinygl_clear ();
-    tinygl_draw_string (note_names[note], tinygl_point (0, 0), 1);
+    tinygl_text (note_names[note], tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 
@@ -123,7 +123,8 @@ static void display_task_init (void)
 {
     tinygl_init (DISPLAY_TASK_RATE);
     tinygl_font_set (&font3x5_1);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_STEP);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
 
     display_note ();
 }

apps/squeak4/squeak4.c

@@ -51,7 +51,8 @@ note_play (tweeter_t tweeter, tweeter_note_t note, uint8_t velocity)
 {
     tinygl_clear ();
     if (note != 0 && velocity != 0)
-        tinygl_draw_string (note_names[note % 12], tinygl_point (0, 0), 1);
+        tinygl_text (note_names[note % 12],
+                     tinygl_point (0, TINYGL_HEIGHT - 1));
 
     tweeter_note_play (tweeter, note, velocity);
 }
@@ -127,7 +128,8 @@ static void display_task_init (void)
 {
     tinygl_init (DISPLAY_TASK_RATE);
     tinygl_font_set (&font3x5_1);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_ROTATE_STEP);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
 }
 
 

apps/task2/task2.c

@@ -39,9 +39,10 @@ static void display_task_init (void)
     tinygl_init (DISPLAY_TASK_RATE);
     tinygl_font_set (&font5x7_1);
     tinygl_text_speed_set (MESSAGE_RATE);
-    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL_LEFT);
+    tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
+    tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);
     
-    tinygl_text ("HELLO WORLD ");
+    tinygl_text ("HELLO WORLD ", tinygl_point (0, TINYGL_HEIGHT - 1));
 }
 
 

apps/updown1/updown1.c

@@ -23,7 +23,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }
 
 

apps/updown2/updown2.c

@@ -24,7 +24,7 @@ static void show_count (uint8_t count)
     /* FIXME!  */
     buffer[0] = count + '0';
     buffer[1] = 0;
-    tinygl_text (buffer);
+    tinygl_text (buffer, tinygl_point (0, 0));
 }