diff --git a/debian/changelog b/debian/changelog index 27e2e538..0ce98feb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,19 @@ +screen-profiles (1.1) UNRELEASED; urgency=low + + [ Nicolas Barcet ] + * Key binding framework basis + * Added some sensible key bindings + * First pot and translation to french + + [ Dustin Kirkland ] + * created keybindings directory, moved keybindings there + * removed po4a directory, in favor of Nick's po directory + * changed 'less' to /usr/bin/sensible-pager, depend on debianutils + + -- Dustin Kirkland Wed, 17 Dec 2008 21:50:01 -0600 + screen-profiles (1.0) UNRELEASED; urgency=low + [ Dustin Kirkland ] * Initial upload (LP: #308789) - ubuntu, debian, redhat, fedora profiles diff --git a/debian/control b/debian/control index 0afb2391..a68822c0 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~kirkland/screen-profiles/main Package: screen-profiles Architecture: all -Depends: debconf (>= 0.5) | debconf-2.0, screen, gettext-base +Depends: debconf (>= 0.5) | debconf-2.0, screen, gettext-base, debianutils Recommends: update-notifier-common Description: a set of useful profiles and a profile-switcher for GNU screen screen-profiles includes a set of profiles for the GNU screen window manager. diff --git a/debian/dirs b/debian/dirs index ad8fdeb2..57da96b0 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,5 @@ usr/bin usr/share/screen-profiles usr/share/screen-profiles/bin +usr/share/screen-profiles/keybindings usr/share/screen-profiles/profiles diff --git a/debian/docs b/debian/docs index e845566c..6f2ee2ed 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ README +doc/help.txt diff --git a/debian/install b/debian/install index a3fb179d..0a6579c5 100644 --- a/debian/install +++ b/debian/install @@ -6,4 +6,5 @@ bin/updates-available usr/share/screen-profiles/bin profiles/common usr/share/screen-profiles/profiles profiles/debian.screenrc usr/share/screen-profiles/profiles profiles/ubuntu.screenrc usr/share/screen-profiles/profiles +keybindings/common usr/share/screen-profiles/keybindings select-screen-profile usr/bin diff --git a/doc/help.txt b/doc/help.txt index aa90f28a..08b4d0bf 100644 --- a/doc/help.txt +++ b/doc/help.txt @@ -1,29 +1,24 @@ - Screen key bindings, page 1 of 1. - Command key: ^A Literal ^A: a + ******************************************** + ** Welcome to the screen powered terminal ** + ******************************************** +The main benefits of the screen program is that your session can have +multiple windows and keep context between multiple logins. You will also +notice the task bar at the bottom that informs you of various system +status, update waiting to be applied and which window you are currently +running on. - break ^B b license , removebuf = - clear C lockscreen ^X x reset Z - colon : log H screen ^C c - copy ^[ [ login L select ' - detach ^D d meta a silence _ - digraph ^V monitor M split S - displays * next ^@ ^N sp n suspend ^Z z - dumptermcap . number N time ^T t - fit F only Q title A - flow ^F f other ^A vbell ^G - focus ^I pow_break B version v - hardcopy h pow_detach D width W - help ? prev ^H ^P p ^? windows ^W w - history { } quit \ wrap ^R r - info i readbuf < writebuf > - kill K k redisplay ^L l xoff ^S s - lastmsg ^M m remove X xon ^Q q +A complete help on the screen program can be obtained using the 'man screen' +command. Note that our implementation remaps the escape prefix to ctrl-G +instead of the standard ctrl-A. - paste . ^] windowlist " select - - - select 0 0 select 1 1 select 2 2 - select 3 3 select 4 4 select 5 5 - select 6 6 select 7 7 select 8 8 - select 9 9 login on I login off O - paste . ] split -v | focus up :kB: +Some usefull mappings (where C- means ctrl): +------------------------------------------------------------------- +shift-tab Goto next window | F1 Basic help (this) +C-pgup Goto previous window | F2 Advanced help +C-pgdown Goto next window | F4 Create new window +C-shift-del Detach and logout | F6 Close current window +------------------------------------------------------------------- +Note that these bindings have been tested for xterm type terminal such as +gnome-terminal, but may need some adjustments elsewhere. diff --git a/keybindings/common b/keybindings/common new file mode 100644 index 00000000..2d5c569c --- /dev/null +++ b/keybindings/common @@ -0,0 +1,45 @@ +############################################################################### +# GNU Screen common keybindings +# This configuration profile is intended to be a common header of useful +# keybindings, included by other profiles. +# +# Copyright (C) 2008 Nick Barcet +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +############################################################################### + +# This file defines Key bindings +# bindkey commands should be followed by a comment that will be used in the +# help file (one day). The command should be formated as: +# | explanation + +escape ^Gg + +# Maps for next and previous windows +bindkey "\033[Z" next # Shift-tab | Next window +bindkey ^[[6;5~ prev # C-pgup | Previous window +bindkey ^[[5;5~ next # C-pgdn | Pext window + +# Maps to create and remove windows +register n "^g^c ^gA" +bindkey -k k4 process n # F4 | Create new window +bindkey -k k6 kill # F6 | Close window + +# Maps for help +bindkey -k k1 screen -t help 0 less /usr/share/doc/screen-profiles/help.txt # F1 | Basic help (this) +bindkey -k k2 help # F2 | Advanced help + +# power detach +register x "^g^d D" +bindkey ^[[3;6~ process x # C-shift-del | Detach and logout diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 00000000..135bf6ad --- /dev/null +++ b/po/fr.po @@ -0,0 +1,33 @@ +# GNU Screen Profiles +# Copyright (C) 2008 Dustin Kirkland +# This file is distributed under the same license as the GNU Screen Profiles package. +# Nicolas Barcet , 2008. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-17 23:42+0100\n" +"PO-Revision-Date: 2008-12-17 23:42+0100\n" +"Last-Translator: Nicolas Barcet \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: select-screen-profile:9 select-screen-profile:16 +msgid "Error:" +msgstr "Erreur:" + +#: select-screen-profile:9 select-screen-profile:16 +msgid "exists, but is not a symlink" +msgstr "existe, mais n'est pas un lien symbolique" + +#: select-screen-profile:30 +msgid "recommended" +msgstr "recommandé" + +#: select-screen-profile:41 select-screen-profile:43 +msgid "Choose" +msgstr "Choisir" diff --git a/po/screen-profiles.pot b/po/screen-profiles.pot new file mode 100644 index 00000000..75e751a0 --- /dev/null +++ b/po/screen-profiles.pot @@ -0,0 +1,33 @@ +# GNU Screen Profiles +# Copyright (C) 2008 Dustin Kirkland +# This file is distributed under the same license as the GNU Screen Profiles package. +# Nicolas Barcet , 2008. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-12-17 23:42+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: select-screen-profile.sh:9 select-screen-profile.sh:16 +msgid "Error:" +msgstr "" + +#: select-screen-profile.sh:9 select-screen-profile.sh:16 +msgid "exists, but is not a symlink" +msgstr "" + +#: select-screen-profile.sh:30 +msgid "recommended" +msgstr "" + +#: select-screen-profile.sh:41 select-screen-profile.sh:43 +msgid "Choose" +msgstr "" diff --git a/po4a/po/screen-profiles.pot b/po4a/po/screen-profiles.pot deleted file mode 100644 index 38e7b2c0..00000000 --- a/po4a/po/screen-profiles.pot +++ /dev/null @@ -1,37 +0,0 @@ -# screen-profiles translations -# Copyright (C) 2008 Canonical, Ltd. -# This file is distributed under the same license as the screen-profiles package. -# Dustin Kirkland , 2008. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: screen-profiles 1.0\n" -"Report-Msgid-Bugs-To: https://bugs.launchpad.net/screen-profiles\n" -"POT-Creation-Date: 2008-12-16 17:21-0600\n" -"PO-Revision-Date: 2008-12-16 17:22-6\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: select-screen-profile:12 -msgid "Error:" -msgstr "" - -#: select-screen-profile:12 -msgid " file exists, but is not a symlink" -msgstr "" - -#: select-screen-profile:19 -msgid "Select a screen profile: " -msgstr "" - -#: select-screen-profile:26 -msgid "recommended" -msgstr "" - -#: select-screen-profile:37 select-screen-profile:39 -msgid "Choose: " -msgstr "" diff --git a/po4a/po/screen-utils.pot b/po4a/po/screen-utils.pot deleted file mode 100644 index 61a4b627..00000000 --- a/po4a/po/screen-utils.pot +++ /dev/null @@ -1,17 +0,0 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2008-12-16 17:27-0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING" - diff --git a/po4a/po4a.conf b/po4a/po4a.conf deleted file mode 100644 index 0e7d2a21..00000000 --- a/po4a/po4a.conf +++ /dev/null @@ -1,2 +0,0 @@ -# location of input files -[po4a_paths] po/screen-utils.pot diff --git a/profiles/common b/profiles/common index 92a79410..6a0da013 100644 --- a/profiles/common +++ b/profiles/common @@ -34,13 +34,9 @@ hardstatus alwayslastline termcapinfo xterm ti@:te@ defscrollback 10000 -# Keybindings -# Map shift-tab to go to next window -bindkey "\033[Z" next -# Ctrl+PgUp and Ctrl+PgDn to change windows -bindkey ^[[5;5~ prev -bindkey ^[[6;5~ next -# Prompt for window title on "ctrl-a c" -register n "^a^c ^aA" -bind c process n +# Default windows +screen -t bash 1 +screen -t welcome 0 /usr/bin/sensible-pager /usr/share/doc/screen-profiles/help.txt +# Default keybindings +source /usr/share/screen-profiles/keybindings/common