Changeset 00ddb40 in mainline

Timestamp:

2014-08-31T20:10:20Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

5713e5f

Parents:

8d3512f1

Message:

Get rid of black alias at the edge of rotated windows

Location:

uspace

Files:

• lib/c/include/io/pixelmap.h (modified) (3 diffs)
• lib/draw/font/bitmap_backend.c (modified) (1 diff)
• lib/draw/source.c (modified) (6 diffs)
• lib/draw/source.h (modified) (3 diffs)
• lib/gui/canvas.c (modified) (1 diff)
• lib/softrend/filter.c (modified) (6 diffs)
• lib/softrend/filter.h (modified) (1 diff)
• srv/hid/compositor/compositor.c (modified) (1 diff)

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
 

uspace/lib/draw/font/bitmap_backend.c

@@ -143 +143 @@
         source_t source;
         source_init(&source);
-        source_set_texture(&source, raw_surface, false);
+        source_set_texture(&source, raw_surface, PIXELMAP_EXTEND_TRANSPARENT_BLACK);
 
         transform_t transform;

uspace/lib/draw/source.c

@@ -45 +45 @@
         source->color = PIXEL(0, 0, 0, 0);
         source->texture = NULL;
-        source->texture_tile = false;
+        source->texture_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 
         source->alpha = PIXEL(255, 0, 0, 0);
         source->mask = NULL;
-        source->mask_tile = false;
+        source->mask_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 }
 
@@ -73 +73 @@
 }
 
-void source_set_texture(source_t *source, surface_t *texture, bool tile)
+void source_set_texture(source_t *source, surface_t *texture,
+    pixelmap_extend_t extend)
 {
         source->texture = texture;
-        source->texture_tile = tile;
+        source->texture_extend = extend;
 }
 
@@ -84 +85 @@
 }
 
-void source_set_mask(source_t *source, surface_t *mask, bool tile)
+void source_set_mask(source_t *source, surface_t *mask,
+    pixelmap_extend_t extend)
 {
         source->mask = mask;
-        source->mask_tile = tile;
+        source->mask_extend = extend;
 }
 
@@ -95 +97 @@
             (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0)) &&
             (source->texture != NULL) &&
-            (source->texture_tile == false) &&
+            (source->texture_extend == PIXELMAP_EXTEND_TRANSPARENT_BLACK) &&
             (transform_is_fast(&source->transform)));
 }
@@ -120 +122 @@
                 mask_pix = source->filter(
                     surface_pixmap_access(source->mask),
-                    x, y, source->mask_tile);
+                    x, y, source->mask_extend);
         } else {
                 mask_pix = source->alpha;
@@ -133 +135 @@
                 texture_pix = source->filter(
                     surface_pixmap_access(source->texture),
-                    x, y, source->texture_tile);
+                    x, y, source->texture_extend);
         } else {
                 texture_pix = source->color;

uspace/lib/draw/source.h

@@ -42 +42 @@
 #include <transform.h>
 #include <filter.h>
+#include <io/pixelmap.h>
 
 #include "surface.h"
@@ -51 +52 @@
         pixel_t color;
         surface_t *texture;
-        bool texture_tile;
+        pixelmap_extend_t texture_extend;
 
         pixel_t alpha;
         surface_t *mask;
-        bool mask_tile;
+        pixelmap_extend_t mask_extend;
 } source_t;
 
@@ -66 +67 @@
 
 extern void source_set_color(source_t *, pixel_t);
-extern void source_set_texture(source_t *, surface_t *, bool);
+extern void source_set_texture(source_t *, surface_t *, pixelmap_extend_t);
 
 extern void source_set_alpha(source_t *, pixel_t);
-extern void source_set_mask(source_t *, surface_t *, bool);
+extern void source_set_mask(source_t *, surface_t *, pixelmap_extend_t);
 
 extern bool source_is_fast(source_t *);

uspace/lib/gui/canvas.c

@@ -58 +58 @@
         source_init(&source);
         source_set_transform(&source, transform);
-        source_set_texture(&source, canvas->surface, false);
+        source_set_texture(&source, canvas->surface,
+            PIXELMAP_EXTEND_TRANSPARENT_BLACK);
         
         drawctx_t drawctx;

uspace/lib/softrend/filter.c

@@ -38 +38 @@
 #include <io/pixel.h>
 
+
 static long round(double val)
 {
@@ -59 +60 @@
 }
 
-static pixel_t get_pixel(pixelmap_t *pixmap, sysarg_t x, sysarg_t y, bool tile)
-{
-        if (tile) {
-                x %= pixmap->width;
-                y %= pixmap->height;
-        }
-
-        return pixelmap_get_pixel(pixmap, (sysarg_t) x, (sysarg_t) y);
-}
 
 static inline pixel_t blend_pixels(size_t count, float *weights,
@@ -84 +76 @@
 }
 
-pixel_t filter_nearest(pixelmap_t *pixmap, double x, double y, bool tile)
+pixel_t filter_nearest(pixelmap_t *pixmap, double x, double y,
+    pixelmap_extend_t extend)
 {
-        return get_pixel(pixmap, round(x), round(y), tile);
+        return pixelmap_get_extended_pixel(pixmap, round(x), round(y), extend);
 }
 
-pixel_t filter_bilinear(pixelmap_t *pixmap, double x, double y, bool tile)
+pixel_t filter_bilinear(pixelmap_t *pixmap, double x, double y,
+    pixelmap_extend_t extend)
 {
         long x1 = floor(x);
@@ -97 +91 @@
         
         if (y1 == y2 && x1 == x2) {
-                return get_pixel(pixmap, (sysarg_t) x1, (sysarg_t) y1,
-                    tile);
+                return pixelmap_get_extended_pixel(pixmap,
+                    (sysarg_t) x1, (sysarg_t) y1, extend);
         }
         
@@ -105 +99 @@
         
         pixel_t pixels[4];
-        pixels[0] = get_pixel(pixmap, x1, y1, tile);
-        pixels[1] = get_pixel(pixmap, x2, y1, tile);
-        pixels[2] = get_pixel(pixmap, x1, y2, tile);
-        pixels[3] = get_pixel(pixmap, x2, y2, tile);
+        pixels[0] = pixelmap_get_extended_pixel(pixmap, x1, y1, extend);
+        pixels[1] = pixelmap_get_extended_pixel(pixmap, x2, y1, extend);
+        pixels[2] = pixelmap_get_extended_pixel(pixmap, x1, y2, extend);
+        pixels[3] = pixelmap_get_extended_pixel(pixmap, x2, y2, extend);
         
         float weights[4];
@@ -119 +113 @@
 }
 
-pixel_t filter_bicubic(pixelmap_t *pixmap, double x, double y, bool tile)
+pixel_t filter_bicubic(pixelmap_t *pixmap, double x, double y,
+    pixelmap_extend_t extend)
 {
         // TODO

uspace/lib/softrend/filter.h

@@ -40 +40 @@
 #include <io/pixelmap.h>
 
-typedef pixel_t (*filter_t)(pixelmap_t *, double, double, bool);
+typedef pixel_t (*filter_t)(pixelmap_t *, double, double, pixelmap_extend_t);
 
-extern pixel_t filter_nearest(pixelmap_t *, double, double, bool);
-extern pixel_t filter_bilinear(pixelmap_t *, double, double, bool);
-extern pixel_t filter_bicubic(pixelmap_t *, double, double, bool);
+extern pixel_t filter_nearest(pixelmap_t *, double, double, pixelmap_extend_t);
+extern pixel_t filter_bilinear(pixelmap_t *, double, double, pixelmap_extend_t);
+extern pixel_t filter_bicubic(pixelmap_t *, double, double, pixelmap_extend_t);
 
 #endif

uspace/srv/hid/compositor/compositor.c

@@ -444 +444 @@
 
                                         source_set_transform(&source, transform);
-                                        source_set_texture(&source, win->surface, false);
+                                        source_set_texture(&source, win->surface,
+                                            PIXELMAP_EXTEND_TRANSPARENT_SIDES);
                                         source_set_alpha(&source, PIXEL(win->opacity, 0, 0, 0));