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.14 by pcg, Thu Dec 18 05:45:11 2003 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.14 2003/12/18 05:45:11 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;
… …
795/* 798/*
796 * This is more or less stolen straight from XFree86 xterm. 799 * This is more or less stolen straight from XFree86 xterm.
797 * This should support all European type languages. 800 * This should support all European type languages.
798 */ 801 */
799void 802void
803rxvt_term::set_locale (const char *locale)
804{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
808#endif
809#if HAVE_NL_LANGINFO
810 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8");
814#else
815 enc_utf8 = 1;
816#endif
817}
818
819void
800rxvt_term::init_xlocale () 820rxvt_term::init_xlocale ()
801{ 821{
802#ifdef USE_XIM 822#ifdef USE_XIM
803 if (!locale) 823 if (!locale)
804 rxvt_print_error ("Setting locale failed."); 824 rxvt_print_error ("Setting locale failed.");
… …
814 if (!XSupportsLocale ()) 834 if (!XSupportsLocale ())
815 { 835 {
816 rxvt_print_error ("The locale is not supported by Xlib"); 836 rxvt_print_error ("The locale is not supported by Xlib");
817 return; 837 return;
818 } 838 }
819
820 rxvt_setTermFontSet (this, 0);
821 839
822 /* see if we can connect yet */ 840 /* see if we can connect yet */
823 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 841 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL);
824 842
825 /* To avoid Segmentation Fault in C locale: Solaris only? */ 843 /* To avoid Segmentation Fault in C locale: Solaris only? */
… …
854 872
855#ifdef META8_OPTION 873#ifdef META8_OPTION
856 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
857#endif 875#endif
858 876
859 rxvt_get_ourmods (this); 877 get_ourmods ();
860 878
861 if (!(Options & Opt_scrollTtyOutput)) 879 if (!(Options & Opt_scrollTtyOutput))
862 PrivateModes |= PrivMode_TtyOutputInh; 880 PrivateModes |= PrivMode_TtyOutputInh;
863 if (Options & Opt_scrollTtyKeypress) 881 if (Options & Opt_scrollTtyKeypress)
864 PrivateModes |= PrivMode_Keypress; 882 PrivateModes |= PrivMode_Keypress;
… …
869 if (STRCMP(key_backspace, "DEC") == 0) 887 if (STRCMP(key_backspace, "DEC") == 0)
870 PrivateModes |= PrivMode_HaveBackSpace; 888 PrivateModes |= PrivMode_HaveBackSpace;
871#endif 889#endif
872 890
873 /* add value for scrollBar */ 891 /* add value for scrollBar */
874 if (scrollbar_visible (this)) 892 if (scrollbar_visible ())
875 { 893 {
876 PrivateModes |= PrivMode_scrollBar; 894 PrivateModes |= PrivMode_scrollBar;
877 SavedModes |= PrivMode_scrollBar; 895 SavedModes |= PrivMode_scrollBar;
878 } 896 }
879 if (menubar_visible (this)) 897 if (menubar_visible ())
880 { 898 {
881 PrivateModes |= PrivMode_menuBar; 899 PrivateModes |= PrivMode_menuBar;
882 SavedModes |= PrivMode_menuBar; 900 SavedModes |= PrivMode_menuBar;
883 } 901 }
884 902
… …
900 exit (EXIT_FAILURE); 918 exit (EXIT_FAILURE);
901 } 919 }
902} 920}
903 921
904/*----------------------------------------------------------------------*/ 922/*----------------------------------------------------------------------*/
905/* INTPROTO */
906void 923void
907rxvt_Get_Colours (pR) 924rxvt_term::Get_Colours ()
908{ 925{
909 int i; 926 int i;
910 927
911 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 928 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
912 { 929 {
913 rxvt_color xcol; 930 rxvt_color xcol;
914 931
915 if (!R->rs[Rs_color + i]) 932 if (!rs[Rs_color + i])
916 continue; 933 continue;
917 934
918 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 935 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
919 { 936 {
920#ifndef XTERM_REVERSE_VIDEO 937#ifndef XTERM_REVERSE_VIDEO
921 if (i < 2 && (R->Options & Opt_reverseVideo)) 938 if (i < 2 && (Options & Opt_reverseVideo))
922 { 939 {
923 R->rs[Rs_color + i] = def_colorName[!i]; 940 rs[Rs_color + i] = def_colorName[!i];
924 } 941 }
925 else 942 else
926#endif 943#endif
927 R->rs[Rs_color + i] = def_colorName[i]; 944 rs[Rs_color + i] = def_colorName[i];
928 945
929 if (!R->rs[Rs_color + i]) 946 if (!rs[Rs_color + i])
930 continue; 947 continue;
931 948
932 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 949 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 950 {
934 switch (i) 951 switch (i)
935 { 952 {
936 case Color_fg: 953 case Color_fg:
937 case Color_bg: 954 case Color_bg:
938 /* fatal: need bg/fg color */ 955 /* fatal: need bg/fg color */
939 rxvt_print_error ("aborting"); 956 rxvt_print_error ("aborting");
940 exit (EXIT_FAILURE); 957 exit (EXIT_FAILURE);
941 /* NOTREACHED */ 958 /* NOTREACHED */
942 break; 959 break;
943#ifndef NO_CURSORCOLOR 960#ifndef NO_CURSORCOLOR
944 case Color_cursor2: 961 case Color_cursor2:
945 xcol = R->PixColors[Color_fg]; 962 xcol = PixColors[Color_fg];
946 break; 963 break;
947#endif /* ! NO_CURSORCOLOR */ 964#endif /* ! NO_CURSORCOLOR */
948 case Color_pointer: 965 case Color_pointer:
949 xcol = R->PixColors[Color_fg]; 966 xcol = PixColors[Color_fg];
950 break; 967 break;
951 default: 968 default:
952 xcol = R->PixColors[Color_bg]; /* None */ 969 xcol = PixColors[Color_bg]; /* None */
953 break; 970 break;
954 } 971 }
955 } 972 }
956 } 973 }
957 974
958 R->PixColors[i] = xcol; 975 PixColors[i] = xcol;
959 SET_PIXCOLOR (R, i); 976 SET_PIXCOLOR (i);
960 } 977 }
961 978
962 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 979 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
963 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 980 PixColors[Color_pointer] = PixColors[Color_fg];
964 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 981 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
965 R->PixColors[Color_border] = R->PixColors[Color_fg]; 982 PixColors[Color_border] = PixColors[Color_fg];
966 983
967 /* 984 /*
968 * get scrollBar/menuBar shadow colors 985 * get scrollBar/menuBar shadow colors
969 * 986 *
970 * The calculations of topShadow/bottomShadow values are adapted 987 * The calculations of topShadow/bottomShadow values are adapted
… …
972 */ 989 */
973#ifdef KEEP_SCROLLCOLOR 990#ifdef KEEP_SCROLLCOLOR
974 991
975 if (XDEPTH <= 2) 992 if (XDEPTH <= 2)
976 { /* Monochrome */ 993 { /* Monochrome */
977 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 994 PixColors[Color_scroll] = PixColors[Color_fg];
978 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 995 PixColors[Color_topShadow] = PixColors[Color_bg];
979 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 996 PixColors[Color_bottomShadow] = PixColors[Color_bg];
980 } 997 }
981 else 998 else
982 { 999 {
983 rxvt_color xcol[3]; 1000 rxvt_color xcol[3];
984 /* xcol[0] == white 1001 /* xcol[0] == white
985 * xcol[1] == top shadow 1002 * xcol[1] == top shadow
986 * xcol[2] == bot shadow */ 1003 * xcol[2] == bot shadow */
987 1004
988 xcol[1] = R->PixColors[Color_scroll]; 1005 xcol[1] = PixColors[Color_scroll];
989# ifdef PREFER_24BIT 1006# ifdef PREFER_24BIT
990 xcol[0].set (R, 65535, 65535, 65535); 1007 xcol[0].set (this, 65535, 65535, 65535);
991 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1008 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
992# else 1009# else
993 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1010 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen));
994# endif 1011# endif
995 1012
996 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1013 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
997 1014
998 xcol[0].get (R, pr0, pg0, pb0); 1015 xcol[0].get (this, pr0, pg0, pb0);
999 xcol[1].get (R, pr1, pg1, pb1); 1016 xcol[1].get (this, pr1, pg1, pb1);
1000 1017
1001 /* bottomShadowColor */ 1018 /* bottomShadowColor */
1002 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1019 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2))
1003 xcol[2] = R->PixColors[Color_Black]; 1020 xcol[2] = PixColors[Color_Black];
1004 1021
1005 R->PixColors[Color_bottomShadow] = xcol[2]; 1022 PixColors[Color_bottomShadow] = xcol[2];
1006 1023
1007 /* topShadowColor */ 1024 /* topShadowColor */
1008 if (!xcol[1].set (aR_ 1025 if (!xcol[1].set (this,
1009 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1026 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1010 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1027 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1011 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1028 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1012 xcol[1] = R->PixColors[Color_White]; 1029 xcol[1] = PixColors[Color_White];
1013 1030
1014 R->PixColors[Color_topShadow] = xcol[1]; 1031 PixColors[Color_topShadow] = xcol[1];
1015 } 1032 }
1016#endif /* KEEP_SCROLLCOLOR */ 1033#endif /* KEEP_SCROLLCOLOR */
1017} 1034}
1018 1035
1019/*----------------------------------------------------------------------*/ 1036/*----------------------------------------------------------------------*/
… …
1027 1044
1028 if (i >= 8 && i <= 15) 1045 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 1046 { /* bright colors */
1030 i -= 8; 1047 i -= 8;
1031#ifndef NO_BRIGHTCOLOR 1048#ifndef NO_BRIGHTCOLOR
1032
1033 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1049 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1034 return; 1050 return;
1035#endif 1051#endif
1036 1052
1037 } 1053 }
1054
1038 if (i >= 0 && i <= 7) /* normal colors */ 1055 if (i >= 0 && i <= 7) /* normal colors */
1039 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1056 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1040 } 1057 }
1041} 1058}
1042 1059
1043/*----------------------------------------------------------------------*/ 1060/*----------------------------------------------------------------------*/
1044/* 1061/*
1045 * 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
1046 * Use resource ``modifier'' to override the Meta modifier 1063 * Use resource ``modifier'' to override the Meta modifier
1047 */ 1064 */
1048/* INTPROTO */
1049void 1065void
1050rxvt_get_ourmods(pR) 1066rxvt_term::get_ourmods ()
1051{ 1067{
1052 int i, j, k; 1068 int i, j, k;
1053 int requestedmeta, realmeta, realalt; 1069 int requestedmeta, realmeta, realalt;
1054 const char *cm, *rsmod; 1070 const char *cm, *rsmod;
1055 XModifierKeymap *map; 1071 XModifierKeymap *map;
… …
1058 { 1074 {
1059 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1075 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1060 }; 1076 };
1061 1077
1062 requestedmeta = realmeta = realalt = 0; 1078 requestedmeta = realmeta = realalt = 0;
1063 rsmod = R->rs[Rs_modifier]; 1079 rsmod = rs[Rs_modifier];
1064 if (rsmod 1080 if (rsmod
1065 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1081 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1066 requestedmeta = rsmod[3] - '0'; 1082 requestedmeta = rsmod[3] - '0';
1067 1083
1068 map = XGetModifierMapping(R->Xdisplay); 1084 map = XGetModifierMapping(Xdisplay);
1069 kc = map->modifiermap; 1085 kc = map->modifiermap;
1070 for (i = 1; i < 6; i++) 1086 for (i = 1; i < 6; i++)
1071 { 1087 {
1072 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1088 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1073 for (j = map->max_keypermod; j--; k++) 1089 for (j = map->max_keypermod; j--; k++)
1074 { 1090 {
1075 if (kc[k] == 0) 1091 if (kc[k] == 0)
1076 break; 1092 break;
1077 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1093 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0))
1078 { 1094 {
1079 case XK_Num_Lock: 1095 case XK_Num_Lock:
1080 R->ModNumLockMask = modmasks[i - 1]; 1096 ModNumLockMask = modmasks[i - 1];
1081 /* FALLTHROUGH */ 1097 /* FALLTHROUGH */
1082 default: 1098 default:
1083 continue; /* for(;;) */ 1099 continue; /* for(;;) */
1084 case XK_Meta_L: 1100 case XK_Meta_L:
1085 case XK_Meta_R: 1101 case XK_Meta_R:
1086 cm = "meta"; 1102 cm = "meta";
1087 realmeta = i; 1103 realmeta = i;
1088 break; 1104 break;
1089 case XK_Alt_L: 1105 case XK_Alt_L:
1090 case XK_Alt_R: 1106 case XK_Alt_R:
1091 cm = "alt"; 1107 cm = "alt";
1092 realalt = i; 1108 realalt = i;
1093 break; 1109 break;
1094 case XK_Super_L: 1110 case XK_Super_L:
1095 case XK_Super_R: 1111 case XK_Super_R:
1096 cm = "super"; 1112 cm = "super";
1097 break; 1113 break;
1098 case XK_Hyper_L: 1114 case XK_Hyper_L:
1099 case XK_Hyper_R: 1115 case XK_Hyper_R:
1100 cm = "hyper"; 1116 cm = "hyper";
1101 break; 1117 break;
1102 } 1118 }
1103 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1119 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1104 requestedmeta = i; 1120 requestedmeta = i;
1105 } 1121 }
1106 } 1122 }
1107 XFreeModifiermap(map); 1123 XFreeModifiermap(map);
1108 i = (requestedmeta ? requestedmeta 1124 i = (requestedmeta ? requestedmeta
1109 : (realmeta ? realmeta 1125 : (realmeta ? realmeta
1110 : (realalt ? realalt : 0))); 1126 : (realalt ? realalt : 0)));
1111 if (i) 1127 if (i)
1112 R->ModMetaMask = modmasks[i - 1]; 1128 ModMetaMask = modmasks[i - 1];
1113} 1129}
1114 1130
1115/*----------------------------------------------------------------------*/ 1131/*----------------------------------------------------------------------*/
1116/* rxvt_Create_Windows() - Open and map the window */ 1132/* rxvt_Create_Windows() - Open and map the window */
1117/* EXTPROTO */
1118void 1133void
1119rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1134rxvt_term::create_windows (int argc, const char *const *argv)
1120{ 1135{
1121 XClassHint classHint; 1136 XClassHint classHint;
1122 XWMHints wmHint; 1137 XWMHints wmHint;
1123 XGCValues gcvalue; 1138 XGCValues gcvalue;
1124 long vt_emask; 1139 long vt_emask;
1125 1140
1141 XWindowAttributes gattr;
1142
1143 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1144 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1145 Xscreen = DefaultScreen (Xdisplay);
1146
1147 if (Options & Opt_transparent)
1148 {
1149 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr);
1150 Xdepth = gattr.depth;
1151 }
1152 else
1153 {
1154 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1126#ifdef PREFER_24BIT 1155#ifdef PREFER_24BIT
1127
1128 XSetWindowAttributes attributes;
1129 XWindowAttributes gattr;
1130
1131 XCMAP = DefaultColormap(R->Xdisplay, Xscreen);
1132 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen);
1133
1134 if (R->Options & Opt_transparent)
1135 {
1136 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen),
1137 &gattr);
1138 XDEPTH = gattr.depth;
1139 }
1140 else
1141 {
1142 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen);
1143 /* 1156 /*
1144 * If depth is not 24, look for a 24bit visual. 1157 * If depth is not 24, look for a 24bit visual.
1145 */ 1158 */
1146 if (XDEPTH != 24) 1159 if (Xdepth != 24)
1147 { 1160 {
1148 XVisualInfo vinfo; 1161 XVisualInfo vinfo;
1149 1162
1150 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo)) 1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1151 { 1164 {
1152 XDEPTH = 24; 1165 Xdepth = 24;
1153 XVISUAL = vinfo.visual; 1166 Xvisual = vinfo.visual;
1154 XCMAP = XCreateColormap(R->Xdisplay, 1167 Xcmap = XCreateColormap(Xdisplay,
1155 RootWindow(R->Xdisplay, Xscreen), 1168 RootWindow(Xdisplay, Xscreen),
1156 XVISUAL, AllocNone); 1169 Xvisual, AllocNone);
1157 } 1170 }
1158 } 1171 }
1159 }
1160#endif 1172#endif
1173
1174 }
1161 1175
1162 /* grab colors before netscape does */ 1176 /* grab colors before netscape does */
1163 rxvt_Get_Colours(aR); 1177 Get_Colours ();
1164 1178
1165 rxvt_change_font(aR_ 1, NULL); 1179 change_font (1, NULL);
1166 rxvt_window_calc(aR_ 0, 0); 1180 window_calc (0, 0);
1167 R->old_width = R->szHint.width; 1181 old_width = szHint.width;
1168 R->old_height = R->szHint.height; 1182 old_height = szHint.height;
1169 1183
1170 /* parent window - reverse video so we can see placement errors 1184 /* parent window - reverse video so we can see placement errors
1171 * sub-window placement & size in rxvt_resize_subwindows() 1185 * sub-window placement & size in rxvt_resize_subwindows()
1172 */ 1186 */
1173 1187
1174#ifdef PREFER_24BIT 1188#ifdef PREFER_24BIT
1189 XSetWindowAttributes attributes;
1175 1190
1176 attributes.background_pixel = R->PixColors[Color_fg]; 1191 attributes.background_pixel = PixColors[Color_fg];
1177 attributes.border_pixel = R->PixColors[Color_border]; 1192 attributes.border_pixel = PixColors[Color_border];
1178 attributes.colormap = XCMAP; 1193 attributes.colormap = Xcmap;
1179 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1194 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1180 R->szHint.x, R->szHint.y, 1195 szHint.x, szHint.y,
1181 R->szHint.width, R->szHint.height, 1196 szHint.width, szHint.height,
1182 R->TermWin.ext_bwidth, 1197 TermWin.ext_bwidth,
1183 XDEPTH, InputOutput, 1198 Xdepth, InputOutput,
1184 XVISUAL, 1199 Xvisual,
1185 CWBackPixel | CWBorderPixel 1200 CWBackPixel | CWBorderPixel
1186 | CWColormap, &attributes); 1201 | CWColormap, &attributes);
1187#else 1202#else
1188
1189 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot, 1203 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1190 R->szHint.x, R->szHint.y, 1204 szHint.x, szHint.y,
1191 R->szHint.width, 1205 szHint.width,
1192 R->szHint.height, 1206 szHint.height,
1193 R->TermWin.ext_bwidth, 1207 TermWin.ext_bwidth,
1194 R->PixColors[Color_border], 1208 PixColors[Color_border],
1195 R->PixColors[Color_fg]); 1209 PixColors[Color_fg]);
1196#endif 1210#endif
1197 1211
1198 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1212 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1199 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1213 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1200 1214
1201 classHint.res_name = (char *)R->rs[Rs_name]; 1215 classHint.res_name = (char *)rs[Rs_name];
1202 classHint.res_class = (char *)APL_CLASS; 1216 classHint.res_class = (char *)APL_CLASS;
1203 1217
1204 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1218 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1205 wmHint.input = True; 1219 wmHint.input = True;
1206 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1220 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1207 : NormalState); 1221 : NormalState);
1208 wmHint.window_group = R->TermWin.parent[0]; 1222 wmHint.window_group = TermWin.parent[0];
1209 1223
1210 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1224 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL,
1211 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1225 (char **)argv, argc, &szHint, &wmHint, &classHint);
1212 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1226 XSelectInput(Xdisplay, TermWin.parent[0],
1213 (KeyPressMask 1227 (KeyPressMask
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1228#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 | KeyReleaseMask 1229 | KeyReleaseMask
1216#endif 1230#endif
1217 | FocusChangeMask | VisibilityChangeMask 1231 | FocusChangeMask | VisibilityChangeMask
1218 | StructureNotifyMask)); 1232 | StructureNotifyMask));
1219 1233
1220 /* vt cursor: Black-on-White is standard, but this is more popular */ 1234 /* vt cursor: Black-on-White is standard, but this is more popular */
1221 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1235 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);
1222 1236
1223#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1237#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1224 /* cursor (menuBar/scrollBar): Black-on-White */ 1238 /* cursor (menuBar/scrollBar): Black-on-White */
1225 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1239 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr);
1226#endif 1240#endif
1227 1241
1228#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1229 1243
1230 { 1244 {
1231 XColor blackcolour; 1245 XColor blackcolour;
1232 blackcolour.red = 0; 1246 blackcolour.red = 0;
1233 blackcolour.green = 0; 1247 blackcolour.green = 0;
1234 blackcolour.blue = 0; 1248 blackcolour.blue = 0;
1235 Font f = XLoadFont (R->Xdisplay, "fixed"); 1249 Font f = XLoadFont (Xdisplay, "fixed");
1236 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1250 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ',
1237 &blackcolour, &blackcolour); 1251 &blackcolour, &blackcolour);
1238 XUnloadFont (R->Xdisplay, f); 1252 XUnloadFont (Xdisplay, f);
1239 } 1253 }
1240#endif 1254#endif
1241 1255
1242 /* the vt window */ 1256 /* the vt window */
1243 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1257 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1244 R->window_vt_x, R->window_vt_y, 1258 window_vt_x, window_vt_y,
1245 TermWin_TotalWidth(), 1259 TermWin_TotalWidth(),
1246 TermWin_TotalHeight(), 1260 TermWin_TotalHeight(),
1247 0, 1261 0,
1248 R->PixColors[Color_fg], 1262 PixColors[Color_fg],
1249 R->PixColors[Color_bg]); 1263 PixColors[Color_bg]);
1250#ifdef DEBUG_X 1264#ifdef DEBUG_X
1251
1252 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1265 XStoreName(Xdisplay, TermWin.vt, "vt window");
1253#endif 1266#endif
1254
1255 R->pointer_unblank ();
1256 1267
1257 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1258 | PropertyChangeMask); 1269 | PropertyChangeMask);
1270
1259#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1272 pointer_unblank ();
1260 1273
1261 if ((R->Options & Opt_pointerBlank)) 1274 if ((Options & Opt_pointerBlank))
1262 vt_emask |= PointerMotionMask; 1275 vt_emask |= PointerMotionMask;
1263 else 1276 else
1264#endif 1277#endif
1265
1266 vt_emask |= (Button1MotionMask | Button3MotionMask); 1278 vt_emask |= (Button1MotionMask | Button3MotionMask);
1279
1267 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1280 XSelectInput(Xdisplay, TermWin.vt, vt_emask);
1268 1281
1269#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1282#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1270 1283
1271 if (menuBar_height()) 1284 if (menuBar_height())
1272 { 1285 {
1273 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1286 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1274 R->window_vt_x, 0, 1287 window_vt_x, 0,
1275 TermWin_TotalWidth(), 1288 TermWin_TotalWidth(),
1276 menuBar_TotalHeight(), 1289 menuBar_TotalHeight(),
1277 0, 1290 0,
1278 R->PixColors[Color_fg], 1291 PixColors[Color_fg],
1279 R->PixColors[Color_scroll]); 1292 PixColors[Color_scroll]);
1280#ifdef DEBUG_X 1293#ifdef DEBUG_X
1281 1294
1282 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1295 XStoreName(Xdisplay, menuBar.win, "menubar");
1283#endif 1296#endif
1284 1297
1285 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1298 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr);
1286 XSelectInput(R->Xdisplay, R->menuBar.win, 1299 XSelectInput(Xdisplay, menuBar.win,
1287 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1300 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1288 | Button1MotionMask)); 1301 | Button1MotionMask));
1289 } 1302 }
1290#endif 1303#endif
1291#ifdef XPM_BACKGROUND 1304#ifdef XPM_BACKGROUND
1292 if (R->rs[Rs_backgroundPixmap] != NULL 1305 if (rs[Rs_backgroundPixmap] != NULL
1293 && !(R->Options & Opt_transparent)) 1306 && !(Options & Opt_transparent))
1294 { 1307 {
1295 const char *p = R->rs[Rs_backgroundPixmap]; 1308 const char *p = rs[Rs_backgroundPixmap];
1296 1309
1297 if ((p = STRCHR(p, ';')) != NULL) 1310 if ((p = STRCHR(p, ';')) != NULL)
1298 { 1311 {
1299 p++; 1312 p++;
1300 rxvt_scale_pixmap(aR_ p); 1313 scale_pixmap (p);
1301 } 1314 }
1302 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1315 set_bgPixmap (rs[Rs_backgroundPixmap]);
1303 rxvt_scr_touch(aR_ True); 1316 scr_touch (True);
1304 } 1317 }
1305#endif 1318#endif
1306 1319
1307 /* graphics context for the vt window */ 1320 /* graphics context for the vt window */
1308 gcvalue.foreground = R->PixColors[Color_fg]; 1321 gcvalue.foreground = PixColors[Color_fg];
1309 gcvalue.background = R->PixColors[Color_bg]; 1322 gcvalue.background = PixColors[Color_bg];
1310 gcvalue.graphics_exposures = 1; 1323 gcvalue.graphics_exposures = 1;
1311 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1324 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt,
1312 GCForeground | GCBackground 1325 GCForeground | GCBackground
1313 | GCGraphicsExposures, &gcvalue); 1326 | GCGraphicsExposures, &gcvalue);
1314 1327
1315#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1328#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1316 1329
1317 gcvalue.foreground = R->PixColors[Color_topShadow]; 1330 gcvalue.foreground = PixColors[Color_topShadow];
1318 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1331 topShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1319 GCForeground, &gcvalue); 1332 GCForeground, &gcvalue);
1320 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1333 gcvalue.foreground = PixColors[Color_bottomShadow];
1321 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1334 botShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1322 GCForeground, &gcvalue); 1335 GCForeground, &gcvalue);
1323 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1336 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1324 : Color_scroll)]; 1337 : Color_scroll)];
1325 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1338 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1326 GCForeground, &gcvalue); 1339 GCForeground, &gcvalue);
1327#endif 1340#endif
1328} 1341}
1329 1342
1330/*----------------------------------------------------------------------*/ 1343/*----------------------------------------------------------------------*/
1331/* 1344/*
… …
1358 1371
1359 /* get slave (tty) */ 1372 /* get slave (tty) */
1360 if (tty_fd < 0) 1373 if (tty_fd < 0)
1361 { 1374 {
1362#ifndef NO_SETOWNER_TTYDEV 1375#ifndef NO_SETOWNER_TTYDEV
1363 rxvt_privileged_ttydev (aR_ SAVE); 1376 privileged_ttydev (SAVE);
1364#endif 1377#endif
1365 1378
1366 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1379 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1367 { 1380 {
1368 close(cfd); 1381 close(cfd);
… …
1384 1397
1385#ifndef __QNX__ 1398#ifndef __QNX__
1386 /* spin off the command interpreter */ 1399 /* spin off the command interpreter */
1387 switch (cmd_pid = fork ()) 1400 switch (cmd_pid = fork ())
1388 { 1401 {
1389 case -1: 1402 case -1:
1390 rxvt_print_error("can't fork"); 1403 rxvt_print_error("can't fork");
1391 return -1; 1404 return -1;
1392 case 0: 1405 case 0:
1393 close (cfd); /* only keep tty_fd and STDERR open */ 1406 close (cfd); /* only keep tty_fd and STDERR open */
1394 close (Xfd); 1407 close (Xfd);
1395 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1408 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1396 rxvt_print_error ("could not obtain control of tty"); 1409 rxvt_print_error ("could not obtain control of tty");
1397 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:
1398 { 1425 {
1399 /* 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);
1400 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
1401 dup2 (tty_fd, STDOUT_FILENO); 1439 dup2 (fdstdin, STDIN_FILENO);
1402 dup2 (tty_fd, STDERR_FILENO);
1403
1404 if (tty_fd > 2)
1405 close (tty_fd); 1440 close (fdstdin);
1441#endif
1406 1442
1407 run_child (argv);
1408 } 1443 }
1409 exit (EXIT_FAILURE);
1410 /* NOTREACHED */
1411 default:
1412 {
1413#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1414 int fdstdin;
1415
1416 fdstdin = dup (STDIN_FILENO);
1417 dup2 (tty_fd, STDIN_FILENO);
1418#endif
1419
1420 rxvt_privileged_utmp (this, SAVE);
1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1422
1423 dup2 (fdstdin, STDIN_FILENO);
1424 close (fdstdin);
1425#endif
1426
1427 }
1428 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1444 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */
1429 break; 1445 break;
1430 } 1446 }
1431#else /* __QNX__ uses qnxspawn() */ 1447#else /* __QNX__ uses qnxspawn() */
1432 fchmod (tty_fd, 0622); 1448 fchmod (tty_fd, 0622);
1433 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1449 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1434 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1450 fcntl (cfd, F_SETFD, FD_CLOEXEC);
… …
1468 { 1484 {
1469 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1485 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1470 close (fd); 1486 close (fd);
1471 } 1487 }
1472#endif /* SRIOCSREDIR */ 1488#endif /* SRIOCSREDIR */
1489
1473 } 1490 }
1474 1491
1475 /* reset signals and spin off the command interpreter */ 1492 /* reset signals and spin off the command interpreter */
1476 signal (SIGINT, SIG_DFL); 1493 signal (SIGINT, SIG_DFL);
1477 signal (SIGQUIT, SIG_DFL); 1494 signal (SIGQUIT, SIG_DFL);
… …
1572 } 1589 }
1573 arg_v = arg_a; 1590 arg_v = arg_a;
1574 } 1591 }
1575 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1592 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1576 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1593 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1577 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1594 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1578 command, arg_v, environ, iov_a, 0); 1595 command, arg_v, environ, iov_a, 0);
1579 if (login) 1596 if (login)
1580 free(login); 1597 free(login);
1581 1598
1582 close(tty_fd); 1599 close(tty_fd);
1583 return cmd_fd; 1600 return cmd_fd;
… …
1588 1605
1589/* ------------------------------------------------------------------------- * 1606/* ------------------------------------------------------------------------- *
1590 * GET TTY CURRENT STATE * 1607 * GET TTY CURRENT STATE *
1591 * ------------------------------------------------------------------------- */ 1608 * ------------------------------------------------------------------------- */
1592/* rxvt_get_ttymode() */ 1609/* rxvt_get_ttymode() */
1593/* INTPROTO */ 1610/* EXTPROTO */
1594void 1611void
1595rxvt_get_ttymode(ttymode_t *tio, int erase) 1612rxvt_get_ttymode(ttymode_t *tio, int erase)
1596{ 1613{
1597#ifdef HAVE_TERMIOS_H 1614#ifdef HAVE_TERMIOS_H
1598 /* 1615 /*

Diff Legend

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