Changeset ba02baa in mainline

Timestamp:

2014-01-16T17:23:30Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

62fbb7e

Parents:

dace86a

Message:

cstyle (no change in functionality)

Location:

uspace

Files:

• lib/gui/window.c (modified) (6 diffs)
• srv/hid/compositor/compositor.c (modified) (12 diffs)

uspace/lib/gui/window.c

@@ -592 +592 @@
     const char *caption, sysarg_t x_offset, sysarg_t y_offset)
 {
-        int rc;
-
         window_t *win = (window_t *) malloc(sizeof(window_t));
-        if (!win) {
+        if (!win)
                 return NULL;
-        }
-
+        
         win->is_main = is_main;
         win->is_decorated = is_decorated;
@@ -604 +601 @@
         prodcons_initialize(&win->events);
         fibril_mutex_initialize(&win->guard);
+        
         widget_init(&win->root, NULL);
         win->root.window = win;
@@ -615 +613 @@
         win->focus = NULL;
         win->surface = NULL;
-
+        
         service_id_t reg_dsid;
-        async_sess_t *reg_sess;
-
-        rc = loc_service_get_id(winreg, &reg_dsid, 0);
+        int rc = loc_service_get_id(winreg, &reg_dsid, 0);
         if (rc != EOK) {
                 free(win);
                 return NULL;
         }
-
-        reg_sess = loc_service_connect(EXCHANGE_SERIALIZE, reg_dsid, 0);
+        
+        async_sess_t *reg_sess = loc_service_connect(EXCHANGE_SERIALIZE,
+            reg_dsid, 0);
         if (reg_sess == NULL) {
                 free(win);
                 return NULL;
         }
-
+        
         service_id_t in_dsid;
         service_id_t out_dsid;
-        
         rc = win_register(reg_sess, &in_dsid, &out_dsid, x_offset, y_offset);
         async_hangup(reg_sess);
@@ -640 +636 @@
                 return NULL;
         }
-
+        
         win->osess = loc_service_connect(EXCHANGE_SERIALIZE, out_dsid, 0);
         if (win->osess == NULL) {
@@ -646 +642 @@
                 return NULL;
         }
-
+        
         win->isess = loc_service_connect(EXCHANGE_SERIALIZE, in_dsid, 0);
         if (win->isess == NULL) {
@@ -653 +649 @@
                 return NULL;
         }
-
-        if (caption == NULL) {
+        
+        if (caption == NULL)
                 win->caption = NULL;
-        } else {
+        else
                 win->caption = str_dup(caption);
-        }
-
+        
         return win;
 }

uspace/srv/hid/compositor/compositor.c

@@ -161 +161 @@
 static void input_disconnect(void);
 
-
 static pointer_t *input_pointer(input_t *input)
 {
@@ -170 +169 @@
 {
         pointer_t *p = (pointer_t *) malloc(sizeof(pointer_t));
-        if (!p) {
+        if (!p)
                 return NULL;
-        }
-
+        
         link_initialize(&p->link);
         p->pos.x = coord_origin;
@@ -185 +183 @@
         p->state = 0;
         cursor_init(&p->cursor, CURSOR_DECODER_EMBEDDED, NULL);
-
+        
         /* Ghost window for transformation animation. */
         transform_identity(&p->ghost.transform);
@@ -198 +196 @@
         p->accum_ghost.x = 0;
         p->accum_ghost.y = 0;
-
+        
         return p;
 }
@@ -213 +211 @@
 {
         window_t *win = (window_t *) malloc(sizeof(window_t));
-        if (!win) {
+        if (!win)
                 return NULL;
-        }
-
+        
         link_initialize(&win->link);
         atomic_set(&win->ref_cnt, 0);
         prodcons_initialize(&win->queue);
         transform_identity(&win->transform);
-        transform_translate(&win->transform, 
+        transform_translate(&win->transform,
             coord_origin + x_offset, coord_origin + y_offset);
         win->dx = coord_origin + x_offset;
@@ -230 +227 @@
         win->opacity = 255;
         win->surface = NULL;
-
+        
         return win;
 }
@@ -707 +704 @@
 {
         fibril_mutex_lock(&window_list_mtx);
-
+        
         list_foreach(window_list, link, window_t, window) {
                 if (window == target) {
@@ -715 +712 @@
                 }
         }
-
+        
         fibril_mutex_unlock(&window_list_mtx);
         free(event);
@@ -723 +720 @@
 {
         fibril_mutex_lock(&window_list_mtx);
+        
         window_t *win = (window_t *) list_first(&window_list);
-        if (win) {
+        if (win)
                 prodcons_produce(&win->queue, &event->link);
-        } else {
+        else
                 free(event);
-        }
+        
         fibril_mutex_unlock(&window_list_mtx);
 }
@@ -1182 +1180 @@
         transform_identity(&translate);
         transform_translate(&translate, win->dx, win->dy);
-
+        
         transform_t scale;
         transform_identity(&scale);
-        if (win->fx != 1 || win->fy != 1) {
+        if ((win->fx != 1) || (win->fy != 1))
                 transform_scale(&scale, win->fx, win->fy);
-        }
-
+        
         transform_t rotate;
         transform_identity(&rotate);
-        if (win->angle != 0) {
+        if (win->angle != 0)
                 transform_rotate(&rotate, win->angle);
-        }
-
+        
         transform_t transform;
         transform_t temp;
@@ -1205 +1201 @@
         transform_multiply(&transform, &temp, &scale);
         
-
         win->transform = transform;
 }
@@ -1268 +1263 @@
                         if (fx > 0) {
 #if ANIMATE_WINDOW_TRANSFORMS == 0
-                                if (scale) win->fx *= fx;
+                                if (scale)
+                                        win->fx *= fx;
 #endif
 #if ANIMATE_WINDOW_TRANSFORMS == 1