From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [RFC 8.3 1/3] Make TUI react to "set style enabled"
Date: Fri, 08 Mar 2019 21:04:00 -0000 [thread overview]
Message-ID: <20190308210433.32683-2-tromey@adacore.com> (raw)
In-Reply-To: <20190308210433.32683-1-tromey@adacore.com>
When the user toggles "set style enabled", the TUI should react by
redrawing the source window, if necessary. This patch implements this
behavior.
No test because the TUI is generally not tested.
I was not sure of a clean way to force an update of the window's
contents; see the new tui_redisplay_source for the workaround I used.
gdb/ChangeLog
2019-03-08 Tom Tromey <tromey@adacore.com>
* cli/cli-style.c (set_style_enabled): Notify new observable.
* tui/tui-hooks.c (tui_redisplay_source): New function.
(tui_attach_detach_observers): Attach or detach
tui_redisplay_source.
* observable.h (source_styling_changed): New observable.
* observable.c: Define source_styling_changed observable.
---
gdb/ChangeLog | 9 +++++++++
gdb/cli/cli-style.c | 2 ++
gdb/observable.c | 1 +
gdb/observable.h | 4 ++++
gdb/tui/tui-hooks.c | 14 ++++++++++++++
5 files changed, 30 insertions(+)
diff --git a/gdb/cli/cli-style.c b/gdb/cli/cli-style.c
index 234cc410dda..729a024c47a 100644
--- a/gdb/cli/cli-style.c
+++ b/gdb/cli/cli-style.c
@@ -21,6 +21,7 @@
#include "cli/cli-cmds.h"
#include "cli/cli-style.h"
#include "source-cache.h"
+#include "observable.h"
/* True if styling is enabled. */
@@ -216,6 +217,7 @@ static void
set_style_enabled (const char *args, int from_tty, struct cmd_list_element *c)
{
g_source_cache.clear ();
+ gdb::observers::source_styling_changed.notify ();
}
static void
diff --git a/gdb/observable.c b/gdb/observable.c
index 33112062424..c077b025932 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -74,6 +74,7 @@ DEFINE_OBSERVABLE (inferior_call_pre);
DEFINE_OBSERVABLE (inferior_call_post);
DEFINE_OBSERVABLE (register_changed);
DEFINE_OBSERVABLE (user_selected_context_changed);
+DEFINE_OBSERVABLE (source_styling_changed);
} /* namespace observers */
} /* namespace gdb */
diff --git a/gdb/observable.h b/gdb/observable.h
index 999ecfbc353..edd1fffae0a 100644
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -228,6 +228,10 @@ extern observable<struct frame_info *, int> register_changed;
frame has changed. */
extern observable<user_selected_what> user_selected_context_changed;
+/* This is notified when the source styling setting has changed and
+ should be reconsulted. */
+extern observable<> source_styling_changed;
+
} /* namespace observers */
} /* namespace gdb */
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 98c6fd651fa..162d6ef525a 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -204,6 +204,18 @@ tui_normal_stop (struct bpstats *bs, int print_frame)
tui_refresh_frame_and_register_information (/*registers_too_p=*/1);
}
+/* Observer for source_cache_cleared. */
+
+static void
+tui_redisplay_source ()
+{
+ if (tui_is_window_visible (SRC_WIN))
+ {
+ /* Force redisplay. */
+ tui_horizontal_source_scroll (tui_win_list[SRC_WIN], LEFT_SCROLL, 0);
+ }
+}
+
/* Token associated with observers registered while TUI hooks are
installed. */
static const gdb::observers::token tui_observers_token {};
@@ -239,6 +251,8 @@ tui_attach_detach_observers (bool attach)
tui_normal_stop, attach);
attach_or_detach (gdb::observers::register_changed,
tui_register_changed, attach);
+ attach_or_detach (gdb::observers::source_styling_changed,
+ tui_redisplay_source, attach);
}
/* Install the TUI specific hooks. */
--
2.20.1
next prev parent reply other threads:[~2019-03-08 21:04 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-08 21:04 [RFC 8.3 0/3] Some style fixes Tom Tromey
2019-03-08 21:04 ` Tom Tromey [this message]
2019-03-13 19:28 ` [RFC 8.3 1/3] Make TUI react to "set style enabled" Pedro Alves
2019-03-14 11:43 ` Tom Tromey
2019-03-08 21:04 ` [RFC 8.3 2/3] Add the "set style source" command Tom Tromey
2019-03-09 6:17 ` Eli Zaretskii
2019-03-11 20:13 ` Tom Tromey
2019-03-09 11:18 ` Philippe Waroquiers
2019-03-11 20:13 ` Tom Tromey
2019-03-11 20:25 ` Eli Zaretskii
2019-03-08 21:04 ` [RFC 8.3 3/3] Avoid a crash in source_cache::extract_lines Tom Tromey
2019-03-13 17:07 ` Pedro Alves
2019-03-13 17:20 ` Tom Tromey
2019-03-13 18:06 ` Pedro Alves
2019-03-14 11:37 ` Tom Tromey
2019-03-09 6:17 ` [RFC 8.3 0/3] Some style fixes Eli Zaretskii
2019-03-10 13:14 ` Eli Zaretskii
2019-03-11 20:15 ` Tom Tromey
2019-03-12 16:44 ` Eli Zaretskii
2019-03-13 15:50 ` Eli Zaretskii
2019-03-14 12:21 ` Tom Tromey
2019-03-14 14:40 ` Pedro Alves
2019-03-14 15:36 ` Eli Zaretskii
2019-03-15 12:34 ` Fix pressing down in the TUI (Re: [RFC 8.3 0/3] Some style fixes) Pedro Alves
2019-03-15 13:37 ` Eli Zaretskii
2019-03-15 13:56 ` Pedro Alves
2019-03-16 17:59 ` Eli Zaretskii
2019-03-24 15:35 ` Simon Marchi
2019-03-25 1:36 ` Simon Marchi
2019-03-25 15:14 ` Tom Tromey
2019-03-26 0:52 ` Simon Marchi
2019-03-15 15:33 ` Tom Tromey
2019-03-15 12:43 ` Avoid overwriting the TUI source window frame " Pedro Alves
2019-03-16 12:17 ` Eli Zaretskii
2019-03-15 14:15 ` [PATCH v2] Fix first time you type UP or DOWN in TUI's command window " Pedro Alves
2019-03-15 15:38 ` Eli Zaretskii
2019-03-18 20:24 ` Pedro Alves
2019-03-19 6:09 ` Eli Zaretskii
2019-03-19 18:14 ` Pedro Alves
2019-03-09 14:28 ` [RFC 8.3 0/3] Some style fixes Hannes Domani via gdb-patches
2019-03-12 16:48 ` Tom Tromey
2019-03-12 17:09 ` Hannes Domani via gdb-patches
2019-03-13 15:44 ` Eli Zaretskii
2019-03-14 20:25 ` "next" into line longer than the source window-width (Re: [RFC 8.3 0/3] Some style fixes) Pedro Alves
2019-03-17 16:05 ` Eli Zaretskii
2019-03-14 20:58 ` [PATCH] Fix scrolling right in the TUI " Pedro Alves
2019-03-15 12:34 ` Hannes Domani via gdb-patches
2019-03-15 21:51 ` Tom Tromey
2019-03-18 14:41 ` Pedro Alves
2019-03-17 16:06 ` Eli Zaretskii
2019-03-12 17:29 ` [RFC 8.3 0/3] Some style fixes Eli Zaretskii
2019-03-12 17:32 ` Eli Zaretskii
2019-03-12 17:29 ` Eli Zaretskii
2019-03-26 20:52 ` Pedro Franco de Carvalho
2019-03-14 11:44 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190308210433.32683-2-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox