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.116 by root, Sun Feb 20 19:45:30 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;
… …
673 if (scrollbar_visible ()) 679 if (scrollbar_visible ())
674 { 680 {
675 priv_modes |= PrivMode_scrollBar; 681 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 682 SavedModes |= PrivMode_scrollBar;
677 } 683 }
684
678 if (menubar_visible ()) 685 if (menubar_visible ())
679 { 686 {
680 priv_modes |= PrivMode_menuBar; 687 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 688 SavedModes |= PrivMode_menuBar;
682 } 689 }
… …
926#endif 933#endif
927 XGCValues gcvalue; 934 XGCValues gcvalue;
928 long vt_emask; 935 long vt_emask;
929 XSetWindowAttributes attributes; 936 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 937 XWindowAttributes gattr;
938 Window top, parent;
931 dDisp; 939 dDisp;
932 940
933#ifdef USING_W11LIB 941#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 942 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 943 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 970 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 971 mwmhints.decorations = 0;
964 } 972 }
965 } 973 }
966 else 974 else
967 {
968 mwmhints.flags = 0; 975 mwmhints.flags = 0;
969 }
970#endif 976#endif
971 977
972 /* grab colors before netscape does */ 978 /* grab colors before netscape does */
973 Get_Colours (); 979 Get_Colours ();
974 980
975 if (!set_fonts ()) 981 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 982 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 983
984 parent = DefaultRootWindow (disp);
985
986#if ENABLE_XEMBED
987 if (rs[Rs_embed])
988 {
989 XWindowAttributes wattr;
990
991 parent = strtol (rs[Rs_embed], 0, 0);
992
993 if (!XGetWindowAttributes (disp, parent, &wattr))
994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
995
996 window_calc (wattr.width, wattr.height);
997 }
998
999#endif
978 window_calc (0, 0); 1000 window_calc (0, 0);
979 old_width = szHint.width;
980 old_height = szHint.height;
981 1001
982 /* sub-window placement & size in rxvt_resize_subwindows () */ 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
983
984#ifdef PREFER_24BIT 1003#ifdef PREFER_24BIT
985 attributes.background_pixel = pix_colors_focused[Color_border]; 1004 attributes.background_pixel = pix_colors_focused[Color_border];
986 attributes.border_pixel = pix_colors_focused[Color_border]; 1005 attributes.border_pixel = pix_colors_focused[Color_border];
987 attributes.colormap = display->cmap; 1006 attributes.colormap = display->cmap;
988 TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp), 1007 top = XCreateWindow (disp, parent,
989 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
990 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
991 TermWin.ext_bwidth, 1010 TermWin.ext_bwidth,
992 display->depth, InputOutput, 1011 display->depth, InputOutput,
993 display->visual, 1012 display->visual,
994 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
995#else 1014#else
996 TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp), 1015 top = XCreateSimpleWindow (disp, parent,
997 szHint.x, szHint.y, 1016 szHint.x, szHint.y,
998 szHint.width, szHint.height, 1017 szHint.width, szHint.height,
999 TermWin.ext_bwidth, 1018 TermWin.ext_bwidth,
1000 pix_colors_focused[Color_border], 1019 pix_colors_focused[Color_border],
1001 pix_colors_focused[Color_border]); 1020 pix_colors_focused[Color_border]);
1002#endif 1021#endif
1022
1023 TermWin.parent[0] = top;
1024
1025 old_width = szHint.width;
1026 old_height = szHint.height;
1003 1027
1004 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1005 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1029 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1006 1030
1007 classHint.res_name = (char *)rs[Rs_name]; 1031 classHint.res_name = (char *)rs[Rs_name];
1008 classHint.res_class = (char *)RESCLASS; 1032 classHint.res_class = (char *)RESCLASS;
1009 1033
1010 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1034 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1011 wmHint.input = True; 1035 wmHint.input = True;
1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1036 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1013 wmHint.window_group = TermWin.parent[0]; 1037 wmHint.window_group = top;
1014 1038
1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, 1039 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1016 (char **)argv, argc, &szHint, &wmHint, &classHint); 1040 &szHint, &wmHint, &classHint);
1017 1041
1018 /* Enable delete window protocol */ 1042 Atom protocols[] = {
1019 XSetWMProtocols (disp, TermWin.parent[0], 1043 xa[XA_WM_DELETE_WINDOW],
1020 &xa[XA_WMDELETEWINDOW], 1); 1044#if ENABLE_EWMH
1045 xa[XA_NET_WM_PING],
1046#endif
1047 };
1021 1048
1022#if ENABLE_FRILLS 1049 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1050
1051#if ENABLE_EWMH
1023 long pid = getpid (); 1052 long pid = getpid ();
1024 1053
1025 XChangeProperty (disp, TermWin.parent[0], 1054 XChangeProperty (disp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
1028#endif
1029 1057
1030 XSelectInput (disp, TermWin.parent[0], 1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif
1060
1061 XSelectInput (disp, top,
1031 KeyPressMask 1062 KeyPressMask
1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1033 | KeyReleaseMask 1064 | KeyReleaseMask
1034#endif 1065#endif
1035 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1036 | ExposureMask
1037 | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1068
1038 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1039 1070
1040#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1072 if (mwmhints.flags)
1042 XChangeProperty (disp, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1044#endif 1075#endif
1045 1076
1046 /* vt cursor: Black-on-White is standard, but this is more popular */ 1077 /* vt cursor: Black-on-White is standard, but this is more popular */
1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
… …
1050 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1052#endif 1083#endif
1053 1084
1054 /* the vt window */ 1085 /* the vt window */
1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1056 window_vt_x, 1087 window_vt_x,
1057 window_vt_y, 1088 window_vt_y,
1058 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1059 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1060 0, 1091 0,
… …
1067 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1068 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1069 1100
1070 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1071 1102
1072 pointer_unblank ();
1073
1074#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
1075 if (options & Opt_pointerBlank) 1104 if (options & Opt_pointerBlank)
1076 vt_emask |= PointerMotionMask; 1105 vt_emask |= PointerMotionMask;
1077 else 1106 else
1078#endif 1107#endif
… …
1082 vt_ev.start (display, TermWin.vt); 1111 vt_ev.start (display, TermWin.vt);
1083 1112
1084#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1113#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1085 if (menuBar_height ()) 1114 if (menuBar_height ())
1086 { 1115 {
1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], 1116 menuBar.win = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 0, 1117 window_vt_x, 0,
1089 TermWin_TotalWidth (), 1118 TermWin_TotalWidth (),
1090 menuBar_TotalHeight (), 1119 menuBar_TotalHeight (),
1091 0, 1120 0,
1092 pix_colors_focused[Color_fg], 1121 pix_colors_focused[Color_fg],
… …
1147 // initially we are in unfocused state 1176 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1177 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1178 pix_colors = pix_colors_unfocused;
1150#endif 1179#endif
1151 1180
1181 pointer_unblank ();
1152 scr_recolour (); 1182 scr_recolour ();
1183
1184#if ENABLE_XEMBED
1185 if (rs[Rs_embed])
1186 {
1187 long info[2] = { 0, XEMBED_MAPPED };
1188
1189 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1190 32, PropModeReplace, (unsigned char *)&info, 2);
1191 }
1192#endif
1153} 1193}
1154 1194
1155/* ------------------------------------------------------------------------- * 1195/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1196 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1197 * ------------------------------------------------------------------------- */
… …
1386 * the slave. 1426 * the slave.
1387 */ 1427 */
1388void 1428void
1389rxvt_term::run_command (const char *const *argv) 1429rxvt_term::run_command (const char *const *argv)
1390{ 1430{
1431#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd])
1433 {
1434 pty.pty = atoi (rs[Rs_pty_fd]);
1435 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1436 }
1437 else
1438#endif
1391 if (!pty.get ()) 1439 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1441
1394 pty.set_utf8_mode (enc_utf8); 1442 pty.set_utf8_mode (enc_utf8);
1395 1443
1396 /* set initial window size */ 1444 /* set initial window size */
1397 tt_winch (); 1445 tt_winch ();
… …
1407#endif 1455#endif
1408 er = -1; 1456 er = -1;
1409 1457
1410 rxvt_get_ttymode (&tio, er); 1458 rxvt_get_ttymode (&tio, er);
1411 1459
1460#if ENABLE_FRILLS
1461 if (rs[Rs_pty_fd])
1462 return;
1463#endif
1464
1412 sw_chld.start (SIGCHLD); 1465 sw_chld.start (SIGCHLD);
1413 1466
1414#ifndef __QNX__ 1467#ifndef __QNX__
1415 /* spin off the command interpreter */ 1468 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1469 switch (cmd_pid = fork ())
1417 { 1470 {
1418 case -1: 1471 case -1:
1472 {
1473 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1474 rxvt_fatal ("can't fork, aborting.\n");
1475 }
1420 case 0: 1476 case 0:
1421 init_env (); 1477 init_env ();
1422 1478
1423 if (!pty.make_controlling_tty ()) 1479 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1480 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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