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.19 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.23 by pcg, Sun Feb 1 01:34:41 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.19 2004/01/28 23:40:50 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
327#endif 326#endif
328#ifdef KEEP_SCROLLCOLOR 327#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 328 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 329 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 330#endif /* KEEP_SCROLLCOLOR */
331
332 }; 332 };
333 333
334const char *const xa_names[NUM_XA] = 334const char *const xa_names[NUM_XA] =
335 { 335 {
336 "TEXT", 336 "TEXT",
… …
445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
446 ttygid = gr->gr_gid; 446 ttygid = gr->gr_gid;
447 } 447 }
448 else 448 else
449#endif /* TTY_GID_SUPPORT */ 449#endif /* TTY_GID_SUPPORT */
450
450 { 451 {
451 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 452 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
452 ttygid = getgid (); 453 ttygid = getgid ();
453 } 454 }
454 455
… …
525 * Open display, get options/resources and create the window 526 * Open display, get options/resources and create the window
526 */ 527 */
527 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
528 rs[Rs_display_name] = ":0"; 529 rs[Rs_display_name] = ":0";
529 530
530 rxvt_get_options (this, r_argc, r_argv); 531 get_options (r_argc, r_argv);
531 free (r_argv); 532 free (r_argv);
532 533
533#ifdef LOCAL_X_IS_UNIX 534#ifdef LOCAL_X_IS_UNIX
534 if (rs[Rs_display_name][0] == ':') 535 if (rs[Rs_display_name][0] == ':')
535 { 536 {
… …
546 { 547 {
547 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
548 exit (EXIT_FAILURE); 549 exit (EXIT_FAILURE);
549 } 550 }
550 551
551 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 552 extract_resources (Xdisplay, rs[Rs_name]);
552 553
553 /* 554 /*
554 * set any defaults not already set 555 * set any defaults not already set
555 */ 556 */
556 if (cmd_argv && cmd_argv[0]) 557 if (cmd_argv && cmd_argv[0])
… …
658#ifndef NO_OLD_SELECTION 659#ifndef NO_OLD_SELECTION
659 660
660 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 661 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
661 selection_style = OLD_SELECT; 662 selection_style = OLD_SELECT;
662#endif 663#endif
664
663 } 665 }
664 666
665#ifdef HAVE_SCROLLBARS 667#ifdef HAVE_SCROLLBARS
666 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
667 rs[Rs_scrollBar_thickness]); 669 rs[Rs_scrollBar_thickness]);
668#endif 670#endif
669 671
670 TermWin.fontset = new rxvt_fontset (this); 672 TermWin.fontset = new rxvt_fontset (this);
671 TermWin.fontset->populate (rs[Rs_font]); 673 TermWin.fontset->populate (rs[Rs_font]);
672 TermWin.fwidth = TermWin.fontset->base_font ()->width; 674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
… …
800void 802void
801rxvt_term::set_locale (const char *locale) 803rxvt_term::set_locale (const char *locale)
802{ 804{
803#if HAVE_XSETLOCALE || HAVE_SETLOCALE 805#if HAVE_XSETLOCALE || HAVE_SETLOCALE
804 free (this->locale); 806 free (this->locale);
805 this->locale = strdup (setlocale (LC_CTYPE, "")); 807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
806#endif 808#endif
807#if HAVE_NL_LANGINFO 809#if HAVE_NL_LANGINFO
808 free (codeset); 810 free (codeset);
809 codeset = strdup (nl_langinfo (CODESET)); 811 codeset = strdup (nl_langinfo (CODESET));
810 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
811 || !STRCASECMP (codeset, "UTF8"); 813 || !STRCASECMP (codeset, "UTF8");
812#else 814#else
813 enc_utf8 = 1; 815 enc_utf8 = 1;
814#endif 816#endif
815} 817}
816 818
… …
870 872
871#ifdef META8_OPTION 873#ifdef META8_OPTION
872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
873#endif 875#endif
874 876
875 rxvt_get_ourmods (this); 877 get_ourmods ();
876 878
877 if (!(Options & Opt_scrollTtyOutput)) 879 if (!(Options & Opt_scrollTtyOutput))
878 PrivateModes |= PrivMode_TtyOutputInh; 880 PrivateModes |= PrivMode_TtyOutputInh;
879 if (Options & Opt_scrollTtyKeypress) 881 if (Options & Opt_scrollTtyKeypress)
880 PrivateModes |= PrivMode_Keypress; 882 PrivateModes |= PrivMode_Keypress;
… …
885 if (STRCMP(key_backspace, "DEC") == 0) 887 if (STRCMP(key_backspace, "DEC") == 0)
886 PrivateModes |= PrivMode_HaveBackSpace; 888 PrivateModes |= PrivMode_HaveBackSpace;
887#endif 889#endif
888 890
889 /* add value for scrollBar */ 891 /* add value for scrollBar */
890 if (scrollbar_visible (this)) 892 if (scrollbar_visible ())
891 { 893 {
892 PrivateModes |= PrivMode_scrollBar; 894 PrivateModes |= PrivMode_scrollBar;
893 SavedModes |= PrivMode_scrollBar; 895 SavedModes |= PrivMode_scrollBar;
894 } 896 }
895 if (menubar_visible (this)) 897 if (menubar_visible ())
896 { 898 {
897 PrivateModes |= PrivMode_menuBar; 899 PrivateModes |= PrivMode_menuBar;
898 SavedModes |= PrivMode_menuBar; 900 SavedModes |= PrivMode_menuBar;
899 } 901 }
900 902
… …
916 exit (EXIT_FAILURE); 918 exit (EXIT_FAILURE);
917 } 919 }
918} 920}
919 921
920/*----------------------------------------------------------------------*/ 922/*----------------------------------------------------------------------*/
921/* INTPROTO */
922void 923void
923rxvt_Get_Colours (pR) 924rxvt_term::Get_Colours ()
924{ 925{
925 int i; 926 int i;
926 927
927 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 928 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
928 { 929 {
929 rxvt_color xcol; 930 rxvt_color xcol;
930 931
931 if (!R->rs[Rs_color + i]) 932 if (!rs[Rs_color + i])
932 continue; 933 continue;
933 934
934 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 935 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
935 { 936 {
936#ifndef XTERM_REVERSE_VIDEO 937#ifndef XTERM_REVERSE_VIDEO
937 if (i < 2 && (R->Options & Opt_reverseVideo)) 938 if (i < 2 && (Options & Opt_reverseVideo))
938 { 939 {
939 R->rs[Rs_color + i] = def_colorName[!i]; 940 rs[Rs_color + i] = def_colorName[!i];
940 } 941 }
941 else 942 else
942#endif 943#endif
943 R->rs[Rs_color + i] = def_colorName[i]; 944 rs[Rs_color + i] = def_colorName[i];
944 945
945 if (!R->rs[Rs_color + i]) 946 if (!rs[Rs_color + i])
946 continue; 947 continue;
947 948
948 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 949 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
949 { 950 {
950 switch (i) 951 switch (i)
951 { 952 {
952 case Color_fg: 953 case Color_fg:
953 case Color_bg: 954 case Color_bg:
954 /* fatal: need bg/fg color */ 955 /* fatal: need bg/fg color */
955 rxvt_print_error ("aborting"); 956 rxvt_print_error ("aborting");
956 exit (EXIT_FAILURE); 957 exit (EXIT_FAILURE);
957 /* NOTREACHED */ 958 /* NOTREACHED */
958 break; 959 break;
959#ifndef NO_CURSORCOLOR 960#ifndef NO_CURSORCOLOR
960 case Color_cursor2: 961 case Color_cursor2:
961 xcol = R->PixColors[Color_fg]; 962 xcol = PixColors[Color_fg];
962 break; 963 break;
963#endif /* ! NO_CURSORCOLOR */ 964#endif /* ! NO_CURSORCOLOR */
964 case Color_pointer: 965 case Color_pointer:
965 xcol = R->PixColors[Color_fg]; 966 xcol = PixColors[Color_fg];
966 break; 967 break;
967 default: 968 default:
968 xcol = R->PixColors[Color_bg]; /* None */ 969 xcol = PixColors[Color_bg]; /* None */
969 break; 970 break;
970 } 971 }
971 } 972 }
972 } 973 }
973 974
974 R->PixColors[i] = xcol; 975 PixColors[i] = xcol;
975 SET_PIXCOLOR (R, i); 976 SET_PIXCOLOR (i);
976 } 977 }
977 978
978 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 979 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
979 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 980 PixColors[Color_pointer] = PixColors[Color_fg];
980 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 981 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
981 R->PixColors[Color_border] = R->PixColors[Color_fg]; 982 PixColors[Color_border] = PixColors[Color_fg];
982 983
983 /* 984 /*
984 * get scrollBar/menuBar shadow colors 985 * get scrollBar/menuBar shadow colors
985 * 986 *
986 * The calculations of topShadow/bottomShadow values are adapted 987 * The calculations of topShadow/bottomShadow values are adapted
… …
988 */ 989 */
989#ifdef KEEP_SCROLLCOLOR 990#ifdef KEEP_SCROLLCOLOR
990 991
991 if (XDEPTH <= 2) 992 if (XDEPTH <= 2)
992 { /* Monochrome */ 993 { /* Monochrome */
993 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 994 PixColors[Color_scroll] = PixColors[Color_fg];
994 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 995 PixColors[Color_topShadow] = PixColors[Color_bg];
995 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 996 PixColors[Color_bottomShadow] = PixColors[Color_bg];
996 } 997 }
997 else 998 else
998 { 999 {
999 rxvt_color xcol[3]; 1000 rxvt_color xcol[3];
1000 /* xcol[0] == white 1001 /* xcol[0] == white
1001 * xcol[1] == top shadow 1002 * xcol[1] == top shadow
1002 * xcol[2] == bot shadow */ 1003 * xcol[2] == bot shadow */
1003 1004
1004 xcol[1] = R->PixColors[Color_scroll]; 1005 xcol[1] = PixColors[Color_scroll];
1005# ifdef PREFER_24BIT 1006# ifdef PREFER_24BIT
1006 xcol[0].set (R, 65535, 65535, 65535); 1007 xcol[0].set (this, 65535, 65535, 65535);
1007 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1008 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1008# else 1009# else
1009 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1010 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen));
1010# endif 1011# endif
1011 1012
1012 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1013 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1013 1014
1014 xcol[0].get (R, pr0, pg0, pb0); 1015 xcol[0].get (this, pr0, pg0, pb0);
1015 xcol[1].get (R, pr1, pg1, pb1); 1016 xcol[1].get (this, pr1, pg1, pb1);
1016 1017
1017 /* bottomShadowColor */ 1018 /* bottomShadowColor */
1018 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1019 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2))
1019 xcol[2] = R->PixColors[Color_Black]; 1020 xcol[2] = PixColors[Color_Black];
1020 1021
1021 R->PixColors[Color_bottomShadow] = xcol[2]; 1022 PixColors[Color_bottomShadow] = xcol[2];
1022 1023
1023 /* topShadowColor */ 1024 /* topShadowColor */
1024 if (!xcol[1].set (aR_ 1025 if (!xcol[1].set (this,
1025 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1026 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1026 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1027 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1027 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1028 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1028 xcol[1] = R->PixColors[Color_White]; 1029 xcol[1] = PixColors[Color_White];
1029 1030
1030 R->PixColors[Color_topShadow] = xcol[1]; 1031 PixColors[Color_topShadow] = xcol[1];
1031 } 1032 }
1032#endif /* KEEP_SCROLLCOLOR */ 1033#endif /* KEEP_SCROLLCOLOR */
1033} 1034}
1034 1035
1035/*----------------------------------------------------------------------*/ 1036/*----------------------------------------------------------------------*/
… …
1046 i -= 8; 1047 i -= 8;
1047#ifndef NO_BRIGHTCOLOR 1048#ifndef NO_BRIGHTCOLOR
1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1049 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1049 return; 1050 return;
1050#endif 1051#endif
1052
1051 } 1053 }
1052 1054
1053 if (i >= 0 && i <= 7) /* normal colors */ 1055 if (i >= 0 && i <= 7) /* normal colors */
1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1056 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1055 } 1057 }
… …
1058/*----------------------------------------------------------------------*/ 1060/*----------------------------------------------------------------------*/
1059/* 1061/*
1060 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1062 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1061 * Use resource ``modifier'' to override the Meta modifier 1063 * Use resource ``modifier'' to override the Meta modifier
1062 */ 1064 */
1063/* INTPROTO */
1064void 1065void
1065rxvt_get_ourmods(pR) 1066rxvt_term::get_ourmods ()
1066{ 1067{
1067 int i, j, k; 1068 int i, j, k;
1068 int requestedmeta, realmeta, realalt; 1069 int requestedmeta, realmeta, realalt;
1069 const char *cm, *rsmod; 1070 const char *cm, *rsmod;
1070 XModifierKeymap *map; 1071 XModifierKeymap *map;
… …
1073 { 1074 {
1074 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1075 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1075 }; 1076 };
1076 1077
1077 requestedmeta = realmeta = realalt = 0; 1078 requestedmeta = realmeta = realalt = 0;
1078 rsmod = R->rs[Rs_modifier]; 1079 rsmod = rs[Rs_modifier];
1079 if (rsmod 1080 if (rsmod
1080 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1081 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1081 requestedmeta = rsmod[3] - '0'; 1082 requestedmeta = rsmod[3] - '0';
1082 1083
1083 map = XGetModifierMapping(R->Xdisplay); 1084 map = XGetModifierMapping(Xdisplay);
1084 kc = map->modifiermap; 1085 kc = map->modifiermap;
1085 for (i = 1; i < 6; i++) 1086 for (i = 1; i < 6; i++)
1086 { 1087 {
1087 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1088 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1088 for (j = map->max_keypermod; j--; k++) 1089 for (j = map->max_keypermod; j--; k++)
1089 { 1090 {
1090 if (kc[k] == 0) 1091 if (kc[k] == 0)
1091 break; 1092 break;
1092 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1093 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0))
1093 { 1094 {
1094 case XK_Num_Lock: 1095 case XK_Num_Lock:
1095 R->ModNumLockMask = modmasks[i - 1]; 1096 ModNumLockMask = modmasks[i - 1];
1096 /* FALLTHROUGH */ 1097 /* FALLTHROUGH */
1097 default: 1098 default:
1098 continue; /* for(;;) */ 1099 continue; /* for(;;) */
1099 case XK_Meta_L: 1100 case XK_Meta_L:
1100 case XK_Meta_R: 1101 case XK_Meta_R:
1101 cm = "meta"; 1102 cm = "meta";
1102 realmeta = i; 1103 realmeta = i;
1103 break; 1104 break;
1104 case XK_Alt_L: 1105 case XK_Alt_L:
1105 case XK_Alt_R: 1106 case XK_Alt_R:
1106 cm = "alt"; 1107 cm = "alt";
1107 realalt = i; 1108 realalt = i;
1108 break; 1109 break;
1109 case XK_Super_L: 1110 case XK_Super_L:
1110 case XK_Super_R: 1111 case XK_Super_R:
1111 cm = "super"; 1112 cm = "super";
1112 break; 1113 break;
1113 case XK_Hyper_L: 1114 case XK_Hyper_L:
1114 case XK_Hyper_R: 1115 case XK_Hyper_R:
1115 cm = "hyper"; 1116 cm = "hyper";
1116 break; 1117 break;
1117 } 1118 }
1118 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1119 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1119 requestedmeta = i; 1120 requestedmeta = i;
1120 } 1121 }
1121 } 1122 }
1122 XFreeModifiermap(map); 1123 XFreeModifiermap(map);
1123 i = (requestedmeta ? requestedmeta 1124 i = (requestedmeta ? requestedmeta
1124 : (realmeta ? realmeta 1125 : (realmeta ? realmeta
1125 : (realalt ? realalt : 0))); 1126 : (realalt ? realalt : 0)));
1126 if (i) 1127 if (i)
1127 R->ModMetaMask = modmasks[i - 1]; 1128 ModMetaMask = modmasks[i - 1];
1128} 1129}
1129 1130
1130/*----------------------------------------------------------------------*/ 1131/*----------------------------------------------------------------------*/
1131/* rxvt_Create_Windows() - Open and map the window */ 1132/* rxvt_Create_Windows() - Open and map the window */
1132void 1133void
… …
1135 XClassHint classHint; 1136 XClassHint classHint;
1136 XWMHints wmHint; 1137 XWMHints wmHint;
1137 XGCValues gcvalue; 1138 XGCValues gcvalue;
1138 long vt_emask; 1139 long vt_emask;
1139 1140
1140 XSetWindowAttributes attributes;
1141 XWindowAttributes gattr; 1141 XWindowAttributes gattr;
1142 1142
1143 Xcmap = DefaultColormap (Xdisplay, Xscreen); 1143 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1144 Xvisual = DefaultVisual (Xdisplay, Xscreen); 1144 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1145 Xscreen = DefaultScreen (Xdisplay); 1145 Xscreen = DefaultScreen (Xdisplay);
… …
1168 RootWindow(Xdisplay, Xscreen), 1168 RootWindow(Xdisplay, Xscreen),
1169 Xvisual, AllocNone); 1169 Xvisual, AllocNone);
1170 } 1170 }
1171 } 1171 }
1172#endif 1172#endif
1173
1173 } 1174 }
1174 1175
1175 /* grab colors before netscape does */ 1176 /* grab colors before netscape does */
1176 rxvt_Get_Colours (this); 1177 Get_Colours ();
1177 1178
1178 rxvt_change_font (this, 1, NULL); 1179 change_font (1, NULL);
1179 window_calc (0, 0); 1180 window_calc (0, 0);
1180 old_width = szHint.width; 1181 old_width = szHint.width;
1181 old_height = szHint.height; 1182 old_height = szHint.height;
1182 1183
1183 /* parent window - reverse video so we can see placement errors 1184 /* parent window - reverse video so we can see placement errors
1184 * sub-window placement & size in rxvt_resize_subwindows() 1185 * sub-window placement & size in rxvt_resize_subwindows()
1185 */ 1186 */
1186 1187
1187#ifdef PREFER_24BIT 1188#ifdef PREFER_24BIT
1189 XSetWindowAttributes attributes;
1190
1188 attributes.background_pixel = PixColors[Color_fg]; 1191 attributes.background_pixel = PixColors[Color_fg];
1189 attributes.border_pixel = PixColors[Color_border]; 1192 attributes.border_pixel = PixColors[Color_border];
1190 attributes.colormap = Xcmap; 1193 attributes.colormap = Xcmap;
1191 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1194 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1192 szHint.x, szHint.y, 1195 szHint.x, szHint.y,
1193 szHint.width, szHint.height, 1196 szHint.width, szHint.height,
1194 TermWin.ext_bwidth, 1197 TermWin.ext_bwidth,
1195 Xdepth, InputOutput, 1198 Xdepth, InputOutput,
1196 Xvisual, 1199 Xvisual,
1197 CWBackPixel | CWBorderPixel 1200 CWBackPixel | CWBorderPixel
1198 | CWColormap, &attributes); 1201 | CWColormap, &attributes);
1199#else 1202#else
1200 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1203 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1201 szHint.x, szHint.y, 1204 szHint.x, szHint.y,
1202 szHint.width, 1205 szHint.width,
1203 szHint.height, 1206 szHint.height,
1204 TermWin.ext_bwidth, 1207 TermWin.ext_bwidth,
1205 PixColors[Color_border], 1208 PixColors[Color_border],
1206 PixColors[Color_fg]); 1209 PixColors[Color_fg]);
1207#endif 1210#endif
1208 1211
1209 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1212 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1210 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1213 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1211 1214
1212 classHint.res_name = (char *)rs[Rs_name]; 1215 classHint.res_name = (char *)rs[Rs_name];
1213 classHint.res_class = (char *)APL_CLASS; 1216 classHint.res_class = (char *)APL_CLASS;
1214 1217
1215 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1218 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
… …
1243 blackcolour.red = 0; 1246 blackcolour.red = 0;
1244 blackcolour.green = 0; 1247 blackcolour.green = 0;
1245 blackcolour.blue = 0; 1248 blackcolour.blue = 0;
1246 Font f = XLoadFont (Xdisplay, "fixed"); 1249 Font f = XLoadFont (Xdisplay, "fixed");
1247 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1250 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ',
1248 &blackcolour, &blackcolour); 1251 &blackcolour, &blackcolour);
1249 XUnloadFont (Xdisplay, f); 1252 XUnloadFont (Xdisplay, f);
1250 } 1253 }
1251#endif 1254#endif
1252 1255
1253 /* the vt window */ 1256 /* the vt window */
1254 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1257 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1255 window_vt_x, window_vt_y, 1258 window_vt_x, window_vt_y,
1256 TermWin_TotalWidth(), 1259 TermWin_TotalWidth(),
1257 TermWin_TotalHeight(), 1260 TermWin_TotalHeight(),
1258 0, 1261 0,
1259 PixColors[Color_fg], 1262 PixColors[Color_fg],
1260 PixColors[Color_bg]); 1263 PixColors[Color_bg]);
1261#ifdef DEBUG_X 1264#ifdef DEBUG_X
1262 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1265 XStoreName(Xdisplay, TermWin.vt, "vt window");
1263#endif 1266#endif
1264 1267
1265 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
… …
1279#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1282#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1280 1283
1281 if (menuBar_height()) 1284 if (menuBar_height())
1282 { 1285 {
1283 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1286 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1284 window_vt_x, 0, 1287 window_vt_x, 0,
1285 TermWin_TotalWidth(), 1288 TermWin_TotalWidth(),
1286 menuBar_TotalHeight(), 1289 menuBar_TotalHeight(),
1287 0, 1290 0,
1288 PixColors[Color_fg], 1291 PixColors[Color_fg],
1289 PixColors[Color_scroll]); 1292 PixColors[Color_scroll]);
1290#ifdef DEBUG_X 1293#ifdef DEBUG_X
1291 1294
1292 XStoreName(Xdisplay, menuBar.win, "menubar"); 1295 XStoreName(Xdisplay, menuBar.win, "menubar");
1293#endif 1296#endif
1294 1297
… …
1305 const char *p = rs[Rs_backgroundPixmap]; 1308 const char *p = rs[Rs_backgroundPixmap];
1306 1309
1307 if ((p = STRCHR(p, ';')) != NULL) 1310 if ((p = STRCHR(p, ';')) != NULL)
1308 { 1311 {
1309 p++; 1312 p++;
1310 rxvt_scale_pixmap (this, p); 1313 scale_pixmap (p);
1311 } 1314 }
1312 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1315 set_bgPixmap (rs[Rs_backgroundPixmap]);
1313 rxvt_scr_touch (this, True); 1316 scr_touch (True);
1314 } 1317 }
1315#endif 1318#endif
1316 1319
1317 /* graphics context for the vt window */ 1320 /* graphics context for the vt window */
1318 gcvalue.foreground = PixColors[Color_fg]; 1321 gcvalue.foreground = PixColors[Color_fg];
1319 gcvalue.background = PixColors[Color_bg]; 1322 gcvalue.background = PixColors[Color_bg];
1320 gcvalue.graphics_exposures = 1; 1323 gcvalue.graphics_exposures = 1;
1321 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1324 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt,
1322 GCForeground | GCBackground 1325 GCForeground | GCBackground
1323 | GCGraphicsExposures, &gcvalue); 1326 | GCGraphicsExposures, &gcvalue);
1324 1327
1325#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1328#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1326 1329
1327 gcvalue.foreground = PixColors[Color_topShadow]; 1330 gcvalue.foreground = PixColors[Color_topShadow];
1328 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1331 topShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1329 GCForeground, &gcvalue); 1332 GCForeground, &gcvalue);
1330 gcvalue.foreground = PixColors[Color_bottomShadow]; 1333 gcvalue.foreground = PixColors[Color_bottomShadow];
1331 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1334 botShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1332 GCForeground, &gcvalue); 1335 GCForeground, &gcvalue);
1333 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1336 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1334 : Color_scroll)]; 1337 : Color_scroll)];
1335 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1338 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1336 GCForeground, &gcvalue); 1339 GCForeground, &gcvalue);
1337#endif 1340#endif
1338} 1341}
1339 1342
1340/*----------------------------------------------------------------------*/ 1343/*----------------------------------------------------------------------*/
1341/* 1344/*
… …
1368 1371
1369 /* get slave (tty) */ 1372 /* get slave (tty) */
1370 if (tty_fd < 0) 1373 if (tty_fd < 0)
1371 { 1374 {
1372#ifndef NO_SETOWNER_TTYDEV 1375#ifndef NO_SETOWNER_TTYDEV
1373 rxvt_privileged_ttydev (aR_ SAVE); 1376 privileged_ttydev (SAVE);
1374#endif 1377#endif
1375 1378
1376 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1379 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1377 { 1380 {
1378 close(cfd); 1381 close(cfd);
… …
1394 1397
1395#ifndef __QNX__ 1398#ifndef __QNX__
1396 /* spin off the command interpreter */ 1399 /* spin off the command interpreter */
1397 switch (cmd_pid = fork ()) 1400 switch (cmd_pid = fork ())
1398 { 1401 {
1399 case -1: 1402 case -1:
1400 rxvt_print_error("can't fork"); 1403 rxvt_print_error("can't fork");
1401 return -1; 1404 return -1;
1402 case 0: 1405 case 0:
1403 close (cfd); /* only keep tty_fd and STDERR open */ 1406 close (cfd); /* only keep tty_fd and STDERR open */
1404 close (Xfd); 1407 close (Xfd);
1405 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1408 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1406 rxvt_print_error ("could not obtain control of tty"); 1409 rxvt_print_error ("could not obtain control of tty");
1407 else 1410 else
1411 {
1412 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1413 dup2 (tty_fd, STDIN_FILENO);
1414 dup2 (tty_fd, STDOUT_FILENO);
1415 dup2 (tty_fd, STDERR_FILENO);
1416
1417 if (tty_fd > 2)
1418 close (tty_fd);
1419
1420 run_child (argv);
1421 }
1422 exit (EXIT_FAILURE);
1423 /* NOTREACHED */
1424 default:
1408 { 1425 {
1409 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1426#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1427 int fdstdin;
1428
1429 fdstdin = dup (STDIN_FILENO);
1410 dup2 (tty_fd, STDIN_FILENO); 1430 dup2 (tty_fd, STDIN_FILENO);
1431#endif
1432
1433#ifdef UTMP_SUPPORT
1434 privileged_utmp (SAVE);
1435#endif
1436
1437#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1438
1411 dup2 (tty_fd, STDOUT_FILENO); 1439 dup2 (fdstdin, STDIN_FILENO);
1412 dup2 (tty_fd, STDERR_FILENO);
1413
1414 if (tty_fd > 2)
1415 close (tty_fd); 1440 close (fdstdin);
1441#endif
1416 1442
1417 run_child (argv);
1418 } 1443 }
1419 exit (EXIT_FAILURE);
1420 /* NOTREACHED */
1421 default:
1422 {
1423#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1424 int fdstdin;
1425
1426 fdstdin = dup (STDIN_FILENO);
1427 dup2 (tty_fd, STDIN_FILENO);
1428#endif
1429
1430#ifdef UTMP_SUPPORT
1431 rxvt_privileged_utmp (this, SAVE);
1432#endif
1433
1434#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1435
1436 dup2 (fdstdin, STDIN_FILENO);
1437 close (fdstdin);
1438#endif
1439
1440 }
1441 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1444 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */
1442 break; 1445 break;
1443 } 1446 }
1444#else /* __QNX__ uses qnxspawn() */ 1447#else /* __QNX__ uses qnxspawn() */
1445 fchmod (tty_fd, 0622); 1448 fchmod (tty_fd, 0622);
1446 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1449 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1447 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1450 fcntl (cfd, F_SETFD, FD_CLOEXEC);
… …
1481 { 1484 {
1482 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1485 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1483 close (fd); 1486 close (fd);
1484 } 1487 }
1485#endif /* SRIOCSREDIR */ 1488#endif /* SRIOCSREDIR */
1489
1486 } 1490 }
1487 1491
1488 /* reset signals and spin off the command interpreter */ 1492 /* reset signals and spin off the command interpreter */
1489 signal (SIGINT, SIG_DFL); 1493 signal (SIGINT, SIG_DFL);
1490 signal (SIGQUIT, SIG_DFL); 1494 signal (SIGQUIT, SIG_DFL);
… …
1585 } 1589 }
1586 arg_v = arg_a; 1590 arg_v = arg_a;
1587 } 1591 }
1588 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1592 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1589 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1593 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1590 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1594 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1591 command, arg_v, environ, iov_a, 0); 1595 command, arg_v, environ, iov_a, 0);
1592 if (login) 1596 if (login)
1593 free(login); 1597 free(login);
1594 1598
1595 close(tty_fd); 1599 close(tty_fd);
1596 return cmd_fd; 1600 return cmd_fd;
… …
1601 1605
1602/* ------------------------------------------------------------------------- * 1606/* ------------------------------------------------------------------------- *
1603 * GET TTY CURRENT STATE * 1607 * GET TTY CURRENT STATE *
1604 * ------------------------------------------------------------------------- */ 1608 * ------------------------------------------------------------------------- */
1605/* rxvt_get_ttymode() */ 1609/* rxvt_get_ttymode() */
1606/* INTPROTO */ 1610/* EXTPROTO */
1607void 1611void
1608rxvt_get_ttymode(ttymode_t *tio, int erase) 1612rxvt_get_ttymode(ttymode_t *tio, int erase)
1609{ 1613{
1610#ifdef HAVE_TERMIOS_H 1614#ifdef HAVE_TERMIOS_H
1611 /* 1615 /*

Diff Legend

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