--- rxvt-unicode/src/init.C 2004/02/13 12:16:21 1.26 +++ rxvt-unicode/src/init.C 2004/04/02 15:15:25 1.49 @@ -11,6 +11,7 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr * - QNX support + * Copyright (c) 2003-2004 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 @@ -314,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 */ @@ -324,6 +326,9 @@ #ifdef OPTION_HC NULL, #endif +#if TINTING + NULL, +#endif #ifdef KEEP_SCROLLCOLOR COLOR_SCROLLBAR, COLOR_SCROLLTROUGH, @@ -385,34 +390,13 @@ 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 - -#ifdef GREEK_SUPPORT - ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH; -#endif - refresh_limit = 1; refresh_type = SLOW_REFRESH; prev_nrow = prev_ncol = 0; -#ifdef MULTICHAR_SET -# ifdef MULTICHAR_ENCODING - encoding_method = MULTICHAR_ENCODING; -# endif - multichar_decode = rxvt_euc2jis; -#endif oldcursor.row = oldcursor.col = -1; #ifdef XPM_BACKGROUND @@ -516,10 +500,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]); /* @@ -544,10 +524,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]); @@ -603,18 +580,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 @@ -652,29 +617,11 @@ 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]); #endif - TermWin.fontset = new rxvt_fontset (this); - TermWin.fontset->populate (rs[Rs_font]); - TermWin.fwidth = TermWin.fontset->base_font ()->width; - TermWin.fheight = TermWin.fontset->base_font ()->height; - TermWin.fbase = TermWin.fontset->base_font ()->ascent; - #ifdef XTERM_REVERSE_VIDEO /* this is how xterm implements reverseVideo */ if (Options & Opt_reverseVideo) @@ -703,7 +650,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); @@ -764,9 +712,12 @@ * @ COLORTERM: terminal sub-name and also indicates its color * @ TERM: terminal name * @ TERMINFO: path to terminfo directory + * @ COLORFGBG: fg;bg color codes */ putenv (env_display); putenv (env_windowid); + if (env_colorfgbg) + putenv (env_colorfgbg); #ifdef RXVT_TERMINFO putenv ("TERMINFO=" RXVT_TERMINFO); @@ -804,8 +755,11 @@ { #if HAVE_XSETLOCALE || HAVE_SETLOCALE free (this->locale); - this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); + this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); + SET_LOCALE (this->locale); + mbstate.reset (); #endif +#if 0 #if HAVE_NL_LANGINFO free (codeset); codeset = strdup (nl_langinfo (CODESET)); @@ -814,6 +768,7 @@ #else enc_utf8 = 1; #endif +#endif } void @@ -821,7 +776,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; @@ -833,7 +788,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; } @@ -897,20 +852,13 @@ SavedModes |= PrivMode_menuBar; } -#ifdef GREEK_SUPPORT - greek_init (); -#endif - #ifdef CURSOR_BLINK if (Options & Opt_cursorBlink) (void)gettimeofday (&lastcursorchange, NULL); #endif if ((cmd_fd = run_command (argv)) < 0) - { - rxvt_print_error ("aborting"); - exit (EXIT_FAILURE); - } + rxvt_fatal ("failure while running command, aborting"); } /*----------------------------------------------------------------------*/ @@ -945,8 +893,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 @@ -954,7 +901,7 @@ xcol = PixColors[Color_fg]; break; #endif /* ! NO_CURSORCOLOR */ - case Color_pointer: + case Color_pointer_fg: xcol = PixColors[Color_fg]; break; default: @@ -968,10 +915,12 @@ 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 (XDEPTH <= 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 @@ -1141,7 +1090,13 @@ /* grab colors before netscape does */ Get_Colours (); - change_font (1, NULL); + if (!change_font (rs[Rs_font])) + { + fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); + destroy (); + return; + } + window_calc (0, 0); old_width = szHint.width; old_height = szHint.height; @@ -1173,11 +1128,11 @@ PixColors[Color_fg]); #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.input = True; @@ -1186,7 +1141,14 @@ 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 @@ -1250,17 +1212,21 @@ if (menuBar_height ()) { menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], - window_vt_x, 0, - TermWin_TotalWidth (), - menuBar_TotalHeight (), - 0, - PixColors[Color_fg], - PixColors[Color_scroll]); + window_vt_x, 0, + TermWin_TotalWidth (), + menuBar_TotalHeight (), + 0, + PixColors[Color_fg], + PixColors[Color_scroll]); + #ifdef DEBUG_X XStoreName (display->display, menuBar.win, "menubar"); #endif - XDefineCursor (display->display, menuBar.win, pointer_leftptr); + menuBar.drawable = new rxvt_drawable (display, menuBar.win); + + XDefineCursor (display->display, menuBar.win, + XCreateFontCursor (display->display, XC_left_ptr)); XSelectInput (display->display, menuBar.win, (ExposureMask | ButtonPressMask | ButtonReleaseMask @@ -1290,20 +1256,18 @@ 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); #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) gcvalue.foreground = PixColors[Color_topShadow]; - topShadowGC = XCreateGC (display->display, TermWin.vt, - GCForeground, &gcvalue); + 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)]; - scrollbarGC = XCreateGC (display->display, TermWin.vt, - GCForeground, &gcvalue); + botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); + gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; + scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); #endif } @@ -1320,10 +1284,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); @@ -1337,8 +1298,7 @@ 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 @@ -1358,13 +1318,14 @@ 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 */ @@ -1376,9 +1337,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) @@ -1397,8 +1360,8 @@ dup2 (fdstdin, STDIN_FILENO); close (fdstdin); #endif - } + close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ break; }