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.108 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.118 by root, Wed Aug 10 15:10:06 2005 UTC

… …
181 "MULTIPLE", 181 "MULTIPLE",
182 "TARGETS", 182 "TARGETS",
183 "TIMESTAMP", 183 "TIMESTAMP",
184 "VT_SELECTION", 184 "VT_SELECTION",
185 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 188 "CLIPBOARD",
188#if ENABLE_FRILLS 189#if ENABLE_FRILLS
190 "_MOTIF_WM_HINTS",
191#endif
192#if ENABLE_EWMH
189 "_NET_WM_PID", 193 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 194 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 195 "_NET_WM_ICON_NAME",
196 "_NET_WM_PING",
193#endif 197#endif
194#if USE_XIM 198#if USE_XIM
195 "WM_LOCALE_NAME", 199 "WM_LOCALE_NAME",
196#endif 200#endif
197#ifdef TRANSPARENT 201#ifdef TRANSPARENT
… …
199 "ESETROOT_PMAP_ID", 203 "ESETROOT_PMAP_ID",
200#endif 204#endif
201#ifdef OFFIX_DND 205#ifdef OFFIX_DND
202 "DndProtocol", 206 "DndProtocol",
203 "DndSelection", 207 "DndSelection",
208#endif
209#if ENABLE_XEMBED
210 "_XEMBED",
211 "_XEMBED_INFO",
204#endif 212#endif
205 }; 213 };
206 214
207bool 215bool
208rxvt_term::init_vars () 216rxvt_term::init_vars ()
… …
225 233
226 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 237 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 239 TermWin.focus = 0;
234 TermWin.ncol = 80; 240 TermWin.ncol = 80;
235 TermWin.nrow = 24; 241 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
340 346
341 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
342 348
343#ifdef LOCAL_X_IS_UNIX
344 if (rs[Rs_display_name][0] == ':')
345 {
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
347 strcpy (val, "unix");
348 strcat (val, rs[Rs_display_name]);
349 display = displays.get (val);
350 free (val);
351 }
352#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name]))) 349 if (!(display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357 351
358 extract_resources (); 352 extract_resources ();
359 free (r_argv); 353 free (r_argv);
360 354
… …
673 if (scrollbar_visible ()) 667 if (scrollbar_visible ())
674 { 668 {
675 priv_modes |= PrivMode_scrollBar; 669 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 670 SavedModes |= PrivMode_scrollBar;
677 } 671 }
672
678 if (menubar_visible ()) 673 if (menubar_visible ())
679 { 674 {
680 priv_modes |= PrivMode_menuBar; 675 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 676 SavedModes |= PrivMode_menuBar;
682 } 677 }
… …
765 * from the fvwm window manager. 760 * from the fvwm window manager.
766 */ 761 */
767#ifdef KEEP_SCROLLCOLOR 762#ifdef KEEP_SCROLLCOLOR
768 763
769 if (display->depth <= 2) 764 if (display->depth <= 2)
765 {
770 { /* Monochrome */ 766 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 767 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 768 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 769 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 770 }
775 else 771 else
… …
926#endif 922#endif
927 XGCValues gcvalue; 923 XGCValues gcvalue;
928 long vt_emask; 924 long vt_emask;
929 XSetWindowAttributes attributes; 925 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 926 XWindowAttributes gattr;
927 Window top, parent;
931 dDisp; 928 dDisp;
932 929
933#ifdef USING_W11LIB 930#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 931 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 932 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 959 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 960 mwmhints.decorations = 0;
964 } 961 }
965 } 962 }
966 else 963 else
967 {
968 mwmhints.flags = 0; 964 mwmhints.flags = 0;
969 }
970#endif 965#endif
971 966
972 /* grab colors before netscape does */ 967 /* grab colors before netscape does */
973 Get_Colours (); 968 Get_Colours ();
974 969
975 if (!set_fonts ()) 970 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 972
973 parent = DefaultRootWindow (disp);
974
975#if ENABLE_XEMBED
976 if (rs[Rs_embed])
977 {
978 XWindowAttributes wattr;
979
980 parent = strtol (rs[Rs_embed], 0, 0);
981
982 if (!XGetWindowAttributes (disp, parent, &wattr))
983 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984
985 window_calc (wattr.width, wattr.height);
986 }
987
988#endif
978 window_calc (0, 0); 989 window_calc (0, 0);
979 old_width = szHint.width;
980 old_height = szHint.height;
981 990
982 /* sub-window placement & size in rxvt_resize_subwindows () */ 991 /* sub-window placement & size in rxvt_resize_subwindows () */
983
984#ifdef PREFER_24BIT 992#ifdef PREFER_24BIT
985 attributes.background_pixel = pix_colors_focused[Color_border]; 993 attributes.background_pixel = pix_colors_focused[Color_border];
986 attributes.border_pixel = pix_colors_focused[Color_border]; 994 attributes.border_pixel = pix_colors_focused[Color_border];
987 attributes.colormap = display->cmap; 995 attributes.colormap = display->cmap;
988 TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp), 996 top = XCreateWindow (disp, parent,
989 szHint.x, szHint.y, 997 szHint.x, szHint.y,
990 szHint.width, szHint.height, 998 szHint.width, szHint.height,
991 TermWin.ext_bwidth, 999 TermWin.ext_bwidth,
992 display->depth, InputOutput, 1000 display->depth, InputOutput,
993 display->visual, 1001 display->visual,
994 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1002 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
995#else 1003#else
996 TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp), 1004 top = XCreateSimpleWindow (disp, parent,
997 szHint.x, szHint.y, 1005 szHint.x, szHint.y,
998 szHint.width, szHint.height, 1006 szHint.width, szHint.height,
999 TermWin.ext_bwidth, 1007 TermWin.ext_bwidth,
1000 pix_colors_focused[Color_border], 1008 pix_colors_focused[Color_border],
1001 pix_colors_focused[Color_border]); 1009 pix_colors_focused[Color_border]);
1002#endif 1010#endif
1011
1012 TermWin.parent[0] = top;
1013
1014 old_width = szHint.width;
1015 old_height = szHint.height;
1003 1016
1004 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1005 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1006 1019
1007 classHint.res_name = (char *)rs[Rs_name]; 1020 classHint.res_name = (char *)rs[Rs_name];
1008 classHint.res_class = (char *)RESCLASS; 1021 classHint.res_class = (char *)RESCLASS;
1009 1022
1010 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1023 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1011 wmHint.input = True; 1024 wmHint.input = True;
1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1025 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1013 wmHint.window_group = TermWin.parent[0]; 1026 wmHint.window_group = top;
1014 1027
1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, 1028 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1016 (char **)argv, argc, &szHint, &wmHint, &classHint); 1029 &szHint, &wmHint, &classHint);
1017 1030
1018 /* Enable delete window protocol */ 1031 Atom protocols[] = {
1019 XSetWMProtocols (disp, TermWin.parent[0], 1032 xa[XA_WM_DELETE_WINDOW],
1020 &xa[XA_WMDELETEWINDOW], 1); 1033#if ENABLE_EWMH
1034 xa[XA_NET_WM_PING],
1035#endif
1036 };
1021 1037
1022#if ENABLE_FRILLS 1038 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1039
1040#if ENABLE_EWMH
1023 long pid = getpid (); 1041 long pid = getpid ();
1024 1042
1025 XChangeProperty (disp, TermWin.parent[0], 1043 XChangeProperty (disp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1044 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1045 PropModeReplace, (unsigned char *)&pid, 1);
1028#endif
1029 1046
1030 XSelectInput (disp, TermWin.parent[0], 1047 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1048#endif
1049
1050 XSelectInput (disp, top,
1031 KeyPressMask 1051 KeyPressMask
1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1052#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1033 | KeyReleaseMask 1053 | KeyReleaseMask
1034#endif 1054#endif
1035 | FocusChangeMask | VisibilityChangeMask 1055 | FocusChangeMask | VisibilityChangeMask
1036 | ExposureMask
1037 | StructureNotifyMask); 1056 | ExposureMask | StructureNotifyMask);
1057
1038 termwin_ev.start (display, TermWin.parent[0]); 1058 termwin_ev.start (display, top);
1039 1059
1040#if ENABLE_FRILLS 1060#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1061 if (mwmhints.flags)
1042 XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1062 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1063 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1044#endif 1064#endif
1045 1065
1046 /* vt cursor: Black-on-White is standard, but this is more popular */ 1066 /* vt cursor: Black-on-White is standard, but this is more popular */
1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1067 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
… …
1050 /* cursor (menuBar/scrollBar): Black-on-White */ 1070 /* cursor (menuBar/scrollBar): Black-on-White */
1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1071 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1052#endif 1072#endif
1053 1073
1054 /* the vt window */ 1074 /* the vt window */
1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], 1075 TermWin.vt = XCreateSimpleWindow (disp, top,
1056 window_vt_x, 1076 window_vt_x,
1057 window_vt_y, 1077 window_vt_y,
1058 TermWin_TotalWidth (), 1078 TermWin_TotalWidth (),
1059 TermWin_TotalHeight (), 1079 TermWin_TotalHeight (),
1060 0, 1080 0,
… …
1067 attributes.bit_gravity = NorthWestGravity; 1087 attributes.bit_gravity = NorthWestGravity;
1068 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1088 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1069 1089
1070 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1071 1091
1072 pointer_unblank ();
1073
1074#ifdef POINTER_BLANK 1092#ifdef POINTER_BLANK
1075 if (options & Opt_pointerBlank) 1093 if (options & Opt_pointerBlank)
1076 vt_emask |= PointerMotionMask; 1094 vt_emask |= PointerMotionMask;
1077 else 1095 else
1078#endif 1096#endif
… …
1082 vt_ev.start (display, TermWin.vt); 1100 vt_ev.start (display, TermWin.vt);
1083 1101
1084#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1102#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1085 if (menuBar_height ()) 1103 if (menuBar_height ())
1086 { 1104 {
1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], 1105 menuBar.win = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 0, 1106 window_vt_x, 0,
1089 TermWin_TotalWidth (), 1107 TermWin_TotalWidth (),
1090 menuBar_TotalHeight (), 1108 menuBar_TotalHeight (),
1091 0, 1109 0,
1092 pix_colors_focused[Color_fg], 1110 pix_colors_focused[Color_fg],
… …
1147 // initially we are in unfocused state 1165 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1166 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1167 pix_colors = pix_colors_unfocused;
1150#endif 1168#endif
1151 1169
1170 pointer_unblank ();
1152 scr_recolour (); 1171 scr_recolour ();
1172
1173#if ENABLE_XEMBED
1174 if (rs[Rs_embed])
1175 {
1176 long info[2] = { 0, XEMBED_MAPPED };
1177
1178 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1179 32, PropModeReplace, (unsigned char *)&info, 2);
1180 }
1181#endif
1153} 1182}
1154 1183
1155/* ------------------------------------------------------------------------- * 1184/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1185 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1186 * ------------------------------------------------------------------------- */
… …
1386 * the slave. 1415 * the slave.
1387 */ 1416 */
1388void 1417void
1389rxvt_term::run_command (const char *const *argv) 1418rxvt_term::run_command (const char *const *argv)
1390{ 1419{
1420#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd])
1422 {
1423 pty.pty = atoi (rs[Rs_pty_fd]);
1424 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1425 }
1426 else
1427#endif
1391 if (!pty.get ()) 1428 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1429 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1430
1394 pty.set_utf8_mode (enc_utf8); 1431 pty.set_utf8_mode (enc_utf8);
1395 1432
1396 /* set initial window size */ 1433 /* set initial window size */
1397 tt_winch (); 1434 tt_winch ();
… …
1407#endif 1444#endif
1408 er = -1; 1445 er = -1;
1409 1446
1410 rxvt_get_ttymode (&tio, er); 1447 rxvt_get_ttymode (&tio, er);
1411 1448
1449#if ENABLE_FRILLS
1450 if (rs[Rs_pty_fd])
1451 return;
1452#endif
1453
1412 sw_chld.start (SIGCHLD); 1454 sw_chld.start (SIGCHLD);
1413 1455
1414#ifndef __QNX__ 1456#ifndef __QNX__
1415 /* spin off the command interpreter */ 1457 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1458 switch (cmd_pid = fork ())
1417 { 1459 {
1418 case -1: 1460 case -1:
1461 {
1462 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1463 rxvt_fatal ("can't fork, aborting.\n");
1464 }
1420 case 0: 1465 case 0:
1421 init_env (); 1466 init_env ();
1422 1467
1423 if (!pty.make_controlling_tty ()) 1468 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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