diff --git a/vt/pdcdisp.c b/vt/pdcdisp.c index 6b538130..3231be43 100644 --- a/vt/pdcdisp.c +++ b/vt/pdcdisp.c @@ -109,27 +109,27 @@ void PDC_gotoyx(int y, int x) char tbuff[50]; #ifdef HAVE_SNPRINTF - snprintf( tbuff, sizeof( tbuff), "\033[%d;%dH", y + 1, x + 1); + snprintf( tbuff, sizeof( tbuff), CSI "%d;%dH", y + 1, x + 1); #else - sprintf( tbuff, "\033[%d;%dH", y + 1, x + 1); + sprintf( tbuff, CSI "%d;%dH", y + 1, x + 1); #endif PDC_puts_to_stdout( tbuff); PDC_doupdate( ); } -#define RESET_ATTRS "\033[0m" -#define ITALIC_ON "\033[3m" -#define ITALIC_OFF "\033[23m" -#define UNDERLINE_ON "\033[4m" -#define UNDERLINE_OFF "\033[24m" -#define BLINK_ON "\033[5m" -#define BLINK_OFF "\033[25m" -#define BOLD_ON "\033[1m" -#define BOLD_OFF "\033[22m" -#define DIM_ON "\033[2m" -#define DIM_OFF "\033[22m" -#define REVERSE_ON "\033[7m" -#define STRIKEOUT_ON "\033[9m" +#define RESET_ATTRS CSI "0m" +#define ITALIC_ON CSI "3m" +#define ITALIC_OFF CSI "23m" +#define UNDERLINE_ON CSI "4m" +#define UNDERLINE_OFF CSI "24m" +#define BLINK_ON CSI "5m" +#define BLINK_OFF CSI "25m" +#define BOLD_ON CSI "1m" +#define BOLD_OFF CSI "22m" +#define DIM_ON CSI "2m" +#define DIM_OFF CSI "22m" +#define REVERSE_ON CSI "7m" +#define STRIKEOUT_ON CSI "9m" /* see 'addch.c' for an explanation of how combining chars are handled. */ @@ -196,14 +196,14 @@ static void reset_color( char *obuff, const chtype ch) if( bg != prev_bg) { if( bg == (PACKED_RGB)-1) /* default background */ - strcpy( obuff, "\033[49m"); + strcpy( obuff, CSI "49m"); else if( !bg) - strcpy( obuff, "\033[40m"); + strcpy( obuff, CSI "40m"); else if( COLORS == 16) - sprintf( obuff, "\033[4%dm", get_sixteen_color_idx( bg)); + sprintf( obuff, CSI "4%dm", get_sixteen_color_idx( bg)); else { - strcpy( obuff, "\033[48;"); + strcpy( obuff, CSI "48;"); color_string( obuff + 5, bg); } prev_bg = bg; @@ -213,12 +213,12 @@ static void reset_color( char *obuff, const chtype ch) { obuff += strlen( obuff); if( fg == (PACKED_RGB)-1) /* default foreground */ - strcpy( obuff, "\033[39m"); + strcpy( obuff, CSI "39m"); else if( COLORS == 16) - sprintf( obuff, "\033[3%dm", get_sixteen_color_idx( fg)); + sprintf( obuff, CSI "3%dm", get_sixteen_color_idx( fg)); else { - strcpy( obuff, "\033[38;"); + strcpy( obuff, CSI "38;"); color_string( obuff + 5, fg); } prev_fg = fg; diff --git a/vt/pdcsetsc.c b/vt/pdcsetsc.c index d6e72a84..6b5cd6ea 100644 --- a/vt/pdcsetsc.c +++ b/vt/pdcsetsc.c @@ -37,16 +37,16 @@ pdcsetsc **man-end****************************************************************/ - /* #define BLINKING_CURSOR "\033[?12h" */ -#define BLINKING_BLOCK "\033[1 q" -#define STEADY_BLOCK "\033[2 q" -#define BLINKING_UNDERLINE "\033[3 q" -#define STEADY_UNDERLINE "\033[4 q" + /* #define BLINKING_CURSOR CSI "?12h" */ +#define BLINKING_BLOCK CSI "1 q" +#define STEADY_BLOCK CSI "2 q" +#define BLINKING_UNDERLINE CSI "3 q" +#define STEADY_UNDERLINE CSI "4 q" /* "bar" = "vertical line". xterm only. */ -#define BLINKING_BAR "\033[5 q" -#define STEADY_BAR "\033[6 q" -#define CURSOR_ON "\033[?25h" -#define CURSOR_OFF "\033[?25l" +#define BLINKING_BAR CSI "5 q" +#define STEADY_BAR CSI "6 q" +#define CURSOR_ON CSI "?25h" +#define CURSOR_OFF CSI "?25l" int PDC_curs_set( int visibility) { @@ -148,7 +148,7 @@ void PDC_set_title( const char *title) #if !defined( DOS) && !defined( LINUX_FRAMEBUFFER_PORT) if( !PDC_is_ansi) { - PDC_puts_to_stdout( "\033]2;"); + PDC_puts_to_stdout( OSC "2;"); PDC_puts_to_stdout( title); PDC_puts_to_stdout( "\a"); }