From 7aa25835ea49f60922e99d0d0470633679256f3f Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Thu, 5 May 2011 21:00:48 -0400
Subject: [PATCH] * usr/lib/byobu/.notify_osd,
 usr/share/byobu/keybindings/f-keys,   usr/share/byobu/profiles/common: LP:
 #776742, #776740   - set msgwait and msginwait to both 0, to turn down the
 verbosity of     screen's messaging, and speed up some byobu operations   -
 improve scrollback (alt-pgup and alt-pgdn) by disabling screen's     status
 message updates about 'copy mode', etc.   - speed up the printscreen
 functionality   - when running printscreen, open the result with the user's
 default     viewer in a new window entitled PRINTSCREEN

---
 debian/changelog                   | 9 +++++++++
 usr/lib/byobu/.notify_osd          | 4 ++++
 usr/share/byobu/keybindings/f-keys | 6 +++---
 usr/share/byobu/profiles/common    | 3 ++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 32ecd4f2..71e090eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,15 @@ byobu (3.35c) unreleased; urgency=low
     - note that this commit does, however, revert the fix for an older bug
   * usr/share/byobu/keybindings/f-keys:
     - fix regression in rename F8 functionality, use <home> key
+  * usr/lib/byobu/.notify_osd, usr/share/byobu/keybindings/f-keys,
+    usr/share/byobu/profiles/common: LP: #776742, #776740
+    - set msgwait and msginwait to both 0, to turn down the verbosity of
+      screen's messaging, and speed up some byobu operations
+    - improve scrollback (alt-pgup and alt-pgdn) by disabling screen's
+      status message updates about 'copy mode', etc.
+    - speed up the printscreen functionality
+    - when running printscreen, open the result with the user's default
+      viewer in a new window entitled PRINTSCREEN
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 03 May 2011 12:11:10 -0500
 
diff --git a/usr/lib/byobu/.notify_osd b/usr/lib/byobu/.notify_osd
index 592a9901..c7585da8 100755
--- a/usr/lib/byobu/.notify_osd
+++ b/usr/lib/byobu/.notify_osd
@@ -21,6 +21,7 @@
 
 $/ = "\n\n";
 $PKG = "byobu";
+$sleep = 5;
 while (<STDIN>) {
 	# Ensure that the notify_osd indicator is enabled
 	my $skip = 0;
@@ -40,5 +41,8 @@ while (<STDIN>) {
 	$msg =~ s/\s+/ /g;		# collapse multi-whitespace into one
 	$msg =~ s/\s+$//g;		# strip trailing whitespace
 	$msg =~ s/^\s+//g;		# strip leading whitespace
+	system("/usr/bin/screen", "-X", "-S", "$ARGV[0]", "at", "*", "msgwait", "$sleep");
 	system("/usr/bin/screen", "-X", "-S", "$ARGV[0]", "at", "*", "echo", "[$msg]");
+	sleep($sleep);
+	system("/usr/bin/screen", "-X", "-S", "$ARGV[0]", "at", "*", "msgwait", "0");
 }
diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys
index 7a0135bd..4e4c03cf 100644
--- a/usr/share/byobu/keybindings/f-keys
+++ b/usr/share/byobu/keybindings/f-keys
@@ -44,7 +44,7 @@ bind $ screen -t status 0 byobu-status-detail 		# F12 $ | show detailed status
 bind @ screen -t config 0 byobu-config			# F12 @ | Configuration
 bind R process r					# F12 R | Reload profile
 register s "\020[g G$>^h"					# Goes with \020~ definition
-bind ~ eval 'process s' 'exec sed -i -e "/./,/^$/!d" /var/run/screen/S-$USER/byobu-exchange' 'echo "See: /var/run/screen/S-$USER/byobu-exchange"' # F12 ~ | write the buffer to file
+bind ~ eval 'process s' 'exec sed -i -e "/./,/^$/!d" /var/run/screen/S-$USER/printscreen' 'screen -t PRINTSCREEN view /var/run/screen/S-$USER/printscreen' # F12 ~ | write the buffer to file, open in a new window
 
 # Hotkeys for splits (gnome-terminal)
 bindkey "^[O1;2Q" eval 'split' 'focus down' 'next' 'focus up'		# shift-F2 | horizontal split
@@ -64,9 +64,9 @@ bindkey "^[[32~" remove							# shift-F6 | kill this split
 
 # Make it more logical how to enter scrollback
 register p "^[[5~"
-bindkey "^[[5;3~" eval 'copy' 'process p'		# alt-pageup | scrollback
+bindkey "^[[5;3~" eval 'msgwait 0' 'msgminwait 0' 'copy' 'process p'		# alt-pageup | scrollback
 register n "^[[6~"
-bindkey "^[[6;3~" eval 'copy' 'process n'		# alt-pagedn | scrollback
+bindkey "^[[6;3~" eval 'msgwait 0' 'msgminwait 0' 'copy' 'process n'		# alt-pagedn | scrollback
 
 # Make socket reconnection a little easier
 bindkey "^[[15;5~" eval 'process r' 'stuff ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets^M"' # ctrl-F5 | reconnect gpg/ssh sockets
diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common
index 723f769b..1583d64a 100644
--- a/usr/share/byobu/profiles/common
+++ b/usr/share/byobu/profiles/common
@@ -23,7 +23,8 @@
 # Now, let's override with our customizations
 startup_message off
 vbell off
-msgwait 5
+msgwait 0
+msgminwait 0
 defutf8 on
 deflogin on