--- rxvt-unicode/src/init.C 2004/02/24 21:46:14 1.37 +++ rxvt-unicode/src/init.C 2004/08/10 20:39:19 1.68 @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: init.c + * File: init.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -315,7 +315,8 @@ COLOR_CURSOR_BACKGROUND, COLOR_CURSOR_FOREGROUND, #endif /* ! NO_CURSORCOLOR */ - NULL, /* Color_pointer */ + NULL, /* Color_pointer_fg */ + NULL, /* Color_pointer_bg */ NULL, /* Color_border */ #ifndef NO_BOLD_UNDERLINE_REVERSE NULL, /* Color_BD */ @@ -329,7 +330,9 @@ COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, #endif /* KEEP_SCROLLCOLOR */ - +#if TINTING + NULL, +#endif }; const char *const xa_names[NUM_XA] = @@ -356,7 +359,12 @@ bool rxvt_term::init_vars () { - PixColors = new rxvt_color [TOTAL_COLORS]; + PixColorsFocused = new rxvt_color [TOTAL_COLORS]; +#ifdef OFF_FOCUS_FADING + PixColorsUnFocused = new rxvt_color [TOTAL_COLORS]; +#endif + PixColors = PixColorsFocused; + if (PixColors == NULL) return false; @@ -386,21 +394,10 @@ TermWin.saveLines = SAVELINES; numPixColors = TOTAL_COLORS; -#ifndef NO_NEW_SELECTION - selection_style = NEW_SELECT; -#else - selection_style = OLD_SELECT; -#endif - #ifndef NO_BRIGHTCOLOR colorfgbg = DEFAULT_RSTYLE; #endif -#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - ks_bigfont = XK_greater; - ks_smallfont = XK_less; -#endif - refresh_limit = 1; refresh_type = SLOW_REFRESH; prev_nrow = prev_ncol = 0; @@ -507,10 +504,6 @@ cmd_argv[i] = NULL; } - /* clear all resources */ - for (i = 0; i < NUM_RESOURCES;) - rs[i++] = NULL; - rs[Rs_name] = rxvt_r_basename (argv[0]); /* @@ -535,10 +528,7 @@ if (!display && ! (display = displays.get (rs[Rs_display_name]))) - { - rxvt_print_error ("can't open display %s", rs[Rs_display_name]); - exit (EXIT_FAILURE); - } + rxvt_fatal ("can't open display %s", rs[Rs_display_name]); extract_resources (display->display, rs[Rs_name]); @@ -594,18 +584,6 @@ if (!rs[Rs_cutchars]) rs[Rs_cutchars] = CUTCHARS; -#ifdef ACS_ASCII - if (!rs[Rs_acs_chars]) - rs[Rs_acs_chars] = ACS_CHARS; - if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20) - { - val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20); - for (; i < 0x20; ) - val[i] = ' '; - rs[Rs_acs_chars] = val; - } -#endif - #ifndef NO_BACKSPACE_KEY if (!rs[Rs_backspace_key]) # ifdef DEFAULT_BACKSPACE @@ -643,18 +621,6 @@ rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); } - if (rs[Rs_selectstyle]) - { - if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0) - selection_style = OLD_WORD_SELECT; -#ifndef NO_OLD_SELECTION - - else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0) - selection_style = OLD_SELECT; -#endif - - } - #ifdef HAVE_SCROLLBARS setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); @@ -688,7 +654,8 @@ color_aliases (Color_cursor); color_aliases (Color_cursor2); #endif /* NO_CURSORCOLOR */ - color_aliases (Color_pointer); + color_aliases (Color_pointer_fg); + color_aliases (Color_pointer_bg); color_aliases (Color_border); #ifndef NO_BOLD_UNDERLINE_REVERSE color_aliases (Color_BD); @@ -792,10 +759,20 @@ { #if HAVE_XSETLOCALE || HAVE_SETLOCALE free (this->locale); - this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); + this->locale = setlocale (LC_CTYPE, locale); + + if (!this->locale) + { + rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); + setlocale (LC_CTYPE, ""); + this->locale = ""; + } + + this->locale = rxvt_strdup (this->locale); SET_LOCALE (this->locale); mbstate.reset (); #endif +#if 0 #if HAVE_NL_LANGINFO free (codeset); codeset = strdup (nl_langinfo (CODESET)); @@ -804,6 +781,7 @@ #else enc_utf8 = 1; #endif +#endif } void @@ -811,7 +789,7 @@ { #ifdef USE_XIM if (!locale) - rxvt_print_error ("Setting locale failed."); + rxvt_warn ("setting locale failed, working without locale support.\n"); else { Atom wmlocale; @@ -823,7 +801,7 @@ if (!XSupportsLocale ()) { - rxvt_print_error ("The locale is not supported by Xlib"); + rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); return; } @@ -863,11 +841,11 @@ get_ourmods (); - if (! (Options & Opt_scrollTtyOutput)) + if (!(Options & Opt_scrollTtyOutput)) PrivateModes |= PrivMode_TtyOutputInh; if (Options & Opt_scrollTtyKeypress) PrivateModes |= PrivMode_Keypress; - if (! (Options & Opt_jumpScroll)) + if (!(Options & Opt_jumpScroll)) PrivateModes |= PrivMode_smoothScroll; #ifndef NO_BACKSPACE_KEY @@ -893,10 +871,7 @@ #endif if ((cmd_fd = run_command (argv)) < 0) - { - rxvt_print_error ("aborting"); - exit (EXIT_FAILURE); - } + rxvt_fatal ("failure while running command, aborting"); } /*----------------------------------------------------------------------*/ @@ -905,7 +880,11 @@ { int i; - for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) +#ifdef OFF_FOCUS_FADING + PixColors = PixColorsFocused; +#endif + + for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) { rxvt_color xcol; @@ -931,8 +910,7 @@ case Color_fg: case Color_bg: /* fatal: need bg/fg color */ - rxvt_print_error ("aborting"); - exit (EXIT_FAILURE); + rxvt_fatal ("unable to get foreground/background colour, aborting"); /* NOTREACHED */ break; #ifndef NO_CURSORCOLOR @@ -940,7 +918,7 @@ xcol = PixColors[Color_fg]; break; #endif /* ! NO_CURSORCOLOR */ - case Color_pointer: + case Color_pointer_fg: xcol = PixColors[Color_fg]; break; default: @@ -951,13 +929,19 @@ } PixColors[i] = xcol; +#ifdef OFF_FOCUS_FADING + if (rs[Rs_fade]) + PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); +#endif SET_PIXCOLOR (i); } - if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) - PixColors[Color_pointer] = PixColors[Color_fg]; - if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) - PixColors[Color_border] = PixColors[Color_fg]; + if (display->depth <= 2) + { + if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; + if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; + if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; + } /* * get scrollBar/menuBar shadow colors @@ -967,37 +951,28 @@ */ #ifdef KEEP_SCROLLCOLOR - if (XDEPTH <= 2) + if (display->depth <= 2) { /* Monochrome */ - PixColors[Color_scroll] = PixColors[Color_fg]; - PixColors[Color_topShadow] = PixColors[Color_bg]; + PixColors[Color_scroll] = PixColors[Color_fg]; + PixColors[Color_topShadow] = PixColors[Color_bg]; PixColors[Color_bottomShadow] = PixColors[Color_bg]; } else { - rxvt_color xcol[3]; + rxvt_color xcol[2]; /* xcol[0] == white * xcol[1] == top shadow * xcol[2] == bot shadow */ xcol[1] = PixColors[Color_scroll]; -# ifdef PREFER_24BIT xcol[0].set (display, 65535, 65535, 65535); - /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */ -# else - xcol[0].set (display, WhitePixel (display->display, display->screen)); -# endif unsigned short pr1, pg1, pb1, pr0, pg0, pb0; xcol[0].get (display, pr0, pg0, pb0); xcol[1].get (display, pr1, pg1, pb1); - /* bottomShadowColor */ - if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2)) - xcol[2] = PixColors[Color_Black]; - - PixColors[Color_bottomShadow] = xcol[2]; + PixColors[Color_bottomShadow] = xcol[1].fade (display, 50); /* topShadowColor */ if (!xcol[1].set (display, @@ -1111,11 +1086,15 @@ void rxvt_term::create_windows (int argc, const char *const *argv) { - XClassHint classHint; - XWMHints wmHint; - XGCValues gcvalue; - long vt_emask; - + XClassHint classHint; + XWMHints wmHint; +#ifndef NO_FRILLS + Atom prop = None; + MWMHints mwmhints; +#endif + XGCValues gcvalue; + long vt_emask; + XSetWindowAttributes attributes; XWindowAttributes gattr; if (Options & Opt_transparent) @@ -1124,6 +1103,30 @@ display->depth = gattr.depth; // doh //TODO, per-term not per-display? } +#ifndef NO_FRILLS + if (Options & Opt_borderLess) + { + prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); + if (prop == None) + { + /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ +#ifdef PREFER_24BIT + attributes.override_redirect = TRUE; +#endif + mwmhints.flags = 0; + } + else + { + mwmhints.flags = MWM_HINTS_DECORATIONS; + mwmhints.decorations = 0; + } + } + else + { + mwmhints.flags = 0; + } +#endif + /* grab colors before netscape does */ Get_Colours (); @@ -1138,14 +1141,10 @@ old_width = szHint.width; old_height = szHint.height; - /* parent window - reverse video so we can see placement errors - * sub-window placement & size in rxvt_resize_subwindows () - */ + /* sub-window placement & size in rxvt_resize_subwindows () */ #ifdef PREFER_24BIT - XSetWindowAttributes attributes; - - attributes.background_pixel = PixColors[Color_fg]; + attributes.background_pixel = PixColors[Color_bg]; attributes.border_pixel = PixColors[Color_border]; attributes.colormap = display->cmap; TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), @@ -1154,41 +1153,55 @@ TermWin.ext_bwidth, display->depth, InputOutput, display->visual, - CWBackPixel | CWBorderPixel | CWColormap, &attributes); + CWColormap | CWBackPixel | CWBorderPixel, &attributes); #else TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), - szHint.x, szHint.y, - szHint.width, - szHint.height, - TermWin.ext_bwidth, - PixColors[Color_border], - PixColors[Color_fg]); + szHint.x, szHint.y, + szHint.width, szHint.height, + TermWin.ext_bwidth, + PixColors[Color_border], + PixColors[Color_bg]); #endif - xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); - xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); + process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); + process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); classHint.res_name = (char *)rs[Rs_name]; - classHint.res_class = (char *)APL_CLASS; + classHint.res_class = (char *)RESCLASS; - wmHint.flags = (InputHint | StateHint | WindowGroupHint); + wmHint.flags = InputHint | StateHint | WindowGroupHint; wmHint.input = True; - wmHint.initial_state = (Options & Opt_iconic ? IconicState - : NormalState); + wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; wmHint.window_group = TermWin.parent[0]; XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, - (char **)argv, argc, &szHint, &wmHint, &classHint); + (char **)argv, argc, &szHint, &wmHint, &classHint); + +#ifndef NO_FRILLS + long pid = getpid (); + XChangeProperty (display->display, TermWin.parent[0], + display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&pid, 1); +#endif XSelectInput (display->display, TermWin.parent[0], - KeyPressMask + KeyPressMask #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - | KeyReleaseMask + | KeyReleaseMask #endif - | FocusChangeMask | VisibilityChangeMask - | StructureNotifyMask); + | FocusChangeMask | VisibilityChangeMask + | ExposureMask + | StructureNotifyMask); termwin_ev.start (display, TermWin.parent[0]); +#ifndef NO_FRILLS + if (mwmhints.flags) + { + prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); + XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS); + } +#endif + /* vt cursor: Black-on-White is standard, but this is more popular */ TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); @@ -1212,28 +1225,30 @@ /* the vt window */ TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], - window_vt_x, window_vt_y, + window_vt_x, + window_vt_y, TermWin_TotalWidth (), TermWin_TotalHeight (), 0, PixColors[Color_fg], PixColors[Color_bg]); - #ifdef DEBUG_X XStoreName (display->display, TermWin.vt, "vt window"); #endif - vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask - | PropertyChangeMask); + attributes.bit_gravity = NorthWestGravity; + XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); + + vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; -#ifdef POINTER_BLANK pointer_unblank (); - if ((Options & Opt_pointerBlank)) +#ifdef POINTER_BLANK + if (Options & Opt_pointerBlank) vt_emask |= PointerMotionMask; else #endif - vt_emask |= (Button1MotionMask | Button3MotionMask); + vt_emask |= Button1MotionMask | Button3MotionMask; XSelectInput (display->display, TermWin.vt, vt_emask); vt_ev.start (display, TermWin.vt); @@ -1269,7 +1284,7 @@ if (rs[Rs_backgroundPixmap] != NULL && ! (Options & Opt_transparent)) { - const char *p = rs[Rs_backgroundPixmap]; + const char *p = rs[Rs_backgroundPixmap]; if ((p = STRCHR (p, ';')) != NULL) { @@ -1286,8 +1301,8 @@ gcvalue.background = PixColors[Color_bg]; gcvalue.graphics_exposures = 1; TermWin.gc = XCreateGC (display->display, TermWin.vt, - GCForeground | GCBackground - | GCGraphicsExposures, &gcvalue); + GCForeground | GCBackground | GCGraphicsExposures, + &gcvalue); TermWin.drawable = new rxvt_drawable (display, TermWin.vt); @@ -1296,9 +1311,15 @@ topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); gcvalue.foreground = PixColors[Color_bottomShadow]; botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); - gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; + gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); #endif + +#ifdef OFF_FOCUS_FADING + // initially we are in unfocused state + if (rs[Rs_fade]) + PixColors = PixColorsUnFocused; +#endif } /*----------------------------------------------------------------------*/ @@ -1314,10 +1335,7 @@ /* get master (pty) */ if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) - { - rxvt_print_error ("can't open pseudo-tty"); - return -1; - } + rxvt_fatal ("can't open pseudo-tty"); fcntl (cfd, F_SETFL, O_NONBLOCK); @@ -1331,10 +1349,10 @@ if ((tty_fd = rxvt_get_tty (ttydev)) < 0) { close (cfd); - rxvt_print_error ("can't open slave tty %s", ttydev); - return -1; + rxvt_fatal ("can't open slave tty %s", ttydev); } } + #ifndef NO_BACKSPACE_KEY if (key_backspace[0] && !key_backspace[1]) er = key_backspace[0]; @@ -1342,25 +1360,23 @@ er = '\177'; /* the initial state anyway */ else #endif - er = -1; - rxvt_get_ttymode (& (tio), er); + rxvt_get_ttymode (&tio, er); #ifndef __QNX__ /* spin off the command interpreter */ switch (cmd_pid = fork ()) { case -1: - rxvt_print_error ("can't fork"); - return -1; + rxvt_fatal ("can't fork"); case 0: close (cfd); /* only keep tty_fd and STDERR open */ init_env (); if (rxvt_control_tty (tty_fd, ttydev) < 0) - rxvt_print_error ("could not obtain control of tty"); + fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); else { /* Reopen stdin, stdout and stderr over the tty file descriptor */ @@ -1372,9 +1388,11 @@ close (tty_fd); run_child (argv); + fprintf (stderr, "%s: unable to exec child.", RESNAME); } - exit (EXIT_FAILURE); - /* NOTREACHED */ + + _exit (EXIT_FAILURE); + default: { #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) @@ -1393,8 +1411,8 @@ dup2 (fdstdin, STDIN_FILENO); close (fdstdin); #endif - } + close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ break; } @@ -1435,10 +1453,8 @@ fd = open (CONSOLE, O_WRONLY, 0); if (fd >= 0) - { - if (ioctl (fd, SRIOCSREDIR, NULL) < 0) - close (fd); - } + if (ioctl (fd, SRIOCSREDIR, NULL) < 0) + close (fd); #endif /* SRIOCSREDIR */ }