Changeset 5713e5f in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2014-09-01T19:17:55Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

21365c0

Parents:

a4666a9 (diff), 00ddb40 (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 improvements in the graphics stack.

• Support for drawing proportional fonts (although no actual font file included yet)
• Implementation of bilinear filter

File:

• uspace/srv/hid/compositor/compositor.c (modified) (5 diffs)

uspace/srv/hid/compositor/compositor.c

@@ -84 +84 @@
 static sysarg_t coord_origin;
 static pixel_t bg_color;
+static filter_t filter = filter_bilinear;
+static unsigned int filter_index = 1;
 
 typedef struct {
@@ -408 +410 @@
 
                         source_init(&source);
-                        source_set_filter(&source, filter_nearest);
+                        source_set_filter(&source, filter);
                         drawctx_init(&context, vp->surface);
                         drawctx_set_compose(&context, compose_over);
@@ -442 +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));
 
@@ -1818 +1821 @@
             key == KC_O || key == KC_P);
         bool kconsole_switch = (mods & KM_ALT) && (key == KC_M);
-
-        bool filter = (type == KEY_RELEASE) && (win_transform || win_resize ||
+        bool filter_switch = (mods & KM_ALT) && (key == KC_Y);
+
+        bool key_filter = (type == KEY_RELEASE) && (win_transform || win_resize ||
             win_opacity || win_close || win_switch || viewport_move ||
-            viewport_change || kconsole_switch);
-
-        if (filter) {
+            viewport_change || kconsole_switch || filter_switch);
+
+        if (key_filter) {
                 /* no-op */
         } else if (win_transform) {
@@ -2091 +2095 @@
                 if (console_kcon())
                         active = false;
+        } else if (filter_switch) {
+                filter_index++;
+                if (filter_index > 1)
+                        filter_index = 0;
+                if (filter_index == 0) {
+                        filter = filter_nearest;
+                }
+                else {
+                        filter = filter_bilinear;
+                }
+                comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         } else {
                 window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));