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.15 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 03:27:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.15 2003/12/18 07:31:19 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>
… …
331#endif /* KEEP_SCROLLCOLOR */ 330#endif /* KEEP_SCROLLCOLOR */
332 }; 331 };
333 332
334const char *const xa_names[NUM_XA] = 333const char *const xa_names[NUM_XA] =
335 { 334 {
335 "TEXT",
336 "COMPOUND_TEXT", 336 "COMPOUND_TEXT",
337 "UTF8_STRING",
337 "MULTIPLE", 338 "MULTIPLE",
338 "TARGETS", 339 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 340 "TIMESTAMP",
341 "VT_SELECTION", 341 "VT_SELECTION",
342 "INCR", 342 "INCR",
343 "WM_DELETE_WINDOW", 343 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 344#ifdef TRANSPARENT
… …
524 * Open display, get options/resources and create the window 524 * Open display, get options/resources and create the window
525 */ 525 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
527 rs[Rs_display_name] = ":0"; 527 rs[Rs_display_name] = ":0";
528 528
529 rxvt_get_options (this, r_argc, r_argv); 529 get_options (r_argc, r_argv);
530 free (r_argv); 530 free (r_argv);
531 531
532#ifdef LOCAL_X_IS_UNIX 532#ifdef LOCAL_X_IS_UNIX
533 if (rs[Rs_display_name][0] == ':') 533 if (rs[Rs_display_name][0] == ':')
534 { 534 {
… …
545 { 545 {
546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
547 exit (EXIT_FAILURE); 547 exit (EXIT_FAILURE);
548 } 548 }
549 549
550 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 550 extract_resources (Xdisplay, rs[Rs_name]);
551 551
552 /* 552 /*
553 * set any defaults not already set 553 * set any defaults not already set
554 */ 554 */
555 if (cmd_argv && cmd_argv[0]) 555 if (cmd_argv && cmd_argv[0])
… …
660 selection_style = OLD_SELECT; 660 selection_style = OLD_SELECT;
661#endif 661#endif
662 } 662 }
663 663
664#ifdef HAVE_SCROLLBARS 664#ifdef HAVE_SCROLLBARS
665 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 666 rs[Rs_scrollBar_thickness]);
667#endif 667#endif
668 668
669 TermWin.fontset = new rxvt_fontset (this); 669 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]); 670 TermWin.fontset->populate (rs[Rs_font]);
… …
799void 799void
800rxvt_term::set_locale (const char *locale) 800rxvt_term::set_locale (const char *locale)
801{ 801{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 802#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 803 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, "")); 804 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
805#endif 805#endif
806#if HAVE_NL_LANGINFO 806#if HAVE_NL_LANGINFO
807 free (codeset); 807 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 808 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 809 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
… …
869 869
870#ifdef META8_OPTION 870#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 872#endif
873 873
874 rxvt_get_ourmods (this); 874 get_ourmods ();
875 875
876 if (!(Options & Opt_scrollTtyOutput)) 876 if (!(Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 877 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 878 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 879 PrivateModes |= PrivMode_Keypress;
… …
884 if (STRCMP(key_backspace, "DEC") == 0) 884 if (STRCMP(key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 885 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 886#endif
887 887
888 /* add value for scrollBar */ 888 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 889 if (scrollbar_visible ())
890 { 890 {
891 PrivateModes |= PrivMode_scrollBar; 891 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 892 SavedModes |= PrivMode_scrollBar;
893 } 893 }
894 if (menubar_visible (this)) 894 if (menubar_visible ())
895 { 895 {
896 PrivateModes |= PrivMode_menuBar; 896 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 897 SavedModes |= PrivMode_menuBar;
898 } 898 }
899 899
… …
915 exit (EXIT_FAILURE); 915 exit (EXIT_FAILURE);
916 } 916 }
917} 917}
918 918
919/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 920void
922rxvt_Get_Colours (pR) 921rxvt_term::Get_Colours ()
923{ 922{
924 int i; 923 int i;
925 924
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 925 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 926 {
928 rxvt_color xcol; 927 rxvt_color xcol;
929 928
930 if (!R->rs[Rs_color + i]) 929 if (!rs[Rs_color + i])
931 continue; 930 continue;
932 931
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 933 {
935#ifndef XTERM_REVERSE_VIDEO 934#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 935 if (i < 2 && (Options & Opt_reverseVideo))
937 { 936 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 937 rs[Rs_color + i] = def_colorName[!i];
939 } 938 }
940 else 939 else
941#endif 940#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 941 rs[Rs_color + i] = def_colorName[i];
943 942
944 if (!R->rs[Rs_color + i]) 943 if (!rs[Rs_color + i])
945 continue; 944 continue;
946 945
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 946 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 947 {
949 switch (i) 948 switch (i)
950 { 949 {
951 case Color_fg: 950 case Color_fg:
952 case Color_bg: 951 case Color_bg:
… …
955 exit (EXIT_FAILURE); 954 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 955 /* NOTREACHED */
957 break; 956 break;
958#ifndef NO_CURSORCOLOR 957#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 958 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 959 xcol = PixColors[Color_fg];
961 break; 960 break;
962#endif /* ! NO_CURSORCOLOR */ 961#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 962 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 963 xcol = PixColors[Color_fg];
965 break; 964 break;
966 default: 965 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 966 xcol = PixColors[Color_bg]; /* None */
968 break; 967 break;
969 } 968 }
970 } 969 }
971 } 970 }
972 971
973 R->PixColors[i] = xcol; 972 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 973 SET_PIXCOLOR (i);
975 } 974 }
976 975
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 976 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 977 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 978 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 979 PixColors[Color_border] = PixColors[Color_fg];
981 980
982 /* 981 /*
983 * get scrollBar/menuBar shadow colors 982 * get scrollBar/menuBar shadow colors
984 * 983 *
985 * The calculations of topShadow/bottomShadow values are adapted 984 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 986 */
988#ifdef KEEP_SCROLLCOLOR 987#ifdef KEEP_SCROLLCOLOR
989 988
990 if (XDEPTH <= 2) 989 if (XDEPTH <= 2)
991 { /* Monochrome */ 990 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 991 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 992 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 993 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 994 }
996 else 995 else
997 { 996 {
998 rxvt_color xcol[3]; 997 rxvt_color xcol[3];
999 /* xcol[0] == white 998 /* xcol[0] == white
1000 * xcol[1] == top shadow 999 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 1000 * xcol[2] == bot shadow */
1002 1001
1003 xcol[1] = R->PixColors[Color_scroll]; 1002 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 1003# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 1004 xcol[0].set (this, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1005 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1007# else 1006# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1007 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen));
1009# endif 1008# endif
1010 1009
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 1011
1013 xcol[0].get (R, pr0, pg0, pb0); 1012 xcol[0].get (this, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 1013 xcol[1].get (this, pr1, pg1, pb1);
1015 1014
1016 /* bottomShadowColor */ 1015 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1016 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 1017 xcol[2] = PixColors[Color_Black];
1019 1018
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 1019 PixColors[Color_bottomShadow] = xcol[2];
1021 1020
1022 /* topShadowColor */ 1021 /* topShadowColor */
1023 if (!xcol[1].set (aR_ 1022 if (!xcol[1].set (this,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1027 xcol[1] = R->PixColors[Color_White]; 1026 xcol[1] = PixColors[Color_White];
1028 1027
1029 R->PixColors[Color_topShadow] = xcol[1]; 1028 PixColors[Color_topShadow] = xcol[1];
1030 } 1029 }
1031#endif /* KEEP_SCROLLCOLOR */ 1030#endif /* KEEP_SCROLLCOLOR */
1032} 1031}
1033 1032
1034/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
… …
1042 1041
1043 if (i >= 8 && i <= 15) 1042 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1043 { /* bright colors */
1045 i -= 8; 1044 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1045#ifndef NO_BRIGHTCOLOR
1047
1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1046 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1049 return; 1047 return;
1050#endif 1048#endif
1051
1052 } 1049 }
1050
1053 if (i >= 0 && i <= 7) /* normal colors */ 1051 if (i >= 0 && i <= 7) /* normal colors */
1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1052 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1055 } 1053 }
1056} 1054}
1057 1055
1058/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1059/* 1057/*
1060 * 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
1061 * Use resource ``modifier'' to override the Meta modifier 1059 * Use resource ``modifier'' to override the Meta modifier
1062 */ 1060 */
1063/* INTPROTO */
1064void 1061void
1065rxvt_get_ourmods(pR) 1062rxvt_term::get_ourmods ()
1066{ 1063{
1067 int i, j, k; 1064 int i, j, k;
1068 int requestedmeta, realmeta, realalt; 1065 int requestedmeta, realmeta, realalt;
1069 const char *cm, *rsmod; 1066 const char *cm, *rsmod;
1070 XModifierKeymap *map; 1067 XModifierKeymap *map;
… …
1073 { 1070 {
1074 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1071 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1075 }; 1072 };
1076 1073
1077 requestedmeta = realmeta = realalt = 0; 1074 requestedmeta = realmeta = realalt = 0;
1078 rsmod = R->rs[Rs_modifier]; 1075 rsmod = rs[Rs_modifier];
1079 if (rsmod 1076 if (rsmod
1080 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1077 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1081 requestedmeta = rsmod[3] - '0'; 1078 requestedmeta = rsmod[3] - '0';
1082 1079
1083 map = XGetModifierMapping(R->Xdisplay); 1080 map = XGetModifierMapping(Xdisplay);
1084 kc = map->modifiermap; 1081 kc = map->modifiermap;
1085 for (i = 1; i < 6; i++) 1082 for (i = 1; i < 6; i++)
1086 { 1083 {
1087 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1084 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1088 for (j = map->max_keypermod; j--; k++) 1085 for (j = map->max_keypermod; j--; k++)
1089 { 1086 {
1090 if (kc[k] == 0) 1087 if (kc[k] == 0)
1091 break; 1088 break;
1092 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1089 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0))
1093 { 1090 {
1094 case XK_Num_Lock: 1091 case XK_Num_Lock:
1095 R->ModNumLockMask = modmasks[i - 1]; 1092 ModNumLockMask = modmasks[i - 1];
1096 /* FALLTHROUGH */ 1093 /* FALLTHROUGH */
1097 default: 1094 default:
1098 continue; /* for(;;) */ 1095 continue; /* for(;;) */
1099 case XK_Meta_L: 1096 case XK_Meta_L:
1100 case XK_Meta_R: 1097 case XK_Meta_R:
… …
1122 XFreeModifiermap(map); 1119 XFreeModifiermap(map);
1123 i = (requestedmeta ? requestedmeta 1120 i = (requestedmeta ? requestedmeta
1124 : (realmeta ? realmeta 1121 : (realmeta ? realmeta
1125 : (realalt ? realalt : 0))); 1122 : (realalt ? realalt : 0)));
1126 if (i) 1123 if (i)
1127 R->ModMetaMask = modmasks[i - 1]; 1124 ModMetaMask = modmasks[i - 1];
1128} 1125}
1129 1126
1130/*----------------------------------------------------------------------*/ 1127/*----------------------------------------------------------------------*/
1131/* rxvt_Create_Windows() - Open and map the window */ 1128/* rxvt_Create_Windows() - Open and map the window */
1132/* EXTPROTO */
1133void 1129void
1134rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1130rxvt_term::create_windows (int argc, const char *const *argv)
1135{ 1131{
1136 XClassHint classHint; 1132 XClassHint classHint;
1137 XWMHints wmHint; 1133 XWMHints wmHint;
1138 XGCValues gcvalue; 1134 XGCValues gcvalue;
1139 long vt_emask; 1135 long vt_emask;
1140 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);
1141#ifdef PREFER_24BIT 1151#ifdef PREFER_24BIT
1142 XSetWindowAttributes attributes;
1143 XWindowAttributes gattr;
1144
1145 XCMAP = DefaultColormap(R->Xdisplay, Xscreen);
1146 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen);
1147
1148 if (R->Options & Opt_transparent)
1149 {
1150 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen),
1151 &gattr);
1152 XDEPTH = gattr.depth;
1153 }
1154 else
1155 {
1156 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen);
1157 /* 1152 /*
1158 * If depth is not 24, look for a 24bit visual. 1153 * If depth is not 24, look for a 24bit visual.
1159 */ 1154 */
1160 if (XDEPTH != 24) 1155 if (Xdepth != 24)
1161 { 1156 {
1162 XVisualInfo vinfo; 1157 XVisualInfo vinfo;
1163 1158
1164 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo)) 1159 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1165 { 1160 {
1166 XDEPTH = 24; 1161 Xdepth = 24;
1167 XVISUAL = vinfo.visual; 1162 Xvisual = vinfo.visual;
1168 XCMAP = XCreateColormap(R->Xdisplay, 1163 Xcmap = XCreateColormap(Xdisplay,
1169 RootWindow(R->Xdisplay, Xscreen), 1164 RootWindow(Xdisplay, Xscreen),
1170 XVISUAL, AllocNone); 1165 Xvisual, AllocNone);
1171 } 1166 }
1172 } 1167 }
1173 }
1174#endif 1168#endif
1169 }
1175 1170
1176 /* grab colors before netscape does */ 1171 /* grab colors before netscape does */
1177 rxvt_Get_Colours(aR); 1172 Get_Colours ();
1178 1173
1179 rxvt_change_font(aR_ 1, NULL); 1174 change_font (1, NULL);
1180 rxvt_window_calc(aR_ 0, 0); 1175 window_calc (0, 0);
1181 R->old_width = R->szHint.width; 1176 old_width = szHint.width;
1182 R->old_height = R->szHint.height; 1177 old_height = szHint.height;
1183 1178
1184 /* parent window - reverse video so we can see placement errors 1179 /* parent window - reverse video so we can see placement errors
1185 * sub-window placement & size in rxvt_resize_subwindows() 1180 * sub-window placement & size in rxvt_resize_subwindows()
1186 */ 1181 */
1187 1182
1188#ifdef PREFER_24BIT 1183#ifdef PREFER_24BIT
1184 XSetWindowAttributes attributes;
1189 1185
1190 attributes.background_pixel = R->PixColors[Color_fg]; 1186 attributes.background_pixel = PixColors[Color_fg];
1191 attributes.border_pixel = R->PixColors[Color_border]; 1187 attributes.border_pixel = PixColors[Color_border];
1192 attributes.colormap = XCMAP; 1188 attributes.colormap = Xcmap;
1193 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1189 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1194 R->szHint.x, R->szHint.y, 1190 szHint.x, szHint.y,
1195 R->szHint.width, R->szHint.height, 1191 szHint.width, szHint.height,
1196 R->TermWin.ext_bwidth, 1192 TermWin.ext_bwidth,
1197 XDEPTH, InputOutput, 1193 Xdepth, InputOutput,
1198 XVISUAL, 1194 Xvisual,
1199 CWBackPixel | CWBorderPixel 1195 CWBackPixel | CWBorderPixel
1200 | CWColormap, &attributes); 1196 | CWColormap, &attributes);
1201#else 1197#else
1202
1203 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot, 1198 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1204 R->szHint.x, R->szHint.y, 1199 szHint.x, szHint.y,
1205 R->szHint.width, 1200 szHint.width,
1206 R->szHint.height, 1201 szHint.height,
1207 R->TermWin.ext_bwidth, 1202 TermWin.ext_bwidth,
1208 R->PixColors[Color_border], 1203 PixColors[Color_border],
1209 R->PixColors[Color_fg]); 1204 PixColors[Color_fg]);
1210#endif 1205#endif
1211 1206
1212 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1207 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1213 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1208 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1214 1209
1215 classHint.res_name = (char *)R->rs[Rs_name]; 1210 classHint.res_name = (char *)rs[Rs_name];
1216 classHint.res_class = (char *)APL_CLASS; 1211 classHint.res_class = (char *)APL_CLASS;
1217 1212
1218 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1213 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1219 wmHint.input = True; 1214 wmHint.input = True;
1220 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1215 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1221 : NormalState); 1216 : NormalState);
1222 wmHint.window_group = R->TermWin.parent[0]; 1217 wmHint.window_group = TermWin.parent[0];
1223 1218
1224 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1219 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL,
1225 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1220 (char **)argv, argc, &szHint, &wmHint, &classHint);
1226 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1221 XSelectInput(Xdisplay, TermWin.parent[0],
1227 (KeyPressMask 1222 (KeyPressMask
1228#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1229 | KeyReleaseMask 1224 | KeyReleaseMask
1230#endif 1225#endif
1231 | FocusChangeMask | VisibilityChangeMask 1226 | FocusChangeMask | VisibilityChangeMask
1232 | StructureNotifyMask)); 1227 | StructureNotifyMask));
1233 1228
1234 /* 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 */
1235 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1230 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm);
1236 1231
1237#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1232#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1238 /* cursor (menuBar/scrollBar): Black-on-White */ 1233 /* cursor (menuBar/scrollBar): Black-on-White */
1239 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1234 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr);
1240#endif 1235#endif
1241 1236
1242#ifdef POINTER_BLANK 1237#ifdef POINTER_BLANK
1243 1238
1244 { 1239 {
1245 XColor blackcolour; 1240 XColor blackcolour;
1246 blackcolour.red = 0; 1241 blackcolour.red = 0;
1247 blackcolour.green = 0; 1242 blackcolour.green = 0;
1248 blackcolour.blue = 0; 1243 blackcolour.blue = 0;
1249 Font f = XLoadFont (R->Xdisplay, "fixed"); 1244 Font f = XLoadFont (Xdisplay, "fixed");
1250 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1245 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ',
1251 &blackcolour, &blackcolour); 1246 &blackcolour, &blackcolour);
1252 XUnloadFont (R->Xdisplay, f); 1247 XUnloadFont (Xdisplay, f);
1253 } 1248 }
1254#endif 1249#endif
1255 1250
1256 /* the vt window */ 1251 /* the vt window */
1257 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1252 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1258 R->window_vt_x, R->window_vt_y, 1253 window_vt_x, window_vt_y,
1259 TermWin_TotalWidth(), 1254 TermWin_TotalWidth(),
1260 TermWin_TotalHeight(), 1255 TermWin_TotalHeight(),
1261 0, 1256 0,
1262 R->PixColors[Color_fg], 1257 PixColors[Color_fg],
1263 R->PixColors[Color_bg]); 1258 PixColors[Color_bg]);
1264#ifdef DEBUG_X 1259#ifdef DEBUG_X
1265
1266 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1260 XStoreName(Xdisplay, TermWin.vt, "vt window");
1267#endif 1261#endif
1268
1269 R->pointer_unblank ();
1270 1262
1271 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1263 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1272 | PropertyChangeMask); 1264 | PropertyChangeMask);
1265
1273#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1267 pointer_unblank ();
1274 1268
1275 if ((R->Options & Opt_pointerBlank)) 1269 if ((Options & Opt_pointerBlank))
1276 vt_emask |= PointerMotionMask; 1270 vt_emask |= PointerMotionMask;
1277 else 1271 else
1278#endif 1272#endif
1279
1280 vt_emask |= (Button1MotionMask | Button3MotionMask); 1273 vt_emask |= (Button1MotionMask | Button3MotionMask);
1274
1281 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1275 XSelectInput(Xdisplay, TermWin.vt, vt_emask);
1282 1276
1283#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1284 1278
1285 if (menuBar_height()) 1279 if (menuBar_height())
1286 { 1280 {
1287 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1281 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0],
1288 R->window_vt_x, 0, 1282 window_vt_x, 0,
1289 TermWin_TotalWidth(), 1283 TermWin_TotalWidth(),
1290 menuBar_TotalHeight(), 1284 menuBar_TotalHeight(),
1291 0, 1285 0,
1292 R->PixColors[Color_fg], 1286 PixColors[Color_fg],
1293 R->PixColors[Color_scroll]); 1287 PixColors[Color_scroll]);
1294#ifdef DEBUG_X 1288#ifdef DEBUG_X
1295 1289
1296 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1290 XStoreName(Xdisplay, menuBar.win, "menubar");
1297#endif 1291#endif
1298 1292
1299 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1293 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr);
1300 XSelectInput(R->Xdisplay, R->menuBar.win, 1294 XSelectInput(Xdisplay, menuBar.win,
1301 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1295 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1302 | Button1MotionMask)); 1296 | Button1MotionMask));
1303 } 1297 }
1304#endif 1298#endif
1305#ifdef XPM_BACKGROUND 1299#ifdef XPM_BACKGROUND
1306 if (R->rs[Rs_backgroundPixmap] != NULL 1300 if (rs[Rs_backgroundPixmap] != NULL
1307 && !(R->Options & Opt_transparent)) 1301 && !(Options & Opt_transparent))
1308 { 1302 {
1309 const char *p = R->rs[Rs_backgroundPixmap]; 1303 const char *p = rs[Rs_backgroundPixmap];
1310 1304
1311 if ((p = STRCHR(p, ';')) != NULL) 1305 if ((p = STRCHR(p, ';')) != NULL)
1312 { 1306 {
1313 p++; 1307 p++;
1314 rxvt_scale_pixmap(aR_ p); 1308 scale_pixmap (p);
1315 } 1309 }
1316 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1310 set_bgPixmap (rs[Rs_backgroundPixmap]);
1317 rxvt_scr_touch(aR_ True); 1311 scr_touch (True);
1318 } 1312 }
1319#endif 1313#endif
1320 1314
1321 /* graphics context for the vt window */ 1315 /* graphics context for the vt window */
1322 gcvalue.foreground = R->PixColors[Color_fg]; 1316 gcvalue.foreground = PixColors[Color_fg];
1323 gcvalue.background = R->PixColors[Color_bg]; 1317 gcvalue.background = PixColors[Color_bg];
1324 gcvalue.graphics_exposures = 1; 1318 gcvalue.graphics_exposures = 1;
1325 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1319 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt,
1326 GCForeground | GCBackground 1320 GCForeground | GCBackground
1327 | GCGraphicsExposures, &gcvalue); 1321 | GCGraphicsExposures, &gcvalue);
1328 1322
1329#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1323#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1330 1324
1331 gcvalue.foreground = R->PixColors[Color_topShadow]; 1325 gcvalue.foreground = PixColors[Color_topShadow];
1332 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1326 topShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1333 GCForeground, &gcvalue); 1327 GCForeground, &gcvalue);
1334 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1328 gcvalue.foreground = PixColors[Color_bottomShadow];
1335 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1329 botShadowGC = XCreateGC(Xdisplay, TermWin.vt,
1336 GCForeground, &gcvalue); 1330 GCForeground, &gcvalue);
1337 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1331 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1338 : Color_scroll)]; 1332 : Color_scroll)];
1339 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1333 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1340 GCForeground, &gcvalue); 1334 GCForeground, &gcvalue);
1341#endif 1335#endif
1342} 1336}
1343 1337
1344/*----------------------------------------------------------------------*/ 1338/*----------------------------------------------------------------------*/
… …
1372 1366
1373 /* get slave (tty) */ 1367 /* get slave (tty) */
1374 if (tty_fd < 0) 1368 if (tty_fd < 0)
1375 { 1369 {
1376#ifndef NO_SETOWNER_TTYDEV 1370#ifndef NO_SETOWNER_TTYDEV
1377 rxvt_privileged_ttydev (aR_ SAVE); 1371 privileged_ttydev (SAVE);
1378#endif 1372#endif
1379 1373
1380 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1374 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1381 { 1375 {
1382 close(cfd); 1376 close(cfd);
… …
1429 1423
1430 fdstdin = dup (STDIN_FILENO); 1424 fdstdin = dup (STDIN_FILENO);
1431 dup2 (tty_fd, STDIN_FILENO); 1425 dup2 (tty_fd, STDIN_FILENO);
1432#endif 1426#endif
1433 1427
1428#ifdef UTMP_SUPPORT
1434 rxvt_privileged_utmp (this, SAVE); 1429 privileged_utmp (SAVE);
1430#endif
1431
1435#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1436 1433
1437 dup2 (fdstdin, STDIN_FILENO); 1434 dup2 (fdstdin, STDIN_FILENO);
1438 close (fdstdin); 1435 close (fdstdin);
1439#endif 1436#endif
… …
1602 1599
1603/* ------------------------------------------------------------------------- * 1600/* ------------------------------------------------------------------------- *
1604 * GET TTY CURRENT STATE * 1601 * GET TTY CURRENT STATE *
1605 * ------------------------------------------------------------------------- */ 1602 * ------------------------------------------------------------------------- */
1606/* rxvt_get_ttymode() */ 1603/* rxvt_get_ttymode() */
1607/* INTPROTO */ 1604/* EXTPROTO */
1608void 1605void
1609rxvt_get_ttymode(ttymode_t *tio, int erase) 1606rxvt_get_ttymode(ttymode_t *tio, int erase)
1610{ 1607{
1611#ifdef HAVE_TERMIOS_H 1608#ifdef HAVE_TERMIOS_H
1612 /* 1609 /*

Diff Legend

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