diff --git a/ChangeLog b/ChangeLog index f60c0c78..9ff2d6c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2017-07-15 Markus Gans - * Keyboarb functions are now in a separate class + * Keyboard functions are now in a separate class + * Fix Parameter passing in term::init_OptiAttr 2017-07-08 Markus Gans * Extension of the unit test of FOptiMove diff --git a/rxvt-cygwin-native.raw b/rxvt-cygwin-native.raw new file mode 100644 index 00000000..21c6525b --- /dev/null +++ b/rxvt-cygwin-native.raw @@ -0,0 +1,5 @@ +[?1001s[?1000h[?1002h[?1015h[?1006h=77[?47h(B)0]P0000000]P42121b1]P2177717]P64949e3]P1b91919]P5b117b1]P3e7861e]P7bbbbbb]P84f4f4f]Pc7fa3eb]Pa5dea5b]Pe61bef7]P9ed4343]Pde8acfe]Pbfae766]Pffefefe[?25l File Edit View  Options  Window Help +  -  The FINAL CUT 0.4.0 (C) 2018 by Markus Gans   lqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk x Input  entry  l Items qqqqqk x x x 1 placehol ^ x x  SIN    List items x 2 placehol   x x  =  Tagged: 0 x 3 placehol   x x  COS    Sum: 99 x 4 placehol   x x x 5 placehol   x x x 6 placehol   x x l Button qqqqk  Get input  x 7 placehol   x x x( ) Enable x x 8 placehol   x x x(`) Disable x x 9 placehol   x x mqqqqqqqqqqqqj   Test  x 10 placeho   x x l Options qqqk x 11 placeho   x x x[ ] Bitmode x x 12 placeho   x x x[x] 8-Bit x  Quit  x 13 placeho   x x mqqqqqqqqqqqqj x 14 placeho   x x x 15 placeho   x x x 16 placeho   x x x 17 placeho   x x x 18 placeho   x x x 19 placeho   x x x 20 placeho   x x x 21 placeho   x x x 22 placeho   x x x 23 placeho   x x x 24 placeho   x x x 25 placeho   x x x 26 placeho   x x x 27 placeho   x x x 28 placeho   x x x 29 placeho   x x x 30 placeho   x x x 31 placeho   x x x 32 placeho   x x x 33 placeho   x x x 34 placeho   x x x 35 placeho   x x x 36 placeho   x x x 37 placeho   x x x 38 placeho   x x x 39 placeho   x x x 40 placeho   x x x 41 placeho   x x x 42 placeho   x x x 43 placeho   x x x 44 placeho   x x x 45 placeho v x x m<  >j x mqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj  + F1-Aboutx F2-Viewx F3-Quit x Take text from input field Get input   Quit  File Edit View  Options  Window Help +  -  The FINAL CUT 0.4.0 (C) 2018 by Markus Gans  + x l Options qq -  Quit lace x x[ ] Bitmodelqqqqqqqqqqqqqqqqqqqqqqqqqqqklace x x[x] 8-Bit x xlace x mqqqqqqqqqqqx Do you really want xlace x x to quit the program ? xlace x x xlace x x xlace x x  Yes   No  xlace x x xlace x mqqqqqqqqqqqqqqqqqqqqqqqqqqqjlace  x 21 place  F1-Aboutx F2-Viewx F3-Quit x Exit the program  Yes [?25h]P0000000]P40000a9]P200a900]P60054a9]P1a90000]P5a900a9]P3a9a900]P7a9a9a9]P8545454]Pc5454fe]Pa54fe54]Pe54fefe]P9fe5454]Pdfe54fe]Pbfefe54]Pffefefe[?1006l[?1015l[?1002l[?1000l[?1001r[?47l88> \ No newline at end of file diff --git a/rxvt-cygwin-native2.raw b/rxvt-cygwin-native2.raw new file mode 100644 index 00000000..d738c7a3 --- /dev/null +++ b/rxvt-cygwin-native2.raw @@ -0,0 +1,4 @@ +[?1001s[?1000h[?1002h[?1015h[?1006h=77[?47h(B)0]P0000000]P42121b1]P2177717]P64949e3]P1b91919]P5b117b1]P3e7861e]P7bbbbbb]P84f4f4f]Pc7fa3eb]Pa5dea5b]Pe61bef7]P9ed4343]Pde8acfe]Pbfae766]Pffefefe[?25l File Edit View  Options  Window Help +  -  The FINAL CUT 0.4.0 (C) 2018 by Markus Gans   lqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqk x Input  entry  l Items qqqqqk x x x 1 placehol ^ x x  SIN    List items x 2 placehol   x x  =  Tagged: 0 x 3 placehol   x x  COS    Sum: 99 x 4 placehol   x x x 5 placehol   x x x 6 placehol   x x l Button qqqqk  Get input  x 7 placehol   x x x( ) Enable x x 8 placehol   x x x(`) Disable x x 9 placehol   x x mqqqqqqqqqqqqj   Test  x 10 placeho   x x l Options qqqk x 11 placeho   x x x[ ] Bitmode x x 12 placeho   x x x[x] 8-Bit x  Quit  x 13 placeho   x x mqqqqqqqqqqqqj x 14 placeho   x x x 15 placeho   x x x 16 placeho   x x x 17 placeho   x x x 18 placeho   x x x 19 placeho   x x x 20 placeho   x x x 21 placeho   x x x 22 placeho   x x x 23 placeho   x x x 24 placeho   x x x 25 placeho   x x x 26 placeho   x x x 27 placeho   x x x 28 placeho   x x x 29 placeho   x x x 30 placeho   x x x 31 placeho   x x x 32 placeho   x x x 33 placeho   x x x 34 placeho   x x x 35 placeho   x x x 36 placeho   x x x 37 placeho   x x x 38 placeho   x x x 39 placeho   x x x 40 placeho   x x x 41 placeho   x x x 42 placeho   x x x 43 placeho   x x x 44 placeho   x x x 45 placeho v x x m<  >j x mqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqj  + F1-Aboutx F2-Viewx F3-Quit x Take text from input field Get input   Quit  File Edit View  Options  Window Help +  -  The FINAL CUT 0.4.0 (C) 2018 by Markus Gans  lqqqqqqqqqqqqj   Test  Options q -  Quit plac[ ] Bitmodlqqqqqqqqqqqqqqqqqqqqqqqqqqqkplac[x] 8-Bit x xplacqqqqqqqqqqx Do you really want xplac x to quit the program ? xplac x xplac x xplac x  Yes   No  xplac x xplac mqqqqqqqqqqqqqqqqqqqqqqqqqqqjplac  x 21 plac  F1-Aboutx F2-Viewx F3-Quit x Exit the program  Yes [?25h]P0000000]P40000a9]P200a900]P60054a9]P1a90000]P5a900a9]P3a9a900]P7a9a9a9]P8545454]Pc5454fe]Pa54fe54]Pe54fefe]P9fe5454]Pdfe54fe]Pbfefe54]Pffefefe[?1006l[?1015l[?1002l[?1000l[?1001r[?47l88> \ No newline at end of file diff --git a/src/fterm.cpp b/src/fterm.cpp index 4051c6e3..699d4e8e 100644 --- a/src/fterm.cpp +++ b/src/fterm.cpp @@ -1438,7 +1438,7 @@ void FTerm::init_OptiAttr() TCAP(fc::t_set_attributes), TCAP(fc::t_exit_attribute_mode), TCAP(fc::t_enter_alt_charset_mode), - TCAP(fc::t_enter_alt_charset_mode), + TCAP(fc::t_exit_alt_charset_mode), TCAP(fc::t_enter_pc_charset_mode), TCAP(fc::t_exit_pc_charset_mode), TCAP(fc::t_set_a_foreground), diff --git a/src/ftermcapquirks.cpp b/src/ftermcapquirks.cpp index bc028085..598d78cf 100644 --- a/src/ftermcapquirks.cpp +++ b/src/ftermcapquirks.cpp @@ -201,7 +201,7 @@ void FTermcapQuirks::init_termcap_linux_quirks() // Set select graphic rendition attributes TCAP(fc::t_set_attributes) = \ C_STR(CSI "0" - "%?%p6%|%t;1%;" + "%?%p6%t;1%;" "%?%p1%p3%|%t;7%;" "%?%p4%t;5%;m" "%?%p9%t\016%e\017%;");