Changeset ce3efa0 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2014-08-12T16:49:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

593e023

Parents:

f6ab787

Message:

cstyle
(no change in functionality)

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -230 +230 @@
 static void window_destroy(window_t *win)
 {
-        if (win && atomic_get(&win->ref_cnt) == 0) {
+        if ((win) && (atomic_get(&win->ref_cnt) == 0)) {
                 while (!list_empty(&win->queue.list)) {
                         window_event_t *event = (window_event_t *) list_first(&win->queue.list);
@@ -236 +236 @@
                         free(event);
                 }
-
-                if (win->surface) {
+                
+                if (win->surface)
                         surface_destroy(win->surface);
-                }
+                
                 free(win);
         }
@@ -251 +251 @@
         transform_invert(&win_trans);
         transform_apply_affine(&win_trans, &x, &y);
-
-        /* Since client coordinate origin is (0, 0), it is necessary to check
+        
+        /*
+         * Since client coordinate origin is (0, 0), it is necessary to check
          * coordinates to avoid underflow. Moreover, it is convenient to also
          * check against provided upper limits to determine whether the converted
-         * coordinates are within the client window.  */
-        if (x < 0 || y < 0) {
+         * coordinates are within the client window.
+         */
+        if ((x < 0) || (y < 0))
                 return false;
-        } else {
-                (*x_out) = (sysarg_t) (x + 0.5);
-                (*y_out) = (sysarg_t) (y + 0.5);
-
-                if ((*x_out) >= x_lim || (*y_out) >= y_lim) {
-                        return false;
-                } else {
-                        return true;
-                }
-        }
+        
+        (*x_out) = (sysarg_t) (x + 0.5);
+        (*y_out) = (sysarg_t) (y + 0.5);
+        
+        if (((*x_out) >= x_lim) || ((*y_out) >= y_lim))
+                return false;
+        
+        return true;
 }
 
@@ -277 +277 @@
         transform_apply_affine(&win_trans, &x, &y);
         
-        /* It is assumed that compositor coordinate origin is chosen in such way,
-         * that underflow/overflow here would be unlikely. */
+        /*
+         * It is assumed that compositor coordinate origin is chosen in such way,
+         * that underflow/overflow here would be unlikely.
+         */
         (*x_out) = (sysarg_t) (x + 0.5);
         (*y_out) = (sysarg_t) (y + 0.5);
@@ -436 +438 @@
                                         transform_translate(&transform, -pos.x, -pos.y);
 
-                                        source_set_transform(&source, transform);                               
+                                        source_set_transform(&source, transform);
                                         source_set_texture(&source, win->surface, false);
                                         source_set_alpha(&source, PIXEL(win->opacity, 0, 0, 0));
@@ -572 +574 @@
                     vp->sess, x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp, 0, 0);
         }
-
+        
         fibril_mutex_unlock(&viewport_list_mtx);
 }
@@ -588 +590 @@
                 return;
         }
+        
         int rc = async_data_read_finalize(callid, event, len);
         if (rc != EOK) {
@@ -594 +597 @@
                 return;
         }
+        
         async_answer_0(iid, EOK);
-        
         free(event);
 }
@@ -606 +609 @@
         double height = IPC_GET_ARG4(*icall);
 
-        if (width == 0 || height == 0) {
+        if ((width == 0) || (height == 0)) {
                 comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
         } else {
@@ -855 +858 @@
 
         comp_damage(x, y, width, height);
-
         async_answer_0(iid, EOK);
 }
@@ -861 +863 @@
 static void comp_window_close_request(window_t *win, ipc_callid_t iid, ipc_call_t *icall)
 {
-    window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
+        window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
         if (event == NULL) {
                 async_answer_0(iid, ENOMEM);
@@ -1001 +1003 @@
                                 break;
                         case WINDOW_CLOSE:
-                                /* Postpone the closing until the phone is hung up to cover
-                                 * the case when the client is killed abruptly. */
+                                /*
+                                 * Postpone the closing until the phone is hung up to cover
+                                 * the case when the client is killed abruptly.
+                                 */
                                 async_answer_0(callid, EOK);
                                 break;
@@ -1017 +1021 @@
 static void comp_mode_change(viewport_t *vp, ipc_callid_t iid, ipc_call_t *icall)
 {
-        int rc;
         sysarg_t mode_idx = IPC_GET_ARG2(*icall);
         fibril_mutex_lock(&viewport_list_mtx);
@@ -1023 +1026 @@
         /* Retrieve the mode that shall be set. */
         vslmode_t new_mode;
-        rc = visualizer_get_mode(vp->sess, &new_mode, mode_idx);
+        int rc = visualizer_get_mode(vp->sess, &new_mode, mode_idx);
         if (rc != EOK) {
                 fibril_mutex_unlock(&viewport_list_mtx);
@@ -1041 +1044 @@
         /* Try to set the mode and share out the surface. */
         rc = visualizer_set_mode(vp->sess,
-                new_mode.index, new_mode.version, surface_direct_access(new_surface));
+            new_mode.index, new_mode.version, surface_direct_access(new_surface));
         if (rc != EOK) {
                 surface_destroy(new_surface);
@@ -1075 +1078 @@
         /* Release viewport resources. */
         fibril_mutex_lock(&viewport_list_mtx);
+        
         list_remove(&vp->link);
         viewport_destroy(vp);
-
+        
         /* Terminate compositor if there are no more viewports. */
         if (list_empty(&viewport_list)) {
@@ -1120 +1124 @@
         fibril_mutex_unlock(&viewport_list_mtx);
 
-        if (!vp) {
+        if (!vp)
                 return;
-        }
 
         /* Ignore parameters, the connection is already opened. */
@@ -1223 +1226 @@
         /* Try to set the mode and share out the surface. */
         rc = visualizer_set_mode(vp->sess,
-                vp->mode.index, vp->mode.version, surface_direct_access(vp->surface));
+            vp->mode.index, vp->mode.version, surface_direct_access(vp->surface));
         if (rc != EOK) {
                 printf("%s: Unable to set mode (%s)\n", NAME, str_error(rc));
@@ -1233 +1236 @@
         if (claimed)
                 visualizer_yield(vp->sess);
+        
         if (vp->sess != NULL)
                 async_hangup(vp->sess);
+        
         free(vp);
         free(vsl_name);
@@ -2196 +2201 @@
         /* Register compositor server. */
         async_set_client_connection(client_connection);
+        
         int rc = loc_server_register(NAME);
         if (rc != EOK) {
@@ -2229 +2235 @@
                 return -1;
         }
-
+        
         /* Establish input bidirectional connection. */
         rc = input_connect(input_svc);
@@ -2236 +2242 @@
                 return rc;
         }
-
+        
         rc = loc_register_cat_change_cb(category_change_cb);
         if (rc != EOK) {
@@ -2243 +2249 @@
                 return rc;
         }       
-
+        
         rc = discover_viewports();
         if (rc != EOK) {
@@ -2255 +2261 @@
                 return -1;
         }
-
+        
         comp_restrict_pointers();
         comp_damage(0, 0, UINT32_MAX, UINT32_MAX);
-        
         
         return EOK;