Changeset 3f03199 in mainline for uspace/lib/gui/window.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/lib/gui/window.c (modified) (7 diffs)

uspace/lib/gui/window.c

@@ -66 +66 @@
 
 static pixel_t border_color = PIXEL(255, 0, 0, 0);
-static pixel_t header_bg_focus_color = PIXEL(255, 25, 25, 112);
+static pixel_t header_bg_focus_color = PIXEL(255, 88, 106, 196);
 static pixel_t header_fg_focus_color = PIXEL(255, 255, 255, 255);
-static pixel_t header_bg_unfocus_color = PIXEL(255, 70, 130, 180);
+static pixel_t header_bg_unfocus_color = PIXEL(255, 12, 57, 92);
 static pixel_t header_fg_unfocus_color = PIXEL(255, 255, 255, 255);
 
@@ -137 +137 @@
 {
         if (widget->window->is_decorated) {
-                list_foreach(widget->children, link) {
-                        widget_t *child = list_get_instance(link, widget_t, link);
+                list_foreach(widget->children, link, widget_t, child) {
                         child->rearrange(child, 
                             widget->hpos + border_thickness,
@@ -146 +145 @@
                 }
         } else {
-                list_foreach(widget->children, link) {
-                        widget_t *child = list_get_instance(link, widget_t, link);
+                list_foreach(widget->children, link, widget_t, child) {
                         child->rearrange(child, widget->hpos, widget->vpos,
                             widget->width, widget->height);
@@ -160 +158 @@
         if (widget->window->is_decorated) {
                 paint_internal(widget);
-                list_foreach(widget->children, link) {
-                        widget_t *child = list_get_instance(link, widget_t, link);
+                list_foreach(widget->children, link, widget_t, child) {
                         child->rearrange(child, 
                             hpos + border_thickness,
@@ -169 +166 @@
                 }
         } else {
-                list_foreach(widget->children, link) {
-                        widget_t *child = list_get_instance(link, widget_t, link);
+                list_foreach(widget->children, link, widget_t, child) {
                         child->rearrange(child, hpos, vpos, width, height);
                 }
@@ -181 +177 @@
                 paint_internal(widget);
         }
-        list_foreach(widget->children, link) {
-                widget_t *child = list_get_instance(link, widget_t, link);
+        list_foreach(widget->children, link, widget_t, child) {
                 child->repaint(child);
         }
@@ -268 +263 @@
                         win_grab(widget->window->osess, event.pos_id, flags);
                 } else {
-                        list_foreach(widget->children, link) {
-                                widget_t *child = list_get_instance(link, widget_t, link);
+                        list_foreach(widget->children, link, widget_t, child) {
                                 child->handle_position_event(child, event);
                         }
                 }
         } else {
-                list_foreach(widget->children, link) {
-                        widget_t *child = list_get_instance(link, widget_t, link);
+                list_foreach(widget->children, link, widget_t, child) {
                         child->handle_position_event(child, event);
                 }