Changeset b0a94854 in mainline for uspace/lib/gui/window.c

Timestamp:

2020-02-19T13:28:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0a052b0

Parents:

e1f2079

git-author:

Jiri Svoboda <jiri@…> (2020-01-18 18:28:21)

git-committer:

Jiri Svoboda <jiri@…> (2020-02-19 13:28:34)

Message:

Deliver window focus and unfocus events

File:

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

uspace/lib/gui/window.c

@@ -83 +83 @@
 static pixel_t color_caption_unfocus = PIXEL(255, 207, 207, 207);
 
+static void window_focus_event(void *);
 static void window_kbd_event(void *, kbd_event_t *);
 static void window_pos_event(void *, pos_event_t *);
+static void window_unfocus_event(void *);
 
 static display_wnd_cb_t window_cb = {
+        .focus_event = window_focus_event,
         .kbd_event = window_kbd_event,
-        .pos_event = window_pos_event
+        .pos_event = window_pos_event,
+        .unfocus_event = window_unfocus_event
 };
 
@@ -587 +591 @@
                         break;
                 case ET_POSITION_EVENT:
-                        if (!win->is_focused) {
-                                win->is_focused = true;
-                                handle_refresh(win);
-                        }
                         deliver_position_event(win, event->data.pos);
                         break;
@@ -766 +766 @@
 }
 
+static void window_focus_event(void *arg)
+{
+        window_t *win = (window_t *) arg;
+        window_event_t *event;
+
+        event = (window_event_t *) calloc(1, sizeof(window_event_t));
+        if (event == NULL)
+                return;
+
+        link_initialize(&event->link);
+        event->type = ET_WINDOW_FOCUS;
+        prodcons_produce(&win->events, &event->link);
+}
+
 static void window_kbd_event(void *arg, kbd_event_t *kevent)
 {
@@ -796 +810 @@
 }
 
+static void window_unfocus_event(void *arg)
+{
+        window_t *win = (window_t *) arg;
+        window_event_t *event;
+
+        event = (window_event_t *) calloc(1, sizeof(window_event_t));
+        if (event == NULL)
+                return;
+
+        link_initialize(&event->link);
+        event->type = ET_WINDOW_UNFOCUS;
+        prodcons_produce(&win->events, &event->link);
+}
+
 /** @}
  */