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

Diff Legend

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