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.149 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
… …
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 306
346 extract_resources (); 307 extract_resources ();
347 308
348 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
349 323
350 /* 324 /*
351 * set any defaults not already set 325 * set any defaults not already set
352 */ 326 */
353 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
906{ 880{
907 XClassHint classHint; 881 XClassHint classHint;
908 XWMHints wmHint; 882 XWMHints wmHint;
909#if ENABLE_FRILLS 883#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 884 MWMHints mwmhints;
912#endif 885#endif
913 XGCValues gcvalue; 886 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 888 Window top, parent;
917 dDisp; 889 dDisp;
918 890
919#ifdef USING_W11LIB 891 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 892
933 /* grab colors before netscape does */ 893 /* grab colors before netscape does */
934 Get_Colours (); 894 Get_Colours ();
935 895
936 if (!set_fonts ()) 896 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 898
939 parent = DefaultRootWindow (disp); 899 parent = display->root;
940 900
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942 902
943#if ENABLE_FRILLS 903#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 904 if (OPTION (Opt_borderLess))
945 { 905 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 907 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
951 attributes.override_redirect = TRUE; 909 attributes.override_redirect = TRUE;
952 mwmhints.flags = 0; 910 mwmhints.flags = 0;
953 } 911 }
… …
977 935
978 window_calc (0, 0); 936 window_calc (0, 0);
979 937
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
983 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
942
984 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (disp, parent,
985 szHint.x, szHint.y, 944 szHint.x, szHint.y,
986 szHint.width, szHint.height, 945 szHint.width, szHint.height,
987 ext_bwidth, 946 ext_bwidth,
988 display->depth, InputOutput, 947 display->depth, InputOutput,
… …
993 this->parent[0] = top; 952 this->parent[0] = top;
994 953
995 old_width = szHint.width; 954 old_width = szHint.width;
996 old_height = szHint.height; 955 old_height = szHint.height;
997 956
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 959
1001 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1003 962
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 964 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 966 wmHint.window_group = top;
1008 967
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
970
971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
1011 976
1012 Atom protocols[] = { 977 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 979#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
… …
1041 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1043 1008
1044 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1045 1010
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 */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1054 1013
1055#ifdef HAVE_SCROLLBARS 1014#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1058#endif 1017#endif
1059 1018
1060 /* the vt window */ 1019 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1062 window_vt_x,
1063 window_vt_y, 1021 window_vt_x, window_vt_y,
1064 width,
1065 height, 1022 width, height,
1066 0, 1023 0,
1067 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1026
1073 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1075 1029
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
… …
1100 scr_touch (true); 1054 scr_touch (true);
1101 } 1055 }
1102#endif 1056#endif
1103 1057
1104 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1108 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (disp, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1065 &gcvalue);
1111 1066
1112 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (display, vt);
1113 1068
1114#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
… …
1126 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1127#endif 1082#endif
1128 1083
1129 pointer_unblank (); 1084 pointer_unblank ();
1130 scr_recolour (); 1085 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} 1086}
1142 1087
1143/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
… …
1435 } 1380 }
1436 1381
1437 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1438 1383
1439 default: 1384 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1385 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1387
1445 pty->close_tty (); 1388 pty->close_tty ();
1446 1389
1447 child_ev.start (cmd_pid); 1390 child_ev.start (cmd_pid);
1448 1391

Diff Legend

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