Changeset dc033a1 in mainline for uspace/srv/fb/ega.c

Timestamp:

2009-03-22T17:45:15Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3fe00ee

Parents:

0a5116db

Message:

Get rid of FB_WRITE. We can use FB_DRAW_TEXT_DATA if we extend it just a little bit.

File:

• uspace/srv/fb/ega.c (modified) (6 diffs)

uspace/srv/fb/ega.c

@@ -79 +79 @@
 static unsigned int scr_width;
 static unsigned int scr_height;
-static char *scr_addr;
+static uint8_t *scr_addr;
 
 static unsigned int style;
@@ -152 +152 @@
 }
 
-static void draw_text_data(keyfield_t *data)
-{
-        int i;
-
-        for (i = 0; i < scr_width * scr_height; i++) {
-                scr_addr[i * 2] = data[i].character;
-                scr_addr[i * 2 + 1] = attr_to_ega_style(&data[i].attrs);
+/** Draw text data to viewport.
+ *
+ * @param vport Viewport id
+ * @param data  Text data.
+ * @param x     Leftmost column of the area.
+ * @param y     Topmost row of the area.
+ * @param w     Number of rows.
+ * @param h     Number of columns.
+ */
+static void draw_text_data(keyfield_t *data, unsigned int x,
+    unsigned int y, unsigned int w, unsigned int h)
+{
+        unsigned int i, j;
+        keyfield_t *field;
+        uint8_t *dp;
+
+        for (j = 0; j < h; j++) {
+                for (i = 0; i < w; i++) {
+                        field = &data[j * w + i];
+                        dp = &scr_addr[2 * ((y + j) * scr_width + (x + i))];
+
+                        dp[0] = field->character;
+                        dp[1] = attr_to_ega_style(&field->attrs);
+                }
         }
 }
@@ -232 +249 @@
 }
 
-#define FB_WRITE_BUF_SIZE 256
-static char fb_write_buf[FB_WRITE_BUF_SIZE];
-
-static void fb_write(ipc_callid_t rid, ipc_call_t *request)
-{
-        int row, col;
-        ipc_callid_t callid;
-        size_t len;
-        size_t i;
-
-        row = IPC_GET_ARG1(*request);
-        col = IPC_GET_ARG2(*request);
-
-        if ((col >= scr_width) || (row >= scr_height)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-
-        if (!ipc_data_write_receive(&callid, &len)) {
-                ipc_answer_0(callid, EINVAL);
-                ipc_answer_0(rid, EINVAL);
-                return;
-        }
-
-        if (len > FB_WRITE_BUF_SIZE)
-                len = FB_WRITE_BUF_SIZE;
-        if (len >= scr_width - col)
-                len = scr_width - col;
-
-        (void) ipc_data_write_finalize(callid, fb_write_buf, len);
-
-        for (i = 0; i < len; i++) {
-                printchar(fb_write_buf[i], row, col++);
-        }
-
-        ipc_answer_1(rid, EOK, len);
-}
-
 static void ega_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
@@ -277 +255 @@
         ipc_call_t call;
         char c;
-        unsigned int row, col;
+        unsigned int row, col, w, h;
         int bg_color, fg_color, attr;
         uint32_t bg_rgb, fg_rgb;
@@ -310 +288 @@
                         break;
                 case FB_DRAW_TEXT_DATA:
+                        col = IPC_GET_ARG1(call);
+                        row = IPC_GET_ARG2(call);
+                        w = IPC_GET_ARG3(call);
+                        h = IPC_GET_ARG4(call);
                         if (!interbuf) {
                                 retval = EINVAL;
                                 break;
                         }
-                        draw_text_data(interbuf);
+                        if (col + w > scr_width || row + h > scr_height) {
+                                retval = EINVAL;
+                                break;
+                        }
+                        draw_text_data(interbuf, col, row, w, h);
                         retval = 0;
                         break;
@@ -335 +321 @@
                         retval = 0;
                         break;
-                case FB_WRITE:
-                        fb_write(callid, &call);
-
-                        /* Message already answered */
-                        continue;
                 case FB_CURSOR_GOTO:
                         row = IPC_GET_ARG1(call);