github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-20 13:33:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/bin/byobu, usr/lib/byobu/include/constants, usr/lib/byobu/logo,

Browse source 
usr/share/man/man1/byobu.1: LP: #938920, #952724
  - fix "infinite scrolling" of status line, when using multibyte
    utf-8 characters in status
  - detect character map, and only enable utf-8 when possible
This commit is contained in:
Dustin Kirkland 2012-06-24 14:27:57 -05:00
commit 96864fbe1b
5 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -15,6 +15,11 @@ byobu (5.20) unreleased; urgency=low
* debian/postrm: LP: #996873 * debian/postrm: LP: #996873
- at package removal, ensure that we remove the auto-launch symlink - at package removal, ensure that we remove the auto-launch symlink
if it exists if it exists
* usr/bin/byobu, usr/lib/byobu/include/constants, usr/lib/byobu/logo,
usr/share/man/man1/byobu.1: LP: #938920, #952724
- fix "infinite scrolling" of status line, when using multibyte
utf-8 characters in status
- detect character map, and only enable utf-8 when possible
-- Dustin Kirkland <kirkland@ubuntu.com> Fri, 08 Jun 2012 17:25:23 -0500 -- Dustin Kirkland <kirkland@ubuntu.com> Fri, 08 Jun 2012 17:25:23 -0500

1
usr/bin/byobu
View file

@ -45,6 +45,7 @@ if [ -z "${BYOBU_PREFIX}" ]; then
. "$HOME/.byoburc" . "$HOME/.byoburc"
fi fi
fi fi
export BYOBU_CHARMAP=$(locale charmap)
[ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc" [ -r "$HOME/.byoburc" ] && . "$HOME/.byoburc"
[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
. "${BYOBU_PREFIX}/lib/${PKG}/include/common" . "${BYOBU_PREFIX}/lib/${PKG}/include/common"

4
usr/lib/byobu/include/constants
View file

@ -20,8 +20,8 @@
PKG="byobu" PKG="byobu"
# UTF8 support in the hardstatus is coming one day in Screen # UTF-8 support in the hardstatus is coming one day in Screen
if [ "$UTF8" = "1" ] || [ "$BYOBU_BACKEND" = "tmux" ]; then if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then
#ICON_C="℃" #ICON_C="℃"
#ICON_F="℉" #ICON_F="℉"
ICON_C="C" ICON_C="C"

2
usr/lib/byobu/logo
View file

@ -54,7 +54,7 @@ __logo() {
case "$distro" in case "$distro" in
*ubuntu*) *ubuntu*)
if $MARKUP; then if $MARKUP; then
if [ "$UTF8" = "1" ] || [ "$BYOBU_BACKEND" = "tmux" ]; then if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then
if [ ! "$VTE_CJK_WIDTH" = "1" ] && [ ! "$VTE_CJK_WIDTH" = "wide" ] ; then if [ ! "$VTE_CJK_WIDTH" = "1" ] && [ ! "$VTE_CJK_WIDTH" = "wide" ] ; then
color m W; printf " u "; color - color m W; printf " u "; color -
else else

4
usr/share/man/man1/byobu.1
View file

@ -91,7 +91,7 @@ Note that BYOBU_CONFIG_DIR=\fI$XDG_CONFIG_HOME/byobu\fP if defined, and \fI$HOME
\fBtime\fP \- the system time in HH:MM:SS format; displayed in the lower bar on the far right in the default text and default background colors \fBtime\fP \- the system time in HH:MM:SS format; displayed in the lower bar on the far right in the default text and default background colors
\fBtime_binary\fP \- only for the hard core geek, the local system time in binary; requires UTF8 support in a VERY recent version of GNU Screen; you must additionally set "UTF8=1" in \fI$BYOBU_CONFIG_DIR/statusrc\fP; displayed in the lower bar on the far right in the default text and background colors \fBtime_binary\fP \- only for the hard core geek, the local system time in binary; requires UTF-8 support in a VERY recent version of GNU Screen; displayed in the lower bar on the far right in the default text and background colors
\fBtime_utc\fP \- the UTC system time in HH:MMformat; displayed in the lower bar on the far right in dark text on a light background \fBtime_utc\fP \- the UTC system time in HH:MMformat; displayed in the lower bar on the far right in dark text on a light background
@ -202,7 +202,7 @@ Apple Mac OSX terminal users have reported 'flashing text'. You can fix this in
Apple Mac keyboard users may need to specify a vt100 terminal by adding this to your OSX profile, in order to get Byobu's function keys and colors to work: Apple Mac keyboard users may need to specify a vt100 terminal by adding this to your OSX profile, in order to get Byobu's function keys and colors to work:
alias ssh='TERM=vt100 ssh' alias ssh='TERM=vt100 ssh'
Users of a non-UTF8 locale (such as cs_CZ charset ISO-8859-2), may need to add "defutf8 off" to \fI~/.screenrc\fP, if some characters are rendering as "?". Users of a non-UTF-8 locale (such as cs_CZ charset ISO-8859-2), may need to add "defutf8 off" to \fI~/.screenrc\fP, if some characters are rendering as "?".
Users who customize their PS1 prompt need to put this setting in \fI~/.bashrc\fP, rather than \fI~/.profile\fP, in order for it to work correctly with Byobu. Users who customize their PS1 prompt need to put this setting in \fI~/.bashrc\fP, rather than \fI~/.profile\fP, in order for it to work correctly with Byobu.