Changeset 46a47c0 in mainline for uspace/app/terminal/terminal.c

Timestamp:

2023-01-16T20:34:01Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b0ae23f

Parents:

b3eeae5

Message:

Make sure window is only show as inactive when it loses last focus

This currently affects the title bar and also the cursor in Terminal.

File:

• uspace/app/terminal/terminal.c (modified) (4 diffs)

uspace/app/terminal/terminal.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
@@ -118 +118 @@
 
 static void terminal_close_event(ui_window_t *, void *);
-static void terminal_focus_event(ui_window_t *, void *);
+static void terminal_focus_event(ui_window_t *, void *, unsigned);
 static void terminal_kbd_event(ui_window_t *, void *, kbd_event_t *);
 static void terminal_pos_event(ui_window_t *, void *, pos_event_t *);
-static void terminal_unfocus_event(ui_window_t *, void *);
+static void terminal_unfocus_event(ui_window_t *, void *, unsigned);
 
 static ui_window_cb_t terminal_window_cb = {
@@ -833 +833 @@
 
 /** Handle window focus event. */
-static void terminal_focus_event(ui_window_t *window, void *arg)
+static void terminal_focus_event(ui_window_t *window, void *arg,
+    unsigned nfocus)
 {
         terminal_t *term = (terminal_t *) arg;
 
+        (void)nfocus;
         term->is_focused = true;
         term_update(term);
@@ -878 +880 @@
 
 /** Handle window unfocus event. */
-static void terminal_unfocus_event(ui_window_t *window, void *arg)
+static void terminal_unfocus_event(ui_window_t *window, void *arg,
+    unsigned nfocus)
 {
         terminal_t *term = (terminal_t *) arg;
 
-        term->is_focused = false;
-        term_update(term);
-        gfx_update(term->gc);
+        if (nfocus == 0) {
+                term->is_focused = false;
+                term_update(term);
+                gfx_update(term->gc);
+        }
 }