Changeset 15d0046 in mainline for uspace/lib/c/include/io

Timestamp:

2014-09-12T13:22:33Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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:

• chardev.h (moved) (moved from uspace/drv/char/xtkbd/chardev.h ) (1 diff)
• chardev_srv.h (added)
• input.h (modified) (2 diffs)
• pixelmap.h (modified) (3 diffs)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvkbd
+/** @addtogroup libc
  * @{
  */
-/** @file
- * @brief ps/2 mouse driver.
- */
 
-#ifndef _CHARDEV_H_
-#define _CHARDEV_H_
+#ifndef LIBC_IO_CHARDEV_H_
+#define LIBC_IO_CHARDEV_H_
 
 #include <libarch/types.h>

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

@@ -49 +49 @@
 
 typedef struct input_ev_ops {
+        int (*active)(input_t *);
+        int (*deactive)(input_t *);
         int (*key)(input_t *, kbd_event_type_t, keycode_t, keymod_t, wchar_t);
         int (*move)(input_t *, int, int);
@@ -57 +59 @@
 extern int input_open(async_sess_t *, input_ev_ops_t *, void *, input_t **);
 extern void input_close(input_t *);
-extern int input_yield(input_t *);
-extern int input_reclaim(input_t *);
+extern int input_activate(input_t *);
 
 #endif

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Petr Koupy
+ * Copyright (c) 2014 Martin Sucha
  * All rights reserved.
  *
@@ -40 +41 @@
 #include <unistd.h>
 #include <io/pixel.h>
+
+/* Defines how a pixel outside of pixmap rectangle shall be treated */
+typedef enum {
+        /* Pixels outside of a pixmap are PIXEL(0, 0, 0, 0) */
+        PIXELMAP_EXTEND_TRANSPARENT_BLACK = 0,
+        
+        /* The pixmap is repeated infinetely */
+        PIXELMAP_EXTEND_TILE,
+        
+        /* If outside of a pixmap, return closest pixel from the edge */
+        PIXELMAP_EXTEND_SIDES,
+        
+        /* If outside of a pixmap, return closest pixel from the edge,
+         * with alpha = 0
+         */
+        PIXELMAP_EXTEND_TRANSPARENT_SIDES
+} pixelmap_extend_t;
 
 typedef struct {
@@ -86 +104 @@
 }
 
+static inline pixel_t pixelmap_get_extended_pixel(pixelmap_t *pixmap,
+    native_t x, native_t y, pixelmap_extend_t extend)
+{
+        bool transparent = false;
+        if (extend == PIXELMAP_EXTEND_TILE) {
+                x %= pixmap->width;
+                y %= pixmap->height;
+        }
+        else if (extend == PIXELMAP_EXTEND_SIDES ||
+            extend == PIXELMAP_EXTEND_TRANSPARENT_SIDES) {
+                bool transparent_outside =
+                    (extend == PIXELMAP_EXTEND_TRANSPARENT_SIDES);
+                if (x < 0) {
+                        x = 0;
+                        transparent = transparent_outside;
+                }
+                else if (((sysarg_t) x) >= pixmap->width) {
+                        x = pixmap->width - 1;
+                        transparent = transparent_outside;
+                }
+                
+                if (y < 0) {
+                        y = 0;
+                        transparent = transparent_outside;
+                }
+                else if (((sysarg_t) y) >= pixmap->height) {
+                        y = pixmap->height - 1;
+                        transparent = transparent_outside;
+                }
+        }
+        
+        if (x < 0 || ((sysarg_t) x) >= pixmap->width ||
+            y < 0 || ((sysarg_t) y) >= pixmap->height)
+                return PIXEL(0, 0, 0, 0);
+
+        pixel_t pixel = pixelmap_get_pixel(pixmap, x, y);
+        
+        if (transparent)
+                pixel = PIXEL(0, RED(pixel), GREEN(pixel), BLUE(pixel));
+        
+        return pixel;
+}
+
+
 #endif