Changeset 2176Tweet

Timestamp:

Dec 23, 2012, 11:57:24 AM (7 years ago)

Author:

sam

Message:

neercs: fix rendering issues and tweak timings so that large fullscreen
apps such as cacademo no longer appear to lag.

Location:

trunk/tools/neercs

Files:

• term/ansi.cpp (modified) (1 diff)
• term/pty.cpp (modified) (2 diffs)
• term/term.cpp (modified) (2 diffs)
• video/text-render.cpp (modified) (2 diffs)

trunk/tools/neercs/term/ansi.cpp

@@ -273 +273 @@
     if (!m_init)
     {
-        m_dfg = CACA_LIGHTGRAY;
-        m_dbg = CACA_BLACK;
+        m_fg = m_dfg = CACA_LIGHTGRAY;
+        m_bg = m_dbg = CACA_BLACK;
+
+        m_bold = m_blink = m_italics = m_negative = m_concealed
+         = m_underline = m_faint = m_strike = m_proportional = 0;
 
         caca_set_color_ansi(m_caca, m_dfg, m_dbg);

trunk/tools/neercs/term/pty.cpp

@@ -47 +47 @@
     m_eof(false),
     m_unread_data(0),
-    m_unread_len(0)
+    m_unread_len(0),
+    m_size(-1, -1)
 {
     ;
@@ -111 +112 @@
 }
 
+/* Read data from the PTY. We only perform one read() call so that the
+ * caller can decide whether to ask for more data or not. This lets us
+ * prioritise data in some way. */
 size_t Pty::ReadData(char *data, size_t maxlen)
 {

trunk/tools/neercs/term/term.cpp

@@ -31 +31 @@
     m_size(size),
     m_title(0),
+    m_bell(0),
+    m_init(0),
+    m_report_mouse(0),
+    m_changed(0),
     m_time(0.f),
     m_debug(false)
@@ -134 +138 @@
         if (current <= 0)
             break;
-        total += current;
+        /* FIXME: by the time we're finished decoding the ANSI data, some
+         * new data may be available. We need to avoid reading it because
+         * it's time rendering the canvas isntead. */
         size_t processed = ReadAnsi(buf, current);
         if (processed < current)
             m_pty->UnreadData(buf + processed, current - processed);
-        if (current < BUFSIZ)
+        total += processed;
+        if (processed == 0)
             break;
-//        if (total > 10000)
-//            break;
+
+        /* FIXME: when do we know when to stop? If we read too much
+         * data, some of our frames will not be rendered because they'll
+         * be overwritten by new data. If we don't read enough, we will
+         * start rendering even if a frame isn't finished. */
+        if (total > 12000)
+            break;
     }
 

trunk/tools/neercs/video/text-render.cpp

@@ -122 +122 @@
     /* Upload libcaca canvas contents to the vertex buffers */
     uint32_t *colors = (uint32_t *)m_vbo1->Lock(0, 0);
+    uint32_t savedattr = caca_get_attr(m_caca, -1, -1);
     for (int j = 0; j < m_canvas_size.y; j++)
     for (int i = 0; i < m_canvas_size.x; i++)
@@ -132 +133 @@
         caca_put_attr(m_caca, i, j, attr);
     }
+    caca_set_attr(m_caca, savedattr);
     memcpy(colors, caca_get_canvas_attrs(m_caca),
            m_cells * sizeof(uint32_t));