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.20 by pcg, Sat Jan 31 00:20:21 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 $ 4 * $Id: init.C,v 1.20 2004/01/31 00:20:21 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * 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> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
331#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
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
… …
524 * Open display, get options/resources and create the window 525 * Open display, get options/resources and create the window
525 */ 526 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 527 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
527 rs[Rs_display_name] = ":0"; 528 rs[Rs_display_name] = ":0";
528 529
529 rxvt_get_options (this, r_argc, r_argv); 530 get_options (r_argc, r_argv);
530 free (r_argv); 531 free (r_argv);
531 532
532#ifdef LOCAL_X_IS_UNIX 533#ifdef LOCAL_X_IS_UNIX
533 if (rs[Rs_display_name][0] == ':') 534 if (rs[Rs_display_name][0] == ':')
534 { 535 {
… …
545 { 546 {
546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 547 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
547 exit (EXIT_FAILURE); 548 exit (EXIT_FAILURE);
548 } 549 }
549 550
550 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 551 extract_resources (Xdisplay, rs[Rs_name]);
551 552
552 /* 553 /*
553 * set any defaults not already set 554 * set any defaults not already set
554 */ 555 */
555 if (cmd_argv && cmd_argv[0]) 556 if (cmd_argv && cmd_argv[0])
… …
660 selection_style = OLD_SELECT; 661 selection_style = OLD_SELECT;
661#endif 662#endif
662 } 663 }
663 664
664#ifdef HAVE_SCROLLBARS 665#ifdef HAVE_SCROLLBARS
665 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 666 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 667 rs[Rs_scrollBar_thickness]);
667#endif 668#endif
668 669
669 TermWin.fontset = new rxvt_fontset (this); 670 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]); 671 TermWin.fontset->populate (rs[Rs_font]);
… …
795/* 796/*
796 * This is more or less stolen straight from XFree86 xterm. 797 * This is more or less stolen straight from XFree86 xterm.
797 * This should support all European type languages. 798 * This should support all European type languages.
798 */ 799 */
799void 800void
801rxvt_term::set_locale (const char *locale)
802{
803#if HAVE_XSETLOCALE || HAVE_SETLOCALE
804 free (this->locale);
805 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
806#endif
807#if HAVE_NL_LANGINFO
808 free (codeset);
809 codeset = strdup (nl_langinfo (CODESET));
810 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
811 || !STRCASECMP (codeset, "UTF8");
812#else
813 enc_utf8 = 1;
814#endif
815}
816
817void
800rxvt_term::init_xlocale () 818rxvt_term::init_xlocale ()
801{ 819{
802#ifdef USE_XIM 820#ifdef USE_XIM
803 if (!locale) 821 if (!locale)
804 rxvt_print_error ("Setting locale failed."); 822 rxvt_print_error ("Setting locale failed.");
… …
814 if (!XSupportsLocale ()) 832 if (!XSupportsLocale ())
815 { 833 {
816 rxvt_print_error ("The locale is not supported by Xlib"); 834 rxvt_print_error ("The locale is not supported by Xlib");
817 return; 835 return;
818 } 836 }
819
820 rxvt_setTermFontSet (this, 0);
821 837
822 /* see if we can connect yet */ 838 /* see if we can connect yet */
823 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 839 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL);
824 840
825 /* To avoid Segmentation Fault in C locale: Solaris only? */ 841 /* To avoid Segmentation Fault in C locale: Solaris only? */
… …
854 870
855#ifdef META8_OPTION 871#ifdef META8_OPTION
856 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
857#endif 873#endif
858 874
859 rxvt_get_ourmods (this); 875 get_ourmods ();
860 876
861 if (!(Options & Opt_scrollTtyOutput)) 877 if (!(Options & Opt_scrollTtyOutput))
862 PrivateModes |= PrivMode_TtyOutputInh; 878 PrivateModes |= PrivMode_TtyOutputInh;
863 if (Options & Opt_scrollTtyKeypress) 879 if (Options & Opt_scrollTtyKeypress)
864 PrivateModes |= PrivMode_Keypress; 880 PrivateModes |= PrivMode_Keypress;
… …
869 if (STRCMP(key_backspace, "DEC") == 0) 885 if (STRCMP(key_backspace, "DEC") == 0)
870 PrivateModes |= PrivMode_HaveBackSpace; 886 PrivateModes |= PrivMode_HaveBackSpace;
871#endif 887#endif
872 888
873 /* add value for scrollBar */ 889 /* add value for scrollBar */
874 if (scrollbar_visible (this)) 890 if (scrollbar_visible ())
875 { 891 {
876 PrivateModes |= PrivMode_scrollBar; 892 PrivateModes |= PrivMode_scrollBar;
877 SavedModes |= PrivMode_scrollBar; 893 SavedModes |= PrivMode_scrollBar;
878 } 894 }
879 if (menubar_visible (this)) 895 if (menubar_visible ())
880 { 896 {
881 PrivateModes |= PrivMode_menuBar; 897 PrivateModes |= PrivMode_menuBar;
882 SavedModes |= PrivMode_menuBar; 898 SavedModes |= PrivMode_menuBar;
883 } 899 }
884 900
… …
900 exit (EXIT_FAILURE); 916 exit (EXIT_FAILURE);
901 } 917 }
902} 918}
903 919
904/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
905/* INTPROTO */
906void 921void
907rxvt_Get_Colours (pR) 922rxvt_term::Get_Colours ()
908{ 923{
909 int i; 924 int i;
910 925
911 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
912 { 927 {
913 rxvt_color xcol; 928 rxvt_color xcol;
914 929
915 if (!R->rs[Rs_color + i]) 930 if (!rs[Rs_color + i])
916 continue; 931 continue;
917 932
918 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 933 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
919 { 934 {
920#ifndef XTERM_REVERSE_VIDEO 935#ifndef XTERM_REVERSE_VIDEO
921 if (i < 2 && (R->Options & Opt_reverseVideo)) 936 if (i < 2 && (Options & Opt_reverseVideo))
922 { 937 {
923 R->rs[Rs_color + i] = def_colorName[!i]; 938 rs[Rs_color + i] = def_colorName[!i];
924 } 939 }
925 else 940 else
926#endif 941#endif
927 R->rs[Rs_color + i] = def_colorName[i]; 942 rs[Rs_color + i] = def_colorName[i];
928 943
929 if (!R->rs[Rs_color + i]) 944 if (!rs[Rs_color + i])
930 continue; 945 continue;
931 946
932 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 947 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 948 {
934 switch (i) 949 switch (i)
935 { 950 {
936 case Color_fg: 951 case Color_fg:
937 case Color_bg: 952 case Color_bg:
… …
940 exit (EXIT_FAILURE); 955 exit (EXIT_FAILURE);
941 /* NOTREACHED */ 956 /* NOTREACHED */
942 break; 957 break;
943#ifndef NO_CURSORCOLOR 958#ifndef NO_CURSORCOLOR
944 case Color_cursor2: 959 case Color_cursor2:
945 xcol = R->PixColors[Color_fg]; 960 xcol = PixColors[Color_fg];
946 break; 961 break;
947#endif /* ! NO_CURSORCOLOR */ 962#endif /* ! NO_CURSORCOLOR */
948 case Color_pointer: 963 case Color_pointer:
949 xcol = R->PixColors[Color_fg]; 964 xcol = PixColors[Color_fg];
950 break; 965 break;
951 default: 966 default:
952 xcol = R->PixColors[Color_bg]; /* None */ 967 xcol = PixColors[Color_bg]; /* None */
953 break; 968 break;
954 } 969 }
955 } 970 }
956 } 971 }
957 972
958 R->PixColors[i] = xcol; 973 PixColors[i] = xcol;
959 SET_PIXCOLOR (R, i); 974 SET_PIXCOLOR (i);
960 } 975 }
961 976
962 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 977 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
963 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 978 PixColors[Color_pointer] = PixColors[Color_fg];
964 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 979 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
965 R->PixColors[Color_border] = R->PixColors[Color_fg]; 980 PixColors[Color_border] = PixColors[Color_fg];
966 981
967 /* 982 /*
968 * get scrollBar/menuBar shadow colors 983 * get scrollBar/menuBar shadow colors
969 * 984 *
970 * The calculations of topShadow/bottomShadow values are adapted 985 * The calculations of topShadow/bottomShadow values are adapted
… …
972 */ 987 */
973#ifdef KEEP_SCROLLCOLOR 988#ifdef KEEP_SCROLLCOLOR
974 989
975 if (XDEPTH <= 2) 990 if (XDEPTH <= 2)
976 { /* Monochrome */ 991 { /* Monochrome */
977 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 992 PixColors[Color_scroll] = PixColors[Color_fg];
978 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 993 PixColors[Color_topShadow] = PixColors[Color_bg];
979 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 994 PixColors[Color_bottomShadow] = PixColors[Color_bg];
980 } 995 }
981 else 996 else
982 { 997 {
983 rxvt_color xcol[3]; 998 rxvt_color xcol[3];
984 /* xcol[0] == white 999 /* xcol[0] == white
985 * xcol[1] == top shadow 1000 * xcol[1] == top shadow
986 * xcol[2] == bot shadow */ 1001 * xcol[2] == bot shadow */
987 1002
988 xcol[1] = R->PixColors[Color_scroll]; 1003 xcol[1] = PixColors[Color_scroll];
989# ifdef PREFER_24BIT 1004# ifdef PREFER_24BIT
990 xcol[0].set (R, 65535, 65535, 65535); 1005 xcol[0].set (R, 65535, 65535, 65535);
991 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1006 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
992# else 1007# else
993 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1008 xcol[0].set (WhitePixel(Xdisplay, Xscreen));
994# endif 1009# endif
995 1010
996 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
997 1012
998 xcol[0].get (R, pr0, pg0, pb0); 1013 xcol[0].get (R, pr0, pg0, pb0);
999 xcol[1].get (R, pr1, pg1, pb1); 1014 xcol[1].get (R, pr1, pg1, pb1);
1000 1015
1001 /* bottomShadowColor */ 1016 /* bottomShadowColor */
1002 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1017 if (!xcol[2].set (pr1 / 2, pg1 / 2, pb1 / 2))
1003 xcol[2] = R->PixColors[Color_Black]; 1018 xcol[2] = PixColors[Color_Black];
1004 1019
1005 R->PixColors[Color_bottomShadow] = xcol[2]; 1020 PixColors[Color_bottomShadow] = xcol[2];
1006 1021
1007 /* topShadowColor */ 1022 /* topShadowColor */
1008 if (!xcol[1].set (aR_
1009 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1023 if (!xcol[1].set ( min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1010 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1011 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1012 xcol[1] = R->PixColors[Color_White]; 1026 xcol[1] = PixColors[Color_White];
1013 1027
1014 R->PixColors[Color_topShadow] = xcol[1]; 1028 PixColors[Color_topShadow] = xcol[1];
1015 } 1029 }
1016#endif /* KEEP_SCROLLCOLOR */ 1030#endif /* KEEP_SCROLLCOLOR */
1017} 1031}
1018 1032
1019/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
… …
1027 1041
1028 if (i >= 8 && i <= 15) 1042 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 1043 { /* bright colors */
1030 i -= 8; 1044 i -= 8;
1031#ifndef NO_BRIGHTCOLOR 1045#ifndef NO_BRIGHTCOLOR
1032
1033 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1046 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1034 return; 1047 return;
1035#endif 1048#endif
1036
1037 } 1049 }
1050
1038 if (i >= 0 && i <= 7) /* normal colors */ 1051 if (i >= 0 && i <= 7) /* normal colors */
1039 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1052 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1040 } 1053 }
1041} 1054}
1042 1055
1043/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1044/* 1057/*
1045 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1058 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1046 * Use resource ``modifier'' to override the Meta modifier 1059 * Use resource ``modifier'' to override the Meta modifier
1047 */ 1060 */
1048/* INTPROTO */
1049void 1061void
1050rxvt_get_ourmods(pR) 1062rxvt_term::get_ourmods ()
1051{ 1063{
1052 int i, j, k; 1064 int i, j, k;
1053 int requestedmeta, realmeta, realalt; 1065 int requestedmeta, realmeta, realalt;
1054 const char *cm, *rsmod; 1066 const char *cm, *rsmod;
1055 XModifierKeymap *map; 1067 XModifierKeymap *map;
… …
1058 { 1070 {
1059 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1071 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1060 }; 1072 };
1061 1073
1062 requestedmeta = realmeta = realalt = 0; 1074 requestedmeta = realmeta = realalt = 0;
1063 rsmod = R->rs[Rs_modifier]; 1075 rsmod = rs[Rs_modifier];
1064 if (rsmod 1076 if (rsmod
1065 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1077 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1066 requestedmeta = rsmod[3] - '0'; 1078 requestedmeta = rsmod[3] - '0';
1067 1079
1068 map = XGetModifierMapping(R->Xdisplay); 1080 map = XGetModifierMapping(Xdisplay);
1069 kc = map->modifiermap; 1081 kc = map->modifiermap;
1070 for (i = 1; i < 6; i++) 1082 for (i = 1; i < 6; i++)
1071 { 1083 {
1072 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1084 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1073 for (j = map->max_keypermod; j--; k++) 1085 for (j = map->max_keypermod; j--; k++)
1074 { 1086 {
1075 if (kc[k] == 0) 1087 if (kc[k] == 0)
1076 break; 1088 break;
1077 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1089 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0))
1078 { 1090 {
1079 case XK_Num_Lock: 1091 case XK_Num_Lock:
1080 R->ModNumLockMask = modmasks[i - 1]; 1092 ModNumLockMask = modmasks[i - 1];
1081 /* FALLTHROUGH */ 1093 /* FALLTHROUGH */
1082 default: 1094 default:
1083 continue; /* for(;;) */ 1095 continue; /* for(;;) */
1084 case XK_Meta_L: 1096 case XK_Meta_L:
1085 case XK_Meta_R: 1097 case XK_Meta_R:
… …
1107 XFreeModifiermap(map); 1119 XFreeModifiermap(map);
1108 i = (requestedmeta ? requestedmeta 1120 i = (requestedmeta ? requestedmeta
1109 : (realmeta ? realmeta 1121 : (realmeta ? realmeta
1110 : (realalt ? realalt : 0))); 1122 : (realalt ? realalt : 0)));
1111 if (i) 1123 if (i)
1112 R->ModMetaMask = modmasks[i - 1]; 1124 ModMetaMask = modmasks[i - 1];
1113} 1125}
1114 1126
1115/*----------------------------------------------------------------------*/ 1127/*----------------------------------------------------------------------*/
1116/* rxvt_Create_Windows() - Open and map the window */ 1128/* rxvt_Create_Windows() - Open and map the window */
1117/* EXTPROTO */
1118void 1129void
1119rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1130rxvt_term::create_windows (int argc, const char *const *argv)
1120{ 1131{
1121 XClassHint classHint; 1132 XClassHint classHint;
1122 XWMHints wmHint; 1133 XWMHints wmHint;
1123 XGCValues gcvalue; 1134 XGCValues gcvalue;
1124 long vt_emask; 1135 long vt_emask;
1125 1136
1137 XWindowAttributes gattr;
1138
1139 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1140 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1141 Xscreen = DefaultScreen (Xdisplay);
1142
1143 if (Options & Opt_transparent)
1144 {
1145 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr);
1146 Xdepth = gattr.depth;
1147 }
1148 else
1149 {
1150 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1126#ifdef PREFER_24BIT 1151#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 /* 1152 /*
1144 * If depth is not 24, look for a 24bit visual. 1153 * If depth is not 24, look for a 24bit visual.
1145 */ 1154 */
1146 if (XDEPTH != 24) 1155 if (Xdepth != 24)
1147 { 1156 {
1148 XVisualInfo vinfo; 1157 XVisualInfo vinfo;
1149 1158
1150 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo)) 1159 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1151 { 1160 {
1152 XDEPTH = 24; 1161 Xdepth = 24;
1153 XVISUAL = vinfo.visual; 1162 Xvisual = vinfo.visual;
1154 XCMAP = XCreateColormap(R->Xdisplay, 1163 Xcmap = XCreateColormap(Xdisplay,
1155 RootWindow(R->Xdisplay, Xscreen), 1164 RootWindow(Xdisplay, Xscreen),
1156 XVISUAL, AllocNone); 1165 Xvisual, AllocNone);
1157 } 1166 }
1158 } 1167 }
1159 }
1160#endif 1168#endif
1169 }
1161 1170
1162 /* grab colors before netscape does */ 1171 /* grab colors before netscape does */
1163 rxvt_Get_Colours(aR); 1172 Get_Colours ();
1164 1173
1165 rxvt_change_font(aR_ 1, NULL); 1174 change_font (1, NULL);
1166 rxvt_window_calc(aR_ 0, 0); 1175 window_calc (0, 0);
1167 R->old_width = R->szHint.width; 1176 old_width = szHint.width;
1168 R->old_height = R->szHint.height; 1177 old_height = szHint.height;
1169 1178
1170 /* parent window - reverse video so we can see placement errors 1179 /* parent window - reverse video so we can see placement errors
1171 * sub-window placement & size in rxvt_resize_subwindows() 1180 * sub-window placement & size in rxvt_resize_subwindows()
1172 */ 1181 */
1173 1182
1174#ifdef PREFER_24BIT 1183#ifdef PREFER_24BIT
1184 XSetWindowAttributes attributes;
1175 1185
1176 attributes.background_pixel = R->PixColors[Color_fg]; 1186 attributes.background_pixel = PixColors[Color_fg];
1177 attributes.border_pixel = R->PixColors[Color_border]; 1187 attributes.border_pixel = PixColors[Color_border];
1178 attributes.colormap = XCMAP; 1188 attributes.colormap = Xcmap;
1179 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1189 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1180 R->szHint.x, R->szHint.y, 1190 szHint.x, szHint.y,
1181 R->szHint.width, R->szHint.height, 1191 szHint.width, szHint.height,
1182 R->TermWin.ext_bwidth, 1192 TermWin.ext_bwidth,
1183 XDEPTH, InputOutput, 1193 Xdepth, InputOutput,
1184 XVISUAL, 1194 Xvisual,
1185 CWBackPixel | CWBorderPixel 1195 CWBackPixel | CWBorderPixel
1186 | CWColormap, &attributes); 1196 | CWColormap, &attributes);
1187#else 1197#else
1188
1189 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot, 1198 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1190 R->szHint.x, R->szHint.y, 1199 szHint.x, szHint.y,
1191 R->szHint.width, 1200 szHint.width,
1192 R->szHint.height, 1201 szHint.height,
1193 R->TermWin.ext_bwidth, 1202 TermWin.ext_bwidth,
1194 R->PixColors[Color_border], 1203 PixColors[Color_border],
1195 R->PixColors[Color_fg]); 1204 PixColors[Color_fg]);
1196#endif 1205#endif
1197 1206
1198 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1207 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1199 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1208 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1200 1209
1201 classHint.res_name = (char *)R->rs[Rs_name]; 1210 classHint.res_name = (char *)rs[Rs_name];
1202 classHint.res_class = (char *)APL_CLASS; 1211 classHint.res_class = (char *)APL_CLASS;
1203 1212
1204 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1213 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1205 wmHint.input = True; 1214 wmHint.input = True;
1206 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1215 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1207 : NormalState); 1216 : NormalState);
1208 wmHint.window_group = R->TermWin.parent[0]; 1217 wmHint.window_group = TermWin.parent[0];
1209 1218
1210 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1219 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL,
1211 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1220 (char **)argv, argc, &szHint, &wmHint, &classHint);
1212 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1221 XSelectInput(Xdisplay, TermWin.parent[0],
1213 (KeyPressMask 1222 (KeyPressMask
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 | KeyReleaseMask 1224 | KeyReleaseMask
1216#endif 1225#endif
1217 | FocusChangeMask | VisibilityChangeMask 1226 | FocusChangeMask | VisibilityChangeMask
1218 | StructureNotifyMask)); 1227 | StructureNotifyMask));
1219 1228
1220 /* vt cursor: Black-on-White is standard, but this is more popular */ 1229 /* vt cursor: Black-on-White is standard, but this is more popular */
1221 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1230 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);
1222 1231
1223#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1232#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1224 /* cursor (menuBar/scrollBar): Black-on-White */ 1233 /* cursor (menuBar/scrollBar): Black-on-White */
1225 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1234 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr);
1226#endif 1235#endif
1227 1236
1228#ifdef POINTER_BLANK 1237#ifdef POINTER_BLANK
1229 1238
1230 { 1239 {
1231 XColor blackcolour; 1240 XColor blackcolour;
1232 blackcolour.red = 0; 1241 blackcolour.red = 0;
1233 blackcolour.green = 0; 1242 blackcolour.green = 0;
1234 blackcolour.blue = 0; 1243 blackcolour.blue = 0;
1235 Font f = XLoadFont (R->Xdisplay, "fixed"); 1244 Font f = XLoadFont (Xdisplay, "fixed");
1236 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1245 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ',
1237 &blackcolour, &blackcolour); 1246 &blackcolour, &blackcolour);
1238 XUnloadFont (R->Xdisplay, f); 1247 XUnloadFont (Xdisplay, f);
1239 } 1248 }
1240#endif 1249#endif
1241 1250
1242 /* the vt window */ 1251 /* the vt window */
1243 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1252 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1244 R->window_vt_x, R->window_vt_y, 1253 window_vt_x, window_vt_y,
1245 TermWin_TotalWidth(), 1254 TermWin_TotalWidth(),
1246 TermWin_TotalHeight(), 1255 TermWin_TotalHeight(),
1247 0, 1256 0,
1248 R->PixColors[Color_fg], 1257 PixColors[Color_fg],
1249 R->PixColors[Color_bg]); 1258 PixColors[Color_bg]);
1250#ifdef DEBUG_X 1259#ifdef DEBUG_X
1251
1252 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1260 XStoreName(Xdisplay, TermWin.vt, "vt window");
1253#endif 1261#endif
1254
1255 R->pointer_unblank ();
1256 1262
1257 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1263 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1258 | PropertyChangeMask); 1264 | PropertyChangeMask);
1265
1259#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1267 pointer_unblank ();
1260 1268
1261 if ((R->Options & Opt_pointerBlank)) 1269 if ((Options & Opt_pointerBlank))
1262 vt_emask |= PointerMotionMask; 1270 vt_emask |= PointerMotionMask;
1263 else 1271 else
1264#endif 1272#endif
1265
1266 vt_emask |= (Button1MotionMask | Button3MotionMask); 1273 vt_emask |= (Button1MotionMask | Button3MotionMask);
1274
1267 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1275 XSelectInput(Xdisplay, TermWin.vt, vt_emask);
1268 1276
1269#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1270 1278
1271 if (menuBar_height()) 1279 if (menuBar_height())
1272 { 1280 {
1273 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1281 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1274 R->window_vt_x, 0, 1282 window_vt_x, 0,
1275 TermWin_TotalWidth(), 1283 TermWin_TotalWidth(),
1276 menuBar_TotalHeight(), 1284 menuBar_TotalHeight(),
1277 0, 1285 0,
1278 R->PixColors[Color_fg], 1286 PixColors[Color_fg],
1279 R->PixColors[Color_scroll]); 1287 PixColors[Color_scroll]);
1280#ifdef DEBUG_X 1288#ifdef DEBUG_X
1281 1289
1282 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1290 XStoreName(Xdisplay, menuBar.win, "menubar");
1283#endif 1291#endif
1284 1292
1285 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1293 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr);
1286 XSelectInput(R->Xdisplay, R->menuBar.win, 1294 XSelectInput(Xdisplay, menuBar.win,
1287 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1295 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1288 | Button1MotionMask)); 1296 | Button1MotionMask));
1289 } 1297 }
1290#endif 1298#endif
1291#ifdef XPM_BACKGROUND 1299#ifdef XPM_BACKGROUND
1292 if (R->rs[Rs_backgroundPixmap] != NULL 1300 if (rs[Rs_backgroundPixmap] != NULL
1293 && !(R->Options & Opt_transparent)) 1301 && !(Options & Opt_transparent))
1294 { 1302 {
1295 const char *p = R->rs[Rs_backgroundPixmap]; 1303 const char *p = rs[Rs_backgroundPixmap];
1296 1304
1297 if ((p = STRCHR(p, ';')) != NULL) 1305 if ((p = STRCHR(p, ';')) != NULL)
1298 { 1306 {
1299 p++; 1307 p++;
1300 rxvt_scale_pixmap(aR_ p); 1308 scale_pixmap (p);
1301 } 1309 }
1302 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1310 set_bgPixmap (rs[Rs_backgroundPixmap]);
1303 rxvt_scr_touch(aR_ True); 1311 scr_touch (True);
1304 } 1312 }
1305#endif 1313#endif
1306 1314
1307 /* graphics context for the vt window */ 1315 /* graphics context for the vt window */
1308 gcvalue.foreground = R->PixColors[Color_fg]; 1316 gcvalue.foreground = PixColors[Color_fg];
1309 gcvalue.background = R->PixColors[Color_bg]; 1317 gcvalue.background = PixColors[Color_bg];
1310 gcvalue.graphics_exposures = 1; 1318 gcvalue.graphics_exposures = 1;
1311 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1319 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt,
1312 GCForeground | GCBackground 1320 GCForeground | GCBackground
1313 | GCGraphicsExposures, &gcvalue); 1321 | GCGraphicsExposures, &gcvalue);
1314 1322
1315#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1323#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1316 1324
1317 gcvalue.foreground = R->PixColors[Color_topShadow]; 1325 gcvalue.foreground = PixColors[Color_topShadow];
1318 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1326 topShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1319 GCForeground, &gcvalue); 1327 GCForeground, &gcvalue);
1320 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1328 gcvalue.foreground = PixColors[Color_bottomShadow];
1321 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1329 botShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1322 GCForeground, &gcvalue); 1330 GCForeground, &gcvalue);
1323 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1331 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1324 : Color_scroll)]; 1332 : Color_scroll)];
1325 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1333 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1326 GCForeground, &gcvalue); 1334 GCForeground, &gcvalue);
1327#endif 1335#endif
1328} 1336}
1329 1337
1330/*----------------------------------------------------------------------*/ 1338/*----------------------------------------------------------------------*/
… …
1358 1366
1359 /* get slave (tty) */ 1367 /* get slave (tty) */
1360 if (tty_fd < 0) 1368 if (tty_fd < 0)
1361 { 1369 {
1362#ifndef NO_SETOWNER_TTYDEV 1370#ifndef NO_SETOWNER_TTYDEV
1363 rxvt_privileged_ttydev (aR_ SAVE); 1371 privileged_ttydev (SAVE);
1364#endif 1372#endif
1365 1373
1366 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1374 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1367 { 1375 {
1368 close(cfd); 1376 close(cfd);
… …
1415 1423
1416 fdstdin = dup (STDIN_FILENO); 1424 fdstdin = dup (STDIN_FILENO);
1417 dup2 (tty_fd, STDIN_FILENO); 1425 dup2 (tty_fd, STDIN_FILENO);
1418#endif 1426#endif
1419 1427
1428#ifdef UTMP_SUPPORT
1420 rxvt_privileged_utmp (this, SAVE); 1429 privileged_utmp (SAVE);
1430#endif
1431
1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1422 1433
1423 dup2 (fdstdin, STDIN_FILENO); 1434 dup2 (fdstdin, STDIN_FILENO);
1424 close (fdstdin); 1435 close (fdstdin);
1425#endif 1436#endif
… …
1588 1599
1589/* ------------------------------------------------------------------------- * 1600/* ------------------------------------------------------------------------- *
1590 * GET TTY CURRENT STATE * 1601 * GET TTY CURRENT STATE *
1591 * ------------------------------------------------------------------------- */ 1602 * ------------------------------------------------------------------------- */
1592/* rxvt_get_ttymode() */ 1603/* rxvt_get_ttymode() */
1593/* INTPROTO */ 1604/* EXTPROTO */
1594void 1605void
1595rxvt_get_ttymode(ttymode_t *tio, int erase) 1606rxvt_get_ttymode(ttymode_t *tio, int erase)
1596{ 1607{
1597#ifdef HAVE_TERMIOS_H 1608#ifdef HAVE_TERMIOS_H
1598 /* 1609 /*

Diff Legend

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