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.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;
… …
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
… …
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
… …
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; 931 Window top, parent;
932 dDisp; 932 dDisp;
933 933
934#ifdef USING_W11LIB 934#ifdef USING_W11LIB
935 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
936 W11AddEventHandler (disp, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
963 mwmhints.flags = MWM_HINTS_DECORATIONS; 963 mwmhints.flags = MWM_HINTS_DECORATIONS;
964 mwmhints.decorations = 0; 964 mwmhints.decorations = 0;
965 } 965 }
966 } 966 }
967 else 967 else
968 {
969 mwmhints.flags = 0; 968 mwmhints.flags = 0;
970 }
971#endif 969#endif
972 970
973 /* grab colors before netscape does */ 971 /* grab colors before netscape does */
974 Get_Colours (); 972 Get_Colours ();
975 973
976 if (!set_fonts ()) 974 if (!set_fonts ())
977 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");
978 976
979#if ENABLE_FRILLS 977 parent = DefaultRootWindow (disp);
978
979#if ENABLE_XEMBED
980 if (rs[Rs_embed]) 980 if (rs[Rs_embed])
981 { 981 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr; 982 XWindowAttributes wattr;
983
984 parent = strtol (rs[Rs_embed], 0, 0);
985
985 XGetWindowAttributes (disp, top, &wattr); 986 if (!XGetWindowAttributes (disp, parent, &wattr))
987 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 988
987 window_calc (wattr.width, wattr.height); 989 window_calc (wattr.width, wattr.height);
990 }
991#endif
988 992
989#if 0 993 window_calc (0, 0);
990 if (wattr.map_state == IsViewable) 994
991 { 995 /* sub-window placement & size in rxvt_resize_subwindows () */
992 TermWin.mapped = 1; 996#ifdef PREFER_24BIT
993 refresh_type = FAST_REFRESH; 997 attributes.background_pixel = pix_colors_focused[Color_border];
994 XClearWindow (disp, top); 998 attributes.border_pixel = pix_colors_focused[Color_border];
995 // TODO: make XMapNotify-event-code a function and call it 999 attributes.colormap = display->cmap;
996 // TODO: how can I detetc visibility without unmpa/map? 1000 top = XCreateWindow (disp, parent,
997 // TODO: focusin etc. 1001 szHint.x, szHint.y,
998 } 1002 szHint.width, szHint.height,
1003 ext_bwidth,
1004 display->depth, InputOutput,
1005 display->visual,
1006 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
999#else 1007#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up 1008 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, 1009 szHint.x, szHint.y,
1016 szHint.width, szHint.height, 1010 szHint.width, szHint.height,
1017 TermWin.ext_bwidth, 1011 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], 1012 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]); 1013 pix_colors_focused[Color_border]);
1028#endif 1014#endif
1029 }
1030 1015
1031 TermWin.parent[0] = top; 1016 this->parent[0] = top;
1032 1017
1033 old_width = szHint.width; 1018 old_width = szHint.width;
1034 old_height = szHint.height; 1019 old_height = szHint.height;
1035 1020
1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1021 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1042 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1027 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1043 wmHint.input = True; 1028 wmHint.input = True;
1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1029 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1045 wmHint.window_group = top; 1030 wmHint.window_group = top;
1046 1031
1047 XSetWMProperties (disp, top, NULL, NULL, 1032 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1048 (char **)argv, argc, &szHint, &wmHint, &classHint); 1033 &szHint, &wmHint, &classHint);
1049 1034
1050 /* Enable delete window protocol */ 1035 Atom protocols[] = {
1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1036 xa[XA_WM_DELETE_WINDOW],
1037#if ENABLE_EWMH
1038 xa[XA_NET_WM_PING],
1039#endif
1040 };
1052 1041
1053#if ENABLE_FRILLS 1042 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1043
1044#if ENABLE_EWMH
1054 long pid = getpid (); 1045 long pid = getpid ();
1055 1046
1056 XChangeProperty (disp, top, 1047 XChangeProperty (disp, top,
1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1058 PropModeReplace, (unsigned char *)&pid, 1); 1049 PropModeReplace, (unsigned char *)&pid, 1);
1050
1051 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 1052#endif
1060 1053
1061 XSelectInput (disp, top, 1054 XSelectInput (disp, top,
1062 KeyPressMask 1055 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1056#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1057 | KeyReleaseMask
1065#endif 1058#endif
1066 | FocusChangeMask | VisibilityChangeMask 1059 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask
1068 | StructureNotifyMask); 1060 | ExposureMask | StructureNotifyMask);
1061
1069 termwin_ev.start (display, top); 1062 termwin_ev.start (display, top);
1070 1063
1071#if ENABLE_FRILLS 1064#if ENABLE_FRILLS
1072 if (mwmhints.flags) 1065 if (mwmhints.flags)
1073 XChangeProperty (disp, top, 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,
… …
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1074 /* cursor (menuBar/scrollBar): Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1075 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083#endif 1076#endif
1084 1077
1085 /* the vt window */ 1078 /* the vt window */
1086 TermWin.vt = XCreateSimpleWindow (disp, top, 1079 vt = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 1080 window_vt_x,
1088 window_vt_y, 1081 window_vt_y,
1089 TermWin_TotalWidth (), 1082 TermWin_TotalWidth (),
1090 TermWin_TotalHeight (), 1083 TermWin_TotalHeight (),
1091 0, 1084 0,
1092 pix_colors_focused[Color_fg], 1085 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1086 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X 1087#ifdef DEBUG_X
1095 XStoreName (disp, TermWin.vt, "vt window"); 1088 XStoreName (disp, vt, "vt window");
1096#endif 1089#endif
1097 1090
1098 attributes.bit_gravity = NorthWestGravity; 1091 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1092 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1100 1093
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1094 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102
1103 pointer_unblank ();
1104 1095
1105#ifdef POINTER_BLANK 1096#ifdef POINTER_BLANK
1106 if (options & Opt_pointerBlank) 1097 if (options & Opt_pointerBlank)
1107 vt_emask |= PointerMotionMask; 1098 vt_emask |= PointerMotionMask;
1108 else 1099 else
1109#endif 1100#endif
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1102
1112 XSelectInput (disp, TermWin.vt, vt_emask); 1103 XSelectInput (disp, vt, vt_emask);
1113 vt_ev.start (display, TermWin.vt); 1104 vt_ev.start (display, vt);
1114 1105
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1106#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ()) 1107 if (menuBar_height ())
1117 { 1108 {
1118 menuBar.win = XCreateSimpleWindow (disp, top, 1109 menuBar.win = XCreateSimpleWindow (disp, top,
… …
1157 1148
1158 /* graphics context for the vt window */ 1149 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1150 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1151 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1152 gcvalue.graphics_exposures = 1;
1162 TermWin.gc = XCreateGC (disp, TermWin.vt, 1153 gc = XCreateGC (disp, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1154 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1155 &gcvalue);
1165 1156
1166 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1157 drawable = new rxvt_drawable (display, vt);
1167 1158
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1159#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1160 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1161 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1162 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1164 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1175#endif 1166#endif
1176 1167
1177#ifdef OFF_FOCUS_FADING 1168#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1169 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1170 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1171 pix_colors = pix_colors_unfocused;
1181#endif 1172#endif
1182 1173
1174 pointer_unblank ();
1183 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
1184} 1186}
1185 1187
1186/* ------------------------------------------------------------------------- * 1188/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1189 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1190 * ------------------------------------------------------------------------- */
… …
1202 tio->c_cc[VKILL] = CKILL; 1204 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1205 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1206 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1207 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1208# ifdef VDSUSP
1207
1208 tio->c_cc[VDSUSP] = CDSUSP; 1209 tio->c_cc[VDSUSP] = CDSUSP;
1209# endif 1210# endif
1210# ifdef VREPRINT 1211# ifdef VREPRINT
1211
1212 tio->c_cc[VREPRINT] = CRPRNT; 1212 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif 1213# endif
1214# ifdef VDISCRD 1214# ifdef VDISCRD
1215
1216 tio->c_cc[VDISCRD] = CFLUSH; 1215 tio->c_cc[VDISCRD] = CFLUSH;
1217# endif 1216# endif
1218# ifdef VWERSE 1217# ifdef VWERSE
1219
1220 tio->c_cc[VWERSE] = CWERASE; 1218 tio->c_cc[VWERSE] = CWERASE;
1221# endif 1219# endif
1222# ifdef VLNEXT 1220# ifdef VLNEXT
1223
1224 tio->c_cc[VLNEXT] = CLNEXT; 1221 tio->c_cc[VLNEXT] = CLNEXT;
1225# endif 1222# endif
1226
1227 } 1223 }
1224
1228 tio->c_cc[VEOF] = CEOF; 1225 tio->c_cc[VEOF] = CEOF;
1229 tio->c_cc[VEOL] = VDISABLE; 1226 tio->c_cc[VEOL] = VDISABLE;
1230# ifdef VEOL2 1227# ifdef VEOL2
1231
1232 tio->c_cc[VEOL2] = VDISABLE; 1228 tio->c_cc[VEOL2] = VDISABLE;
1233# endif 1229# endif
1234# ifdef VSWTC 1230# ifdef VSWTC
1235
1236 tio->c_cc[VSWTC] = VDISABLE; 1231 tio->c_cc[VSWTC] = VDISABLE;
1237# endif 1232# endif
1238# ifdef VSWTCH 1233# ifdef VSWTCH
1239
1240 tio->c_cc[VSWTCH] = VDISABLE; 1234 tio->c_cc[VSWTCH] = VDISABLE;
1241# endif 1235# endif
1242# if VMIN != VEOF 1236# if VMIN != VEOF
1243
1244 tio->c_cc[VMIN] = 1; 1237 tio->c_cc[VMIN] = 1;
1245# endif 1238# endif
1246# if VTIME != VEOL 1239# if VTIME != VEOL
1247
1248 tio->c_cc[VTIME] = 0; 1240 tio->c_cc[VTIME] = 0;
1249# endif 1241# endif
1250 1242
1251 if (erase != -1) 1243 if (erase != -1)
1252 tio->c_cc[VERASE] = (char)erase; 1244 tio->c_cc[VERASE] = (char)erase;
… …
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1272 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 { 1273 {
1282 tio->sg.sg_erase = CERASE; /* ^H */ 1274 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */ 1275 tio->sg.sg_kill = CKILL; /* ^U */
1284 } 1276 }
1277
1285 if (erase != -1) 1278 if (erase != -1)
1286 tio->sg.sg_erase = (char)erase; 1279 tio->sg.sg_erase = (char)erase;
1287 1280
1288 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1281 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1289 1282
… …
1295 tio->tc.t_startc = CSTART; /* ^Q */ 1288 tio->tc.t_startc = CSTART; /* ^Q */
1296 tio->tc.t_stopc = CSTOP; /* ^S */ 1289 tio->tc.t_stopc = CSTOP; /* ^S */
1297 tio->tc.t_eofc = CEOF; /* ^D */ 1290 tio->tc.t_eofc = CEOF; /* ^D */
1298 tio->tc.t_brkc = -1; 1291 tio->tc.t_brkc = -1;
1299 } 1292 }
1293
1300 /* get local special chars */ 1294 /* get local special chars */
1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1295 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302 { 1296 {
1303 tio->lc.t_suspc = CSUSP; /* ^Z */ 1297 tio->lc.t_suspc = CSUSP; /* ^Z */
1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1298 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1308 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1302 tio->lc.t_lnextc = CLNEXT; /* ^V */
1309 } 1303 }
1310 /* get line discipline */ 1304 /* get line discipline */
1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1305 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312# ifdef NTTYDISC 1306# ifdef NTTYDISC
1313
1314 tio->line = NTTYDISC; 1307 tio->line = NTTYDISC;
1315# endif /* NTTYDISC */ 1308# endif /* NTTYDISC */
1316 1309
1317 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1310 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1318#endif /* HAVE_TERMIOS_H */ 1311#endif /* HAVE_TERMIOS_H */
… …
1341 FOO (IGNCR, "IGNCR"); 1334 FOO (IGNCR, "IGNCR");
1342 FOO (ICRNL, "ICRNL"); 1335 FOO (ICRNL, "ICRNL");
1343 FOO (IXON, "IXON"); 1336 FOO (IXON, "IXON");
1344 FOO (IXOFF, "IXOFF"); 1337 FOO (IXOFF, "IXOFF");
1345# ifdef IUCLC 1338# ifdef IUCLC
1346
1347 FOO (IUCLC, "IUCLC"); 1339 FOO (IUCLC, "IUCLC");
1348# endif 1340# endif
1349# ifdef IXANY 1341# ifdef IXANY
1350
1351 FOO (IXANY, "IXANY"); 1342 FOO (IXANY, "IXANY");
1352# endif 1343# endif
1353# ifdef IMAXBEL 1344# ifdef IMAXBEL
1354
1355 FOO (IMAXBEL, "IMAXBEL"); 1345 FOO (IMAXBEL, "IMAXBEL");
1356# endif 1346# endif
1357 1347
1358 fprintf (stderr, "\n"); 1348 fprintf (stderr, "\n");
1359 1349
… …
1366 FOO (VERASE, "VERASE"); 1356 FOO (VERASE, "VERASE");
1367 FOO (VKILL, "VKILL"); 1357 FOO (VKILL, "VKILL");
1368 FOO (VEOF, "VEOF"); 1358 FOO (VEOF, "VEOF");
1369 FOO (VEOL, "VEOL"); 1359 FOO (VEOL, "VEOL");
1370# ifdef VEOL2 1360# ifdef VEOL2
1371
1372 FOO (VEOL2, "VEOL2"); 1361 FOO (VEOL2, "VEOL2");
1373# endif 1362# endif
1374# ifdef VSWTC 1363# ifdef VSWTC
1375
1376 FOO (VSWTC, "VSWTC"); 1364 FOO (VSWTC, "VSWTC");
1377# endif 1365# endif
1378# ifdef VSWTCH 1366# ifdef VSWTCH
1379
1380 FOO (VSWTCH, "VSWTCH"); 1367 FOO (VSWTCH, "VSWTCH");
1381# endif 1368# endif
1382
1383 FOO (VSTART, "VSTART"); 1369 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP"); 1370 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP"); 1371 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP 1372# ifdef VDSUSP
1387
1388 FOO (VDSUSP, "VDSUSP"); 1373 FOO (VDSUSP, "VDSUSP");
1389# endif 1374# endif
1390# ifdef VREPRINT 1375# ifdef VREPRINT
1391
1392 FOO (VREPRINT, "VREPRINT"); 1376 FOO (VREPRINT, "VREPRINT");
1393# endif 1377# endif
1394# ifdef VDISCRD 1378# ifdef VDISCRD
1395
1396 FOO (VDISCRD, "VDISCRD"); 1379 FOO (VDISCRD, "VDISCRD");
1397# endif 1380# endif
1398# ifdef VWERSE 1381# ifdef VWERSE
1399
1400 FOO (VWERSE, "VWERSE"); 1382 FOO (VWERSE, "VWERSE");
1401# endif 1383# endif
1402# ifdef VLNEXT 1384# ifdef VLNEXT
1403
1404 FOO (VLNEXT, "VLNEXT"); 1385 FOO (VLNEXT, "VLNEXT");
1405# endif 1386# endif
1406 1387
1407 fprintf (stderr, "\n"); 1388 fprintf (stderr, "\n");
1408# undef FOO 1389# undef FOO
… …
1417 * the slave. 1398 * the slave.
1418 */ 1399 */
1419void 1400void
1420rxvt_term::run_command (const char *const *argv) 1401rxvt_term::run_command (const char *const *argv)
1421{ 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
1422 if (!pty.get ()) 1411 if (!pty.get ())
1423 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1412 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1424 1413
1425 pty.set_utf8_mode (enc_utf8); 1414 pty.set_utf8_mode (enc_utf8);
1426 1415
1427 /* set initial window size */ 1416 /* set initial window size */
1428 tt_winch (); 1417 tt_winch ();
… …
1438#endif 1427#endif
1439 er = -1; 1428 er = -1;
1440 1429
1441 rxvt_get_ttymode (&tio, er); 1430 rxvt_get_ttymode (&tio, er);
1442 1431
1443 sw_chld.start (SIGCHLD); 1432#if ENABLE_FRILLS
1433 if (rs[Rs_pty_fd])
1434 return;
1435#endif
1444 1436
1445#ifndef __QNX__ 1437#ifndef __QNX__
1446 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1448 { 1440 {
1449 case -1: 1441 case -1:
1442 {
1443 cmd_pid = 0;
1450 rxvt_fatal ("can't fork, aborting.\n"); 1444 rxvt_fatal ("can't fork, aborting.\n");
1445 }
1451 case 0: 1446 case 0:
1452 init_env (); 1447 init_env ();
1453 1448
1454 if (!pty.make_controlling_tty ()) 1449 if (!pty.make_controlling_tty ())
1455 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