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.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.124 by root, Wed Dec 21 14:19:19 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
200#endif 207#endif
201#ifdef OFFIX_DND 208#ifdef OFFIX_DND
202 "DndProtocol", 209 "DndProtocol",
203 "DndSelection", 210 "DndSelection",
204#endif 211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
205 }; 216 };
206 217
207bool 218bool
208rxvt_term::init_vars () 219rxvt_term::init_vars ()
209{ 220{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 224#endif
217 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
218 226
219 if (pix_colors == NULL) 227 if (pix_colors == NULL)
220 return false; 228 return false;
221 229
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 231 pixmap = None;
224#endif 232#endif
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 focus = 0;
234 TermWin.ncol = 80; 240 ncol = 80;
235 TermWin.nrow = 24; 241 nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
237 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
238 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
239 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
240 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
241 247
242 refresh_limit = 1; 248 refresh_limit = 1;
243 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
244 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
337 */ 343 */
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);
348
349 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351
352 extract_resources ();
342 free (r_argv); 353 free (r_argv);
343
344#ifdef LOCAL_X_IS_UNIX
345 if (rs[Rs_display_name][0] == ':')
346 {
347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
348 strcpy (val, "unix");
349 strcat (val, rs[Rs_display_name]);
350 display = displays.get (val);
351 free (val);
352 }
353#endif
354
355 if (!display
356 && ! (display = displays.get (rs[Rs_display_name])))
357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
358
359 extract_resources (display->display, rs[Rs_name]);
360 354
361 /* 355 /*
362 * set any defaults not already set 356 * set any defaults not already set
363 */ 357 */
364 if (cmd_argv && cmd_argv[0]) 358 if (cmd_argv && cmd_argv[0])
… …
375 if (!rs[Rs_iconName]) 369 if (!rs[Rs_iconName])
376 rs[Rs_iconName] = rs[Rs_name]; 370 rs[Rs_iconName] = rs[Rs_name];
377 } 371 }
378 372
379 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
380 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 374 saveLines = min (i, MAX_POSITIVE_INT16);
381 375
382#if ENABLE_FRILLS 376#if ENABLE_FRILLS
383 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
384 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 378 int_bwidth = min (i, MAX_POSITIVE_INT16);
379
385 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 380 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
386 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 381 ext_bwidth = min (i, MAX_POSITIVE_INT16);
382
387 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 383 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
388 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 384 lineSpace = min (i, MAX_POSITIVE_INT16);
389#endif 385#endif
390 386
391#ifdef POINTER_BLANK 387#ifdef POINTER_BLANK
392 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 388 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
393 pointerBlankDelay = i; 389 pointerBlankDelay = i;
394 else 390 else
395 pointerBlankDelay = 2; 391 pointerBlankDelay = 2;
396#endif 392#endif
397 393
398 /* no point having a scrollbar without having any scrollback! */ 394 /* no point having a scrollbar without having any scrollback! */
399 if (!TermWin.saveLines) 395 if (!saveLines)
400 options &= ~Opt_scrollBar; 396 options &= ~Opt_scrollBar;
401 397
402#ifdef PRINTPIPE 398#ifdef PRINTPIPE
403 if (!rs[Rs_print_pipe]) 399 if (!rs[Rs_print_pipe])
404 rs[Rs_print_pipe] = PRINTPIPE; 400 rs[Rs_print_pipe] = PRINTPIPE;
… …
464 rs[Rs_color + i] = def_colorName[i]; 460 rs[Rs_color + i] = def_colorName[i];
465 461
466#ifndef XTERM_REVERSE_VIDEO 462#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 463 /* this is how we implement reverseVideo */
468 if (options & Opt_reverseVideo) 464 if (options & Opt_reverseVideo)
469 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 465 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 466#endif
471 467
472 /* convenient aliases for setting fg/bg to colors */ 468 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 469 color_aliases (Color_fg);
474 color_aliases (Color_bg); 470 color_aliases (Color_bg);
… …
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 520 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 521
526 sprintf (env_display, "DISPLAY=%s", val); 522 sprintf (env_display, "DISPLAY=%s", val);
527 523
528 /* avoiding the math library: 524 /* avoiding the math library:
529 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 525 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 526 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ; 527 ;
532 MAX_IT (i, 1); 528 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 529 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534 530
535 sprintf (env_windowid, "WINDOWID=%u", 531 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)TermWin.parent[0]); 532 (unsigned int)parent[0]);
537 533
538 /* add entries to the environment: 534 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 535 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 536 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 537 * @ COLORTERM: terminal sub-name and also indicates its color
… …
673 if (scrollbar_visible ()) 669 if (scrollbar_visible ())
674 { 670 {
675 priv_modes |= PrivMode_scrollBar; 671 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 672 SavedModes |= PrivMode_scrollBar;
677 } 673 }
674
678 if (menubar_visible ()) 675 if (menubar_visible ())
679 { 676 {
680 priv_modes |= PrivMode_menuBar; 677 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 678 SavedModes |= PrivMode_menuBar;
682 } 679 }
… …
742 } 739 }
743 } 740 }
744 } 741 }
745 742
746 pix_colors[i] = xcol; 743 pix_colors[i] = xcol;
744 SET_PIXCOLOR (i);
745 }
746
747#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 748 if (rs[Rs_fade])
749 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 750 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
750#endif 751#endif
751 SET_PIXCOLOR (i);
752 }
753 752
754 if (display->depth <= 2) 753 if (display->depth <= 2)
755 { 754 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
765 * from the fvwm window manager. 764 * from the fvwm window manager.
766 */ 765 */
767#ifdef KEEP_SCROLLCOLOR 766#ifdef KEEP_SCROLLCOLOR
768 767
769 if (display->depth <= 2) 768 if (display->depth <= 2)
769 {
770 { /* Monochrome */ 770 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 774 }
775 else 775 else
… …
830 * Use resource ``modifier'' to override the Meta modifier 830 * Use resource ``modifier'' to override the Meta modifier
831 */ 831 */
832void 832void
833rxvt_term::get_ourmods () 833rxvt_term::get_ourmods ()
834{ 834{
835 int i, j, k; 835 int i, j, k;
836 int requestedmeta, realmeta, realalt; 836 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 837 const char *cm, *rsmod;
838 XModifierKeymap *map; 838 XModifierKeymap *map;
839 KeyCode *kc; 839 KeyCode *kc;
840 const unsigned int modmasks[] = 840 const unsigned int modmasks[] =
841 { 841 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 843 };
844 844
… …
926#endif 926#endif
927 XGCValues gcvalue; 927 XGCValues gcvalue;
928 long vt_emask; 928 long vt_emask;
929 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 930 XWindowAttributes gattr;
931 Window top, parent;
932 dDisp;
931 933
932#ifdef USING_W11LIB 934#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 937#endif
936 938
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 939 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 940 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 941
940 if (options & Opt_transparent) 942 if (options & Opt_transparent)
941 { 943 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 944 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 945 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 946 }
945 947
946#if ENABLE_FRILLS 948#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 949 if (options & Opt_borderLess)
948 { 950 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 951 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 952
951 if (prop == None) 953 if (prop == None)
952 { 954 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 955 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT 956#ifdef PREFER_24BIT
… …
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 963 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0; 964 mwmhints.decorations = 0;
963 } 965 }
964 } 966 }
965 else 967 else
966 {
967 mwmhints.flags = 0; 968 mwmhints.flags = 0;
968 }
969#endif 969#endif
970 970
971 /* grab colors before netscape does */ 971 /* grab colors before netscape does */
972 Get_Colours (); 972 Get_Colours ();
973 973
974 if (!set_fonts ()) 974 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 976
977 parent = DefaultRootWindow (disp);
978
979#if ENABLE_XEMBED
980 if (rs[Rs_embed])
981 {
982 XWindowAttributes wattr;
983
984 parent = strtol (rs[Rs_embed], 0, 0);
985
986 if (!XGetWindowAttributes (disp, parent, &wattr))
987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
988
989 window_calc (wattr.width, wattr.height);
990 }
991#endif
992
977 window_calc (0, 0); 993 window_calc (0, 0);
978 old_width = szHint.width;
979 old_height = szHint.height;
980 994
981 /* sub-window placement & size in rxvt_resize_subwindows () */ 995 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT 996#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border]; 997 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border]; 998 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap; 999 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1000 top = XCreateWindow (disp, parent,
988 szHint.x, szHint.y, 1001 szHint.x, szHint.y,
989 szHint.width, szHint.height, 1002 szHint.width, szHint.height,
990 TermWin.ext_bwidth, 1003 ext_bwidth,
991 display->depth, InputOutput, 1004 display->depth, InputOutput,
992 display->visual, 1005 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else 1007#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1008 top = XCreateSimpleWindow (disp, parent,
996 szHint.x, szHint.y, 1009 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1011 ext_bwidth,
999 pix_colors_focused[Color_border], 1012 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
1001#endif 1014#endif
1015
1016 this->parent[0] = top;
1017
1018 old_width = szHint.width;
1019 old_height = szHint.height;
1002 1020
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1022 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1023
1006 classHint.res_name = (char *)rs[Rs_name]; 1024 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1025 classHint.res_class = (char *)RESCLASS;
1008 1026
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1027 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1028 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1030 wmHint.window_group = top;
1013 1031
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1033 &szHint, &wmHint, &classHint);
1016 1034
1017 /* Enable delete window protocol */ 1035 Atom protocols[] = {
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1036 xa[XA_WM_DELETE_WINDOW],
1019 &xa[XA_WMDELETEWINDOW], 1); 1037#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING],
1039#endif
1040 };
1020 1041
1021#if ENABLE_FRILLS 1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043
1044#if ENABLE_EWMH
1022 long pid = getpid (); 1045 long pid = getpid ();
1023 1046
1024 XChangeProperty (display->display, TermWin.parent[0], 1047 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1049 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif
1028 1050
1029 XSelectInput (display->display, TermWin.parent[0], 1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1052#endif
1053
1054 XSelectInput (disp, top,
1030 KeyPressMask 1055 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1057 | KeyReleaseMask
1033#endif 1058#endif
1034 | FocusChangeMask | VisibilityChangeMask 1059 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1036 | StructureNotifyMask); 1060 | ExposureMask | StructureNotifyMask);
1061
1037 termwin_ev.start (display, TermWin.parent[0]); 1062 termwin_ev.start (display, top);
1038 1063
1039#if ENABLE_FRILLS 1064#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1065 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1066 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1067 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1068#endif
1044 1069
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1070 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1071 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1072
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1073#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1076#endif
1052 1077
1053 /* the vt window */ 1078 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1079 vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1080 window_vt_x,
1056 window_vt_y, 1081 window_vt_y,
1057 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1058 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1059 0, 1084 0,
1060 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1087#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1064#endif 1089#endif
1065 1090
1066 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1068 1093
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070
1071 pointer_unblank ();
1072 1095
1073#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1074 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1075 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1076 else 1099 else
1077#endif 1100#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1102
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1082 1105
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1107 if (menuBar_height ())
1085 { 1108 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1109 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1110 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1111 TermWin_TotalWidth (),
1089 menuBar_TotalHeight (), 1112 menuBar_TotalHeight (),
1090 0, 1113 0,
1091 pix_colors_focused[Color_fg], 1114 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1115 pix_colors_focused[Color_scroll]);
1093 1116
1094#ifdef DEBUG_X 1117#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1118 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1119#endif
1097 1120
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1121 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1122
1100 XDefineCursor (display->display, menuBar.win, 1123 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1124 XCreateFontCursor (disp, XC_left_ptr));
1102 1125
1103 XSelectInput (display->display, menuBar.win, 1126 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1127 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1128 menubar_ev.start (display, menuBar.win);
1107 } 1129 }
1108#endif 1130#endif
1109 1131
1110#ifdef XPM_BACKGROUND 1132#ifdef XPM_BACKGROUND
… …
1126 1148
1127 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1155 &gcvalue);
1134 1156
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1136 1158
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1144#endif 1166#endif
1145 1167
1146#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1169 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1171 pix_colors = pix_colors_unfocused;
1150#endif 1172#endif
1151 1173
1174 pointer_unblank ();
1152 scr_recolour (); 1175 scr_recolour ();
1176
1177#if ENABLE_XEMBED
1178 if (rs[Rs_embed])
1179 {
1180 long info[2] = { 0, XEMBED_MAPPED };
1181
1182 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1183 32, PropModeReplace, (unsigned char *)&info, 2);
1184 }
1185#endif
1153} 1186}
1154 1187
1155/* ------------------------------------------------------------------------- * 1188/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1189 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1190 * ------------------------------------------------------------------------- */
… …
1171 tio->c_cc[VKILL] = CKILL; 1204 tio->c_cc[VKILL] = CKILL;
1172 tio->c_cc[VSTART] = CSTART; 1205 tio->c_cc[VSTART] = CSTART;
1173 tio->c_cc[VSTOP] = CSTOP; 1206 tio->c_cc[VSTOP] = CSTOP;
1174 tio->c_cc[VSUSP] = CSUSP; 1207 tio->c_cc[VSUSP] = CSUSP;
1175# ifdef VDSUSP 1208# ifdef VDSUSP
1176
1177 tio->c_cc[VDSUSP] = CDSUSP; 1209 tio->c_cc[VDSUSP] = CDSUSP;
1178# endif 1210# endif
1179# ifdef VREPRINT 1211# ifdef VREPRINT
1180
1181 tio->c_cc[VREPRINT] = CRPRNT; 1212 tio->c_cc[VREPRINT] = CRPRNT;
1182# endif 1213# endif
1183# ifdef VDISCRD 1214# ifdef VDISCRD
1184
1185 tio->c_cc[VDISCRD] = CFLUSH; 1215 tio->c_cc[VDISCRD] = CFLUSH;
1186# endif 1216# endif
1187# ifdef VWERSE 1217# ifdef VWERSE
1188
1189 tio->c_cc[VWERSE] = CWERASE; 1218 tio->c_cc[VWERSE] = CWERASE;
1190# endif 1219# endif
1191# ifdef VLNEXT 1220# ifdef VLNEXT
1192
1193 tio->c_cc[VLNEXT] = CLNEXT; 1221 tio->c_cc[VLNEXT] = CLNEXT;
1194# endif 1222# endif
1195
1196 } 1223 }
1224
1197 tio->c_cc[VEOF] = CEOF; 1225 tio->c_cc[VEOF] = CEOF;
1198 tio->c_cc[VEOL] = VDISABLE; 1226 tio->c_cc[VEOL] = VDISABLE;
1199# ifdef VEOL2 1227# ifdef VEOL2
1200
1201 tio->c_cc[VEOL2] = VDISABLE; 1228 tio->c_cc[VEOL2] = VDISABLE;
1202# endif 1229# endif
1203# ifdef VSWTC 1230# ifdef VSWTC
1204
1205 tio->c_cc[VSWTC] = VDISABLE; 1231 tio->c_cc[VSWTC] = VDISABLE;
1206# endif 1232# endif
1207# ifdef VSWTCH 1233# ifdef VSWTCH
1208
1209 tio->c_cc[VSWTCH] = VDISABLE; 1234 tio->c_cc[VSWTCH] = VDISABLE;
1210# endif 1235# endif
1211# if VMIN != VEOF 1236# if VMIN != VEOF
1212
1213 tio->c_cc[VMIN] = 1; 1237 tio->c_cc[VMIN] = 1;
1214# endif 1238# endif
1215# if VTIME != VEOL 1239# if VTIME != VEOL
1216
1217 tio->c_cc[VTIME] = 0; 1240 tio->c_cc[VTIME] = 0;
1218# endif 1241# endif
1219 1242
1220 if (erase != -1) 1243 if (erase != -1)
1221 tio->c_cc[VERASE] = (char)erase; 1244 tio->c_cc[VERASE] = (char)erase;
… …
1249 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1250 { 1273 {
1251 tio->sg.sg_erase = CERASE; /* ^H */ 1274 tio->sg.sg_erase = CERASE; /* ^H */
1252 tio->sg.sg_kill = CKILL; /* ^U */ 1275 tio->sg.sg_kill = CKILL; /* ^U */
1253 } 1276 }
1277
1254 if (erase != -1) 1278 if (erase != -1)
1255 tio->sg.sg_erase = (char)erase; 1279 tio->sg.sg_erase = (char)erase;
1256 1280
1257 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1258 1282
… …
1264 tio->tc.t_startc = CSTART; /* ^Q */ 1288 tio->tc.t_startc = CSTART; /* ^Q */
1265 tio->tc.t_stopc = CSTOP; /* ^S */ 1289 tio->tc.t_stopc = CSTOP; /* ^S */
1266 tio->tc.t_eofc = CEOF; /* ^D */ 1290 tio->tc.t_eofc = CEOF; /* ^D */
1267 tio->tc.t_brkc = -1; 1291 tio->tc.t_brkc = -1;
1268 } 1292 }
1293
1269 /* get local special chars */ 1294 /* get local special chars */
1270 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1271 { 1296 {
1272 tio->lc.t_suspc = CSUSP; /* ^Z */ 1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1273 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1277 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1278 } 1303 }
1279 /* get line discipline */ 1304 /* get line discipline */
1280 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1281# ifdef NTTYDISC 1306# ifdef NTTYDISC
1282
1283 tio->line = NTTYDISC; 1307 tio->line = NTTYDISC;
1284# endif /* NTTYDISC */ 1308# endif /* NTTYDISC */
1285 1309
1286 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1287#endif /* HAVE_TERMIOS_H */ 1311#endif /* HAVE_TERMIOS_H */
… …
1310 FOO (IGNCR, "IGNCR"); 1334 FOO (IGNCR, "IGNCR");
1311 FOO (ICRNL, "ICRNL"); 1335 FOO (ICRNL, "ICRNL");
1312 FOO (IXON, "IXON"); 1336 FOO (IXON, "IXON");
1313 FOO (IXOFF, "IXOFF"); 1337 FOO (IXOFF, "IXOFF");
1314# ifdef IUCLC 1338# ifdef IUCLC
1315
1316 FOO (IUCLC, "IUCLC"); 1339 FOO (IUCLC, "IUCLC");
1317# endif 1340# endif
1318# ifdef IXANY 1341# ifdef IXANY
1319
1320 FOO (IXANY, "IXANY"); 1342 FOO (IXANY, "IXANY");
1321# endif 1343# endif
1322# ifdef IMAXBEL 1344# ifdef IMAXBEL
1323
1324 FOO (IMAXBEL, "IMAXBEL"); 1345 FOO (IMAXBEL, "IMAXBEL");
1325# endif 1346# endif
1326 1347
1327 fprintf (stderr, "\n"); 1348 fprintf (stderr, "\n");
1328 1349
… …
1335 FOO (VERASE, "VERASE"); 1356 FOO (VERASE, "VERASE");
1336 FOO (VKILL, "VKILL"); 1357 FOO (VKILL, "VKILL");
1337 FOO (VEOF, "VEOF"); 1358 FOO (VEOF, "VEOF");
1338 FOO (VEOL, "VEOL"); 1359 FOO (VEOL, "VEOL");
1339# ifdef VEOL2 1360# ifdef VEOL2
1340
1341 FOO (VEOL2, "VEOL2"); 1361 FOO (VEOL2, "VEOL2");
1342# endif 1362# endif
1343# ifdef VSWTC 1363# ifdef VSWTC
1344
1345 FOO (VSWTC, "VSWTC"); 1364 FOO (VSWTC, "VSWTC");
1346# endif 1365# endif
1347# ifdef VSWTCH 1366# ifdef VSWTCH
1348
1349 FOO (VSWTCH, "VSWTCH"); 1367 FOO (VSWTCH, "VSWTCH");
1350# endif 1368# endif
1351
1352 FOO (VSTART, "VSTART"); 1369 FOO (VSTART, "VSTART");
1353 FOO (VSTOP, "VSTOP"); 1370 FOO (VSTOP, "VSTOP");
1354 FOO (VSUSP, "VSUSP"); 1371 FOO (VSUSP, "VSUSP");
1355# ifdef VDSUSP 1372# ifdef VDSUSP
1356
1357 FOO (VDSUSP, "VDSUSP"); 1373 FOO (VDSUSP, "VDSUSP");
1358# endif 1374# endif
1359# ifdef VREPRINT 1375# ifdef VREPRINT
1360
1361 FOO (VREPRINT, "VREPRINT"); 1376 FOO (VREPRINT, "VREPRINT");
1362# endif 1377# endif
1363# ifdef VDISCRD 1378# ifdef VDISCRD
1364
1365 FOO (VDISCRD, "VDISCRD"); 1379 FOO (VDISCRD, "VDISCRD");
1366# endif 1380# endif
1367# ifdef VWERSE 1381# ifdef VWERSE
1368
1369 FOO (VWERSE, "VWERSE"); 1382 FOO (VWERSE, "VWERSE");
1370# endif 1383# endif
1371# ifdef VLNEXT 1384# ifdef VLNEXT
1372
1373 FOO (VLNEXT, "VLNEXT"); 1385 FOO (VLNEXT, "VLNEXT");
1374# endif 1386# endif
1375 1387
1376 fprintf (stderr, "\n"); 1388 fprintf (stderr, "\n");
1377# undef FOO 1389# undef FOO
… …
1386 * the slave. 1398 * the slave.
1387 */ 1399 */
1388void 1400void
1389rxvt_term::run_command (const char *const *argv) 1401rxvt_term::run_command (const char *const *argv)
1390{ 1402{
1403#if ENABLE_FRILLS
1404 if (rs[Rs_pty_fd])
1405 {
1406 pty.pty = atoi (rs[Rs_pty_fd]);
1407 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1408 }
1409 else
1410#endif
1391 if (!pty.get ()) 1411 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1413
1394 pty.set_utf8_mode (enc_utf8); 1414 pty.set_utf8_mode (enc_utf8);
1395 1415
1396 /* set initial window size */ 1416 /* set initial window size */
1397 tt_winch (); 1417 tt_winch ();
… …
1407#endif 1427#endif
1408 er = -1; 1428 er = -1;
1409 1429
1410 rxvt_get_ttymode (&tio, er); 1430 rxvt_get_ttymode (&tio, er);
1411 1431
1412 sw_chld.start (SIGCHLD); 1432#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd])
1434 return;
1435#endif
1413 1436
1414#ifndef __QNX__ 1437#ifndef __QNX__
1415 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1417 { 1440 {
1418 case -1: 1441 case -1:
1442 {
1443 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1444 rxvt_fatal ("can't fork, aborting.\n");
1445 }
1420 case 0: 1446 case 0:
1421 init_env (); 1447 init_env ();
1422 1448
1423 if (!pty.make_controlling_tty ()) 1449 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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