From: Tomasz Pala Date: Sun, 7 Sep 2003 21:44:45 +0000 (+0000) Subject: - added ctrl-{home,end,insert,delete,up,down,left,right,page_up,page_down}, X-Git-Tag: auto/ac/XFree86-4_3_99_13-0_2~31 X-Git-Url: http://git.pld-linux.org/?p=packages%2FXFree86.git;a=commitdiff_plain;h=040522970011f73e53f3a79eb359d00966d64747 - added ctrl-{home,end,insert,delete,up,down,left,right,page_up,page_down}, - added shift-{home,end,insert,delete,up,down,left,right}, - commented out Meta-? and Meta-! - depends on keyboard layout, - typo, - file is not a place for changelog. Changed files: XFree86-XTerm.ad.patch -> 1.7 XTerm.ad-pl -> 1.9 --- diff --git a/XFree86-XTerm.ad.patch b/XFree86-XTerm.ad.patch index 21944ec..0168542 100644 --- a/XFree86-XTerm.ad.patch +++ b/XFree86-XTerm.ad.patch @@ -12,13 +12,13 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad ! Uncomment this to use color for the bold attribute !*VT100*colorBDMode: on -@@ -142,3 +142,150 @@ +@@ -142,3 +142,166 @@ *VT100*color15: white *VT100*colorUL: yellow *VT100*colorBD: white + +! This file causes when loaded using xrdb correct behaviour of xterm -+! is you are using enclosed xterm.tcap and xterm.ti. ++! if you are using enclosed xterm.tcap and xterm.ti. +! Some keys would never normally work if they weren't here (like Alt +! something), some key definitions differ from one termcap/terminfo +! to the other. You may delete any line if you find out that mc @@ -63,34 +63,54 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad + KP_Equal: string(=)\n\ + KP_Multiply: string(*)\n\ + KP_Subtract: string(-)\n\ ++ ShiftKP_Home: scroll-back(100,page)\n\ ++ ShiftKP_End: scroll-forw(100,page)\n\ ++ KP_Home: string(0x1b) string("[1~")\n\ ++ KP_End: string(0x1b) string("[4~")\n\ + ShiftPrior:scroll-back(1,page)\n\ + ShiftNext:scroll-forw(1,page)\n\ + F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\ + F18: insert-selection(PRIMARY, CLIPBOARD)\n\ + F27: scroll-back(100,page)\n\ + R13: scroll-forw(100,page)\n\ -+ KP_Home: string(0x1b) string("[1~")\n\ -+ KP_End: string(0x1b) string("[4~")\n\ ++ CtrlHome: string(0x1b) string("[1;5H")\n\ ++ ShiftHome: string(0x1b) string("[1;2H")\n\ + ~MetaHome: string(0x1b) string("[1~")\n\ + MetaHome: string(0x1b) string(0x1b) string("[1~")\n\ ++ CtrlEnd: string(0x1b) string("[1;5F")\n\ ++ ShiftEnd: string(0x1b) string("[1;2F")\n\ + ~MetaEnd: string(0x1b) string("[4~")\n\ + MetaEnd: string(0x1b) string(0x1b) string("[4~")\n\ ++ CtrlInsert: string(0x1b) string("[2;5~")\n\ ++ ShiftInsert: string(0x1b) string("[2;2~")\n\ + ~MetaInsert: string(0x1b) string("[2~")\n\ + MetaInsert: string(0x1b) string(0x1b) string("[2~")\n\ ++ CtrlDelete: string(0x1b) string("[3;5~")\n\ ++ ShiftDelete: string(0x1b) string("[3;2~")\n\ + ~MetaDelete: string(0x1b) string("[3~")\n\ + MetaDelete: string(0x1b) string(0x1b) string("[3~")\n\ ++ CtrlPage_Up: string(0x1b) string("[5;5~")\n\ + ~MetaPage_Up: string(0x1b) string("[5~")\n\ + MetaPage_Up: string(0x1b) string(0x1b) string("[5~")\n\ ++ CtrlPage_Down: string(0x1b) string("[6;5~")\n\ + ~MetaPage_Down: string(0x1b) string("[6~")\n\ + MetaPage_Down: string(0x1b) string(0x1b) string("[6~")\n\ + ~MetaBackSpace: string(0x08)\n\ + MetaBackSpace: string(0x1b) string(0x08)\n\ ++ CtrlUp: string(0x1b) string("[1;5A")\n\ ++ ShiftUp: string(0x1b) string("O2A")\n\ + ~MetaUp: string(0x1b) string("OA")\n\ + MetaUp: string(0x1b) string(0x1b) string("OA")\n\ ++ CtrlDown: string(0x1b) string("[1;5B")\n\ ++ ShiftDown: string(0x1b) string("O2B")\n\ + ~MetaDown: string(0x1b) string("OB")\n\ + MetaDown: string(0x1b) string(0x1b) string("OB")\n\ ++ CtrlLeft: string(0x1b) string("[1;5D")\n\ ++ ShiftLeft: string(0x1b) string("O2D")\n\ + ~MetaLeft: string(0x1b) string("OD")\n\ + MetaLeft: string(0x1b) string(0x1b) string("OD")\n\ ++ CtrlRight: string(0x1b) string("[1;5C")\n\ ++ ShiftRight: string(0x1b) string("O2C")\n\ + ~MetaRight: string(0x1b) string("OC")\n\ + MetaRight: string(0x1b) string(0x1b) string("OC")\n\ + ~MetaReturn: string(0x0d)\n\ @@ -117,10 +137,6 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad + F18: string(0x1b) string("[32~")\n\ + F19: string(0x1b) string("[33~")\n\ + F20: string(0x1b) string("[34~")\n\ -+ ShiftHome: scroll-back(100,page)\n\ -+ ShiftEnd: scroll-forw(100,page)\n\ -+ ShiftKP_Home: scroll-back(100,page)\n\ -+ ShiftKP_End: scroll-forw(100,page)\n\ + sF1: string(0x1b) string("[23~")\n\ + sF2: string(0x1b) string("[24~")\n\ + sF3: string(0x1b) string("[25~")\n\ @@ -160,6 +176,6 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad + aw: string(0x1b) string("w")\n\ + ax: string(0x1b) string("x")\n\ + ay: string(0x1b) string("y")\n\ -+ az: string(0x1b) string("z")\n\ -+ a s/: string(0x1b) string("?")\n\ -+ a s1: string(0x1b) string("!") ++ az: string(0x1b) string("z") ++! a s/: string(0x1b) string("?")\n\ ++! a s1: string(0x1b) string("!") diff --git a/XTerm.ad-pl b/XTerm.ad-pl index 9d15575..6e71913 100644 --- a/XTerm.ad-pl +++ b/XTerm.ad-pl @@ -1,16 +1,3 @@ -! $autor: Tomasz K³oczko -! $Ver: 0.03 -! - 09.04.98 -! Pierwsza w miarê kompletna wersja -! - 04.02.99 -! Poprawione dzia³anie klawiszy Home, End -! - 28.10.2001 -! Poprawione BackSpace (^H zamiast \177) -! - 16.11.2002 (GoTaR ) -! Poprawione b³êdy, dodane meta-? i meta-! -! - 6.09.2003 (GoTaR ) -! Usuniête duplikaty, dodane meta-H - NXTerm.JoinSession: False *SimpleMenu*BackingStore: NotUseful *SimpleMenu*menuLabel.font: -misc-*-*-*-*-*-15-*-*-*-*-*-*-2 @@ -135,7 +122,7 @@ NXTerm.JoinSession: False *tek4014*fontSmall: 6x10 ! This file causes when loaded using xrdb correct behaviour of xterm -! is you are using enclosed xterm.tcap and xterm.ti. +! if you are using enclosed xterm.tcap and xterm.ti. ! Some keys would never normally work if they weren't here (like Alt ! something), some key definitions differ from one termcap/terminfo ! to the other. You may delete any line if you find out that mc @@ -180,34 +167,54 @@ NXTerm.JoinSession: False KP_Equal: string(=)\n\ KP_Multiply: string(*)\n\ KP_Subtract: string(-)\n\ + ShiftKP_Home: scroll-back(100,page)\n\ + ShiftKP_End: scroll-forw(100,page)\n\ + KP_Home: string(0x1b) string("[1~")\n\ + KP_End: string(0x1b) string("[4~")\n\ ShiftPrior:scroll-back(1,page)\n\ ShiftNext:scroll-forw(1,page)\n\ F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\ F18: insert-selection(PRIMARY, CLIPBOARD)\n\ F27: scroll-back(100,page)\n\ R13: scroll-forw(100,page)\n\ - KP_Home: string(0x1b) string("[1~")\n\ - KP_End: string(0x1b) string("[4~")\n\ + CtrlHome: string(0x1b) string("[1;5H")\n\ + ShiftHome: string(0x1b) string("[1;2H")\n\ ~MetaHome: string(0x1b) string("[1~")\n\ MetaHome: string(0x1b) string(0x1b) string("[1~")\n\ + CtrlEnd: string(0x1b) string("[1;5F")\n\ + ShiftEnd: string(0x1b) string("[1;2F")\n\ ~MetaEnd: string(0x1b) string("[4~")\n\ MetaEnd: string(0x1b) string(0x1b) string("[4~")\n\ + CtrlInsert: string(0x1b) string("[2;5~")\n\ + ShiftInsert: string(0x1b) string("[2;2~")\n\ ~MetaInsert: string(0x1b) string("[2~")\n\ MetaInsert: string(0x1b) string(0x1b) string("[2~")\n\ + CtrlDelete: string(0x1b) string("[3;5~")\n\ + ShiftDelete: string(0x1b) string("[3;2~")\n\ ~MetaDelete: string(0x1b) string("[3~")\n\ MetaDelete: string(0x1b) string(0x1b) string("[3~")\n\ + CtrlPage_Up: string(0x1b) string("[5;5~")\n\ ~MetaPage_Up: string(0x1b) string("[5~")\n\ MetaPage_Up: string(0x1b) string(0x1b) string("[5~")\n\ + CtrlPage_Down: string(0x1b) string("[6;5~")\n\ ~MetaPage_Down: string(0x1b) string("[6~")\n\ MetaPage_Down: string(0x1b) string(0x1b) string("[6~")\n\ ~MetaBackSpace: string(0x08)\n\ MetaBackSpace: string(0x1b) string(0x08)\n\ + CtrlUp: string(0x1b) string("[1;5A")\n\ + ShiftUp: string(0x1b) string("O2A")\n\ ~MetaUp: string(0x1b) string("OA")\n\ MetaUp: string(0x1b) string(0x1b) string("OA")\n\ + CtrlDown: string(0x1b) string("[1;5B")\n\ + ShiftDown: string(0x1b) string("O2B")\n\ ~MetaDown: string(0x1b) string("OB")\n\ MetaDown: string(0x1b) string(0x1b) string("OB")\n\ + CtrlLeft: string(0x1b) string("[1;5D")\n\ + ShiftLeft: string(0x1b) string("O2D")\n\ ~MetaLeft: string(0x1b) string("OD")\n\ MetaLeft: string(0x1b) string(0x1b) string("OD")\n\ + CtrlRight: string(0x1b) string("[1;5C")\n\ + ShiftRight: string(0x1b) string("O2C")\n\ ~MetaRight: string(0x1b) string("OC")\n\ MetaRight: string(0x1b) string(0x1b) string("OC")\n\ ~MetaReturn: string(0x0d)\n\ @@ -234,10 +241,6 @@ NXTerm.JoinSession: False F18: string(0x1b) string("[32~")\n\ F19: string(0x1b) string("[33~")\n\ F20: string(0x1b) string("[34~")\n\ - ShiftHome: scroll-back(100,page)\n\ - ShiftEnd: scroll-forw(100,page)\n\ - ShiftKP_Home: scroll-back(100,page)\n\ - ShiftKP_End: scroll-forw(100,page)\n\ sF1: string(0x1b) string("[23~")\n\ sF2: string(0x1b) string("[24~")\n\ sF3: string(0x1b) string("[25~")\n\ @@ -277,6 +280,6 @@ NXTerm.JoinSession: False aw: string(0x1b) string("w")\n\ ax: string(0x1b) string("x")\n\ ay: string(0x1b) string("y")\n\ - az: string(0x1b) string("z")\n\ - a s/: string(0x1b) string("?")\n\ - a s1: string(0x1b) string("!") + az: string(0x1b) string("z") +! a s/: string(0x1b) string("?")\n\ +! a s1: string(0x1b) string("!")