Changeset 8dc12ac in mainline for uspace/srv/fb/fb.c

Timestamp:

2009-06-03T18:41:27Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

5d0e461

Parents:

424cd43

Message:

framebuffer server rewrite: cleanup, always use canonical order of coordinates (x, y)

File:

• uspace/srv/fb/fb.c (modified) (7 diffs)

uspace/srv/fb/fb.c

@@ -52 +52 @@
 #include <kernel/errno.h>
 #include <kernel/genarch/fb/visuals.h>
-#include <console/color.h>
-#include <console/style.h>
+#include <io/color.h>
+#include <io/style.h>
 #include <async.h>
 #include <bool.h>
@@ -376 +376 @@
 static void vport_redraw(viewport_t *vport)
 {
+        unsigned int col;
         unsigned int row;
-        unsigned int col;
         
         for (row = 0; row < vport->rows; row++) {
@@ -432 +432 @@
 static void vport_scroll(viewport_t *vport, int lines)
 {
+        unsigned int col;
         unsigned int row;
-        unsigned int col;
         unsigned int x;
         unsigned int y;
@@ -1565 +1565 @@
                 int scroll;
                 wchar_t ch;
-                unsigned int row, col;
+                unsigned int col, row;
                 
                 if ((vport->cursor_active) || (anims_enabled))
@@ -1602 +1602 @@
                 case FB_PUTCHAR:
                         ch = IPC_GET_ARG1(call);
-                        row = IPC_GET_ARG2(call);
-                        col = IPC_GET_ARG3(call);
+                        col = IPC_GET_ARG2(call);
+                        row = IPC_GET_ARG3(call);
                         
                         if ((col >= vport->cols) || (row >= vport->rows)) {
@@ -1621 +1621 @@
                         break;
                 case FB_CURSOR_GOTO:
-                        row = IPC_GET_ARG1(call);
-                        col = IPC_GET_ARG2(call);
+                        col = IPC_GET_ARG1(call);
+                        row = IPC_GET_ARG2(call);
                         
                         if ((col >= vport->cols) || (row >= vport->rows)) {
@@ -1642 +1642 @@
                         break;
                 case FB_GET_CSIZE:
-                        ipc_answer_2(callid, EOK, vport->rows, vport->cols);
+                        ipc_answer_2(callid, EOK, vport->cols, vport->rows);
                         continue;
                 case FB_SCROLL: