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.16 by pcg, Thu Dec 18 13:33:02 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.16 2003/12/18 13:33:02 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]);
… …
799void 800void
800rxvt_term::set_locale (const char *locale) 801rxvt_term::set_locale (const char *locale)
801{ 802{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 803#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 804 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, "")); 805 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
805#endif 806#endif
806#if HAVE_NL_LANGINFO 807#if HAVE_NL_LANGINFO
807 free (codeset); 808 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 809 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 810 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
… …
869 870
870#ifdef META8_OPTION 871#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 873#endif
873 874
874 rxvt_get_ourmods (this); 875 get_ourmods ();
875 876
876 if (!(Options & Opt_scrollTtyOutput)) 877 if (!(Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 878 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 879 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 880 PrivateModes |= PrivMode_Keypress;
… …
884 if (STRCMP(key_backspace, "DEC") == 0) 885 if (STRCMP(key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 886 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 887#endif
887 888
888 /* add value for scrollBar */ 889 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 890 if (scrollbar_visible ())
890 { 891 {
891 PrivateModes |= PrivMode_scrollBar; 892 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 893 SavedModes |= PrivMode_scrollBar;
893 } 894 }
894 if (menubar_visible (this)) 895 if (menubar_visible ())
895 { 896 {
896 PrivateModes |= PrivMode_menuBar; 897 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 898 SavedModes |= PrivMode_menuBar;
898 } 899 }
899 900
… …
915 exit (EXIT_FAILURE); 916 exit (EXIT_FAILURE);
916 } 917 }
917} 918}
918 919
919/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 921void
922rxvt_Get_Colours (pR) 922rxvt_term::Get_Colours ()
923{ 923{
924 int i; 924 int i;
925 925
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 927 {
928 rxvt_color xcol; 928 rxvt_color xcol;
929 929
930 if (!R->rs[Rs_color + i]) 930 if (!rs[Rs_color + i])
931 continue; 931 continue;
932 932
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 933 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 934 {
935#ifndef XTERM_REVERSE_VIDEO 935#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 936 if (i < 2 && (Options & Opt_reverseVideo))
937 { 937 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 938 rs[Rs_color + i] = def_colorName[!i];
939 } 939 }
940 else 940 else
941#endif 941#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 942 rs[Rs_color + i] = def_colorName[i];
943 943
944 if (!R->rs[Rs_color + i]) 944 if (!rs[Rs_color + i])
945 continue; 945 continue;
946 946
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 947 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 948 {
949 switch (i) 949 switch (i)
950 { 950 {
951 case Color_fg: 951 case Color_fg:
952 case Color_bg: 952 case Color_bg:
… …
955 exit (EXIT_FAILURE); 955 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 956 /* NOTREACHED */
957 break; 957 break;
958#ifndef NO_CURSORCOLOR 958#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 959 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 960 xcol = PixColors[Color_fg];
961 break; 961 break;
962#endif /* ! NO_CURSORCOLOR */ 962#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 963 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 964 xcol = PixColors[Color_fg];
965 break; 965 break;
966 default: 966 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 967 xcol = PixColors[Color_bg]; /* None */
968 break; 968 break;
969 } 969 }
970 } 970 }
971 } 971 }
972 972
973 R->PixColors[i] = xcol; 973 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 974 SET_PIXCOLOR (i);
975 } 975 }
976 976
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 977 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 978 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 979 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 980 PixColors[Color_border] = PixColors[Color_fg];
981 981
982 /* 982 /*
983 * get scrollBar/menuBar shadow colors 983 * get scrollBar/menuBar shadow colors
984 * 984 *
985 * The calculations of topShadow/bottomShadow values are adapted 985 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 987 */
988#ifdef KEEP_SCROLLCOLOR 988#ifdef KEEP_SCROLLCOLOR
989 989
990 if (XDEPTH <= 2) 990 if (XDEPTH <= 2)
991 { /* Monochrome */ 991 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 992 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 993 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 994 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 995 }
996 else 996 else
997 { 997 {
998 rxvt_color xcol[3]; 998 rxvt_color xcol[3];
999 /* xcol[0] == white 999 /* xcol[0] == white
1000 * xcol[1] == top shadow 1000 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 1001 * xcol[2] == bot shadow */
1002 1002
1003 xcol[1] = R->PixColors[Color_scroll]; 1003 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 1004# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 1005 xcol[0].set (R, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1006 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */
1007# else 1007# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1008 xcol[0].set (WhitePixel(Xdisplay, Xscreen));
1009# endif 1009# endif
1010 1010
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 1012
1013 xcol[0].get (R, pr0, pg0, pb0); 1013 xcol[0].get (R, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 1014 xcol[1].get (R, pr1, pg1, pb1);
1015 1015
1016 /* bottomShadowColor */ 1016 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1017 if (!xcol[2].set (pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 1018 xcol[2] = PixColors[Color_Black];
1019 1019
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 1020 PixColors[Color_bottomShadow] = xcol[2];
1021 1021
1022 /* topShadowColor */ 1022 /* topShadowColor */
1023 if (!xcol[1].set (aR_
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1023 if (!xcol[1].set ( 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 */
1132void 1129void
… …
1135 XClassHint classHint; 1132 XClassHint classHint;
1136 XWMHints wmHint; 1133 XWMHints wmHint;
1137 XGCValues gcvalue; 1134 XGCValues gcvalue;
1138 long vt_emask; 1135 long vt_emask;
1139 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);
1140#ifdef PREFER_24BIT 1151#ifdef PREFER_24BIT
1141 XSetWindowAttributes attributes;
1142 XWindowAttributes gattr;
1143
1144 XCMAP = DefaultColormap(Xdisplay, Xscreen);
1145 XVISUAL = DefaultVisual(Xdisplay, Xscreen);
1146
1147 if (Options & Opt_transparent)
1148 {
1149 XGetWindowAttributes(Xdisplay, RootWindow(Xdisplay, Xscreen),
1150 &gattr);
1151 XDEPTH = gattr.depth;
1152 }
1153 else
1154 {
1155 XDEPTH = DefaultDepth(Xdisplay, Xscreen);
1156 /* 1152 /*
1157 * If depth is not 24, look for a 24bit visual. 1153 * If depth is not 24, look for a 24bit visual.
1158 */ 1154 */
1159 if (XDEPTH != 24) 1155 if (Xdepth != 24)
1160 { 1156 {
1161 XVisualInfo vinfo; 1157 XVisualInfo vinfo;
1162 1158
1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo)) 1159 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1164 { 1160 {
1165 XDEPTH = 24; 1161 Xdepth = 24;
1166 XVISUAL = vinfo.visual; 1162 Xvisual = vinfo.visual;
1167 XCMAP = XCreateColormap(Xdisplay, 1163 Xcmap = XCreateColormap(Xdisplay,
1168 RootWindow(Xdisplay, Xscreen), 1164 RootWindow(Xdisplay, Xscreen),
1169 XVISUAL, AllocNone); 1165 Xvisual, AllocNone);
1170 } 1166 }
1171 } 1167 }
1172 }
1173#endif 1168#endif
1169 }
1174 1170
1175 /* grab colors before netscape does */ 1171 /* grab colors before netscape does */
1176 rxvt_Get_Colours (this); 1172 Get_Colours ();
1177 1173
1178 rxvt_change_font (this, 1, NULL); 1174 change_font (1, NULL);
1179 window_calc (0, 0); 1175 window_calc (0, 0);
1180 old_width = szHint.width; 1176 old_width = szHint.width;
1181 old_height = szHint.height; 1177 old_height = szHint.height;
1182 1178
1183 /* parent window - reverse video so we can see placement errors 1179 /* parent window - reverse video so we can see placement errors
1184 * sub-window placement & size in rxvt_resize_subwindows() 1180 * sub-window placement & size in rxvt_resize_subwindows()
1185 */ 1181 */
1186 1182
1187#ifdef PREFER_24BIT 1183#ifdef PREFER_24BIT
1184 XSetWindowAttributes attributes;
1185
1188 attributes.background_pixel = PixColors[Color_fg]; 1186 attributes.background_pixel = PixColors[Color_fg];
1189 attributes.border_pixel = PixColors[Color_border]; 1187 attributes.border_pixel = PixColors[Color_border];
1190 attributes.colormap = XCMAP; 1188 attributes.colormap = Xcmap;
1191 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1189 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1192 szHint.x, szHint.y, 1190 szHint.x, szHint.y,
1193 szHint.width, szHint.height, 1191 szHint.width, szHint.height,
1194 TermWin.ext_bwidth, 1192 TermWin.ext_bwidth,
1195 XDEPTH, InputOutput, 1193 Xdepth, InputOutput,
1196 XVISUAL, 1194 Xvisual,
1197 CWBackPixel | CWBorderPixel 1195 CWBackPixel | CWBorderPixel
1198 | CWColormap, &attributes); 1196 | CWColormap, &attributes);
1199#else 1197#else
1200 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1198 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay),
1201 szHint.x, szHint.y, 1199 szHint.x, szHint.y,
… …
1204 TermWin.ext_bwidth, 1202 TermWin.ext_bwidth,
1205 PixColors[Color_border], 1203 PixColors[Color_border],
1206 PixColors[Color_fg]); 1204 PixColors[Color_fg]);
1207#endif 1205#endif
1208 1206
1209 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1207 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1210 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1208 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1211 1209
1212 classHint.res_name = (char *)rs[Rs_name]; 1210 classHint.res_name = (char *)rs[Rs_name];
1213 classHint.res_class = (char *)APL_CLASS; 1211 classHint.res_class = (char *)APL_CLASS;
1214 1212
1215 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1213 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
… …
1257 TermWin_TotalHeight(), 1255 TermWin_TotalHeight(),
1258 0, 1256 0,
1259 PixColors[Color_fg], 1257 PixColors[Color_fg],
1260 PixColors[Color_bg]); 1258 PixColors[Color_bg]);
1261#ifdef DEBUG_X 1259#ifdef DEBUG_X
1262
1263 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1260 XStoreName(Xdisplay, TermWin.vt, "vt window");
1264#endif 1261#endif
1265
1266 pointer_unblank ();
1267 1262
1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1263 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1269 | PropertyChangeMask); 1264 | PropertyChangeMask);
1265
1270#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1267 pointer_unblank ();
1271 1268
1272 if ((Options & Opt_pointerBlank)) 1269 if ((Options & Opt_pointerBlank))
1273 vt_emask |= PointerMotionMask; 1270 vt_emask |= PointerMotionMask;
1274 else 1271 else
1275#endif 1272#endif
1276
1277 vt_emask |= (Button1MotionMask | Button3MotionMask); 1273 vt_emask |= (Button1MotionMask | Button3MotionMask);
1274
1278 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1275 XSelectInput(Xdisplay, TermWin.vt, vt_emask);
1279 1276
1280#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1281 1278
1282 if (menuBar_height()) 1279 if (menuBar_height())
… …
1306 const char *p = rs[Rs_backgroundPixmap]; 1303 const char *p = rs[Rs_backgroundPixmap];
1307 1304
1308 if ((p = STRCHR(p, ';')) != NULL) 1305 if ((p = STRCHR(p, ';')) != NULL)
1309 { 1306 {
1310 p++; 1307 p++;
1311 rxvt_scale_pixmap (this, p); 1308 scale_pixmap (p);
1312 } 1309 }
1313 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1310 set_bgPixmap (rs[Rs_backgroundPixmap]);
1314 rxvt_scr_touch (this, True); 1311 scr_touch (True);
1315 } 1312 }
1316#endif 1313#endif
1317 1314
1318 /* graphics context for the vt window */ 1315 /* graphics context for the vt window */
1319 gcvalue.foreground = PixColors[Color_fg]; 1316 gcvalue.foreground = PixColors[Color_fg];
… …
1369 1366
1370 /* get slave (tty) */ 1367 /* get slave (tty) */
1371 if (tty_fd < 0) 1368 if (tty_fd < 0)
1372 { 1369 {
1373#ifndef NO_SETOWNER_TTYDEV 1370#ifndef NO_SETOWNER_TTYDEV
1374 rxvt_privileged_ttydev (aR_ SAVE); 1371 privileged_ttydev (SAVE);
1375#endif 1372#endif
1376 1373
1377 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1374 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1378 { 1375 {
1379 close(cfd); 1376 close(cfd);
… …
1426 1423
1427 fdstdin = dup (STDIN_FILENO); 1424 fdstdin = dup (STDIN_FILENO);
1428 dup2 (tty_fd, STDIN_FILENO); 1425 dup2 (tty_fd, STDIN_FILENO);
1429#endif 1426#endif
1430 1427
1428#ifdef UTMP_SUPPORT
1431 rxvt_privileged_utmp (this, SAVE); 1429 privileged_utmp (SAVE);
1430#endif
1431
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433 1433
1434 dup2 (fdstdin, STDIN_FILENO); 1434 dup2 (fdstdin, STDIN_FILENO);
1435 close (fdstdin); 1435 close (fdstdin);
1436#endif 1436#endif
… …
1599 1599
1600/* ------------------------------------------------------------------------- * 1600/* ------------------------------------------------------------------------- *
1601 * GET TTY CURRENT STATE * 1601 * GET TTY CURRENT STATE *
1602 * ------------------------------------------------------------------------- */ 1602 * ------------------------------------------------------------------------- */
1603/* rxvt_get_ttymode() */ 1603/* rxvt_get_ttymode() */
1604/* INTPROTO */ 1604/* EXTPROTO */
1605void 1605void
1606rxvt_get_ttymode(ttymode_t *tio, int erase) 1606rxvt_get_ttymode(ttymode_t *tio, int erase)
1607{ 1607{
1608#ifdef HAVE_TERMIOS_H 1608#ifdef HAVE_TERMIOS_H
1609 /* 1609 /*

Diff Legend

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