Changeset 18b6a88 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2018-04-15T09:35:04Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -488 +488 @@
                                                 if (y_bnd_ghost == y_dmg_ghost) {
                                                         for (sysarg_t x = x_dmg_ghost - vp->pos.x;
-                                                                    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
+                                                            x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x, y_dmg_ghost - vp->pos.y);
@@ -498 +498 @@
                                                 if (y_bnd_ghost + h_bnd_ghost == y_dmg_ghost + h_dmg_ghost) {
                                                         for (sysarg_t x = x_dmg_ghost - vp->pos.x;
-                                                                    x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
+                                                            x < x_dmg_ghost - vp->pos.x + w_dmg_ghost; ++x) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x, y_dmg_ghost - vp->pos.y + h_dmg_ghost - 1);
@@ -508 +508 @@
                                                 if (x_bnd_ghost == x_dmg_ghost) {
                                                         for (sysarg_t y = y_dmg_ghost - vp->pos.y;
-                                                                    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
+                                                            y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x_dmg_ghost - vp->pos.x, y);
@@ -518 +518 @@
                                                 if (x_bnd_ghost + w_bnd_ghost == x_dmg_ghost + w_dmg_ghost) {
                                                         for (sysarg_t y = y_dmg_ghost - vp->pos.y;
-                                                                    y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
+                                                            y < y_dmg_ghost - vp->pos.y + h_dmg_ghost; ++y) {
                                                                 ghost_color = surface_get_pixel(vp->surface,
                                                                     x_dmg_ghost - vp->pos.x + w_dmg_ghost - 1, y);
@@ -562 +562 @@
                                                 while (count-- != 0) {
                                                         *dst = (*src & 0xff000000) ? *src : *dst;
-                                                        ++dst; ++src;
+                                                        ++dst;
+                                                        ++src;
                                                 }
                                         }
@@ -1347 +1348 @@
                         if (fy > 0) {
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-                                if (scale) win->fy *= fy;
+                                if (scale)
+                                        win->fy *= fy;
 #endif
 #if ANIMATE_WINDOW_TRANSFORMS == 1
@@ -1449 +1451 @@
 
         if (w_i == 0 || h_i == 0) {
-                rect1->x = x_u; rect2->x = 0; rect3->x = 0; rect4->x = 0;
-                rect1->y = y_u; rect2->y = 0; rect3->y = 0; rect4->y = 0;
-                rect1->w = w_u; rect2->w = 0; rect3->w = 0; rect4->w = 0;
-                rect1->h = h_u; rect2->h = 0; rect3->h = 0; rect4->h = 0;
+                rect1->x = x_u;
+                rect2->x = 0;
+                rect3->x = 0;
+                rect4->x = 0;
+
+                rect1->y = y_u;
+                rect2->y = 0;
+                rect3->y = 0;
+                rect4->y = 0;
+
+                rect1->w = w_u;
+                rect2->w = 0;
+                rect3->w = 0;
+                rect4->w = 0;
+
+                rect1->h = h_u;
+                rect2->h = 0;
+                rect3->h = 0;
+                rect4->h = 0;
         } else {
                 rect1->x = x_u;
@@ -1477 +1494 @@
 #endif
 
-static errno_t comp_abs_move(input_t *input, unsigned x , unsigned y,
+static errno_t comp_abs_move(input_t *input, unsigned x, unsigned y,
     unsigned max_x, unsigned max_y)
 {
@@ -1526 +1543 @@
         sysarg_t cursor_height;
         surface_get_resolution(pointer->cursor.states[pointer->state],
-             &cursor_width, &cursor_height);
+            &cursor_width, &cursor_height);
 
         if (pointer->pos.x + dx < viewport_bound_rect.x)
@@ -1788 +1805 @@
 
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-                comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);
-                comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);
-                comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);
-                comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);
+        comp_damage(dmg_rect1.x, dmg_rect1.y, dmg_rect1.w, dmg_rect1.h);
+        comp_damage(dmg_rect2.x, dmg_rect2.y, dmg_rect2.w, dmg_rect2.h);
+        comp_damage(dmg_rect3.x, dmg_rect3.y, dmg_rect3.w, dmg_rect3.h);
+        comp_damage(dmg_rect4.x, dmg_rect4.y, dmg_rect4.w, dmg_rect4.h);
 #endif
 
@@ -1826 +1843 @@
     keymod_t mods, wchar_t c)
 {
-        bool win_transform = (mods & KM_ALT) && (
-            key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
+        bool win_transform = (mods & KM_ALT) &&
+            (key == KC_W || key == KC_S || key == KC_A || key == KC_D ||
             key == KC_Q || key == KC_E || key == KC_R || key == KC_F);
-        bool win_resize = (mods & KM_ALT) && (
-            key == KC_T || key == KC_G || key == KC_B || key == KC_N);
-        bool win_opacity = (mods & KM_ALT) && (
-            key == KC_C || key == KC_V);
+        bool win_resize = (mods & KM_ALT) &&
+            (key == KC_T || key == KC_G || key == KC_B || key == KC_N);
+        bool win_opacity = (mods & KM_ALT) && (key == KC_C || key == KC_V);
         bool win_close = (mods & KM_ALT) && (key == KC_X);
         bool win_switch = (mods & KM_ALT) && (key == KC_TAB);
-        bool viewport_move = (mods & KM_ALT) && (
-            key == KC_I || key == KC_K || key == KC_J || key == KC_L);
-        bool viewport_change = (mods & KM_ALT) && (
-            key == KC_O || key == KC_P);
+        bool viewport_move = (mods & KM_ALT) &&
+            (key == KC_I || key == KC_K || key == KC_J || key == KC_L);
+        bool viewport_change = (mods & KM_ALT) && (key == KC_O || key == KC_P);
         bool kconsole_switch = (key == KC_PAUSE) || (key == KC_BREAK);
         bool filter_switch = (mods & KM_ALT) && (key == KC_Y);
@@ -2120 +2135 @@
                 if (filter_index == 0) {
                         filter = filter_nearest;
-                }
-                else {
+                } else {
                         filter = filter_bilinear;
                 }