ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.30 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.68 by root, Tue Aug 10 20:39:19 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
313#endif 313#endif
314#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
319 NULL, /* Color_border */ 320 NULL, /* Color_border */
320#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
321 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
322 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
323 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
327#endif 328#endif
328#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
332 333#if TINTING
334 NULL,
335#endif
333 }; 336 };
334 337
335const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
336 { 339 {
337 "TEXT", 340 "TEXT",
… …
354 }; 357 };
355 358
356bool 359bool
357rxvt_term::init_vars () 360rxvt_term::init_vars ()
358{ 361{
359 PixColors = new rxvt_color [TOTAL_COLORS]; 362 PixColorsFocused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 PixColors = PixColorsFocused;
367
360 if (PixColors == NULL) 368 if (PixColors == NULL)
361 return false; 369 return false;
362 370
363#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
364 TermWin.pixmap = None; 372 TermWin.pixmap = None;
… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 393 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 394 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 395 numPixColors = TOTAL_COLORS;
388 396
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 397#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 398 colorfgbg = DEFAULT_RSTYLE;
397#endif
398
399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
400 ks_bigfont = XK_greater;
401 ks_smallfont = XK_less;
402#endif
403
404#ifdef GREEK_SUPPORT
405 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
406#endif 399#endif
407 400
408 refresh_limit = 1; 401 refresh_limit = 1;
409 refresh_type = SLOW_REFRESH; 402 refresh_type = SLOW_REFRESH;
410 prev_nrow = prev_ncol = 0; 403 prev_nrow = prev_ncol = 0;
411#ifdef MULTICHAR_SET
412# ifdef MULTICHAR_ENCODING
413 encoding_method = MULTICHAR_ENCODING;
414# endif
415 multichar_decode = rxvt_euc2jis;
416#endif
417 404
418 oldcursor.row = oldcursor.col = -1; 405 oldcursor.row = oldcursor.col = -1;
419#ifdef XPM_BACKGROUND 406#ifdef XPM_BACKGROUND
420 /* bgPixmap.w = bgPixmap.h = 0; */ 407 /* bgPixmap.w = bgPixmap.h = 0; */
421 bgPixmap.x = bgPixmap.y = 50; 408 bgPixmap.x = bgPixmap.y = 50;
… …
515 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
516 503
517 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
518 } 505 }
519 506
520 /* clear all resources */
521 for (i = 0; i < NUM_RESOURCES;)
522 rs[i++] = NULL;
523
524 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
525 508
526 /* 509 /*
527 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
528 */ 511 */
… …
543 } 526 }
544#endif 527#endif
545 528
546 if (!display 529 if (!display
547 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
548 {
549 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
550 exit (EXIT_FAILURE);
551 }
552 532
553 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
554 534
555 /* 535 /*
556 * set any defaults not already set 536 * set any defaults not already set
… …
601 rs[Rs_print_pipe] = PRINTPIPE; 581 rs[Rs_print_pipe] = PRINTPIPE;
602#endif 582#endif
603 583
604 if (!rs[Rs_cutchars]) 584 if (!rs[Rs_cutchars])
605 rs[Rs_cutchars] = CUTCHARS; 585 rs[Rs_cutchars] = CUTCHARS;
606
607#ifdef ACS_ASCII
608 if (!rs[Rs_acs_chars])
609 rs[Rs_acs_chars] = ACS_CHARS;
610 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
611 {
612 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
613 for (; i < 0x20; )
614 val[i] = ' ';
615 rs[Rs_acs_chars] = val;
616 }
617#endif
618 586
619#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
620 if (!rs[Rs_backspace_key]) 588 if (!rs[Rs_backspace_key])
621# ifdef DEFAULT_BACKSPACE 589# ifdef DEFAULT_BACKSPACE
622 key_backspace = DEFAULT_BACKSPACE; 590 key_backspace = DEFAULT_BACKSPACE;
… …
651 { 619 {
652 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
653 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
654 } 622 }
655 623
656 if (rs[Rs_selectstyle])
657 {
658 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
659 selection_style = OLD_WORD_SELECT;
660#ifndef NO_OLD_SELECTION
661
662 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
663 selection_style = OLD_SELECT;
664#endif
665
666 }
667
668#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
669 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
670 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
671#endif 627#endif
672
673 TermWin.fontset = new rxvt_fontset (this);
674 TermWin.fontset->populate (rs[Rs_font]);
675 TermWin.fwidth = TermWin.fontset->base_font ()->width;
676 TermWin.fheight = TermWin.fontset->base_font ()->height;
677 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
678 628
679#ifdef XTERM_REVERSE_VIDEO 629#ifdef XTERM_REVERSE_VIDEO
680 /* this is how xterm implements reverseVideo */ 630 /* this is how xterm implements reverseVideo */
681 if (Options & Opt_reverseVideo) 631 if (Options & Opt_reverseVideo)
682 { 632 {
… …
702 color_aliases (Color_bg); 652 color_aliases (Color_bg);
703#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
704 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
705 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
706#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
707 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
708 color_aliases (Color_border); 659 color_aliases (Color_border);
709#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
710 color_aliases (Color_BD); 661 color_aliases (Color_BD);
711 color_aliases (Color_UL); 662 color_aliases (Color_UL);
712 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
806void 757void
807rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
808{ 759{
809#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
810 free (this->locale); 761 free (this->locale);
811 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 762 this->locale = setlocale (LC_CTYPE, locale);
763
764 if (!this->locale)
765 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, "");
768 this->locale = "";
769 }
770
771 this->locale = rxvt_strdup (this->locale);
812 SET_LOCALE (this->locale); 772 SET_LOCALE (this->locale);
813 mbstate.reset (); 773 mbstate.reset ();
814#endif 774#endif
775#if 0
815#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
816 free (codeset); 777 free (codeset);
817 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
818 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
819 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
820#else 781#else
821 enc_utf8 = 1; 782 enc_utf8 = 1;
822#endif 783#endif
784#endif
823} 785}
824 786
825void 787void
826rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
827{ 789{
828#ifdef USE_XIM 790#ifdef USE_XIM
829 if (!locale) 791 if (!locale)
830 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
831 else 793 else
832 { 794 {
833 Atom wmlocale; 795 Atom wmlocale;
834 796
835 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
837 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
838 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
839 801
840 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
841 { 803 {
842 rxvt_print_error ("The locale is not supported by Xlib"); 804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
843 return; 805 return;
844 } 806 }
845 807
846 im_ev.start (display); 808 im_ev.start (display);
847 809
… …
877 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
878#endif 840#endif
879 841
880 get_ourmods (); 842 get_ourmods ();
881 843
882 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
883 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
884 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
885 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
886 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
887 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
888 850
889#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
890 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
891 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
901 { 863 {
902 PrivateModes |= PrivMode_menuBar; 864 PrivateModes |= PrivMode_menuBar;
903 SavedModes |= PrivMode_menuBar; 865 SavedModes |= PrivMode_menuBar;
904 } 866 }
905 867
906#ifdef GREEK_SUPPORT
907 greek_init ();
908#endif
909
910#ifdef CURSOR_BLINK 868#ifdef CURSOR_BLINK
911 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
912 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
913#endif 871#endif
914 872
915 if ((cmd_fd = run_command (argv)) < 0) 873 if ((cmd_fd = run_command (argv)) < 0)
916 { 874 rxvt_fatal ("failure while running command, aborting");
917 rxvt_print_error ("aborting");
918 exit (EXIT_FAILURE);
919 }
920} 875}
921 876
922/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
923void 878void
924rxvt_term::Get_Colours () 879rxvt_term::Get_Colours ()
925{ 880{
926 int i; 881 int i;
927 882
883#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused;
885#endif
886
928 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 887 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
929 { 888 {
930 rxvt_color xcol; 889 rxvt_color xcol;
931 890
932 if (!rs[Rs_color + i]) 891 if (!rs[Rs_color + i])
933 continue; 892 continue;
… …
949 switch (i) 908 switch (i)
950 { 909 {
951 case Color_fg: 910 case Color_fg:
952 case Color_bg: 911 case Color_bg:
953 /* fatal: need bg/fg color */ 912 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 913 rxvt_fatal ("unable to get foreground/background colour, aborting");
955 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 914 /* NOTREACHED */
957 break; 915 break;
958#ifndef NO_CURSORCOLOR 916#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 917 case Color_cursor2:
960 xcol = PixColors[Color_fg]; 918 xcol = PixColors[Color_fg];
961 break; 919 break;
962#endif /* ! NO_CURSORCOLOR */ 920#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 921 case Color_pointer_fg:
964 xcol = PixColors[Color_fg]; 922 xcol = PixColors[Color_fg];
965 break; 923 break;
966 default: 924 default:
967 xcol = PixColors[Color_bg]; /* None */ 925 xcol = PixColors[Color_bg]; /* None */
968 break; 926 break;
969 } 927 }
970 } 928 }
971 } 929 }
972 930
973 PixColors[i] = xcol; 931 PixColors[i] = xcol;
932#ifdef OFF_FOCUS_FADING
933 if (rs[Rs_fade])
934 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
935#endif
974 SET_PIXCOLOR (i); 936 SET_PIXCOLOR (i);
975 } 937 }
976 938
977 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 939 if (display->depth <= 2)
978 PixColors[Color_pointer] = PixColors[Color_fg]; 940 {
979 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 941 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
980 PixColors[Color_border] = PixColors[Color_fg]; 942 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
943 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
944 }
981 945
982 /* 946 /*
983 * get scrollBar/menuBar shadow colors 947 * get scrollBar/menuBar shadow colors
984 * 948 *
985 * The calculations of topShadow/bottomShadow values are adapted 949 * The calculations of topShadow/bottomShadow values are adapted
986 * from the fvwm window manager. 950 * from the fvwm window manager.
987 */ 951 */
988#ifdef KEEP_SCROLLCOLOR 952#ifdef KEEP_SCROLLCOLOR
989 953
990 if (XDEPTH <= 2) 954 if (display->depth <= 2)
991 { /* Monochrome */ 955 { /* Monochrome */
992 PixColors[Color_scroll] = PixColors[Color_fg]; 956 PixColors[Color_scroll] = PixColors[Color_fg];
993 PixColors[Color_topShadow] = PixColors[Color_bg]; 957 PixColors[Color_topShadow] = PixColors[Color_bg];
994 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 958 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 959 }
996 else 960 else
997 { 961 {
998 rxvt_color xcol[3]; 962 rxvt_color xcol[2];
999 /* xcol[0] == white 963 /* xcol[0] == white
1000 * xcol[1] == top shadow 964 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 965 * xcol[2] == bot shadow */
1002 966
1003 xcol[1] = PixColors[Color_scroll]; 967 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT
1005 xcol[0].set (display, 65535, 65535, 65535); 968 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1007# else
1008 xcol[0].set (display, WhitePixel (display->display, display->screen));
1009# endif
1010 969
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 971
1013 xcol[0].get (display, pr0, pg0, pb0); 972 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (display, pr1, pg1, pb1); 973 xcol[1].get (display, pr1, pg1, pb1);
1015 974
1016 /* bottomShadowColor */
1017 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = PixColors[Color_Black];
1019
1020 PixColors[Color_bottomShadow] = xcol[2]; 975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
1021 976
1022 /* topShadowColor */ 977 /* topShadowColor */
1023 if (!xcol[1].set (display, 978 if (!xcol[1].set (display,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 979 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 980 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1129/*----------------------------------------------------------------------*/ 1084/*----------------------------------------------------------------------*/
1130/* rxvt_Create_Windows () - Open and map the window */ 1085/* rxvt_Create_Windows () - Open and map the window */
1131void 1086void
1132rxvt_term::create_windows (int argc, const char *const *argv) 1087rxvt_term::create_windows (int argc, const char *const *argv)
1133{ 1088{
1134 XClassHint classHint; 1089 XClassHint classHint;
1135 XWMHints wmHint; 1090 XWMHints wmHint;
1091#ifndef NO_FRILLS
1092 Atom prop = None;
1093 MWMHints mwmhints;
1094#endif
1136 XGCValues gcvalue; 1095 XGCValues gcvalue;
1137 long vt_emask; 1096 long vt_emask;
1138 1097 XSetWindowAttributes attributes;
1139 XWindowAttributes gattr; 1098 XWindowAttributes gattr;
1140 1099
1141 if (Options & Opt_transparent) 1100 if (Options & Opt_transparent)
1142 { 1101 {
1143 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1102 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1144 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1103 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1145 } 1104 }
1146 1105
1106#ifndef NO_FRILLS
1107 if (Options & Opt_borderLess)
1108 {
1109 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1110 if (prop == None)
1111 {
1112 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1113#ifdef PREFER_24BIT
1114 attributes.override_redirect = TRUE;
1115#endif
1116 mwmhints.flags = 0;
1117 }
1118 else
1119 {
1120 mwmhints.flags = MWM_HINTS_DECORATIONS;
1121 mwmhints.decorations = 0;
1122 }
1123 }
1124 else
1125 {
1126 mwmhints.flags = 0;
1127 }
1128#endif
1129
1147 /* grab colors before netscape does */ 1130 /* grab colors before netscape does */
1148 Get_Colours (); 1131 Get_Colours ();
1149 1132
1150 change_font (1, NULL); 1133 if (!change_font (rs[Rs_font]))
1134 {
1135 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1136 destroy ();
1137 return;
1138 }
1139
1151 window_calc (0, 0); 1140 window_calc (0, 0);
1152 old_width = szHint.width; 1141 old_width = szHint.width;
1153 old_height = szHint.height; 1142 old_height = szHint.height;
1154 1143
1155 /* parent window - reverse video so we can see placement errors
1156 * sub-window placement & size in rxvt_resize_subwindows () 1144 /* sub-window placement & size in rxvt_resize_subwindows () */
1157 */
1158 1145
1159#ifdef PREFER_24BIT 1146#ifdef PREFER_24BIT
1160 XSetWindowAttributes attributes;
1161
1162 attributes.background_pixel = PixColors[Color_fg]; 1147 attributes.background_pixel = PixColors[Color_bg];
1163 attributes.border_pixel = PixColors[Color_border]; 1148 attributes.border_pixel = PixColors[Color_border];
1164 attributes.colormap = display->cmap; 1149 attributes.colormap = display->cmap;
1165 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1150 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1166 szHint.x, szHint.y, 1151 szHint.x, szHint.y,
1167 szHint.width, szHint.height, 1152 szHint.width, szHint.height,
1168 TermWin.ext_bwidth, 1153 TermWin.ext_bwidth,
1169 display->depth, InputOutput, 1154 display->depth, InputOutput,
1170 display->visual, 1155 display->visual,
1171 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1156 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1172#else 1157#else
1173 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1158 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1174 szHint.x, szHint.y, 1159 szHint.x, szHint.y,
1175 szHint.width, 1160 szHint.width, szHint.height,
1176 szHint.height,
1177 TermWin.ext_bwidth, 1161 TermWin.ext_bwidth,
1178 PixColors[Color_border], 1162 PixColors[Color_border],
1179 PixColors[Color_fg]); 1163 PixColors[Color_bg]);
1180#endif 1164#endif
1181 1165
1182 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1166 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1183 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1167 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1184 1168
1185 classHint.res_name = (char *)rs[Rs_name]; 1169 classHint.res_name = (char *)rs[Rs_name];
1186 classHint.res_class = (char *)APL_CLASS; 1170 classHint.res_class = (char *)RESCLASS;
1187 1171
1188 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1172 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1189 wmHint.input = True; 1173 wmHint.input = True;
1190 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1174 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1191 : NormalState);
1192 wmHint.window_group = TermWin.parent[0]; 1175 wmHint.window_group = TermWin.parent[0];
1193 1176
1194 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1177 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1195 (char **)argv, argc, &szHint, &wmHint, &classHint); 1178 (char **)argv, argc, &szHint, &wmHint, &classHint);
1179
1180#ifndef NO_FRILLS
1181 long pid = getpid ();
1182 XChangeProperty (display->display, TermWin.parent[0],
1183 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1184 PropModeReplace, (unsigned char *)&pid, 1);
1185#endif
1196 1186
1197 XSelectInput (display->display, TermWin.parent[0], 1187 XSelectInput (display->display, TermWin.parent[0],
1198 KeyPressMask 1188 KeyPressMask
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1189#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 | KeyReleaseMask 1190 | KeyReleaseMask
1201#endif 1191#endif
1202 | FocusChangeMask | VisibilityChangeMask 1192 | FocusChangeMask | VisibilityChangeMask
1193 | ExposureMask
1203 | StructureNotifyMask); 1194 | StructureNotifyMask);
1204 termwin_ev.start (display, TermWin.parent[0]); 1195 termwin_ev.start (display, TermWin.parent[0]);
1196
1197#ifndef NO_FRILLS
1198 if (mwmhints.flags)
1199 {
1200 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1201 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1202 }
1203#endif
1205 1204
1206 /* vt cursor: Black-on-White is standard, but this is more popular */ 1205 /* vt cursor: Black-on-White is standard, but this is more popular */
1207 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1208 1207
1209#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1224 } 1223 }
1225#endif 1224#endif
1226 1225
1227 /* the vt window */ 1226 /* the vt window */
1228 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1229 window_vt_x, window_vt_y, 1228 window_vt_x,
1229 window_vt_y,
1230 TermWin_TotalWidth (), 1230 TermWin_TotalWidth (),
1231 TermWin_TotalHeight (), 1231 TermWin_TotalHeight (),
1232 0, 1232 0,
1233 PixColors[Color_fg], 1233 PixColors[Color_fg],
1234 PixColors[Color_bg]); 1234 PixColors[Color_bg]);
1235
1236#ifdef DEBUG_X 1235#ifdef DEBUG_X
1237 XStoreName (display->display, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1238#endif 1237#endif
1239 1238
1239 attributes.bit_gravity = NorthWestGravity;
1240 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1241
1240 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1242 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1241 | PropertyChangeMask); 1243
1244 pointer_unblank ();
1242 1245
1243#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1244 pointer_unblank ();
1245
1246 if ((Options & Opt_pointerBlank)) 1247 if (Options & Opt_pointerBlank)
1247 vt_emask |= PointerMotionMask; 1248 vt_emask |= PointerMotionMask;
1248 else 1249 else
1249#endif 1250#endif
1250 vt_emask |= (Button1MotionMask | Button3MotionMask); 1251 vt_emask |= Button1MotionMask | Button3MotionMask;
1251 1252
1252 XSelectInput (display->display, TermWin.vt, vt_emask); 1253 XSelectInput (display->display, TermWin.vt, vt_emask);
1253 vt_ev.start (display, TermWin.vt); 1254 vt_ev.start (display, TermWin.vt);
1254 1255
1255#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1256#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1256 if (menuBar_height ()) 1257 if (menuBar_height ())
1257 { 1258 {
1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1259 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1259 window_vt_x, 0, 1260 window_vt_x, 0,
1260 TermWin_TotalWidth (), 1261 TermWin_TotalWidth (),
1261 menuBar_TotalHeight (), 1262 menuBar_TotalHeight (),
1262 0, 1263 0,
1263 PixColors[Color_fg], 1264 PixColors[Color_fg],
1264 PixColors[Color_scroll]); 1265 PixColors[Color_scroll]);
1266
1265#ifdef DEBUG_X 1267#ifdef DEBUG_X
1266 XStoreName (display->display, menuBar.win, "menubar"); 1268 XStoreName (display->display, menuBar.win, "menubar");
1267#endif 1269#endif
1268 1270
1271 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1272
1269 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1273 XDefineCursor (display->display, menuBar.win,
1274 XCreateFontCursor (display->display, XC_left_ptr));
1270 1275
1271 XSelectInput (display->display, menuBar.win, 1276 XSelectInput (display->display, menuBar.win,
1272 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1277 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1273 | Button1MotionMask)); 1278 | Button1MotionMask));
1274 menubar_ev.start (display, menuBar.win); 1279 menubar_ev.start (display, menuBar.win);
… …
1277 1282
1278#ifdef XPM_BACKGROUND 1283#ifdef XPM_BACKGROUND
1279 if (rs[Rs_backgroundPixmap] != NULL 1284 if (rs[Rs_backgroundPixmap] != NULL
1280 && ! (Options & Opt_transparent)) 1285 && ! (Options & Opt_transparent))
1281 { 1286 {
1282 const char *p = rs[Rs_backgroundPixmap]; 1287 const char *p = rs[Rs_backgroundPixmap];
1283 1288
1284 if ((p = STRCHR (p, ';')) != NULL) 1289 if ((p = STRCHR (p, ';')) != NULL)
1285 { 1290 {
1286 p++; 1291 p++;
1287 scale_pixmap (p); 1292 scale_pixmap (p);
… …
1294 /* graphics context for the vt window */ 1299 /* graphics context for the vt window */
1295 gcvalue.foreground = PixColors[Color_fg]; 1300 gcvalue.foreground = PixColors[Color_fg];
1296 gcvalue.background = PixColors[Color_bg]; 1301 gcvalue.background = PixColors[Color_bg];
1297 gcvalue.graphics_exposures = 1; 1302 gcvalue.graphics_exposures = 1;
1298 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1303 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1299 GCForeground | GCBackground 1304 GCForeground | GCBackground | GCGraphicsExposures,
1300 | GCGraphicsExposures, &gcvalue); 1305 &gcvalue);
1306
1307 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1301 1308
1302#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1309#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1303 gcvalue.foreground = PixColors[Color_topShadow]; 1310 gcvalue.foreground = PixColors[Color_topShadow];
1304 topShadowGC = XCreateGC (display->display, TermWin.vt, 1311 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1305 GCForeground, &gcvalue);
1306 gcvalue.foreground = PixColors[Color_bottomShadow]; 1312 gcvalue.foreground = PixColors[Color_bottomShadow];
1307 botShadowGC = XCreateGC (display->display, TermWin.vt, 1313 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1308 GCForeground, &gcvalue); 1314 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1309 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1310 : Color_scroll)];
1311 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1315 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1312 GCForeground, &gcvalue); 1316#endif
1317
1318#ifdef OFF_FOCUS_FADING
1319 // initially we are in unfocused state
1320 if (rs[Rs_fade])
1321 PixColors = PixColorsUnFocused;
1313#endif 1322#endif
1314} 1323}
1315 1324
1316/*----------------------------------------------------------------------*/ 1325/*----------------------------------------------------------------------*/
1317/* 1326/*
… …
1324{ 1333{
1325 int cfd, er; 1334 int cfd, er;
1326 1335
1327 /* get master (pty) */ 1336 /* get master (pty) */
1328 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1337 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1329 {
1330 rxvt_print_error ("can't open pseudo-tty"); 1338 rxvt_fatal ("can't open pseudo-tty");
1331 return -1;
1332 }
1333 1339
1334 fcntl (cfd, F_SETFL, O_NONBLOCK); 1340 fcntl (cfd, F_SETFL, O_NONBLOCK);
1335 1341
1336 /* get slave (tty) */ 1342 /* get slave (tty) */
1337 if (tty_fd < 0) 1343 if (tty_fd < 0)
… …
1341#endif 1347#endif
1342 1348
1343 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1349 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1344 { 1350 {
1345 close (cfd); 1351 close (cfd);
1346 rxvt_print_error ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1347 return -1;
1348 } 1353 }
1349 } 1354 }
1355
1350#ifndef NO_BACKSPACE_KEY 1356#ifndef NO_BACKSPACE_KEY
1351 if (key_backspace[0] && !key_backspace[1]) 1357 if (key_backspace[0] && !key_backspace[1])
1352 er = key_backspace[0]; 1358 er = key_backspace[0];
1353 else if (STRCMP (key_backspace, "DEC") == 0) 1359 else if (STRCMP (key_backspace, "DEC") == 0)
1354 er = '\177'; /* the initial state anyway */ 1360 er = '\177'; /* the initial state anyway */
1355 else 1361 else
1356#endif 1362#endif
1357
1358 er = -1; 1363 er = -1;
1359 1364
1360 rxvt_get_ttymode (& (tio), er); 1365 rxvt_get_ttymode (&tio, er);
1361 1366
1362#ifndef __QNX__ 1367#ifndef __QNX__
1363 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1364 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1365 { 1370 {
1366 case -1: 1371 case -1:
1367 rxvt_print_error ("can't fork"); 1372 rxvt_fatal ("can't fork");
1368 return -1;
1369 case 0: 1373 case 0:
1370 close (cfd); /* only keep tty_fd and STDERR open */ 1374 close (cfd); /* only keep tty_fd and STDERR open */
1371 1375
1372 init_env (); 1376 init_env ();
1373 1377
1374 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1378 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1375 rxvt_print_error ("could not obtain control of tty"); 1379 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1376 else 1380 else
1377 { 1381 {
1378 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1382 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1379 dup2 (tty_fd, STDIN_FILENO); 1383 dup2 (tty_fd, STDIN_FILENO);
1380 dup2 (tty_fd, STDOUT_FILENO); 1384 dup2 (tty_fd, STDOUT_FILENO);
… …
1382 1386
1383 if (tty_fd > 2) 1387 if (tty_fd > 2)
1384 close (tty_fd); 1388 close (tty_fd);
1385 1389
1386 run_child (argv); 1390 run_child (argv);
1391 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1387 } 1392 }
1393
1388 exit (EXIT_FAILURE); 1394 _exit (EXIT_FAILURE);
1389 /* NOTREACHED */ 1395
1390 default: 1396 default:
1391 { 1397 {
1392#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1393 int fdstdin; 1399 int fdstdin;
1394 1400
… …
1403#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1409#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1404 1410
1405 dup2 (fdstdin, STDIN_FILENO); 1411 dup2 (fdstdin, STDIN_FILENO);
1406 close (fdstdin); 1412 close (fdstdin);
1407#endif 1413#endif
1408
1409 } 1414 }
1415
1410 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1416 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1411 break; 1417 break;
1412 } 1418 }
1413#else /* __QNX__ uses qnxspawn () */ 1419#else /* __QNX__ uses qnxspawn () */
1414 fchmod (tty_fd, 0622); 1420 fchmod (tty_fd, 0622);
… …
1445#elif defined (SRIOCSREDIR) 1451#elif defined (SRIOCSREDIR)
1446 int fd; 1452 int fd;
1447 1453
1448 fd = open (CONSOLE, O_WRONLY, 0); 1454 fd = open (CONSOLE, O_WRONLY, 0);
1449 if (fd >= 0) 1455 if (fd >= 0)
1450 {
1451 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1452 close (fd); 1457 close (fd);
1453 }
1454#endif /* SRIOCSREDIR */ 1458#endif /* SRIOCSREDIR */
1455 1459
1456 } 1460 }
1457 1461
1458 /* reset signals and spin off the command interpreter */ 1462 /* reset signals and spin off the command interpreter */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines