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