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.29 by pcg, Sat Feb 21 21:43:37 2004 UTC vs.
Revision 1.57 by root, Mon Jun 21 22:24:07 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
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
312#endif 313#endif
313#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
314 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
315 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
316#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
317 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
318 NULL, /* Color_border */ 320 NULL, /* Color_border */
319#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
320 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
321 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
322 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
326#endif 328#endif
327#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
331 333#if TINTING
334 NULL,
335#endif
332 }; 336 };
333 337
334const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
335 { 339 {
336 "TEXT", 340 "TEXT",
… …
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 387 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 388 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 389 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 390 numPixColors = TOTAL_COLORS;
387 391
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR 392#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE; 393 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 394#endif
406 395
407 refresh_limit = 1; 396 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 397 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 398 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 399
417 oldcursor.row = oldcursor.col = -1; 400 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 401#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 402 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 403 bgPixmap.x = bgPixmap.y = 50;
… …
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 497 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 498
516 cmd_argv[i] = NULL; 499 cmd_argv[i] = NULL;
517 } 500 }
518 501
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename (argv[0]); 502 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 503
525 /* 504 /*
526 * Open display, get options/resources and create the window 505 * Open display, get options/resources and create the window
527 */ 506 */
… …
542 } 521 }
543#endif 522#endif
544 523
545 if (!display 524 if (!display
546 && ! (display = displays.get (rs[Rs_display_name]))) 525 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 526 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 527
552 extract_resources (display->display, rs[Rs_name]); 528 extract_resources (display->display, rs[Rs_name]);
553 529
554 /* 530 /*
555 * set any defaults not already set 531 * set any defaults not already set
… …
600 rs[Rs_print_pipe] = PRINTPIPE; 576 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 577#endif
602 578
603 if (!rs[Rs_cutchars]) 579 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 580 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 581
618#ifndef NO_BACKSPACE_KEY 582#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 583 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 584# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 585 key_backspace = DEFAULT_BACKSPACE;
… …
650 { 614 {
651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 615 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 } 617 }
654 618
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 }
666
667#ifdef HAVE_SCROLLBARS 619#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 620 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
669 rs[Rs_scrollBar_thickness]); 621 rs[Rs_scrollBar_thickness]);
670#endif 622#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 623
678#ifdef XTERM_REVERSE_VIDEO 624#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 625 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 626 if (Options & Opt_reverseVideo)
681 { 627 {
… …
701 color_aliases (Color_bg); 647 color_aliases (Color_bg);
702#ifndef NO_CURSORCOLOR 648#ifndef NO_CURSORCOLOR
703 color_aliases (Color_cursor); 649 color_aliases (Color_cursor);
704 color_aliases (Color_cursor2); 650 color_aliases (Color_cursor2);
705#endif /* NO_CURSORCOLOR */ 651#endif /* NO_CURSORCOLOR */
706 color_aliases (Color_pointer); 652 color_aliases (Color_pointer_fg);
653 color_aliases (Color_pointer_bg);
707 color_aliases (Color_border); 654 color_aliases (Color_border);
708#ifndef NO_BOLD_UNDERLINE_REVERSE 655#ifndef NO_BOLD_UNDERLINE_REVERSE
709 color_aliases (Color_BD); 656 color_aliases (Color_BD);
710 color_aliases (Color_UL); 657 color_aliases (Color_UL);
711 color_aliases (Color_RV); 658 color_aliases (Color_RV);
… …
805void 752void
806rxvt_term::set_locale (const char *locale) 753rxvt_term::set_locale (const char *locale)
807{ 754{
808#if HAVE_XSETLOCALE || HAVE_SETLOCALE 755#if HAVE_XSETLOCALE || HAVE_SETLOCALE
809 free (this->locale); 756 free (this->locale);
810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 757 this->locale = setlocale (LC_CTYPE, locale);
758
759 if (!this->locale)
760 {
761 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
762 setlocale (LC_CTYPE, "");
763 this->locale = "";
764 }
765
766 this->locale = rxvt_strdup (this->locale);
811 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
812 mbstate.reset (); 768 mbstate.reset ();
813#endif 769#endif
770#if 0
814#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
815 free (codeset); 772 free (codeset);
816 codeset = strdup (nl_langinfo (CODESET)); 773 codeset = strdup (nl_langinfo (CODESET));
817 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 774 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
818 || !STRCASECMP (codeset, "UTF8"); 775 || !STRCASECMP (codeset, "UTF8");
819#else 776#else
820 enc_utf8 = 1; 777 enc_utf8 = 1;
821#endif 778#endif
779#endif
822} 780}
823 781
824void 782void
825rxvt_term::init_xlocale () 783rxvt_term::init_xlocale ()
826{ 784{
827#ifdef USE_XIM 785#ifdef USE_XIM
828 if (!locale) 786 if (!locale)
829 rxvt_print_error ("Setting locale failed."); 787 rxvt_warn ("setting locale failed, working without locale support.\n");
830 else 788 else
831 { 789 {
832 Atom wmlocale; 790 Atom wmlocale;
833 791
834 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 792 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
836 XA_STRING, 8, PropModeReplace, 794 XA_STRING, 8, PropModeReplace,
837 (unsigned char *)locale, STRLEN (locale)); 795 (unsigned char *)locale, STRLEN (locale));
838 796
839 if (!XSupportsLocale ()) 797 if (!XSupportsLocale ())
840 { 798 {
841 rxvt_print_error ("The locale is not supported by Xlib"); 799 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
842 return; 800 return;
843 } 801 }
844 802
845 im_ev.start (display); 803 im_ev.start (display);
846 804
… …
876 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 834 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
877#endif 835#endif
878 836
879 get_ourmods (); 837 get_ourmods ();
880 838
881 if (! (Options & Opt_scrollTtyOutput)) 839 if (!(Options & Opt_scrollTtyOutput))
882 PrivateModes |= PrivMode_TtyOutputInh; 840 PrivateModes |= PrivMode_TtyOutputInh;
883 if (Options & Opt_scrollTtyKeypress) 841 if (Options & Opt_scrollTtyKeypress)
884 PrivateModes |= PrivMode_Keypress; 842 PrivateModes |= PrivMode_Keypress;
885 if (! (Options & Opt_jumpScroll)) 843 if (!(Options & Opt_jumpScroll))
886 PrivateModes |= PrivMode_smoothScroll; 844 PrivateModes |= PrivMode_smoothScroll;
887 845
888#ifndef NO_BACKSPACE_KEY 846#ifndef NO_BACKSPACE_KEY
889 if (STRCMP (key_backspace, "DEC") == 0) 847 if (STRCMP (key_backspace, "DEC") == 0)
890 PrivateModes |= PrivMode_HaveBackSpace; 848 PrivateModes |= PrivMode_HaveBackSpace;
… …
900 { 858 {
901 PrivateModes |= PrivMode_menuBar; 859 PrivateModes |= PrivMode_menuBar;
902 SavedModes |= PrivMode_menuBar; 860 SavedModes |= PrivMode_menuBar;
903 } 861 }
904 862
905#ifdef GREEK_SUPPORT
906 greek_init ();
907#endif
908
909#ifdef CURSOR_BLINK 863#ifdef CURSOR_BLINK
910 if (Options & Opt_cursorBlink) 864 if (Options & Opt_cursorBlink)
911 (void)gettimeofday (&lastcursorchange, NULL); 865 (void)gettimeofday (&lastcursorchange, NULL);
912#endif 866#endif
913 867
914 if ((cmd_fd = run_command (argv)) < 0) 868 if ((cmd_fd = run_command (argv)) < 0)
915 { 869 rxvt_fatal ("failure while running command, aborting");
916 rxvt_print_error ("aborting");
917 exit (EXIT_FAILURE);
918 }
919} 870}
920 871
921/*----------------------------------------------------------------------*/ 872/*----------------------------------------------------------------------*/
922void 873void
923rxvt_term::Get_Colours () 874rxvt_term::Get_Colours ()
… …
948 switch (i) 899 switch (i)
949 { 900 {
950 case Color_fg: 901 case Color_fg:
951 case Color_bg: 902 case Color_bg:
952 /* fatal: need bg/fg color */ 903 /* fatal: need bg/fg color */
953 rxvt_print_error ("aborting"); 904 rxvt_fatal ("unable to get foreground/background colour, aborting");
954 exit (EXIT_FAILURE);
955 /* NOTREACHED */ 905 /* NOTREACHED */
956 break; 906 break;
957#ifndef NO_CURSORCOLOR 907#ifndef NO_CURSORCOLOR
958 case Color_cursor2: 908 case Color_cursor2:
959 xcol = PixColors[Color_fg]; 909 xcol = PixColors[Color_fg];
960 break; 910 break;
961#endif /* ! NO_CURSORCOLOR */ 911#endif /* ! NO_CURSORCOLOR */
962 case Color_pointer: 912 case Color_pointer_fg:
963 xcol = PixColors[Color_fg]; 913 xcol = PixColors[Color_fg];
964 break; 914 break;
965 default: 915 default:
966 xcol = PixColors[Color_bg]; /* None */ 916 xcol = PixColors[Color_bg]; /* None */
967 break; 917 break;
… …
971 921
972 PixColors[i] = xcol; 922 PixColors[i] = xcol;
973 SET_PIXCOLOR (i); 923 SET_PIXCOLOR (i);
974 } 924 }
975 925
976 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 926 if (XDEPTH <= 2)
977 PixColors[Color_pointer] = PixColors[Color_fg]; 927 {
978 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 928 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
979 PixColors[Color_border] = PixColors[Color_fg]; 929 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
930 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
931 }
980 932
981 /* 933 /*
982 * get scrollBar/menuBar shadow colors 934 * get scrollBar/menuBar shadow colors
983 * 935 *
984 * The calculations of topShadow/bottomShadow values are adapted 936 * The calculations of topShadow/bottomShadow values are adapted
… …
986 */ 938 */
987#ifdef KEEP_SCROLLCOLOR 939#ifdef KEEP_SCROLLCOLOR
988 940
989 if (XDEPTH <= 2) 941 if (XDEPTH <= 2)
990 { /* Monochrome */ 942 { /* Monochrome */
991 PixColors[Color_scroll] = PixColors[Color_fg]; 943 PixColors[Color_scroll] = PixColors[Color_fg];
992 PixColors[Color_topShadow] = PixColors[Color_bg]; 944 PixColors[Color_topShadow] = PixColors[Color_bg];
993 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 945 PixColors[Color_bottomShadow] = PixColors[Color_bg];
994 } 946 }
995 else 947 else
996 { 948 {
997 rxvt_color xcol[3]; 949 rxvt_color xcol[3];
998 /* xcol[0] == white 950 /* xcol[0] == white
999 * xcol[1] == top shadow 951 * xcol[1] == top shadow
1000 * xcol[2] == bot shadow */ 952 * xcol[2] == bot shadow */
1001 953
1002 xcol[1] = PixColors[Color_scroll]; 954 xcol[1] = PixColors[Color_scroll];
… …
1128/*----------------------------------------------------------------------*/ 1080/*----------------------------------------------------------------------*/
1129/* rxvt_Create_Windows () - Open and map the window */ 1081/* rxvt_Create_Windows () - Open and map the window */
1130void 1082void
1131rxvt_term::create_windows (int argc, const char *const *argv) 1083rxvt_term::create_windows (int argc, const char *const *argv)
1132{ 1084{
1133 XClassHint classHint; 1085 XClassHint classHint;
1134 XWMHints wmHint; 1086 XWMHints wmHint;
1135 XGCValues gcvalue; 1087 XGCValues gcvalue;
1136 long vt_emask; 1088 long vt_emask;
1137 1089 XSetWindowAttributes attributes;
1138 XWindowAttributes gattr; 1090 XWindowAttributes gattr;
1139 1091
1140 if (Options & Opt_transparent) 1092 if (Options & Opt_transparent)
1141 { 1093 {
1142 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1094 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1144 } 1096 }
1145 1097
1146 /* grab colors before netscape does */ 1098 /* grab colors before netscape does */
1147 Get_Colours (); 1099 Get_Colours ();
1148 1100
1149 change_font (1, NULL); 1101 if (!change_font (rs[Rs_font]))
1102 {
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 destroy ();
1105 return;
1106 }
1107
1150 window_calc (0, 0); 1108 window_calc (0, 0);
1151 old_width = szHint.width; 1109 old_width = szHint.width;
1152 old_height = szHint.height; 1110 old_height = szHint.height;
1153 1111
1154 /* parent window - reverse video so we can see placement errors
1155 * sub-window placement & size in rxvt_resize_subwindows () 1112 /* sub-window placement & size in rxvt_resize_subwindows () */
1156 */
1157 1113
1158#ifdef PREFER_24BIT 1114#ifdef PREFER_24BIT
1159 XSetWindowAttributes attributes;
1160
1161 attributes.background_pixel = PixColors[Color_fg]; 1115 attributes.background_pixel = PixColors[Color_bg];
1162 attributes.border_pixel = PixColors[Color_border]; 1116 attributes.border_pixel = PixColors[Color_border];
1163 attributes.colormap = display->cmap; 1117 attributes.colormap = display->cmap;
1164 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1165 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1166 szHint.width, szHint.height, 1120 szHint.width, szHint.height,
1167 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1168 display->depth, InputOutput, 1122 display->depth, InputOutput,
1169 display->visual, 1123 display->visual,
1170 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1124 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1171#else 1125#else
1172 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1126 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1173 szHint.x, szHint.y, 1127 szHint.x, szHint.y,
1174 szHint.width, 1128 szHint.width, szHint.height,
1175 szHint.height,
1176 TermWin.ext_bwidth, 1129 TermWin.ext_bwidth,
1177 PixColors[Color_border], 1130 PixColors[Color_border],
1178 PixColors[Color_fg]); 1131 PixColors[Color_bg]);
1179#endif 1132#endif
1180 1133
1181 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1182 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1183 1136
1184 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
1185 classHint.res_class = (char *)APL_CLASS; 1138 classHint.res_class = (char *)RESCLASS;
1186 1139
1187 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1188 wmHint.input = True; 1141 wmHint.input = True;
1189 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1142 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1190 : NormalState);
1191 wmHint.window_group = TermWin.parent[0]; 1143 wmHint.window_group = TermWin.parent[0];
1192 1144
1193 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1194 (char **)argv, argc, &szHint, &wmHint, &classHint); 1146 (char **)argv, argc, &szHint, &wmHint, &classHint);
1147
1148#ifndef NO_FRILLS
1149 long pid = getpid ();
1150 XChangeProperty (display->display, TermWin.parent[0],
1151 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1152 PropModeReplace, (unsigned char *)&pid, 1);
1153#endif
1195 1154
1196 XSelectInput (display->display, TermWin.parent[0], 1155 XSelectInput (display->display, TermWin.parent[0],
1197 KeyPressMask 1156 KeyPressMask
1198#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1157#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1199 | KeyReleaseMask 1158 | KeyReleaseMask
… …
1223 } 1182 }
1224#endif 1183#endif
1225 1184
1226 /* the vt window */ 1185 /* the vt window */
1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1186 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1228 window_vt_x, window_vt_y, 1187 window_vt_x,
1188 window_vt_y,
1229 TermWin_TotalWidth (), 1189 TermWin_TotalWidth (),
1230 TermWin_TotalHeight (), 1190 TermWin_TotalHeight (),
1231 0, 1191 0,
1232 PixColors[Color_fg], 1192 PixColors[Color_fg],
1233 PixColors[Color_bg]); 1193 PixColors[Color_bg]);
1234 1194
1235#ifdef DEBUG_X 1195#ifdef DEBUG_X
1236 XStoreName (display->display, TermWin.vt, "vt window"); 1196 XStoreName (display->display, TermWin.vt, "vt window");
1237#endif 1197#endif
1238 1198
1199 attributes.bit_gravity = NorthWestGravity;
1200 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1201
1239 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1202 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1240 | PropertyChangeMask);
1241 1203
1242#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
1243 pointer_unblank (); 1205 pointer_unblank ();
1244 1206
1245 if ((Options & Opt_pointerBlank)) 1207 if (Options & Opt_pointerBlank)
1246 vt_emask |= PointerMotionMask; 1208 vt_emask |= PointerMotionMask;
1247 else 1209 else
1248#endif 1210#endif
1249 vt_emask |= (Button1MotionMask | Button3MotionMask); 1211 vt_emask |= Button1MotionMask | Button3MotionMask;
1250 1212
1251 XSelectInput (display->display, TermWin.vt, vt_emask); 1213 XSelectInput (display->display, TermWin.vt, vt_emask);
1252 vt_ev.start (display, TermWin.vt); 1214 vt_ev.start (display, TermWin.vt);
1253 1215
1254#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1216#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1255 if (menuBar_height ()) 1217 if (menuBar_height ())
1256 { 1218 {
1257 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1219 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1258 window_vt_x, 0, 1220 window_vt_x, 0,
1259 TermWin_TotalWidth (), 1221 TermWin_TotalWidth (),
1260 menuBar_TotalHeight (), 1222 menuBar_TotalHeight (),
1261 0, 1223 0,
1262 PixColors[Color_fg], 1224 PixColors[Color_fg],
1263 PixColors[Color_scroll]); 1225 PixColors[Color_scroll]);
1226
1264#ifdef DEBUG_X 1227#ifdef DEBUG_X
1265 XStoreName (display->display, menuBar.win, "menubar"); 1228 XStoreName (display->display, menuBar.win, "menubar");
1266#endif 1229#endif
1267 1230
1231 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1232
1268 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1233 XDefineCursor (display->display, menuBar.win,
1234 XCreateFontCursor (display->display, XC_left_ptr));
1269 1235
1270 XSelectInput (display->display, menuBar.win, 1236 XSelectInput (display->display, menuBar.win,
1271 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1272 | Button1MotionMask)); 1238 | Button1MotionMask));
1273 menubar_ev.start (display, menuBar.win); 1239 menubar_ev.start (display, menuBar.win);
… …
1293 /* graphics context for the vt window */ 1259 /* graphics context for the vt window */
1294 gcvalue.foreground = PixColors[Color_fg]; 1260 gcvalue.foreground = PixColors[Color_fg];
1295 gcvalue.background = PixColors[Color_bg]; 1261 gcvalue.background = PixColors[Color_bg];
1296 gcvalue.graphics_exposures = 1; 1262 gcvalue.graphics_exposures = 1;
1297 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1263 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1298 GCForeground | GCBackground 1264 GCForeground | GCBackground | GCGraphicsExposures,
1299 | GCGraphicsExposures, &gcvalue); 1265 &gcvalue);
1266
1267 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1300 1268
1301#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1269#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1302 gcvalue.foreground = PixColors[Color_topShadow]; 1270 gcvalue.foreground = PixColors[Color_topShadow];
1303 topShadowGC = XCreateGC (display->display, TermWin.vt, 1271 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305 gcvalue.foreground = PixColors[Color_bottomShadow]; 1272 gcvalue.foreground = PixColors[Color_bottomShadow];
1306 botShadowGC = XCreateGC (display->display, TermWin.vt, 1273 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1307 GCForeground, &gcvalue);
1308 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1274 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1309 : Color_scroll)];
1310 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1275 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1311 GCForeground, &gcvalue);
1312#endif 1276#endif
1313} 1277}
1314 1278
1315/*----------------------------------------------------------------------*/ 1279/*----------------------------------------------------------------------*/
1316/* 1280/*
… …
1323{ 1287{
1324 int cfd, er; 1288 int cfd, er;
1325 1289
1326 /* get master (pty) */ 1290 /* get master (pty) */
1327 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1291 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1328 {
1329 rxvt_print_error ("can't open pseudo-tty"); 1292 rxvt_fatal ("can't open pseudo-tty");
1330 return -1;
1331 }
1332 1293
1333 fcntl (cfd, F_SETFL, O_NONBLOCK); 1294 fcntl (cfd, F_SETFL, O_NONBLOCK);
1334 1295
1335 /* get slave (tty) */ 1296 /* get slave (tty) */
1336 if (tty_fd < 0) 1297 if (tty_fd < 0)
… …
1340#endif 1301#endif
1341 1302
1342 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1303 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1343 { 1304 {
1344 close (cfd); 1305 close (cfd);
1345 rxvt_print_error ("can't open slave tty %s", ttydev); 1306 rxvt_fatal ("can't open slave tty %s", ttydev);
1346 return -1;
1347 } 1307 }
1348 } 1308 }
1349#ifndef NO_BACKSPACE_KEY 1309#ifndef NO_BACKSPACE_KEY
1350 if (key_backspace[0] && !key_backspace[1]) 1310 if (key_backspace[0] && !key_backspace[1])
1351 er = key_backspace[0]; 1311 er = key_backspace[0];
… …
1361#ifndef __QNX__ 1321#ifndef __QNX__
1362 /* spin off the command interpreter */ 1322 /* spin off the command interpreter */
1363 switch (cmd_pid = fork ()) 1323 switch (cmd_pid = fork ())
1364 { 1324 {
1365 case -1: 1325 case -1:
1366 rxvt_print_error ("can't fork"); 1326 rxvt_fatal ("can't fork");
1367 return -1;
1368 case 0: 1327 case 0:
1369 close (cfd); /* only keep tty_fd and STDERR open */ 1328 close (cfd); /* only keep tty_fd and STDERR open */
1370 1329
1371 init_env (); 1330 init_env ();
1372 1331
1373 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1332 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1374 rxvt_print_error ("could not obtain control of tty"); 1333 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1375 else 1334 else
1376 { 1335 {
1377 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1336 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1378 dup2 (tty_fd, STDIN_FILENO); 1337 dup2 (tty_fd, STDIN_FILENO);
1379 dup2 (tty_fd, STDOUT_FILENO); 1338 dup2 (tty_fd, STDOUT_FILENO);
… …
1381 1340
1382 if (tty_fd > 2) 1341 if (tty_fd > 2)
1383 close (tty_fd); 1342 close (tty_fd);
1384 1343
1385 run_child (argv); 1344 run_child (argv);
1345 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1386 } 1346 }
1347
1387 exit (EXIT_FAILURE); 1348 _exit (EXIT_FAILURE);
1388 /* NOTREACHED */ 1349
1389 default: 1350 default:
1390 { 1351 {
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1352#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392 int fdstdin; 1353 int fdstdin;
1393 1354
… …
1402#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1363#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1403 1364
1404 dup2 (fdstdin, STDIN_FILENO); 1365 dup2 (fdstdin, STDIN_FILENO);
1405 close (fdstdin); 1366 close (fdstdin);
1406#endif 1367#endif
1407
1408 } 1368 }
1369
1409 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1370 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1410 break; 1371 break;
1411 } 1372 }
1412#else /* __QNX__ uses qnxspawn () */ 1373#else /* __QNX__ uses qnxspawn () */
1413 fchmod (tty_fd, 0622); 1374 fchmod (tty_fd, 0622);

Diff Legend

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