Changeset e1a27be in mainline for uspace/lib/c/include/io

Timestamp:

2012-12-29T10:48:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

17cc8f4f

Parents:

8f88beb7 (diff), c928bb7 (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

Location:

uspace/lib/c/include/io

Files:

• charfield.h (modified) (1 diff)
• con_srv.h (modified) (1 diff)
• console.h (modified) (1 diff)
• klog.h (modified) (1 diff)
• pixel.h (modified) (1 diff)
• pixelmap.h (modified) (1 diff)
• window.h (modified) (3 diffs)

uspace/lib/c/include/io/charfield.h

@@ -38 +38 @@
 
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <io/color.h>
 #include <io/style.h>

uspace/lib/c/include/io/con_srv.h

@@ -44 +44 @@
 #include <io/pixel.h>
 #include <io/style.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/time.h>
 #include <sys/types.h>

uspace/lib/c/include/io/console.h

@@ -41 +41 @@
 #include <io/keycode.h>
 #include <async.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <stdio.h>
 

uspace/lib/c/include/io/klog.h

@@ -42 +42 @@
 extern size_t klog_write(const void *, size_t);
 extern void klog_update(void);
+extern void klog_command(const void *, size_t);
 extern int klog_printf(const char *, ...)
     PRINTF_ATTRIBUTE(1, 2);

uspace/lib/c/include/io/pixel.h

@@ -42 +42 @@
         ((channel) >> (8 - (bits)))
 
+#define INVERT(pixel) ((pixel) ^ 0x00ffffff)
+
 #define ALPHA(pixel)  ((pixel) >> 24)
 #define RED(pixel)    (((pixel) & 0x00ff0000) >> 16)

uspace/lib/c/include/io/pixelmap.h

@@ -52 +52 @@
     sysarg_t y)
 {
-        size_t offset = y * pixelmap->width + x;
-        pixel_t *pixel = pixelmap->data + offset;
-        return pixel;
+        if (x < pixelmap->width && y < pixelmap->height) {
+                size_t offset = y * pixelmap->width + x;
+                pixel_t *pixel = pixelmap->data + offset;
+                return pixel;
+        } else {
+                return NULL;
+        }
 }
 

uspace/lib/c/include/io/window.h

@@ -36 +36 @@
 #define LIBC_IO_WINDOW_H_
 
-#include <bool.h>
+#include <stdbool.h>
 #include <sys/types.h>
 #include <async.h>
@@ -71 +71 @@
         ET_POSITION_EVENT,
         ET_SIGNAL_EVENT,
+        ET_WINDOW_FOCUS,
+        ET_WINDOW_UNFOCUS,
         ET_WINDOW_RESIZE,
         ET_WINDOW_REFRESH,
@@ -100 +102 @@
 } window_grab_flags_t;
 
-extern int win_register(async_sess_t *, service_id_t *, service_id_t *);
+extern int win_register(async_sess_t *, service_id_t *, service_id_t *, sysarg_t, sysarg_t);
 
 extern int win_get_event(async_sess_t *, window_event_t *);