summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2013-07-14 23:40:12 +0200
committerAxel Beckert <abe@deuxchevaux.org>2013-07-14 23:45:21 +0200
commit65eb6af9cbdac95f6b1e29c7ae068f45ef64706d (patch)
treedeb2a7d53bc0961704d0a55d8e5350d638088d56
parent7f68139dbd5d4eb8c09bd2c717d60b51c9f28d45 (diff)
downloadscreen-65eb6af9cbdac95f6b1e29c7ae068f45ef64706d.tar.gz
Ensure that the title prompt can only appear once
Closes: #625866
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/62-prevent-repeated-title-prompt.patch44
-rw-r--r--debian/patches/series1
3 files changed, 46 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index e23abb6..550e754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ screen (4.1.0~20120320gitdb59704-9) UNRELEASED; urgency=low
* screen-cleanup init.d script: Label /var/run/screen for SE Linux
(Closes: #680360)
* Add a package with debugging symbols (Closes: #715170)
+ * Ensure that the title prompt can only appear once. (Closes: #625866)
-- Axel Beckert <abe@debian.org> Sun, 14 Jul 2013 21:23:58 +0200
diff --git a/debian/patches/62-prevent-repeated-title-prompt.patch b/debian/patches/62-prevent-repeated-title-prompt.patch
new file mode 100644
index 0000000..37d2ecf
--- /dev/null
+++ b/debian/patches/62-prevent-repeated-title-prompt.patch
@@ -0,0 +1,44 @@
+Description: Ensure that the title prompt only appears once
+ Windows in screen can be renamed using C-a A (title). This can be done
+ repeatedly so that any number of prompts for a new window name overlay
+ each other. Once the user entered a name in the topmost prompt and
+ presses enter, he has to do it again for all the prompts underneath.
+ This can be very confusing in case the user hit C-a A several times
+ without noticing or realizing.
+Author: Tobias Wulff <tobi@swulff.de>
+Debian-Bug: 625866
+
+Index: screen/process.c
+===================================================================
+--- screen.orig/process.c 2013-07-14 23:43:28.058810093 +0200
++++ screen/process.c 2013-07-14 23:43:28.050810057 +0200
+@@ -478,6 +478,8 @@
+
+ char *noargs[1];
+
++int enter_window_name_mode = 0;
++
+ void
+ InitKeytab()
+ {
+@@ -5745,6 +5747,8 @@
+ ASSERT(display);
+ if (len && fore)
+ ChangeAKA(fore, buf, strlen(buf));
++
++ enter_window_name_mode = 0;
+ }
+
+ static void
+@@ -5752,6 +5756,11 @@
+ {
+ char *s, *ss;
+ int n;
++
++ if (enter_window_name_mode == 1) return;
++
++ enter_window_name_mode = 1;
++
+ Input("Set window's title to: ", sizeof(fore->w_akabuf) - 1, INP_COOKED, AKAfin, NULL, 0);
+ s = fore->w_title;
+ if (!s)
diff --git a/debian/patches/series b/debian/patches/series
index 26b5cf1..26eff2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,5 +28,6 @@
59-fix-manpage-warnings.patch
60-644788-screen-4.1.0-4.0.3-interoperability.patch
61-allow-dev-console-to-be-a-symlink.patch
+62-prevent-repeated-title-prompt.patch
# 80-99: experimental patches, new features etc.
80EXP_session_creation_time.patch