--- rxvt-unicode/src/init.C 2007/01/20 00:45:30 1.177 +++ rxvt-unicode/src/init.C 2007/09/08 20:54:50 1.209 @@ -48,7 +48,7 @@ "rgb:00/00/00", // 0: black (Black) "rgb:cd/00/00", // 1: red (Red3) "rgb:00/cd/00", // 2: green (Green3) - "rgb:cd/cd/00", // 3: ywlloe (Yellow3) + "rgb:cd/cd/00", // 3: yellow (Yellow3) "rgb:00/00/cd", // 4: blue (Blue3) "rgb:cd/00/cd", // 5: magenta (Magenta3) "rgb:00/cd/cd", // 6: cyan (Cyan3) @@ -168,7 +168,7 @@ COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, #endif /* KEEP_SCROLLCOLOR */ -#if TINTING +#if ENABLE_TRANSPARENCY NULL, #endif #if OFF_FOCUS_FADING @@ -185,13 +185,9 @@ pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; #endif -#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) - pixmap = None; -#endif MEvent.time = CurrentTime; MEvent.button = AnyButton; - options = DEFAULT_OPTIONS; want_refresh = 1; priv_modes = SavedModes = PrivMode_Default; ncol = 80; @@ -202,18 +198,33 @@ saveLines = SAVELINES; numpix_colors = TOTAL_COLORS; - refresh_limit = 1; refresh_type = SLOW_REFRESH; oldcursor.row = oldcursor.col = -1; -#ifdef XPM_BACKGROUND +#ifdef HAVE_BG_PIXMAP +#ifdef HAVE_AFTERIMAGE + bgPixmap.original_asim = NULL; +#endif /* bgPixmap.w = bgPixmap.h = 0; */ - bgPixmap.x = bgPixmap.y = 50; +#ifdef XPM_BACKGROUND + bgPixmap.h_scale = bgPixmap.v_scale = 0; + bgPixmap.h_align = bgPixmap.v_align = 0; +#endif + bgPixmap.flags = 0; bgPixmap.pixmap = None; #endif - last_bot = last_state = -1; + set_option (Opt_scrollBar); + set_option (Opt_scrollTtyOutput); + set_option (Opt_jumpScroll); + set_option (Opt_skipScroll); + set_option (Opt_secondaryScreen); + set_option (Opt_secondaryScroll); + set_option (Opt_pastableTabs); + set_option (Opt_intensityStyles); + set_option (Opt_iso14755_52); + return true; } @@ -310,6 +321,9 @@ select_visual (strtol (rs[Rs_depth], 0, 0)); #endif +#ifdef HAVE_AFTERIMAGE + asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); +#endif free (r_argv); for (int i = NUM_RESOURCES; i--; ) @@ -390,8 +404,6 @@ else { val = strdup (rs[Rs_backspace_key]); - rxvt_Str_trim (val); - rxvt_Str_escaped (val); key_backspace = val; } #endif @@ -406,16 +418,9 @@ else { val = strdup (rs[Rs_delete_key]); - rxvt_Str_trim (val); - rxvt_Str_escaped (val); key_delete = val; } #endif - if (rs[Rs_answerbackstring]) - { - rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); - rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); - } #ifdef HAVE_SCROLLBARS setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); @@ -423,7 +428,7 @@ #ifdef XTERM_REVERSE_VIDEO /* this is how xterm implements reverseVideo */ - if (OPTION (Opt_reverseVideo)) + if (option (Opt_reverseVideo)) { if (!rs[Rs_color + Color_fg]) rs[Rs_color + Color_fg] = def_colorName[Color_bg]; @@ -439,7 +444,7 @@ #ifndef XTERM_REVERSE_VIDEO /* this is how we implement reverseVideo */ - if (OPTION (Opt_reverseVideo)) + if (option (Opt_reverseVideo)) ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); #endif @@ -470,7 +475,6 @@ rxvt_term::init_env () { int i; - unsigned int u; char *val; #ifdef DISPLAY_IS_IP @@ -495,7 +499,7 @@ rs[Rs_display_name] = val; /* use broken `:0' value */ i = strlen (val); - env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); + env_display = (char *)rxvt_malloc (i + 9); sprintf (env_display, "DISPLAY=%s", val); @@ -526,7 +530,7 @@ if (rs[Rs_term_name] != NULL) { - env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); + env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); sprintf (env_term, "TERM=%s", rs[Rs_term_name]); putenv (env_term); } @@ -623,16 +627,16 @@ */ #ifdef META8_OPTION - meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; + meta_char = option (Opt_meta8) ? 0x80 : C0_ESC; #endif get_ourmods (); - if (!OPTION (Opt_scrollTtyOutput)) + if (!option (Opt_scrollTtyOutput)) priv_modes |= PrivMode_TtyOutputInh; - if (OPTION (Opt_scrollTtyKeypress)) + if (option (Opt_scrollTtyKeypress)) priv_modes |= PrivMode_Keypress; - if (!OPTION (Opt_jumpScroll)) + if (!option (Opt_jumpScroll)) priv_modes |= PrivMode_smoothScroll; #ifndef NO_BACKSPACE_KEY @@ -672,7 +676,7 @@ if (!set_color (xcol, name)) { #ifndef XTERM_REVERSE_VIDEO - if (i < 2 && OPTION (Opt_reverseVideo)) + if (i < 2 && option (Opt_reverseVideo)) name = def_colorName [1 - i]; else #endif @@ -873,7 +877,7 @@ XClassHint classHint; XWMHints wmHint; #if ENABLE_FRILLS - MWMHints mwmhints; + MWMHints mwmhints = { }; #endif XGCValues gcvalue; XSetWindowAttributes attributes; @@ -889,25 +893,21 @@ parent = display->root; - attributes.override_redirect = !!OPTION (Opt_override_redirect); + attributes.override_redirect = !!option (Opt_override_redirect); #if ENABLE_FRILLS - if (OPTION (Opt_borderLess)) + if (option (Opt_borderLess)) { if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) { - /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ + // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n"); attributes.override_redirect = true; - mwmhints.flags = 0; } else { mwmhints.flags = MWM_HINTS_DECORATIONS; - mwmhints.decorations = 0; } } - else - mwmhints.flags = 0; #endif #if ENABLE_XEMBED @@ -952,7 +952,7 @@ wmHint.flags = InputHint | StateHint | WindowGroupHint; wmHint.input = True; - wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; + wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; wmHint.window_group = top; XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, @@ -1019,7 +1019,7 @@ vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; - if (OPTION (Opt_pointerBlank)) + if (option (Opt_pointerBlank)) vt_emask |= PointerMotionMask; else vt_emask |= Button1MotionMask | Button3MotionMask; @@ -1028,23 +1028,6 @@ vt_ev.start (display, vt); -#ifdef XPM_BACKGROUND - if (rs[Rs_backgroundPixmap] != NULL - && !OPTION (Opt_transparent)) - { - const char *p = rs[Rs_backgroundPixmap]; - - if ((p = strchr (p, ';')) != NULL) - { - p++; - scale_pixmap (p); - } - - set_bgPixmap (rs[Rs_backgroundPixmap]); - scr_touch (true); - } -#endif - /* graphics context for the vt window */ gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; @@ -1279,8 +1262,8 @@ er = -1; rxvt_get_ttymode (&tio, er); + SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ pty->set_utf8_mode (enc_utf8); - SET_TTYMODE (pty->tty, &tio); /* init terminal attributes */ /* set initial window size */ tt_winch (); @@ -1324,8 +1307,8 @@ _exit (EXIT_FAILURE); default: - if (!OPTION (Opt_utmpInhibit)) - pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); + if (!option (Opt_utmpInhibit)) + pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); pty->close_tty (); @@ -1348,7 +1331,7 @@ { char *login; - if (OPTION (Opt_console)) + if (option (Opt_console)) { /* be virtual console, fail silently */ #ifdef TIOCCONS unsigned int on = 1; @@ -1407,9 +1390,9 @@ argv0 = (const char *)rxvt_r_basename (shell); - if (OPTION (Opt_loginShell)) + if (option (Opt_loginShell)) { - login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); + login = (char *)rxvt_malloc (strlen (argv0) + 2); login[0] = '-'; strcpy (&login[1], argv0);