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.109 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.115 by root, Sun Feb 20 02:00:43 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
189 "_NET_WM_PID", 190 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS", 191 "_MOTIF_WM_HINTS",
… …
200#endif 201#endif
201#ifdef OFFIX_DND 202#ifdef OFFIX_DND
202 "DndProtocol", 203 "DndProtocol",
203 "DndSelection", 204 "DndSelection",
204#endif 205#endif
206#if ENABLE_XEMBED
207 "_XEMBED",
208 "_XEMBED_INFO",
209#endif
205 }; 210 };
206 211
207bool 212bool
208rxvt_term::init_vars () 213rxvt_term::init_vars ()
209{ 214{
… …
225 230
226 MEvent.time = CurrentTime; 231 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 232 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 233 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 234 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 235 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 236 TermWin.focus = 0;
234 TermWin.ncol = 80; 237 TermWin.ncol = 80;
235 TermWin.nrow = 24; 238 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 239 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
673 if (scrollbar_visible ()) 676 if (scrollbar_visible ())
674 { 677 {
675 priv_modes |= PrivMode_scrollBar; 678 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 679 SavedModes |= PrivMode_scrollBar;
677 } 680 }
681
678 if (menubar_visible ()) 682 if (menubar_visible ())
679 { 683 {
680 priv_modes |= PrivMode_menuBar; 684 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 685 SavedModes |= PrivMode_menuBar;
682 } 686 }
… …
926#endif 930#endif
927 XGCValues gcvalue; 931 XGCValues gcvalue;
928 long vt_emask; 932 long vt_emask;
929 XSetWindowAttributes attributes; 933 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 934 XWindowAttributes gattr;
931 Window top; 935 Window top, parent;
932 dDisp; 936 dDisp;
933 937
934#ifdef USING_W11LIB 938#ifdef USING_W11LIB
935 /* enable W11 callbacks */ 939 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event); 940 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
974 Get_Colours (); 978 Get_Colours ();
975 979
976 if (!set_fonts ()) 980 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 981 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978 982
979#if ENABLE_FRILLS 983 parent = DefaultRootWindow (disp);
984
985#if ENABLE_XEMBED
980 if (rs[Rs_embed]) 986 if (rs[Rs_embed])
981 { 987 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr; 988 XWindowAttributes wattr;
989
990 parent = strtol (rs[Rs_embed], 0, 0);
991
985 XGetWindowAttributes (disp, top, &wattr); 992 if (!XGetWindowAttributes (disp, parent, &wattr))
993 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 994
987 window_calc (wattr.width, wattr.height); 995 window_calc (wattr.width, wattr.height);
996 }
988 997
989#if 0 998#endif
990 if (wattr.map_state == IsViewable) 999 window_calc (0, 0);
991 { 1000
992 TermWin.mapped = 1; 1001 /* sub-window placement & size in rxvt_resize_subwindows () */
993 refresh_type = FAST_REFRESH; 1002#ifdef PREFER_24BIT
994 XClearWindow (disp, top); 1003 attributes.background_pixel = pix_colors_focused[Color_border];
995 // TODO: make XMapNotify-event-code a function and call it 1004 attributes.border_pixel = pix_colors_focused[Color_border];
996 // TODO: how can I detetc visibility without unmpa/map? 1005 attributes.colormap = display->cmap;
997 // TODO: focusin etc. 1006 top = XCreateWindow (disp, parent,
998 } 1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 TermWin.ext_bwidth,
1010 display->depth, InputOutput,
1011 display->visual,
1012 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
999#else 1013#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up 1014 top = XCreateSimpleWindow (disp, parent,
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 {
1007 window_calc (0, 0);
1008
1009 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border];
1013 attributes.colormap = display->cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp),
1015 szHint.x, szHint.y, 1015 szHint.x, szHint.y,
1016 szHint.width, szHint.height, 1016 szHint.width, szHint.height,
1017 TermWin.ext_bwidth, 1017 TermWin.ext_bwidth,
1018 display->depth, InputOutput,
1019 display->visual,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1021#else
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border], 1018 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]); 1019 pix_colors_focused[Color_border]);
1028#endif 1020#endif
1029 }
1030 1021
1031 TermWin.parent[0] = top; 1022 TermWin.parent[0] = top;
1032 1023
1033 old_width = szHint.width; 1024 old_width = szHint.width;
1034 old_height = szHint.height; 1025 old_height = szHint.height;
… …
1042 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1033 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1043 wmHint.input = True; 1034 wmHint.input = True;
1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1035 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1045 wmHint.window_group = top; 1036 wmHint.window_group = top;
1046 1037
1047 XSetWMProperties (disp, top, NULL, NULL, 1038 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1048 (char **)argv, argc, &szHint, &wmHint, &classHint); 1039 &szHint, &wmHint, &classHint);
1049 1040
1050 /* Enable delete window protocol */ 1041 /* Enable delete window protocol */
1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1042 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1052 1043
1053#if ENABLE_FRILLS 1044#if ENABLE_FRILLS
1054 long pid = getpid (); 1045 long pid = getpid ();
1055 1046
1056 XChangeProperty (disp, top, 1047 XChangeProperty (disp, top,
… …
1062 KeyPressMask 1053 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1055 | KeyReleaseMask
1065#endif 1056#endif
1066 | FocusChangeMask | VisibilityChangeMask 1057 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask
1068 | StructureNotifyMask); 1058 | ExposureMask | StructureNotifyMask);
1059
1069 termwin_ev.start (display, top); 1060 termwin_ev.start (display, top);
1070 1061
1071#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
1072 if (mwmhints.flags) 1063 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1098 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1100 1091
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1093
1103 pointer_unblank ();
1104
1105#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
1106 if (options & Opt_pointerBlank) 1095 if (options & Opt_pointerBlank)
1107 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1108 else 1097 else
1109#endif 1098#endif
… …
1178 // initially we are in unfocused state 1167 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1168 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1169 pix_colors = pix_colors_unfocused;
1181#endif 1170#endif
1182 1171
1172 pointer_unblank ();
1183 scr_recolour (); 1173 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1184} 1184}
1185 1185
1186/* ------------------------------------------------------------------------- * 1186/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1187 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1188 * ------------------------------------------------------------------------- */
… …
1417 * the slave. 1417 * the slave.
1418 */ 1418 */
1419void 1419void
1420rxvt_term::run_command (const char *const *argv) 1420rxvt_term::run_command (const char *const *argv)
1421{ 1421{
1422#if ENABLE_FRILLS
1423 if (rs[Rs_pty_fd])
1424 {
1425 pty.pty = atoi (rs[Rs_pty_fd]);
1426 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1427 }
1428 else
1429#endif
1422 if (!pty.get ()) 1430 if (!pty.get ())
1423 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424 1432
1425 pty.set_utf8_mode (enc_utf8); 1433 pty.set_utf8_mode (enc_utf8);
1426 1434
1427 /* set initial window size */ 1435 /* set initial window size */
1428 tt_winch (); 1436 tt_winch ();
… …
1438#endif 1446#endif
1439 er = -1; 1447 er = -1;
1440 1448
1441 rxvt_get_ttymode (&tio, er); 1449 rxvt_get_ttymode (&tio, er);
1442 1450
1451#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd])
1453 return;
1454#endif
1455
1443 sw_chld.start (SIGCHLD); 1456 sw_chld.start (SIGCHLD);
1444 1457
1445#ifndef __QNX__ 1458#ifndef __QNX__
1446 /* spin off the command interpreter */ 1459 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1460 switch (cmd_pid = fork ())
1448 { 1461 {
1449 case -1: 1462 case -1:
1463 {
1464 cmd_pid = 0;
1450 rxvt_fatal ("can't fork, aborting.\n"); 1465 rxvt_fatal ("can't fork, aborting.\n");
1466 }
1451 case 0: 1467 case 0:
1452 init_env (); 1468 init_env ();
1453 1469
1454 if (!pty.make_controlling_tty ()) 1470 if (!pty.make_controlling_tty ())
1455 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1471 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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