Changes in uspace/lib/gui/window.c [21eeb653:6d5e378] in mainline

File:

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

uspace/lib/gui/window.c

@@ -34 +34 @@
  */
 
-#include <stdbool.h>
+#include <bool.h>
 #include <errno.h>
 #include <stdio.h>
@@ -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_fg_focus_color = PIXEL(255, 255, 255, 255);
-static pixel_t header_bg_unfocus_color = PIXEL(255, 70, 130, 180);
-static pixel_t header_fg_unfocus_color = PIXEL(255, 255, 255, 255);
+static pixel_t header_bgcolor = PIXEL(255, 25, 25, 112);
+static pixel_t header_fgcolor = PIXEL(255, 255, 255, 255);
 
 static void paint_internal(widget_t *w)
@@ -96 +94 @@
             w->vpos + w->height - border_thickness, w->width, border_thickness);
 
-        source_set_color(&source, 
-            w->window->is_focused ? header_bg_focus_color : header_bg_unfocus_color);
+        source_set_color(&source, header_bgcolor);
         drawctx_transfer(&drawctx,
             w->hpos + border_thickness, w->vpos + border_thickness,
@@ -109 +106 @@
         char cls_pict[] = "x";
         font_get_box(&font, cls_pict, &cls_width, &cls_height);
-        source_set_color(&source, 
-            w->window->is_focused ? header_fg_focus_color : header_fg_unfocus_color);
+        source_set_color(&source, header_fgcolor);
         sysarg_t cls_x = ((close_width - cls_width) / 2) + w->hpos + w->width -
             border_thickness - close_width;
@@ -424 +420 @@
 
         while (!list_empty(&win->events.list)) {
-                window_event_t *event = (window_event_t *) list_first(&win->events.list);
-                list_remove(&event->link);
-                free(event);
+                list_remove(list_first(&win->events.list));
         }
 
@@ -453 +447 @@
                         break;
                 case ET_POSITION_EVENT:
-                        if (!win->is_focused) {
-                                win->is_focused = true;
-                                handle_refresh(win);
-                        }
                         deliver_position_event(win, event->data.pos);
                         break;
@@ -464 +454 @@
                 case ET_WINDOW_RESIZE:
                         handle_resize(win, event->data.rsz.width, event->data.rsz.height);
-                        break;
-                case ET_WINDOW_FOCUS:
-                        if (!win->is_focused) {
-                                win->is_focused = true;
-                                handle_refresh(win);
-                        }
-                        break;
-                case ET_WINDOW_UNFOCUS:
-                        if (win->is_focused) {
-                                win->is_focused = false;
-                                handle_refresh(win);
-                        }
                         break;
                 case ET_WINDOW_REFRESH:
@@ -536 +514 @@
 }
 
-window_t *window_open(char *winreg, bool is_main, bool is_decorated, 
-    const char *caption, sysarg_t x_offset, sysarg_t y_offset)
+window_t *window_open(char *winreg, bool is_main, bool is_decorated, const char *caption)
 {
         int rc;
@@ -548 +525 @@
         win->is_main = is_main;
         win->is_decorated = is_decorated;
-        win->is_focused = true;
         prodcons_initialize(&win->events);
         fibril_mutex_initialize(&win->guard);
@@ -581 +557 @@
         service_id_t out_dsid;
         
-        rc = win_register(reg_sess, &in_dsid, &out_dsid, x_offset, y_offset);
+        rc = win_register(reg_sess, &in_dsid, &out_dsid);
         async_hangup(reg_sess);
         if (rc != EOK) {