diff --git a/src/ChangeLog b/src/ChangeLog index bba48159f..7e0711712 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2007-10-15 Pavel Tsekov + + * myslang.h [HAS_ACS_AS_PCCHARS]: Remove all code ifdef-ed + HAS_ACS_AS_PCCHARS - it's unused. + * help.c [HAS_ACS_AS_PCCHARS]: Likewise. + * layout.c (init_curses) [HAS_ACS_AS_PCCHARS]: Remove redundant code. + 2007-09-24 David Sterba * widget.h: Define new mode for listbox insertion. diff --git a/src/help.c b/src/help.c index a01ff482f..3261cbbb3 100644 --- a/src/help.c +++ b/src/help.c @@ -98,37 +98,6 @@ static int inside_link_area = 0; static cb_ret_t help_callback (struct Dlg_head *h, dlg_msg_t, int parm); -#ifdef HAS_ACS_AS_PCCHARS -static const struct { - int acscode; - int pccode; -} acs2pc_table [] = { - { 'q', 0xC4 }, - { 'x', 0xB3 }, - { 'l', 0xDA }, - { 'k', 0xBF }, - { 'm', 0xC0 }, - { 'j', 0xD9 }, - { 'a', 0xB0 }, - { 'u', 0xB4 }, - { 't', 0xC3 }, - { 'w', 0xC2 }, - { 'v', 0xC1 }, - { 'n', 0xC5 }, - { 0, 0 } }; - -static int acs2pc (int acscode) -{ - int i; - - for (i = 0; acs2pc_table[i].acscode != 0; i++) - if (acscode == acs2pc_table[i].acscode) { - return acs2pc_table[i].pccode; - } - return 0; -} -#endif - /* returns the position where text was found in the start buffer */ /* or 0 if not found */ static const char * diff --git a/src/layout.c b/src/layout.c index 6c54e341a..9f3616f7a 100644 --- a/src/layout.c +++ b/src/layout.c @@ -552,10 +552,6 @@ static void check_split (void) void init_curses () { -#ifndef HAS_ACS_AS_PCCHARS - if (force_ugly_line_drawing) - SLtt_Has_Alt_Charset = 0; -#endif SLsmg_init_smg (); do_enter_ca_mode (); init_colors (); diff --git a/src/myslang.h b/src/myslang.h index 60d1c6f44..17057e70b 100644 --- a/src/myslang.h +++ b/src/myslang.h @@ -27,17 +27,10 @@ enum { #define ACS_URCORNER SLSMG_URCORN_CHAR #define ACS_LRCORNER SLSMG_LRCORN_CHAR -#ifdef HAS_ACS_AS_PCCHARS -# define ACS_LTEE 0xC3 -# define acs() ; -# define noacs() ; -# define baudrate() 19200 -#else -# define ACS_LTEE 't' -# define acs() SLsmg_set_char_set(1) -# define noacs() SLsmg_set_char_set (0) -# define baudrate() SLang_TT_Baud_Rate -#endif +#define ACS_LTEE 't' +#define acs() SLsmg_set_char_set(1) +#define noacs() SLsmg_set_char_set (0) +#define baudrate() SLang_TT_Baud_Rate enum { COLOR_BLACK, COLOR_RED, COLOR_GREEN, COLOR_YELLOW, COLOR_BLUE,