Changeset 179Tweet

Timestamp:

Nov 15, 2003, 10:58:20 AM (20 years ago)

Author:

Sam Hocevar

Message:

• libee/graphics.c: + Correct clipping in ee_putstr() for long strings.
• libee/ee.c: + New ee_get_rendertime() call to provide framerate information.
• libee/ee.h: + Added const keywords where it was meaningful, despite Slang's blatant

omission of such keywords in its prototypes.

Location:

libcaca/trunk/libee

Files:

• ee.c (modified) (7 diffs)
• ee.h (modified) (3 diffs)
• ee_internals.h (modified) (1 diff)
• graphics.c (modified) (2 diffs)
• line.c (modified) (2 diffs)

libcaca/trunk/libee/ee.c

@@ -47 +47 @@
 
 /* Global array with color names */
-char *ee_color_names[16] =
+const char *ee_color_names[16] =
 {
     "black",
@@ -67 +67 @@
 };
 
-static int _ee_delay;
+static unsigned int _ee_delay;
+static unsigned int _ee_rendertime;
 char *_ee_empty_line;
+char *_ee_scratch_line;
 
 #if defined(USE_NCURSES)
@@ -186 +188 @@
     _ee_empty_line[ee_get_width()] = '\0';
 
+    _ee_scratch_line = malloc(ee_get_width() + 1);
+
     _ee_delay = 0;
+    _ee_rendertime = 0;
 
     return 0;
 }
 
-int ee_get_width(void)
+unsigned int ee_get_width(void)
 {
 #if defined(USE_SLANG)
@@ -202 +207 @@
 }
 
-int ee_get_height(void)
+unsigned int ee_get_height(void)
 {
 #if defined(USE_SLANG)
@@ -213 +218 @@
 }
 
-void ee_set_delay(int usec)
+void ee_set_delay(unsigned int usec)
 {
     _ee_delay = usec;
+}
+
+unsigned int ee_get_rendertime(void)
+{
+    return _ee_rendertime;
 }
 
@@ -240 +250 @@
 void ee_refresh(void)
 {
-    static int lastticks = 0;
+    static unsigned int lastticks = 0;
     unsigned int ticks = lastticks + _ee_getticks();
 
@@ -258 +268 @@
     for(ticks += _ee_getticks(); ticks < _ee_delay; ticks += _ee_getticks())
         usleep(10000);
+
+    /* Update the sliding mean of the render time */
+    _ee_rendertime = (7 * _ee_rendertime + ticks) / 8;
 
     lastticks = ticks - _ee_delay;

libcaca/trunk/libee/ee.h

@@ -52 +52 @@
 };
 
-extern char *ee_color_names[16];
+extern const char *ee_color_names[16];
 
 /*
@@ -63 +63 @@
  */
 int ee_init(void);
-void ee_set_delay(int);
-int ee_get_width(void);
-int ee_get_height(void);
+void ee_set_delay(unsigned int);
+unsigned int ee_get_rendertime(void);
+unsigned int ee_get_width(void);
+unsigned int ee_get_height(void);
 void ee_refresh(void);
 void ee_end(void);
@@ -74 +75 @@
 int ee_get_color(void);
 void ee_putchar(int, int, char);
-void ee_putstr(int, int, char *);
+void ee_putstr(int, int, const char *);
 void ee_clear(void);
 
 void ee_draw_line(int, int, int, int, char);
-void ee_draw_polyline(int[], int[], int, char);
+void ee_draw_polyline(const int[], const int[], int, char);
 void ee_draw_thin_line(int, int, int, int);
-void ee_draw_thin_polyline(int[], int[], int);
+void ee_draw_thin_polyline(const int[], const int[], int);
 
 void ee_draw_circle(int, int, int, char);

libcaca/trunk/libee/ee_internals.h

@@ -33 +33 @@
 
 extern char *_ee_empty_line;
+extern char *_ee_scratch_line;
 
 #endif /* __EE_INTERNALS_H__ */

libcaca/trunk/libee/graphics.c

@@ -80 +80 @@
 }
 
-void ee_putstr(int x, int y, char *s)
+void ee_putstr(int x, int y, const char *s)
 {
     int len;
 
-    if(y < 0 || y >= ee_get_height())
+    if(y < 0 || y >= ee_get_height() || x >= ee_get_width())
         return;
 
@@ -96 +96 @@
         s += -x;
         x = 0;
+    }
+
+    if(x + len >= ee_get_width())
+    {
+        memcpy(_ee_scratch_line, s, ee_get_width() - x);
+        _ee_scratch_line[ee_get_width() - x] = '\0';
+        s = _ee_scratch_line;
     }
 

libcaca/trunk/libee/line.c

@@ -69 +69 @@
 }
 
-void ee_draw_polyline(int x[], int y[], int n, char c)
+void ee_draw_polyline(const int x[], const int y[], int n, char c)
 {
     int i;
@@ -106 +106 @@
 }
 
-void ee_draw_thin_polyline(int x[], int y[], int n)
+void ee_draw_thin_polyline(const int x[], const int y[], int n)
 {
     int i;