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.33 by pcg, Sun Feb 22 10:37:54 2004 UTC vs.
Revision 1.67 by root, Tue Aug 3 22:19:51 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 399#endif
403 400
404 refresh_limit = 1; 401 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 402 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 403 prev_nrow = prev_ncol = 0;
407#ifdef MULTICHAR_SET
408# ifdef MULTICHAR_ENCODING
409 encoding_method = MULTICHAR_ENCODING;
410# endif
411 multichar_decode = rxvt_euc2jis;
412#endif
413 404
414 oldcursor.row = oldcursor.col = -1; 405 oldcursor.row = oldcursor.col = -1;
415#ifdef XPM_BACKGROUND 406#ifdef XPM_BACKGROUND
416 /* bgPixmap.w = bgPixmap.h = 0; */ 407 /* bgPixmap.w = bgPixmap.h = 0; */
417 bgPixmap.x = bgPixmap.y = 50; 408 bgPixmap.x = bgPixmap.y = 50;
… …
511 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 502 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
512 503
513 cmd_argv[i] = NULL; 504 cmd_argv[i] = NULL;
514 } 505 }
515 506
516 /* clear all resources */
517 for (i = 0; i < NUM_RESOURCES;)
518 rs[i++] = NULL;
519
520 rs[Rs_name] = rxvt_r_basename (argv[0]); 507 rs[Rs_name] = rxvt_r_basename (argv[0]);
521 508
522 /* 509 /*
523 * Open display, get options/resources and create the window 510 * Open display, get options/resources and create the window
524 */ 511 */
… …
539 } 526 }
540#endif 527#endif
541 528
542 if (!display 529 if (!display
543 && ! (display = displays.get (rs[Rs_display_name]))) 530 && ! (display = displays.get (rs[Rs_display_name])))
544 {
545 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
546 exit (EXIT_FAILURE);
547 }
548 532
549 extract_resources (display->display, rs[Rs_name]); 533 extract_resources (display->display, rs[Rs_name]);
550 534
551 /* 535 /*
552 * set any defaults not already set 536 * set any defaults not already set
… …
597 rs[Rs_print_pipe] = PRINTPIPE; 581 rs[Rs_print_pipe] = PRINTPIPE;
598#endif 582#endif
599 583
600 if (!rs[Rs_cutchars]) 584 if (!rs[Rs_cutchars])
601 rs[Rs_cutchars] = CUTCHARS; 585 rs[Rs_cutchars] = CUTCHARS;
602
603#ifdef ACS_ASCII
604 if (!rs[Rs_acs_chars])
605 rs[Rs_acs_chars] = ACS_CHARS;
606 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
607 {
608 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
609 for (; i < 0x20; )
610 val[i] = ' ';
611 rs[Rs_acs_chars] = val;
612 }
613#endif
614 586
615#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
616 if (!rs[Rs_backspace_key]) 588 if (!rs[Rs_backspace_key])
617# ifdef DEFAULT_BACKSPACE 589# ifdef DEFAULT_BACKSPACE
618 key_backspace = DEFAULT_BACKSPACE; 590 key_backspace = DEFAULT_BACKSPACE;
… …
645#endif 617#endif
646 if (rs[Rs_answerbackstring]) 618 if (rs[Rs_answerbackstring])
647 { 619 {
648 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
649 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
650 }
651
652 if (rs[Rs_selectstyle])
653 {
654 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
655 selection_style = OLD_WORD_SELECT;
656#ifndef NO_OLD_SELECTION
657
658 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
659 selection_style = OLD_SELECT;
660#endif
661
662 } 622 }
663 623
664#ifdef HAVE_SCROLLBARS 624#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 626 rs[Rs_scrollBar_thickness]);
… …
692 color_aliases (Color_bg); 652 color_aliases (Color_bg);
693#ifndef NO_CURSORCOLOR 653#ifndef NO_CURSORCOLOR
694 color_aliases (Color_cursor); 654 color_aliases (Color_cursor);
695 color_aliases (Color_cursor2); 655 color_aliases (Color_cursor2);
696#endif /* NO_CURSORCOLOR */ 656#endif /* NO_CURSORCOLOR */
697 color_aliases (Color_pointer); 657 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg);
698 color_aliases (Color_border); 659 color_aliases (Color_border);
699#ifndef NO_BOLD_UNDERLINE_REVERSE 660#ifndef NO_BOLD_UNDERLINE_REVERSE
700 color_aliases (Color_BD); 661 color_aliases (Color_BD);
701 color_aliases (Color_UL); 662 color_aliases (Color_UL);
702 color_aliases (Color_RV); 663 color_aliases (Color_RV);
… …
796void 757void
797rxvt_term::set_locale (const char *locale) 758rxvt_term::set_locale (const char *locale)
798{ 759{
799#if HAVE_XSETLOCALE || HAVE_SETLOCALE 760#if HAVE_XSETLOCALE || HAVE_SETLOCALE
800 free (this->locale); 761 free (this->locale);
801 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 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);
802 SET_LOCALE (this->locale); 772 SET_LOCALE (this->locale);
803 mbstate.reset (); 773 mbstate.reset ();
804#endif 774#endif
775#if 0
805#if HAVE_NL_LANGINFO 776#if HAVE_NL_LANGINFO
806 free (codeset); 777 free (codeset);
807 codeset = strdup (nl_langinfo (CODESET)); 778 codeset = strdup (nl_langinfo (CODESET));
808 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
809 || !STRCASECMP (codeset, "UTF8"); 780 || !STRCASECMP (codeset, "UTF8");
810#else 781#else
811 enc_utf8 = 1; 782 enc_utf8 = 1;
812#endif 783#endif
784#endif
813} 785}
814 786
815void 787void
816rxvt_term::init_xlocale () 788rxvt_term::init_xlocale ()
817{ 789{
818#ifdef USE_XIM 790#ifdef USE_XIM
819 if (!locale) 791 if (!locale)
820 rxvt_print_error ("Setting locale failed."); 792 rxvt_warn ("setting locale failed, working without locale support.\n");
821 else 793 else
822 { 794 {
823 Atom wmlocale; 795 Atom wmlocale;
824 796
825 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
827 XA_STRING, 8, PropModeReplace, 799 XA_STRING, 8, PropModeReplace,
828 (unsigned char *)locale, STRLEN (locale)); 800 (unsigned char *)locale, STRLEN (locale));
829 801
830 if (!XSupportsLocale ()) 802 if (!XSupportsLocale ())
831 { 803 {
832 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");
833 return; 805 return;
834 } 806 }
835 807
836 im_ev.start (display); 808 im_ev.start (display);
837 809
… …
867 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
868#endif 840#endif
869 841
870 get_ourmods (); 842 get_ourmods ();
871 843
872 if (! (Options & Opt_scrollTtyOutput)) 844 if (!(Options & Opt_scrollTtyOutput))
873 PrivateModes |= PrivMode_TtyOutputInh; 845 PrivateModes |= PrivMode_TtyOutputInh;
874 if (Options & Opt_scrollTtyKeypress) 846 if (Options & Opt_scrollTtyKeypress)
875 PrivateModes |= PrivMode_Keypress; 847 PrivateModes |= PrivMode_Keypress;
876 if (! (Options & Opt_jumpScroll)) 848 if (!(Options & Opt_jumpScroll))
877 PrivateModes |= PrivMode_smoothScroll; 849 PrivateModes |= PrivMode_smoothScroll;
878 850
879#ifndef NO_BACKSPACE_KEY 851#ifndef NO_BACKSPACE_KEY
880 if (STRCMP (key_backspace, "DEC") == 0) 852 if (STRCMP (key_backspace, "DEC") == 0)
881 PrivateModes |= PrivMode_HaveBackSpace; 853 PrivateModes |= PrivMode_HaveBackSpace;
… …
897 if (Options & Opt_cursorBlink) 869 if (Options & Opt_cursorBlink)
898 (void)gettimeofday (&lastcursorchange, NULL); 870 (void)gettimeofday (&lastcursorchange, NULL);
899#endif 871#endif
900 872
901 if ((cmd_fd = run_command (argv)) < 0) 873 if ((cmd_fd = run_command (argv)) < 0)
902 { 874 rxvt_fatal ("failure while running command, aborting");
903 rxvt_print_error ("aborting");
904 exit (EXIT_FAILURE);
905 }
906} 875}
907 876
908/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
909void 878void
910rxvt_term::Get_Colours () 879rxvt_term::Get_Colours ()
911{ 880{
912 int i; 881 int i;
913 882
883#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused;
885#endif
886
914 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 887 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
915 { 888 {
916 rxvt_color xcol; 889 rxvt_color xcol;
917 890
918 if (!rs[Rs_color + i]) 891 if (!rs[Rs_color + i])
919 continue; 892 continue;
… …
935 switch (i) 908 switch (i)
936 { 909 {
937 case Color_fg: 910 case Color_fg:
938 case Color_bg: 911 case Color_bg:
939 /* fatal: need bg/fg color */ 912 /* fatal: need bg/fg color */
940 rxvt_print_error ("aborting"); 913 rxvt_fatal ("unable to get foreground/background colour, aborting");
941 exit (EXIT_FAILURE);
942 /* NOTREACHED */ 914 /* NOTREACHED */
943 break; 915 break;
944#ifndef NO_CURSORCOLOR 916#ifndef NO_CURSORCOLOR
945 case Color_cursor2: 917 case Color_cursor2:
946 xcol = PixColors[Color_fg]; 918 xcol = PixColors[Color_fg];
947 break; 919 break;
948#endif /* ! NO_CURSORCOLOR */ 920#endif /* ! NO_CURSORCOLOR */
949 case Color_pointer: 921 case Color_pointer_fg:
950 xcol = PixColors[Color_fg]; 922 xcol = PixColors[Color_fg];
951 break; 923 break;
952 default: 924 default:
953 xcol = PixColors[Color_bg]; /* None */ 925 xcol = PixColors[Color_bg]; /* None */
954 break; 926 break;
955 } 927 }
956 } 928 }
957 } 929 }
958 930
959 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
960 SET_PIXCOLOR (i); 936 SET_PIXCOLOR (i);
961 } 937 }
962 938
963 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 939 if (display->depth <= 2)
964 PixColors[Color_pointer] = PixColors[Color_fg]; 940 {
965 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 941 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
966 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 }
967 945
968 /* 946 /*
969 * get scrollBar/menuBar shadow colors 947 * get scrollBar/menuBar shadow colors
970 * 948 *
971 * The calculations of topShadow/bottomShadow values are adapted 949 * The calculations of topShadow/bottomShadow values are adapted
972 * from the fvwm window manager. 950 * from the fvwm window manager.
973 */ 951 */
974#ifdef KEEP_SCROLLCOLOR 952#ifdef KEEP_SCROLLCOLOR
975 953
976 if (XDEPTH <= 2) 954 if (display->depth <= 2)
977 { /* Monochrome */ 955 { /* Monochrome */
978 PixColors[Color_scroll] = PixColors[Color_fg]; 956 PixColors[Color_scroll] = PixColors[Color_fg];
979 PixColors[Color_topShadow] = PixColors[Color_bg]; 957 PixColors[Color_topShadow] = PixColors[Color_bg];
980 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 958 PixColors[Color_bottomShadow] = PixColors[Color_bg];
981 } 959 }
982 else 960 else
983 { 961 {
984 rxvt_color xcol[3]; 962 rxvt_color xcol[2];
985 /* xcol[0] == white 963 /* xcol[0] == white
986 * xcol[1] == top shadow 964 * xcol[1] == top shadow
987 * xcol[2] == bot shadow */ 965 * xcol[2] == bot shadow */
988 966
989 xcol[1] = PixColors[Color_scroll]; 967 xcol[1] = PixColors[Color_scroll];
990# ifdef PREFER_24BIT
991 xcol[0].set (display, 65535, 65535, 65535); 968 xcol[0].set (display, 65535, 65535, 65535);
992 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
993# else
994 xcol[0].set (display, WhitePixel (display->display, display->screen));
995# endif
996 969
997 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
998 971
999 xcol[0].get (display, pr0, pg0, pb0); 972 xcol[0].get (display, pr0, pg0, pb0);
1000 xcol[1].get (display, pr1, pg1, pb1); 973 xcol[1].get (display, pr1, pg1, pb1);
1001 974
1002 /* bottomShadowColor */
1003 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1004 xcol[2] = PixColors[Color_Black];
1005
1006 PixColors[Color_bottomShadow] = xcol[2]; 975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
1007 976
1008 /* topShadowColor */ 977 /* topShadowColor */
1009 if (!xcol[1].set (display, 978 if (!xcol[1].set (display,
1010 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 979 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1011 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 980 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
… …
1115/*----------------------------------------------------------------------*/ 1084/*----------------------------------------------------------------------*/
1116/* rxvt_Create_Windows () - Open and map the window */ 1085/* rxvt_Create_Windows () - Open and map the window */
1117void 1086void
1118rxvt_term::create_windows (int argc, const char *const *argv) 1087rxvt_term::create_windows (int argc, const char *const *argv)
1119{ 1088{
1120 XClassHint classHint; 1089 XClassHint classHint;
1121 XWMHints wmHint; 1090 XWMHints wmHint;
1091#ifndef NO_FRILLS
1092 Atom prop = None;
1093 MWMHints mwmhints;
1094#endif
1122 XGCValues gcvalue; 1095 XGCValues gcvalue;
1123 long vt_emask; 1096 long vt_emask;
1124 1097 XSetWindowAttributes attributes;
1125 XWindowAttributes gattr; 1098 XWindowAttributes gattr;
1126 1099
1127 if (Options & Opt_transparent) 1100 if (Options & Opt_transparent)
1128 { 1101 {
1129 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1102 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1130 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1103 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1131 } 1104 }
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
1132 1129
1133 /* grab colors before netscape does */ 1130 /* grab colors before netscape does */
1134 Get_Colours (); 1131 Get_Colours ();
1135 1132
1136 if (!change_font (rs[Rs_font])) 1133 if (!change_font (rs[Rs_font]))
… …
1142 1139
1143 window_calc (0, 0); 1140 window_calc (0, 0);
1144 old_width = szHint.width; 1141 old_width = szHint.width;
1145 old_height = szHint.height; 1142 old_height = szHint.height;
1146 1143
1147 /* parent window - reverse video so we can see placement errors
1148 * sub-window placement & size in rxvt_resize_subwindows () 1144 /* sub-window placement & size in rxvt_resize_subwindows () */
1149 */
1150 1145
1151#ifdef PREFER_24BIT 1146#ifdef PREFER_24BIT
1152 XSetWindowAttributes attributes;
1153
1154 attributes.background_pixel = PixColors[Color_fg]; 1147 attributes.background_pixel = PixColors[Color_bg];
1155 attributes.border_pixel = PixColors[Color_border]; 1148 attributes.border_pixel = PixColors[Color_border];
1156 attributes.colormap = display->cmap; 1149 attributes.colormap = display->cmap;
1157 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1150 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1158 szHint.x, szHint.y, 1151 szHint.x, szHint.y,
1159 szHint.width, szHint.height, 1152 szHint.width, szHint.height,
1160 TermWin.ext_bwidth, 1153 TermWin.ext_bwidth,
1161 display->depth, InputOutput, 1154 display->depth, InputOutput,
1162 display->visual, 1155 display->visual,
1163 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1156 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1164#else 1157#else
1165 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1158 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1166 szHint.x, szHint.y, 1159 szHint.x, szHint.y,
1167 szHint.width, 1160 szHint.width, szHint.height,
1168 szHint.height,
1169 TermWin.ext_bwidth, 1161 TermWin.ext_bwidth,
1170 PixColors[Color_border], 1162 PixColors[Color_border],
1171 PixColors[Color_fg]); 1163 PixColors[Color_bg]);
1172#endif 1164#endif
1173 1165
1174 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1166 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1175 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1167 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1176 1168
1177 classHint.res_name = (char *)rs[Rs_name]; 1169 classHint.res_name = (char *)rs[Rs_name];
1178 classHint.res_class = (char *)APL_CLASS; 1170 classHint.res_class = (char *)RESCLASS;
1179 1171
1180 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1172 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1181 wmHint.input = True; 1173 wmHint.input = True;
1182 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1174 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1183 : NormalState);
1184 wmHint.window_group = TermWin.parent[0]; 1175 wmHint.window_group = TermWin.parent[0];
1185 1176
1186 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1177 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1187 (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
1188 1186
1189 XSelectInput (display->display, TermWin.parent[0], 1187 XSelectInput (display->display, TermWin.parent[0],
1190 KeyPressMask 1188 KeyPressMask
1191#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1189#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1192 | KeyReleaseMask 1190 | KeyReleaseMask
1193#endif 1191#endif
1194 | FocusChangeMask | VisibilityChangeMask 1192 | FocusChangeMask | VisibilityChangeMask
1193 | ExposureMask
1195 | StructureNotifyMask); 1194 | StructureNotifyMask);
1196 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
1197 1204
1198 /* 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 */
1199 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1200 1207
1201#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1216 } 1223 }
1217#endif 1224#endif
1218 1225
1219 /* the vt window */ 1226 /* the vt window */
1220 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1221 window_vt_x, window_vt_y, 1228 window_vt_x,
1229 window_vt_y,
1222 TermWin_TotalWidth (), 1230 TermWin_TotalWidth (),
1223 TermWin_TotalHeight (), 1231 TermWin_TotalHeight (),
1224 0, 1232 0,
1225 PixColors[Color_fg], 1233 PixColors[Color_fg],
1226 PixColors[Color_bg]); 1234 PixColors[Color_bg]);
1227
1228#ifdef DEBUG_X 1235#ifdef DEBUG_X
1229 XStoreName (display->display, TermWin.vt, "vt window"); 1236 XStoreName (display->display, TermWin.vt, "vt window");
1230#endif 1237#endif
1231 1238
1239 attributes.bit_gravity = NorthWestGravity;
1240 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1241
1232 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1242 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1233 | PropertyChangeMask); 1243
1244 pointer_unblank ();
1234 1245
1235#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1236 pointer_unblank ();
1237
1238 if ((Options & Opt_pointerBlank)) 1247 if (Options & Opt_pointerBlank)
1239 vt_emask |= PointerMotionMask; 1248 vt_emask |= PointerMotionMask;
1240 else 1249 else
1241#endif 1250#endif
1242 vt_emask |= (Button1MotionMask | Button3MotionMask); 1251 vt_emask |= Button1MotionMask | Button3MotionMask;
1243 1252
1244 XSelectInput (display->display, TermWin.vt, vt_emask); 1253 XSelectInput (display->display, TermWin.vt, vt_emask);
1245 vt_ev.start (display, TermWin.vt); 1254 vt_ev.start (display, TermWin.vt);
1246 1255
1247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1256#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1248 if (menuBar_height ()) 1257 if (menuBar_height ())
1249 { 1258 {
1250 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1259 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1251 window_vt_x, 0, 1260 window_vt_x, 0,
1252 TermWin_TotalWidth (), 1261 TermWin_TotalWidth (),
1253 menuBar_TotalHeight (), 1262 menuBar_TotalHeight (),
1254 0, 1263 0,
1255 PixColors[Color_fg], 1264 PixColors[Color_fg],
1256 PixColors[Color_scroll]); 1265 PixColors[Color_scroll]);
1266
1257#ifdef DEBUG_X 1267#ifdef DEBUG_X
1258 XStoreName (display->display, menuBar.win, "menubar"); 1268 XStoreName (display->display, menuBar.win, "menubar");
1259#endif 1269#endif
1260 1270
1271 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1272
1261 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1273 XDefineCursor (display->display, menuBar.win,
1274 XCreateFontCursor (display->display, XC_left_ptr));
1262 1275
1263 XSelectInput (display->display, menuBar.win, 1276 XSelectInput (display->display, menuBar.win,
1264 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1277 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | Button1MotionMask)); 1278 | Button1MotionMask));
1266 menubar_ev.start (display, menuBar.win); 1279 menubar_ev.start (display, menuBar.win);
… …
1269 1282
1270#ifdef XPM_BACKGROUND 1283#ifdef XPM_BACKGROUND
1271 if (rs[Rs_backgroundPixmap] != NULL 1284 if (rs[Rs_backgroundPixmap] != NULL
1272 && ! (Options & Opt_transparent)) 1285 && ! (Options & Opt_transparent))
1273 { 1286 {
1274 const char *p = rs[Rs_backgroundPixmap]; 1287 const char *p = rs[Rs_backgroundPixmap];
1275 1288
1276 if ((p = STRCHR (p, ';')) != NULL) 1289 if ((p = STRCHR (p, ';')) != NULL)
1277 { 1290 {
1278 p++; 1291 p++;
1279 scale_pixmap (p); 1292 scale_pixmap (p);
… …
1286 /* graphics context for the vt window */ 1299 /* graphics context for the vt window */
1287 gcvalue.foreground = PixColors[Color_fg]; 1300 gcvalue.foreground = PixColors[Color_fg];
1288 gcvalue.background = PixColors[Color_bg]; 1301 gcvalue.background = PixColors[Color_bg];
1289 gcvalue.graphics_exposures = 1; 1302 gcvalue.graphics_exposures = 1;
1290 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1303 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1291 GCForeground | GCBackground 1304 GCForeground | GCBackground | GCGraphicsExposures,
1292 | GCGraphicsExposures, &gcvalue); 1305 &gcvalue);
1306
1307 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1308
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1309#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1310 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, 1311 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 GCForeground, &gcvalue);
1298 gcvalue.foreground = PixColors[Color_bottomShadow]; 1312 gcvalue.foreground = PixColors[Color_bottomShadow];
1299 botShadowGC = XCreateGC (display->display, TermWin.vt, 1313 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1300 GCForeground, &gcvalue); 1314 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1301 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg
1302 : Color_scroll)];
1303 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1315 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 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;
1305#endif 1322#endif
1306} 1323}
1307 1324
1308/*----------------------------------------------------------------------*/ 1325/*----------------------------------------------------------------------*/
1309/* 1326/*
… …
1316{ 1333{
1317 int cfd, er; 1334 int cfd, er;
1318 1335
1319 /* get master (pty) */ 1336 /* get master (pty) */
1320 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1337 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1321 {
1322 rxvt_print_error ("can't open pseudo-tty"); 1338 rxvt_fatal ("can't open pseudo-tty");
1323 return -1;
1324 }
1325 1339
1326 fcntl (cfd, F_SETFL, O_NONBLOCK); 1340 fcntl (cfd, F_SETFL, O_NONBLOCK);
1327 1341
1328 /* get slave (tty) */ 1342 /* get slave (tty) */
1329 if (tty_fd < 0) 1343 if (tty_fd < 0)
… …
1333#endif 1347#endif
1334 1348
1335 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1349 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1336 { 1350 {
1337 close (cfd); 1351 close (cfd);
1338 rxvt_print_error ("can't open slave tty %s", ttydev); 1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1339 return -1;
1340 } 1353 }
1341 } 1354 }
1342#ifndef NO_BACKSPACE_KEY 1355#ifndef NO_BACKSPACE_KEY
1343 if (key_backspace[0] && !key_backspace[1]) 1356 if (key_backspace[0] && !key_backspace[1])
1344 er = key_backspace[0]; 1357 er = key_backspace[0];
… …
1354#ifndef __QNX__ 1367#ifndef __QNX__
1355 /* spin off the command interpreter */ 1368 /* spin off the command interpreter */
1356 switch (cmd_pid = fork ()) 1369 switch (cmd_pid = fork ())
1357 { 1370 {
1358 case -1: 1371 case -1:
1359 rxvt_print_error ("can't fork"); 1372 rxvt_fatal ("can't fork");
1360 return -1;
1361 case 0: 1373 case 0:
1362 close (cfd); /* only keep tty_fd and STDERR open */ 1374 close (cfd); /* only keep tty_fd and STDERR open */
1363 1375
1364 init_env (); 1376 init_env ();
1365 1377
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1378 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1379 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1380 else
1369 { 1381 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1382 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1383 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1384 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1386
1375 if (tty_fd > 2) 1387 if (tty_fd > 2)
1376 close (tty_fd); 1388 close (tty_fd);
1377 1389
1378 run_child (argv); 1390 run_child (argv);
1391 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1392 }
1393
1380 exit (EXIT_FAILURE); 1394 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1395
1382 default: 1396 default:
1383 { 1397 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1399 int fdstdin;
1386 1400
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1409#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1410
1397 dup2 (fdstdin, STDIN_FILENO); 1411 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1412 close (fdstdin);
1399#endif 1413#endif
1400
1401 } 1414 }
1415
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1416 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1417 break;
1404 } 1418 }
1405#else /* __QNX__ uses qnxspawn () */ 1419#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1420 fchmod (tty_fd, 0622);

Diff Legend

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