Changeset 82edef2 in mainline

Timestamp:

2012-11-26T20:47:18Z (12 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

e1c6d5df

Parents:

fa98b26a

Message:

Ensure that conditions for fast pixel transfers are maintained by window movement and resizing.

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -1117 +1117 @@
         transform_t scale;
         transform_identity(&scale);
-        transform_scale(&scale, win->fx, win->fy);
+        if (win->fx != 1 || win->fy != 1) {
+                transform_scale(&scale, win->fx, win->fy);
+        }
 
         transform_t rotate;
         transform_identity(&rotate);
-        transform_rotate(&rotate, win->angle);
+        if (win->angle != 0) {
+                transform_rotate(&rotate, win->angle);
+        }
 
         transform_t transform;
@@ -1165 +1169 @@
                 }
 
-                if (scale || resize) {
+                if ((scale || resize) && (win->angle != 0)) {
                         transform_t rotate;
                         transform_identity(&rotate);
@@ -1182 +1186 @@
                 double _dx = dx;
                 double _dy = dy;
-                transform_t unrotate;
-                transform_identity(&unrotate);
-                transform_rotate(&unrotate, -win->angle);
-                transform_apply_linear(&unrotate, &_dx, &_dy);
+                if (win->angle != 0) {
+                        transform_t unrotate;
+                        transform_identity(&unrotate);
+                        transform_rotate(&unrotate, -win->angle);
+                        transform_apply_linear(&unrotate, &_dx, &_dy);
+                }
                 _dx = (pointer->grab_flags & GF_MOVE_X) ? -_dx : _dx;
                 _dy = (pointer->grab_flags & GF_MOVE_Y) ? -_dy : _dy;
@@ -1192 +1198 @@
                         double fx = 1.0 + (_dx / ((width - 1) * win->fx));
                         if (fx > 0) {
+#if ANIMATE_WINDOW_TRANSFORMS == 0
+                                if (scale) win->fx *= fx;
+#endif
+#if ANIMATE_WINDOW_TRANSFORMS == 1
                                 win->fx *= fx;
+#endif
                                 scale_back_x *= fx;
                         }
@@ -1200 +1211 @@
                         double fy = 1.0 + (_dy / ((height - 1) * win->fy));
                         if (fy > 0) {
+#if ANIMATE_WINDOW_TRANSFORMS == 0
+                                if (scale) win->fy *= fy;
+#endif
+#if ANIMATE_WINDOW_TRANSFORMS == 1
                                 win->fy *= fy;
+#endif
                                 scale_back_y *= fy;
                         }
@@ -1559 +1575 @@
 
                         surface_get_resolution(top->surface, &width, &height);
+#if ANIMATE_WINDOW_TRANSFORMS == 1
                         top->fx *= (1.0 / scale_back_x);
                         top->fy *= (1.0 / scale_back_y);
                         comp_recalc_transform(top);
+#endif
 
                         /* Commit proper resize action. */