--- rxvt-unicode/src/init.C 2007/10/28 11:25:04 1.220 +++ rxvt-unicode/src/init.C 2008/01/04 17:57:28 1.238 @@ -12,9 +12,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 1999 D J Hawkey Jr - * - QNX support - * Copyright (c) 2003-2006 Marc Lehmann + * Copyright (c) 2003-2007 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -43,6 +41,8 @@ #include +#include + #ifdef HAVE_XSETLOCALE # define X_LOCALE # include @@ -156,9 +156,9 @@ "rgb:00/00/cd", // 4: blue (Blue3) "rgb:cd/00/cd", // 5: magenta (Magenta3) "rgb:00/cd/cd", // 6: cyan (Cyan3) -# ifdef XTERM_COLORS +# ifdef XTERM_COLORS "rgb:e5/e5/e5", // 7: white (Grey90) -# else +# else "rgb:fa/eb/d7", // 7: white (AntiqueWhite) # endif /* high-intensity colors */ @@ -252,7 +252,7 @@ #ifndef NO_CURSORCOLOR COLOR_CURSOR_BACKGROUND, COLOR_CURSOR_FOREGROUND, -#endif /* ! NO_CURSORCOLOR */ +#endif /* ! NO_CURSORCOLOR */ NULL, /* Color_pointer_fg */ NULL, /* Color_pointer_bg */ NULL, /* Color_border */ @@ -261,7 +261,7 @@ NULL, /* Color_IT */ NULL, /* Color_UL */ NULL, /* Color_RV */ -#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ +#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ #if ENABLE_FRILLS NULL, // Color_underline #endif @@ -271,7 +271,7 @@ #ifdef KEEP_SCROLLCOLOR COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, -#endif /* KEEP_SCROLLCOLOR */ +#endif /* KEEP_SCROLLCOLOR */ #if ENABLE_TRANSPARENCY NULL, #endif @@ -280,15 +280,10 @@ #endif }; -bool +void rxvt_term::init_vars () { - pix_colors = // - pix_colors_focused = new rxvt_color [TOTAL_COLORS]; -#ifdef OFF_FOCUS_FADING - pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; -#endif - + pix_colors = pix_colors_focused; MEvent.time = CurrentTime; MEvent.button = AnyButton; @@ -300,12 +295,10 @@ ext_bwidth = EXTERNALBORDERWIDTH; lineSpace = LINESPACE; saveLines = SAVELINES; - numpix_colors = TOTAL_COLORS; refresh_type = SLOW_REFRESH; oldcursor.row = oldcursor.col = -1; - last_bot = last_state = -1; set_option (Opt_scrollBar); set_option (Opt_scrollTtyOutput); @@ -316,8 +309,6 @@ set_option (Opt_pastableTabs); set_option (Opt_intensityStyles); set_option (Opt_iso14755_52); - - return true; } void @@ -418,6 +409,8 @@ #endif #ifdef HAVE_AFTERIMAGE + set_application_name ((char*)rs[Rs_name]); + set_output_threshold (OUTPUT_LEVEL_WARNING); asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); #endif free (r_argv); @@ -540,7 +533,7 @@ #ifndef NO_CURSORCOLOR color_aliases (Color_cursor); color_aliases (Color_cursor2); -#endif /* NO_CURSORCOLOR */ +#endif /* NO_CURSORCOLOR */ color_aliases (Color_pointer_fg); color_aliases (Color_pointer_bg); color_aliases (Color_border); @@ -548,7 +541,7 @@ color_aliases (Color_BD); color_aliases (Color_UL); color_aliases (Color_RV); -#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ +#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ if (!rs[Rs_color + Color_border]) rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; @@ -578,7 +571,7 @@ rs[Rs_display_name] = (const char *)val; if (val == NULL) -#endif /* DISPLAY_IS_IP */ +#endif /* DISPLAY_IS_IP */ val = XDisplayString (dpy); if (rs[Rs_display_name] == NULL) @@ -628,7 +621,7 @@ unsetenv ("LINES"); unsetenv ("COLUMNS"); unsetenv ("TERMCAP"); /* terminfo should be okay */ -#endif /* HAVE_UNSETENV */ +#endif /* HAVE_UNSETENV */ } /*----------------------------------------------------------------------*/ @@ -749,7 +742,7 @@ #ifdef OFF_FOCUS_FADING pix_colors = pix_colors_focused; #endif - + for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) { const char *name = rs[Rs_color + i]; @@ -837,7 +830,7 @@ )) alias_color (Color_topShadow, Color_White); } -#endif /* KEEP_SCROLLCOLOR */ +#endif /* KEEP_SCROLLCOLOR */ #ifdef OFF_FOCUS_FADING for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) @@ -855,13 +848,10 @@ int i = atoi (rs[Rs_color + idx]); if (i >= 8 && i <= 15) - { /* bright colors */ - i -= 8; - rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; - return; - } - - if (i >= 0 && i <= 7) /* normal colors */ + /* bright colors */ + rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; + else if (i >= 0 && i <= 7) + /* normal colors */ rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; } } @@ -1087,11 +1077,6 @@ /* vt cursor: Black-on-White is standard, but this is more popular */ TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); -#ifdef HAVE_SCROLLBARS - /* cursor scrollBar: Black-on-White */ - leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); -#endif - /* the vt window */ vt = XCreateSimpleWindow (dpy, top, window_vt_x, window_vt_y, @@ -1125,15 +1110,6 @@ drawable = new rxvt_drawable (this, vt); -#ifdef RXVT_SCROLLBAR - gcvalue.foreground = pix_colors[Color_topShadow]; - topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); - gcvalue.foreground = pix_colors[Color_bottomShadow]; - botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); - gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; - scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); -#endif - #ifdef OFF_FOCUS_FADING // initially we are in unfocused state if (rs[Rs_fade]) @@ -1148,16 +1124,16 @@ * GET TTY CURRENT STATE * * ------------------------------------------------------------------------- */ void -rxvt_get_ttymode (ttymode_t *tio, int erase) +rxvt_get_ttymode (struct termios *tio, int erase) { /* * standard System V termios interface */ - if (GET_TERMIOS (STDIN_FILENO, tio) < 0) + if (tcgetattr (STDIN_FILENO, tio) < 0) { // return error - use system defaults, // where possible, and zero elsewhere - memset (tio, 0, sizeof (ttymode_t)); + memset (tio, 0, sizeof (struct termios)); tio->c_cc[VINTR] = CINTR; tio->c_cc[VQUIT] = CQUIT; @@ -1231,7 +1207,6 @@ * Debugging */ #ifdef DEBUG_TTYMODE -#ifdef HAVE_TERMIOS_H /* c_iflag bits */ fprintf (stderr, "Input flags\n"); @@ -1304,8 +1279,7 @@ fprintf (stderr, "\n"); # undef FOO -# endif /* HAVE_TERMIOS_H */ -#endif /* DEBUG_TTYMODE */ +#endif /* DEBUG_TTYMODE */ } /*----------------------------------------------------------------------*/ @@ -1348,7 +1322,10 @@ er = -1; rxvt_get_ttymode (&tio, er); - SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ + /* init terminal attributes */ + cfsetospeed (&tio, BAUDRATE); + cfsetispeed (&tio, BAUDRATE); + tcsetattr (pty->tty, TCSANOW, &tio); pty->set_utf8_mode (enc_utf8); /* set initial window size */ @@ -1418,7 +1395,8 @@ char *login; if (option (Opt_console)) - { /* be virtual console, fail silently */ + { + /* be virtual console, fail silently */ #ifdef TIOCCONS unsigned int on = 1; @@ -1430,7 +1408,7 @@ if (fd >= 0) if (ioctl (fd, SRIOCSREDIR, NULL) < 0) close (fd); -#endif /* SRIOCSREDIR */ +#endif /* SRIOCSREDIR */ } /* reset signals and spin off the command interpreter */ @@ -1447,7 +1425,7 @@ signal (SIGTSTP, SIG_IGN); signal (SIGTTIN, SIG_IGN); signal (SIGTTOU, SIG_IGN); -#endif /* SIGTSTP */ +#endif /* SIGTSTP */ // unblock signals (signals are blocked by iom.C sigset_t ss;