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

Diff Legend

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