From 1c6b19d41f75dc43d7f9319af785ce77f30c4b79 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Mon, 12 Nov 2007 13:11:46 +0000 Subject: [PATCH] Switch out Eterm for pterm. pterm's emulation is much more complete than Eterm's, and I've become annoyed with rubbish being left on the screen by Eterm's bugginess. --- e-keybindings.cfg | 4 +- eterm-theme.cfg | 243 ------------------------------------------------------ putty-defaults | 184 +++++++++++++++++++++++++++++++++++++++++ setup | 2 +- xinitrc | 10 +-- 5 files changed, 192 insertions(+), 251 deletions(-) delete mode 100644 eterm-theme.cfg create mode 100644 putty-defaults diff --git a/e-keybindings.cfg b/e-keybindings.cfg index c519a38..875b2cb 100644 --- a/e-keybindings.cfg +++ b/e-keybindings.cfg @@ -205,7 +205,7 @@ __ACLASS __BGN __KEY Insert __EVENT __KEY_PRESS __MODIFIER_KEY __CTRL_ALT - __ACTION __A_EXEC Eterm + __ACTION __A_EXEC pterm __NEXT_ACTION __KEY v __MODIFIER_KEY __CTRL_ALT @@ -290,7 +290,7 @@ __ACLASS __BGN __KEY F8 __EVENT __KEY_PRESS __MODIFIER_KEY __ALT - __ACTION __A_EXEC Eterm + __ACTION __A_EXEC pterm __NEXT_ACTION __KEY F9 __EVENT __KEY_PRESS diff --git a/eterm-theme.cfg b/eterm-theme.cfg deleted file mode 100644 index 40620f9..0000000 --- a/eterm-theme.cfg +++ /dev/null @@ -1,243 +0,0 @@ - -# ^- This must be the first line of any Eterm config file! -# Format is: where VERSION is replaced by -# the version it was written for, -# minus the "DR-" if any. -# -# This is a sample Eterm config file. It should be placed in -# ~/.Eterm/themes/Eterm/MAIN and modified to suit your needs -# -# As always, the authors guarantee absolutely nothing and take -# no responsibility for anything that might happen to you, your -# computer, your dog, your sex life, or anyone or anything else -# directly or indirectly through the use of, or inability to use, -# this program. Use at your OWN risk. - -# Define the color properties -begin color - -# Foreground, background, cursor, scrollbar, pointer colors - foreground white - background black - cursor #ff0000 - cursor_text #008888 - pointer white - -# video attribute can either be "normal" or "reverse" - video normal - -# Redefine the 16 basic colors, if you really feel the need -# First word is "color", next is the number (0-15, BD, or UL), -# then the values for red, green, and blue separated by spaces -# Numbers are base 10 unless preceded by "0x" (base 16) or '0' -# (base 8). Alternatively, you can use color names or #xxxxxx -# format. - -# The colors below are taken from Rasterman's .Xdefaults file. They are intended to -# display ANSI art properly when combined with a good ANSI-art font (like vga or -# Rasterman's nexus font). - color 0 #000000 - color 1 #aa0000 - color 2 #008800 - color 3 #aa8822 - color 4 #0000cc - color 5 #aa00aa - color 6 #00aaaa - color 7 #dddddd - color 8 #444444 - color 9 #ff4444 - color 10 #44ff44 - color 11 #ffff44 - color 12 #4466ff - color 13 #ff44ff - color 14 #44ffff - color 15 #ffffff - color bd #ffffff - color ul #ffffff - -# This ends the color section. Any text after the word "end" is -# assumed to be a comment and ignored. -end color - -begin image - type background - state normal -# mode trans - mode solid - color #ffffff #000000 -# colormod image 102 - - type anchor - state disabled - color #000000 #808080 - state normal - color #000000 #d0d0d0 - - type trough - state disabled - color #000000 #808080 - state normal - color #000000 #d0d0d0 - - type down_arrow - state disabled - color #000000 #808080 - state normal - color #000000 #d0d0d0 - - type up_arrow - state disabled - color #000000 #808080 - state normal - color #000000 #d0d0d0 -end image - - -# menu_text black -# scrollbar #d0d0d0 -# unfocusedscrollbar #808080 - -# The X11 attributes section. Should be fairly self-explanatory, -# but if not, consult the X man page. - begin attributes - -# Geometry == widthxheight+x_offset+y_offset, offsets from top left -# if +, bottom right if - -# geometry 132x50+100+100 - title Eterm - name %appname() - geometry 80x50 -# iconname Eterm - -# Set the fonts. These must be monospace fonts. The values shown are -# the Eterm defaults. The "bold" font is the font used if color BD has -# not been set and Eterm cannot map the foreground color to one of the -# high-intensity colors (8-15). - font 0 fixed - font 1 6x10 - font 2 fixed - font 3 8x13 - font 4 9x15 -# font bold 7x14 - scrollbar_type next - scrollbar_width 12 - font default 2 - end attributes - -# This section is for pixmap definitions. The only one used currently -# is "background". The supplied numbers work just like they do for -# Enlightenment: first is X (width), second is Y (height). -1 to -# scale 100%, 0 to tile, any other number specifies W/H in pixels -# begin pixmaps -# background %random(`cat pixmaps.list 2>/dev/null`) -# path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:/usr/share/Eterm/pix/" - -# Support for these is forthcoming -# scroll_up -1 -1 ~/.Eterm/up_arrow.ppm -# scroll_down -1 -1 ~/.Eterm/down_arrow.ppm -# scroll_background 0 0 ~/.Eterm/scroll.ppm -# scroll_anchor -1 -1 ~/.Eterm/anchor.ppm -# end - -# The Kanji support options. Same goes for these fonts as for the normal -# ones. The "encoding" attribute can be either "eucj" or "sjis". -# begin kanji -# font 0 k14 -# font 1 jiskan16 -# font 2 jiskan18 -# font 3 jiskan24 -# font 4 jiskan26 -# encoding eucj -# end kanji - -# Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", -# "off", or "false" for FALSE. - begin toggles - -# If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07) - map_alert on - -# If true, Eterm will flash rather than sending a beep. - visual_bell off - -# If true, Eterm will prepend '-' to the shell name when calling it. - login_shell false - -# If true, Eterm will display the scroll bar - scrollbar on -# menubar off - -# If true, Eterm will attempt to make an entry in the utmp file to record the -# login information. Eterm *must* run privileged to do this. - utmp_logging on - -# If true, Eterm will handle the Meta (Alt) + keypress to set the 8th bit. -# If false, Eterm will handle the Meta + keypress as an escape prefix. (default) -# meta8 false - -# If true, Eterm will start iconified. - iconic false - -# If true, Eterm will jump to the bottom of the window when something is echoed -# to the terminal, either by program output or user input. - home_on_output 0 - home_on_input 1 - -# If true, Eterm will put the scrollbar on the right of the window (default is left). - scrollbar_right true - -# If true, the scrollbar will have no trough. - scrollbar_floating false - -# If true, Eterm will run with no window borders. - borderless false - - select_line true - - end toggles - - begin keyboard - -# Use the supplied keysym to reduce/enlarge the font - smallfont_key LessThan - bigfont_key GreaterThan - -# You can also associate a given keysym (0xff00 - 0xffff) with a string -# keysym 0xffff "\r\n\e\007\t" - -# uncomment these two lines if your home and end keys are having problems -# keysym 0xff50 "\eOH" -# keysym 0xff57 "\eOF" - keysym 0xff08 "^?" - keysym 0xffff "\e[3\~" - -# Greek keyboard mode. First the word "greek", then its boolean -# state, then its mode (either "iso" or "ibm"). -# greek off iso - end keyboard - - begin misc - -# The command to which to pipe print requests (printscreen) -# print_pipe "lpr" - -# The number of lines in the scrollback buffer. More lines, more memory needed. - save_lines 1000 - -# The characters to use as word delimiters for double-click selection - cut_chars "\t\\\`\\\"\'&() *,;<=>?@[]{|}" - -# Defines the width of the border between the terminal window and the client window. -# (Default is 5). - border_width 5 - -# Value to use for $TERM - term_name xterm - -# Program to exec (intended for use with themes) -# exec bash - - border_width 0 - -end misc - diff --git a/putty-defaults b/putty-defaults new file mode 100644 index 0000000..5c4a630 --- /dev/null +++ b/putty-defaults @@ -0,0 +1,184 @@ +Present=1 +HostName= +LogFileName=putty.log +LogType=0 +LogFileClash=-1 +LogFlush=1 +SSHLogOmitPasswords=1 +SSHLogOmitData=0 +Protocol=raw +PortNumber=0 +CloseOnExit=2 +WarnOnClose=1 +PingInterval=0 +PingIntervalSecs=0 +TCPNoDelay=1 +TCPKeepalives=0 +TerminalType=xterm +TerminalSpeed=38400,38400 +TerminalModes=INTR=A,QUIT=A,ERASE=A,KILL=A,EOF=A,EOL=A,EOL2=A,START=A,STOP=A,SUSP=A,DSUSP=A,REPRINT=A,WERASE=A,LNEXT=A,FLUSH=A,SWTCH=A,STATUS=A,DISCARD=A,IGNPAR=A,PARMRK=A,INPCK=A,ISTRIP=A,INLCR=A,IGNCR=A,ICRNL=A,IUCLC=A,IXON=A,IXANY=A,IXOFF=A,IMAXBEL=A,ISIG=A,ICANON=A,XCASE=A,ECHO=A,ECHOE=A,ECHOK=A,ECHONL=A,NOFLSH=A,TOSTOP=A,IEXTEN=A,ECHOCTL=A,ECHOKE=A,PENDIN=A,OPOST=A,OLCUC=A,ONLCR=A,OCRNL=A,ONOCR=A,ONLRET=A,CS7=A,CS8=A,PARENB=A,PARODD=A, +AddressFamily=0 +ProxyExcludeList= +ProxyDNS=1 +ProxyLocalhost=0 +ProxyMethod=0 +ProxyHost=proxy +ProxyPort=80 +ProxyUsername= +ProxyPassword= +ProxyTelnetCommand=connect %host %port\n +Environment= +UserName= +LocalUserName= +NoPTY=0 +Compression=0 +TryAgent=1 +AgentFwd=0 +ChangeUsername=0 +Cipher=aes,blowfish,3des,WARN,des,arcfour +KEX=dh-gex-sha1,dh-group14-sha1,dh-group1-sha1,WARN +RekeyTime=60 +RekeyBytes=1G +SshNoAuth=0 +AuthTIS=0 +AuthKI=1 +SshNoShell=0 +SshProt=2 +SSH2DES=0 +PublicKeyFile= +RemoteCommand= +RFCEnviron=0 +PassiveTelnet=0 +BackspaceIsDelete=1 +RXVTHomeEnd=0 +LinuxFunctionKeys=0 +NoApplicationKeys=0 +NoApplicationCursors=0 +NoMouseReporting=0 +NoRemoteResize=0 +NoAltScreen=0 +NoRemoteWinTitle=0 +RemoteQTitleAction=1 +NoDBackspace=0 +NoRemoteCharset=0 +ApplicationCursorKeys=0 +ApplicationKeypad=0 +NetHackKeypad=0 +AltF4=1 +AltSpace=0 +AltOnly=0 +ComposeKey=0 +CtrlAltKeys=1 +TelnetKey=0 +TelnetRet=1 +LocalEcho=2 +LocalEdit=2 +Answerback=PuTTY +AlwaysOnTop=0 +FullScreenOnAltEnter=0 +HideMousePtr=0 +SunkenEdge=0 +WindowBorder=0 +CurType=0 +BlinkCur=0 +Beep=1 +BeepInd=0 +BellWaveFile= +BellOverload=1 +BellOverloadN=5 +BellOverloadT=2000 +BellOverloadS=5000 +ScrollbackLines=1000 +DECOriginMode=0 +AutoWrapMode=1 +LFImpliesCR=0 +DisableArabicShaping=0 +DisableBidi=0 +WinNameAlways=0 +WinTitle= +TermWidth=80 +TermHeight=75 +Font=fixed +FontQuality=0 +FontVTMode=4 +UseSystemColours=0 +TryPalette=0 +ANSIColour=1 +Xterm256Colour=1 +BoldAsColour=0 +Colour0=255,255,255 +Colour1=255,255,255 +Colour2=0,0,0 +Colour3=0,0,0 +Colour4=255,255,255 +Colour5=255,0,0 +Colour6=0,0,0 +Colour7=68,68,68 +Colour8=255,68,68 +Colour9=255,68,68 +Colour10=68,255,68 +Colour11=68,255,68 +Colour12=255,255,68 +Colour13=255,255,68 +Colour14=0,0,204 +Colour15=68,102,255 +Colour16=255,68,255 +Colour17=255,68,255 +Colour18=0,170,170 +Colour19=68,255,255 +Colour20=221,221,221 +Colour21=255,255,255 +RawCNP=0 +PasteRTF=0 +MouseIsXterm=0 +RectSelect=0 +MouseOverride=1 +Wordness0=0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +Wordness32=0,1,2,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1 +Wordness64=1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2 +Wordness96=1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1 +Wordness128=1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +Wordness160=1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +Wordness192=2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2 +Wordness224=2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2 +LineCodePage=Use font encoding +CJKAmbigWide=0 +UTF8Override=1 +Printer= +CapsLockCyr=0 +ScrollBar=1 +ScrollBarFullScreen=0 +ScrollOnKey=0 +ScrollOnDisp=1 +EraseToScrollback=1 +LockSize=0 +BCE=1 +BlinkText=0 +X11Forward=0 +X11Display= +X11AuthType=1 +LocalPortAcceptAll=0 +RemotePortAcceptAll=0 +PortForwardings= +BugIgnore1=0 +BugPlainPW1=0 +BugRSA1=0 +BugHMAC2=0 +BugDeriveKey2=0 +BugRSAPad2=0 +BugPKSessID2=0 +BugRekey2=0 +StampUtmp=0 +LoginShell=0 +ScrollbarOnLeft=0 +BoldFont= +WideFont= +WideBoldFont= +ShadowBold=0 +ShadowBoldOffset=1 +SerialLine=/dev/ttyS0 +SerialSpeed=9600 +SerialDataBits=8 +SerialStopHalfbits=2 +SerialParity=0 +SerialFlowControl=1 diff --git a/setup b/setup index b9b4276..323a164 100755 --- a/setup +++ b/setup @@ -154,7 +154,7 @@ dotfiles=" dircolors colordiffrc screenrc cvsrc indent.pro" [ "$xstuff" ] && dotfiles="$dotfiles xinitrc xsession Xdefaults vncrc vncsession - eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg + putty-defaults:.putty/sessions/Default%20Settings e-keybindings.cfg:.enlightenment/keybindings.cfg evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg" diff --git a/xinitrc b/xinitrc index 4e52f4b..e2674c6 100755 --- a/xinitrc +++ b/xinitrc @@ -44,10 +44,10 @@ emacs="noip emacs" # --- Xterm window measurements --- # -# Window width is 504 (fixed). +# Window width is 503 (fixed). # Vertical line pixel height = 13; misc overhead = 23 -xterm="Eterm" xgeom=-geometry +xterm="pterm" xgeom=geometry # --- GNOME stuff measurements --- # @@ -64,7 +64,7 @@ declare -i xbound="XWIDTH - 113" # and the toolbar, so we add on some rows which are later mysteriously # subtracted. -declare -i ecols="(xbound - 504 - 34)/492" +declare -i ecols="(xbound - 503 - 34)/492" if (( ecols < 2 && xbound > 492 * 2 + 34 )); then ecols=2 elif (( ecols < 1 )); then @@ -87,7 +87,7 @@ $emacs -geometry $((ecols * 82 - 2))x$(((XHEIGHT - 52)/13))+0+0& declare -i n=0 pgx=0 l h y ht declare -i hstd="35 * 13 + 23" hmin="25 * 13 + 23" while true; do - if ((x + 504 > xbound)); then + if ((x + 503 > xbound)); then if ((n >= 3)); then break; fi x="pgx + XWIDTH" pgx="pgx + XWIDTH" xbound="xbound + XWIDTH" fi @@ -104,7 +104,7 @@ while true; do $xterm -$xgeom 80x25+$x+$y& n="n + 1" fi - x="x + 504" + x="x + 503" done # --- Wait for the world to end --- -- 2.11.0