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

Timestamp:

2013-09-10T16:32:35Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4982d87

Parents:

e8d6ce2

Message:

Simplify use of list_foreach.

File:

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

uspace/srv/hid/compositor/compositor.c

@@ -335 +335 @@
         }
 
-        list_foreach(viewport_list, link) {
-                viewport_t *vp = list_get_instance(link, viewport_t, link);
+        list_foreach(viewport_list, link, viewport_t, vp) {
                 sysarg_t w_vp, h_vp;
                 surface_get_resolution(vp->surface, &w_vp, &h_vp);
@@ -354 +353 @@
         fibril_mutex_lock(&pointer_list_mtx);
 
-        list_foreach(pointer_list, link) {
-                pointer_t *ptr = list_get_instance(link, pointer_t, link);
+        list_foreach(pointer_list, link, pointer_t, ptr) {
                 ptr->pos.x = ptr->pos.x > viewport_bound_rect.x ? ptr->pos.x : viewport_bound_rect.x;
                 ptr->pos.y = ptr->pos.y > viewport_bound_rect.y ? ptr->pos.y : viewport_bound_rect.y;
@@ -374 +372 @@
         fibril_mutex_lock(&pointer_list_mtx);
 
-        list_foreach(viewport_list, link) {
-
+        list_foreach(viewport_list, link, viewport_t, vp) {
                 /* Determine what part of the viewport must be updated. */
-                viewport_t *vp = list_get_instance(link, viewport_t, link);
                 sysarg_t x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp;
                 surface_get_resolution(vp->surface, &w_dmg_vp, &h_dmg_vp);
@@ -446 +442 @@
                         }
 
-                        list_foreach(pointer_list, link) {
-
-                                pointer_t *ptr = list_get_instance(link, pointer_t, link);
+                        list_foreach(pointer_list, link, pointer_t, ptr) {
                                 if (ptr->ghost.surface) {
 
@@ -522 +516 @@
                         }
 
-                        list_foreach(pointer_list, link) {
+                        list_foreach(pointer_list, link, pointer_t, ptr) {
 
                                 /* Determine what part of the pointer intersects with the
                                  * updated area of the current viewport. */
-                                pointer_t *ptr = list_get_instance(link, pointer_t, link);
                                 sysarg_t x_dmg_ptr, y_dmg_ptr, w_dmg_ptr, h_dmg_ptr;
                                 surface_t *sf_ptr = ptr->cursor.states[ptr->state];
@@ -569 +562 @@
 
         /* Notify visualizers about updated regions. */
-        list_foreach(viewport_list, link) {
-                viewport_t *vp = list_get_instance(link, viewport_t, link);
+        list_foreach(viewport_list, link, viewport_t, vp) {
                 sysarg_t x_dmg_vp, y_dmg_vp, w_dmg_vp, h_dmg_vp;
                 surface_get_damaged_region(vp->surface, &x_dmg_vp, &y_dmg_vp, &w_dmg_vp, &h_dmg_vp);
@@ -631 +623 @@
 
         fibril_mutex_lock(&pointer_list_mtx);
-        list_foreach(pointer_list, link) {
-                pointer_t *pointer = list_get_instance(link, pointer_t, link);
+        list_foreach(pointer_list, link, pointer_t, pointer) {
                 if (pointer->id == pos_id) {
                         pointer->grab_flags = pointer->pressed ? grab_flags : GF_EMPTY;
@@ -710 +701 @@
 {
         fibril_mutex_lock(&window_list_mtx);
-        window_t *window = NULL;
-        list_foreach(window_list, link) {
-                window = list_get_instance(link, window_t, link);
+
+        list_foreach(window_list, link, window_t, window) {
                 if (window == target) {
                         prodcons_produce(&window->queue, &event->link);
-                }
-        }
-        if (!window) {
-                free(event);
-        }
+                        fibril_mutex_unlock(&window_list_mtx);
+                        return;
+                }
+        }
+
         fibril_mutex_unlock(&window_list_mtx);
+        free(event);
 }
 
@@ -863 +854 @@
         window_t *win = NULL;
         fibril_mutex_lock(&window_list_mtx);
-        list_foreach(window_list, link) {
-                window_t *cur = list_get_instance(link, window_t, link);
+        list_foreach(window_list, link, window_t, cur) {
                 if (cur->in_dsid == service_id || cur->out_dsid == service_id) {
                         win = cur;
@@ -1007 +997 @@
                 /* Close all clients and their windows. */
                 fibril_mutex_lock(&window_list_mtx);
-                list_foreach(window_list, link) {
-                        window_t *win = list_get_instance(link, window_t, link);
+                list_foreach(window_list, link, window_t, win) {
                         window_event_t *event = (window_event_t *) malloc(sizeof(window_event_t));
                         if (event) {
@@ -1034 +1023 @@
         viewport_t *vp = NULL;
         fibril_mutex_lock(&viewport_list_mtx);
-        list_foreach(viewport_list, link) {
-                viewport_t *cur = list_get_instance(link, viewport_t, link);
+        list_foreach(viewport_list, link, viewport_t, cur) {
                 if (cur->dsid == (service_id_t) IPC_GET_ARG1(*icall)) {
                         vp = cur;
@@ -1571 +1559 @@
 
         /* Determine the window which the mouse click belongs to. */
-        list_foreach(window_list, link) {
-                win = list_get_instance(link, window_t, link);
+        list_foreach(window_list, link, window_t, cw) {
+                win = cw;
                 if (win->surface) {
                         surface_get_resolution(win->surface, &width, &height);