Changeset 89c57b6 in mainline for uspace/srv/hid/console/gcons.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/console/gcons.c (modified) (13 diffs)

uspace/srv/hid/console/gcons.c

@@ -34 +34 @@
 
 #include <ipc/fb.h>
-#include <ipc/ipc.h>
 #include <async.h>
 #include <stdio.h>
@@ -82 +81 @@
 
 static bool use_gcons = false;
-static ipcarg_t xres;
-static ipcarg_t yres;
+static sysarg_t xres;
+static sysarg_t yres;
 
 enum butstate {
@@ -107 +106 @@
 static size_t active_console = 0;
 
-static ipcarg_t mouse_x = 0;
-static ipcarg_t mouse_y= 0;
+static sysarg_t mouse_x = 0;
+static sysarg_t mouse_y= 0;
 
 static bool btn_pressed = false;
-static ipcarg_t btn_x = 0;
-static ipcarg_t btn_y = 0;
+static sysarg_t btn_x = 0;
+static sysarg_t btn_y = 0;
 
 static void vp_switch(int vp)
@@ -120 +119 @@
 
 /** Create view port */
-static int vp_create(ipcarg_t x, ipcarg_t y, ipcarg_t width, ipcarg_t height)
+static int vp_create(sysarg_t x, sysarg_t y, sysarg_t width, sysarg_t height)
 {
         return async_req_2_0(fbphone, FB_VIEWPORT_CREATE, (x << 16) | y,
@@ -137 +136 @@
 
 /** Transparent putchar */
-static void tran_putch(wchar_t ch, ipcarg_t col, ipcarg_t row)
+static void tran_putch(wchar_t ch, sysarg_t col, sysarg_t row)
 {
         async_msg_3(fbphone, FB_PUTCHAR, ch, col, row);
@@ -157 +156 @@
                 
                 char data[5];
-                snprintf(data, 5, "%u", index + 1);
+                snprintf(data, 5, "%zu", index + 1);
                 
                 size_t i;
@@ -287 +286 @@
         ssize_t ny = (ssize_t) mouse_y + dy;
         
+        /* Until gcons is initalized we don't have the screen resolution */
+        if (xres == 0 || yres == 0)
+                return;
+        
         mouse_x = (size_t) limit(nx, 0, xres);
         mouse_y = (size_t) limit(ny, 0, yres);
@@ -294 +297 @@
 }
 
-static int gcons_find_conbut(ipcarg_t x, ipcarg_t y)
-{
-        ipcarg_t status_start = STATUS_START + (xres - 800) / 2;
+static int gcons_find_conbut(sysarg_t x, sysarg_t y)
+{
+        sysarg_t status_start = STATUS_START + (xres - 800) / 2;
         
         if ((y < STATUS_TOP) || (y >= STATUS_TOP + STATUS_HEIGHT))
@@ -310 +313 @@
                 return -1;
         
-        ipcarg_t btn = (x - status_start) / (STATUS_WIDTH + STATUS_SPACE);
+        sysarg_t btn = (x - status_start) / (STATUS_WIDTH + STATUS_SPACE);
         
         if (btn < CONSOLE_COUNT)
@@ -360 +363 @@
  *
  */
-static void draw_pixmap(char *logo, size_t size, ipcarg_t x, ipcarg_t y)
+static void draw_pixmap(char *logo, size_t size, sysarg_t x, sysarg_t y)
 {
         /* Create area */
@@ -371 +374 @@
         
         /* Send area */
-        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
+        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
         if (rc)
                 goto exit;
@@ -433 +436 @@
         
         /* Send area */
-        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (ipcarg_t) shm);
+        int rc = async_req_1_0(fbphone, FB_PREPARE_SHM, (sysarg_t) shm);
         if (rc)
                 goto exit;
@@ -510 +513 @@
         
         /* Create status buttons */
-        ipcarg_t status_start = STATUS_START + (xres - 800) / 2;
+        sysarg_t status_start = STATUS_START + (xres - 800) / 2;
         size_t i;
         for (i = 0; i < CONSOLE_COUNT; i++) {