Changeset b0b4592e in mainline for uspace/lib/draw/cursor/embedded.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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/lib/draw/cursor/embedded.c (modified) (3 diffs)

uspace/lib/draw/cursor/embedded.c

@@ -46 +46 @@
         assert(state_count);
         assert(data);
-
+        
         (*state_count) = 1;
         (*data) = NULL;
@@ -53 +53 @@
 static surface_t *cde_render(uint8_t state)
 {
-        if (state != 0) {
+        if (state != 0)
                 return NULL;
-        }
-
+        
         surface_t *surface = surface_create(CURSOR_WIDTH, CURSOR_HEIGHT, NULL, 0);
-
-        if (!surface) {
+        if (!surface)
                 return NULL;
-        }
         
         for (unsigned int y = 0; y < CURSOR_HEIGHT; ++y) {
@@ -69 +66 @@
                         pixel_t pixel = (cursor_texture[offset] & (1 << (x % 8))) ?
                             PIXEL(255, 0, 0, 0) : PIXEL(255, 255, 255, 255);
-                        surface_put_pixel(surface, x, y, visible ? pixel : PIXEL(0, 0, 0, 0));
+                        
+                        if (visible)
+                                surface_put_pixel(surface, x, y, pixel);
                 }
         }
-
+        
         return surface;
 }