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.148 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.154 by root, Wed Jan 25 02:45:36 2006 UTC

… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
… …
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 302 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 303
346 extract_resources (); 304 extract_resources ();
347 305
348 free (r_argv); 306 free (r_argv);
307
308#if ENABLE_PERL
309 if (!rs[Rs_perl_ext_1])
310 rs[Rs_perl_ext_1] = "default";
311
312 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
313 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
314 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
315 {
316 rxvt_perl.init (this);
317 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
318 }
319#endif
349 320
350 /* 321 /*
351 * set any defaults not already set 322 * set any defaults not already set
352 */ 323 */
353 if (cmd_argv && cmd_argv[0]) 324 if (cmd_argv && cmd_argv[0])
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
906{ 877{
907 XClassHint classHint; 878 XClassHint classHint;
908 XWMHints wmHint; 879 XWMHints wmHint;
909#if ENABLE_FRILLS 880#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 881 MWMHints mwmhints;
912#endif 882#endif
913 XGCValues gcvalue; 883 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 885 Window top, parent;
917 dDisp; 886 dDisp;
918 887
919#ifdef USING_W11LIB 888 xa = display->xa;
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 889
933 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
934 Get_Colours (); 891 Get_Colours ();
935 892
936 if (!set_fonts ()) 893 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 895
939 parent = DefaultRootWindow (disp); 896 parent = display->root;
940 897
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942 899
943#if ENABLE_FRILLS 900#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
945 { 902 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 903 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 904 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
951 attributes.override_redirect = TRUE; 906 attributes.override_redirect = TRUE;
952 mwmhints.flags = 0; 907 mwmhints.flags = 0;
953 } 908 }
… …
977 932
978 window_calc (0, 0); 933 window_calc (0, 0);
979 934
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 936 attributes.background_pixel = pix_colors_focused[Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 937 attributes.border_pixel = pix_colors_focused[Color_border];
983 attributes.colormap = display->cmap; 938 attributes.colormap = display->cmap;
939
984 top = XCreateWindow (disp, parent, 940 top = XCreateWindow (disp, parent,
985 szHint.x, szHint.y, 941 szHint.x, szHint.y,
986 szHint.width, szHint.height, 942 szHint.width, szHint.height,
987 ext_bwidth, 943 ext_bwidth,
988 display->depth, InputOutput, 944 display->depth, InputOutput,
… …
993 this->parent[0] = top; 949 this->parent[0] = top;
994 950
995 old_width = szHint.width; 951 old_width = szHint.width;
996 old_height = szHint.height; 952 old_height = szHint.height;
997 953
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 956
1001 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
1003 959
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 961 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 963 wmHint.window_group = top;
1008 964
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
967
968#if ENABLE_FRILLS
969 if (mwmhints.flags)
970 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif
1011 973
1012 Atom protocols[] = { 974 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 976#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
… …
1041 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
1043 1005
1044 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
1045 1007
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* vt cursor: Black-on-White is standard, but this is more popular */ 1008 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1054 1010
1055#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1058#endif 1014#endif
1059 1015
1060 /* the vt window */ 1016 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1017 vt = XCreateSimpleWindow (disp, top,
1062 window_vt_x,
1063 window_vt_y, 1018 window_vt_x, window_vt_y,
1064 width,
1065 height, 1019 width, height,
1066 0, 1020 0,
1067 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1023
1073 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1075 1026
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
… …
1084 1035
1085 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1086 1037
1087#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1089 && ! OPTION (Opt_transparent)) 1040 && !OPTION (Opt_transparent))
1090 { 1041 {
1091 const char *p = rs[Rs_backgroundPixmap]; 1042 const char *p = rs[Rs_backgroundPixmap];
1092 1043
1093 if ((p = strchr (p, ';')) != NULL) 1044 if ((p = strchr (p, ';')) != NULL)
1094 { 1045 {
… …
1100 scr_touch (true); 1051 scr_touch (true);
1101 } 1052 }
1102#endif 1053#endif
1103 1054
1104 /* graphics context for the vt window */ 1055 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1056 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1057 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1058 gcvalue.graphics_exposures = 1;
1059
1108 gc = XCreateGC (disp, vt, 1060 gc = XCreateGC (disp, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1061 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1062 &gcvalue);
1111 1063
1112 drawable = new rxvt_drawable (display, vt); 1064 drawable = new rxvt_drawable (display, vt);
1113 1065
1114#ifdef RXVT_SCROLLBAR 1066#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1067 gcvalue.foreground = pix_colors[Color_topShadow];
… …
1126 pix_colors = pix_colors_unfocused; 1078 pix_colors = pix_colors_unfocused;
1127#endif 1079#endif
1128 1080
1129 pointer_unblank (); 1081 pointer_unblank ();
1130 scr_recolour (); 1082 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1083}
1142 1084
1143/* ------------------------------------------------------------------------- * 1085/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1086 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1087 * ------------------------------------------------------------------------- */
… …
1435 } 1377 }
1436 1378
1437 _exit (EXIT_FAILURE); 1379 _exit (EXIT_FAILURE);
1438 1380
1439 default: 1381 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1382 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1384
1445 pty->close_tty (); 1385 pty->close_tty ();
1386
1387 child_ev.start (cmd_pid);
1388
1389 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1446 break; 1390 break;
1447 } 1391 }
1448} 1392}
1449 1393
1450/* ------------------------------------------------------------------------- * 1394/* ------------------------------------------------------------------------- *

Diff Legend

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