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.130 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.173 by root, Wed Jul 5 20:31:48 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3)
52 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
56# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57 "Grey90", /* 7: white (#E5E5E5) */ 57# else
58# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59 "AntiqueWhite", /* 7: white (#FAEBD7) */
60# endif 59# endif
61 /* high-intensity colors */ 60 /* high-intensity colors */
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
68 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
69 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
71 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
73 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
74 "White", /* 7/15: bright white (#FFFFFF) */
75 73
76 // 88 xterm colours 74 // 88 xterm colours
77 "rgb:00/00/00", 75 "rgb:00/00/00",
78 "rgb:00/00/8b", 76 "rgb:00/00/8b",
79 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
172#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
173#if TINTING 171#if TINTING
174 NULL, 172 NULL,
175#endif 173#endif
176#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
177 "black", 175 "rgb:00/00/00",
178#endif
179 };
180
181const char *const xa_names[] =
182 {
183 "TEXT",
184 "COMPOUND_TEXT",
185 "UTF8_STRING",
186 "MULTIPLE",
187 "TARGETS",
188 "TIMESTAMP",
189 "VT_SELECTION",
190 "INCR",
191 "WM_PROTOCOLS",
192 "WM_DELETE_WINDOW",
193 "CLIPBOARD",
194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
198 "_NET_WM_PID",
199 "_NET_WM_NAME",
200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
202#endif
203#if USE_XIM
204 "WM_LOCALE_NAME",
205#endif
206#ifdef TRANSPARENT
207 "_XROOTPMAP_ID",
208 "ESETROOT_PMAP_ID",
209#endif
210#ifdef OFFIX_DND
211 "DndProtocol",
212 "DndSelection",
213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif 176#endif
218 }; 177 };
219 178
220bool 179bool
221rxvt_term::init_vars () 180rxvt_term::init_vars ()
222{ 181{
182 pix_colors = //
223 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
224#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
226#endif 186#endif
227 pix_colors = pix_colors_focused;
228
229 if (pix_colors == NULL)
230 return false;
231 187
232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
233 pixmap = None; 189 pixmap = None;
234#endif 190#endif
235 191
236 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
237 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
238 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
239 want_refresh = 1; 195 want_refresh = 1;
240 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
241 focus = 0;
242 ncol = 80; 197 ncol = 80;
243 nrow = 24; 198 nrow = 24;
244 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
245 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
246 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
247 saveLines = SAVELINES; 202 saveLines = SAVELINES;
248 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
249 204
250 refresh_limit = 1; 205 refresh_limit = 1;
251 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
252 prev_nrow = prev_ncol = 0;
253 207
254 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
255#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
256 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
257 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
258 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
259#endif 213#endif
260 214
261 last_bot = last_state = -1; 215 last_bot = last_state = -1;
262
263#ifdef MENUBAR
264 menu_readonly = 1;
265# if ! (MENUBAR_MAX > 1)
266 CurrentBar = &BarList;
267# endif /* (MENUBAR_MAX > 1) */
268#endif
269 216
270 return true; 217 return true;
271} 218}
272 219
273void 220void
… …
311 int i, r_argc; 258 int i, r_argc;
312 char *val; 259 char *val;
313 const char **cmd_argv, **r_argv; 260 const char **cmd_argv, **r_argv;
314 261
315 /* 262 /*
316 * Look for -exec option. Find => split and make cmd_argv[] of command args 263 * Look for -e option. Find => split and make cmd_argv[] of command args
317 */ 264 */
318 for (r_argc = 0; r_argc < argc; r_argc++) 265 for (r_argc = 0; r_argc < argc; r_argc++)
319 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 266 if (!strcmp (argv[r_argc], "-e"))
320 break; 267 break;
321 268
322 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
323 270
324 for (i = 0; i < r_argc; i++) 271 for (i = 0; i < r_argc; i++)
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 289
343 /* 290 /*
344 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
345 */ 292 */
293
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
348 296
349 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
350 298
351 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 301
302 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305 set (display);
354 extract_resources (); 306 extract_resources ();
307
308#if XFT
309 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif
312
355 free (r_argv); 313 free (r_argv);
314
315 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef)
317 rs [i] = 0;
318
319#if ENABLE_PERL
320 if (!rs[Rs_perl_ext_1])
321 rs[Rs_perl_ext_1] = "default";
322
323 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
324 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
325 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
326 {
327 rxvt_perl.init (this);
328 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
329 }
330#endif
356 331
357 /* 332 /*
358 * set any defaults not already set 333 * set any defaults not already set
359 */ 334 */
360 if (cmd_argv && cmd_argv[0]) 335 if (cmd_argv && cmd_argv[0])
… …
393 pointerBlankDelay = 2; 368 pointerBlankDelay = 2;
394#endif 369#endif
395 370
396 /* no point having a scrollbar without having any scrollback! */ 371 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 372 if (!saveLines)
398 CLR_OPTION (Opt_scrollBar); 373 set_option (Opt_scrollBar, 0);
399 374
400#ifdef PRINTPIPE 375#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 376 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 377 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 378#endif
… …
450 /* this is how xterm implements reverseVideo */ 425 /* this is how xterm implements reverseVideo */
451 if (OPTION (Opt_reverseVideo)) 426 if (OPTION (Opt_reverseVideo))
452 { 427 {
453 if (!rs[Rs_color + Color_fg]) 428 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 429 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430
455 if (!rs[Rs_color + Color_bg]) 431 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 432 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 433 }
458#endif 434#endif
459 435
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
513 489
514 if (val == NULL) 490 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 492 val = XDisplayString (dpy);
517 493
518 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
520 496
521 i = strlen (val); 497 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 499
524 sprintf (env_display, "DISPLAY=%s", val); 500 sprintf (env_display, "DISPLAY=%s", val);
525 501
526 /* avoiding the math library: 502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ;
530 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532
533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)parent[0]);
535 503
536 /* add entries to the environment: 504 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 505 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 506 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 507 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 509 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 510 * @ COLORFGBG: fg;bg color codes
543 */ 511 */
544 putenv (env_display); 512 putenv (env_display);
545 putenv (env_windowid); 513 putenv (env_windowid);
514
546 if (env_colorfgbg) 515 if (env_colorfgbg)
547 putenv (env_colorfgbg); 516 putenv (env_colorfgbg);
548 517
549#ifdef RXVT_TERMINFO 518#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 519 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 520#endif
552 521
553 if (display->depth <= 2) 522 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 523 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 524 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 525 putenv ("COLORTERM=" COLORTERMENVFULL);
557 526
558 if (rs[Rs_term_name] != NULL) 527 if (rs[Rs_term_name] != NULL)
… …
578 * This should support all European type languages. 547 * This should support all European type languages.
579 */ 548 */
580void 549void
581rxvt_term::set_locale (const char *locale) 550rxvt_term::set_locale (const char *locale)
582{ 551{
552 set_environ (envv);
553
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 554#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 555 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 556 this->locale = setlocale (LC_CTYPE, locale);
586 557
587 if (!this->locale) 558 if (!this->locale)
588 { 559 {
589 if (*locale) 560 if (*locale)
590 { 561 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 562 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 563 setlocale (LC_CTYPE, "C");
593 } 564 }
594 else 565 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 566 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 567
597 this->locale = ""; 568 this->locale = "C";
598 } 569 }
599 570
600 571
601 this->locale = rxvt_strdup (this->locale); 572 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 573 SET_LOCALE (this->locale);
… …
617} 588}
618 589
619void 590void
620rxvt_term::init_xlocale () 591rxvt_term::init_xlocale ()
621{ 592{
593 set_environ (envv);
594
622#ifdef USE_XIM 595#ifdef USE_XIM
623 if (!locale) 596 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 597 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 598 else
626 { 599 {
… …
666 if (strcmp (key_backspace, "DEC") == 0) 639 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 640 priv_modes |= PrivMode_HaveBackSpace;
668#endif 641#endif
669 642
670 /* add value for scrollBar */ 643 /* add value for scrollBar */
671 if (scrollbar_visible ()) 644 if (scrollBar.state)
672 { 645 {
673 priv_modes |= PrivMode_scrollBar; 646 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 647 SavedModes |= PrivMode_scrollBar;
675 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 } 648 }
682 649
683 run_command (argv); 650 run_command (argv);
684} 651}
685 652
… …
691 658
692#ifdef OFF_FOCUS_FADING 659#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 660 pix_colors = pix_colors_focused;
694#endif 661#endif
695 662
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 664 {
665 const char *name = rs[Rs_color + i];
666
667 if (!name)
668 continue;
669
698 rxvt_color xcol; 670 rxvt_color xcol;
699 671
700 if (!rs[Rs_color + i]) 672 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 673 {
705#ifndef XTERM_REVERSE_VIDEO 674#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 675 if (i < 2 && OPTION (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 676 name = def_colorName [1 - i];
708 else 677 else
709#endif 678#endif
710 rs[Rs_color + i] = def_colorName[i]; 679 name = def_colorName [i];
711 680
712 if (!rs[Rs_color + i]) 681 if (!name)
713 continue; 682 continue;
714 683
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 684 if (!set_color (xcol, name))
716 { 685 {
717 switch (i) 686 switch (i)
718 { 687 {
719 case Color_fg: 688 case Color_fg:
720 case Color_bg: 689 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 691 name = "";
724 break; 692 break;
725#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 694 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 695#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 696 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
732 break; 699 break;
733 default: 700 default:
734 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
735 break; 703 break;
736 } 704 }
737 } 705 }
738 } 706 }
739 707
740 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 709 rs[Rs_color + i] = name;
742 }
743
744#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748#endif
749
750 if (display->depth <= 2)
751 { 710 }
711
712 if (depth <= 2)
713 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 717 }
756 718
757 /* 719 /*
758 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
759 * 721 *
760 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 723 * from the fvwm window manager.
762 */ 724 */
763#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 726 if (depth <= 2)
766 { 727 {
767 /* Monochrome */ 728 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
771 } 732 }
772 else 733 else
773 { 734 {
774 rxvt_color xcol[2]; 735 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 736
779 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 738 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 739
789 /* topShadowColor */ 740 /* topShadowColor */
790 if (!xcol[1].set (display, 741 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 742 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 746 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 747 ))
748 alias_color (Color_topShadow, Color_White);
797 } 749 }
798#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 {
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif
799} 761}
800 762
801/*----------------------------------------------------------------------*/ 763/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 764/* color aliases, fg/bg bright-bold */
803void 765void
… …
808 int i = atoi (rs[Rs_color + idx]); 770 int i = atoi (rs[Rs_color + idx]);
809 771
810 if (i >= 8 && i <= 15) 772 if (i >= 8 && i <= 15)
811 { /* bright colors */ 773 { /* bright colors */
812 i -= 8; 774 i -= 8;
813#ifndef NO_BRIGHTCOLOR
814 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
815 return; 776 return;
816#endif
817 } 777 }
818 778
819 if (i >= 0 && i <= 7) /* normal colors */ 779 if (i >= 0 && i <= 7) /* normal colors */
820 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
821 } 781 }
… …
844 804
845 if (rsmod 805 if (rsmod
846 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
847 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
848 808
849 map = XGetModifierMapping (display->display); 809 map = XGetModifierMapping (dpy);
850 kc = map->modifiermap; 810 kc = map->modifiermap;
851 811
852 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
853 { 813 {
854 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
856 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
857 { 817 {
858 if (kc[k] == 0) 818 if (kc[k] == 0)
859 break; 819 break;
860 820
861 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 821 switch (XKeycodeToKeysym (dpy, kc[k], 0))
862 { 822 {
863 case XK_Num_Lock: 823 case XK_Num_Lock:
864 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
865 continue; 825 continue;
866 826
… …
916rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
917{ 877{
918 XClassHint classHint; 878 XClassHint classHint;
919 XWMHints wmHint; 879 XWMHints wmHint;
920#if ENABLE_FRILLS 880#if ENABLE_FRILLS
921 Atom prop = None;
922 MWMHints mwmhints; 881 MWMHints mwmhints;
923#endif 882#endif
924 XGCValues gcvalue; 883 XGCValues gcvalue;
925 long vt_emask;
926 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
927 XWindowAttributes gattr;
928 Window top, parent; 885 Window top, parent;
929 dDisp;
930 886
931#ifdef USING_W11LIB 887 dLocal (Display *, dpy);
932 /* enable W11 callbacks */
933 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif
935 888
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 889 /* grab colors before netscape does */
937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 890 Get_Colours ();
938 891
939 if (OPTION (Opt_transparent)) 892 if (!set_fonts ())
940 { 893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 894
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 895 parent = display->root;
943 } 896
897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
944 898
945#if ENABLE_FRILLS 899#if ENABLE_FRILLS
946 if (OPTION (Opt_borderLess)) 900 if (OPTION (Opt_borderLess))
947 { 901 {
948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 903 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 905 attributes.override_redirect = true;
955#endif
956 mwmhints.flags = 0; 906 mwmhints.flags = 0;
957 } 907 }
958 else 908 else
959 { 909 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 910 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
963 } 913 }
964 else 914 else
965 mwmhints.flags = 0; 915 mwmhints.flags = 0;
966#endif 916#endif
967 917
968 /* grab colors before netscape does */
969 Get_Colours ();
970
971 if (!set_fonts ())
972 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
973
974 parent = DefaultRootWindow (disp);
975
976#if ENABLE_XEMBED 918#if ENABLE_XEMBED
977 if (rs[Rs_embed]) 919 if (rs[Rs_embed])
978 { 920 {
979 XWindowAttributes wattr; 921 XWindowAttributes wattr;
980 922
981 parent = strtol (rs[Rs_embed], 0, 0); 923 parent = strtol (rs[Rs_embed], 0, 0);
982 924
983 if (!XGetWindowAttributes (disp, parent, &wattr)) 925 if (!XGetWindowAttributes (dpy, parent, &wattr))
984 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985 927
986 window_calc (wattr.width, wattr.height); 928 window_calc (wattr.width, wattr.height);
987 } 929 }
988#endif 930#endif
989 931
990 window_calc (0, 0); 932 window_calc (0, 0);
991 933
992 /* sub-window placement & size in rxvt_resize_subwindows () */ 934 /* sub-window placement & size in rxvt_resize_subwindows () */
993#ifdef PREFER_24BIT
994 attributes.background_pixel = pix_colors_focused[Color_border]; 935 attributes.background_pixel = pix_colors_focused [Color_border];
995 attributes.border_pixel = pix_colors_focused[Color_border]; 936 attributes.border_pixel = pix_colors_focused [Color_border];
996 attributes.colormap = display->cmap; 937 attributes.colormap = cmap;
938
997 top = XCreateWindow (disp, parent, 939 top = XCreateWindow (dpy, parent,
998 szHint.x, szHint.y, 940 szHint.x, szHint.y,
999 szHint.width, szHint.height, 941 szHint.width, szHint.height,
1000 ext_bwidth, 942 ext_bwidth,
1001 display->depth, InputOutput, 943 depth, InputOutput, visual,
1002 display->visual,
1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1004#else 945 &attributes);
1005 top = XCreateSimpleWindow (disp, parent,
1006 szHint.x, szHint.y,
1007 szHint.width, szHint.height,
1008 ext_bwidth,
1009 pix_colors_focused[Color_border],
1010 pix_colors_focused[Color_border]);
1011#endif
1012 946
1013 this->parent[0] = top; 947 this->parent[0] = top;
1014 948
1015 old_width = szHint.width; 949 old_width = szHint.width;
1016 old_height = szHint.height; 950 old_height = szHint.height;
1017 951
1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1019 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1020 954
1021 classHint.res_name = (char *)rs[Rs_name]; 955 classHint.res_name = (char *)rs[Rs_name];
1022 classHint.res_class = (char *)RESCLASS; 956 classHint.res_class = (char *)RESCLASS;
1023 957
1024 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1025 wmHint.input = True; 959 wmHint.input = True;
1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1027 wmHint.window_group = top; 961 wmHint.window_group = top;
1028 962
1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1030 &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
965
966#if ENABLE_FRILLS
967 if (mwmhints.flags)
968 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif
1031 971
1032 Atom protocols[] = { 972 Atom protocols[] = {
1033 xa[XA_WM_DELETE_WINDOW], 973 xa[XA_WM_DELETE_WINDOW],
1034#if ENABLE_EWMH 974#if ENABLE_EWMH
1035 xa[XA_NET_WM_PING], 975 xa[XA_NET_WM_PING],
1036#endif 976#endif
1037 }; 977 };
1038 978
1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 979 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
980
981#if ENABLE_FRILLS
982 if (rs[Rs_transient_for])
983 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif
1040 985
1041#if ENABLE_EWMH 986#if ENABLE_EWMH
1042 long pid = getpid (); 987 long pid = getpid ();
1043 988
1044 XChangeProperty (disp, top, 989 XChangeProperty (dpy, top,
1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1046 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1047 992
1048 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1049#endif 994#endif
1050 995
1051 XSelectInput (disp, top, 996 XSelectInput (dpy, top,
1052 KeyPressMask 997 KeyPressMask
1053#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1054 | KeyReleaseMask 999 | KeyReleaseMask
1055#endif 1000#endif
1056 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1057 | ExposureMask | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1058 1003
1059 termwin_ev.start (display, top); 1004 termwin_ev.start (display, top);
1060 1005
1061#if ENABLE_FRILLS
1062 if (mwmhints.flags)
1063 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1064 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1065#endif
1066
1067 /* vt cursor: Black-on-White is standard, but this is more popular */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1068 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1069 1008
1070#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1009#ifdef HAVE_SCROLLBARS
1071 /* cursor (menuBar/scrollBar): Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1073#endif 1012#endif
1074 1013
1075 /* the vt window */ 1014 /* the vt window */
1076 vt = XCreateSimpleWindow (disp, top, 1015 vt = XCreateSimpleWindow (dpy, top,
1077 window_vt_x,
1078 window_vt_y, 1016 window_vt_x, window_vt_y,
1079 width,
1080 height, 1017 width, height,
1081 0, 1018 0,
1082 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1083 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1084#ifdef DEBUG_X
1085 XStoreName (disp, vt, "vt window");
1086#endif
1087 1021
1088 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1090 1024
1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1092 1026
1093#ifdef POINTER_BLANK
1094 if (OPTION (Opt_pointerBlank)) 1027 if (OPTION (Opt_pointerBlank))
1095 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
1096 else 1029 else
1097#endif
1098 vt_emask |= Button1MotionMask | Button3MotionMask; 1030 vt_emask |= Button1MotionMask | Button3MotionMask;
1099 1031
1100 XSelectInput (disp, vt, vt_emask); 1032 vt_select_input ();
1033
1101 vt_ev.start (display, vt); 1034 vt_ev.start (display, vt);
1102
1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1104 if (menuBar_height ())
1105 {
1106 menuBar.win = XCreateSimpleWindow (disp, top,
1107 window_vt_x, 0,
1108 width,
1109 menuBar_TotalHeight (),
1110 0,
1111 pix_colors_focused[Color_fg],
1112 pix_colors_focused[Color_scroll]);
1113
1114#ifdef DEBUG_X
1115 XStoreName (disp, menuBar.win, "menubar");
1116#endif
1117
1118 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1119
1120 XDefineCursor (disp, menuBar.win,
1121 XCreateFontCursor (disp, XC_left_ptr));
1122
1123 XSelectInput (disp, menuBar.win,
1124 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1125 menubar_ev.start (display, menuBar.win);
1126 }
1127#endif
1128 1035
1129#ifdef XPM_BACKGROUND 1036#ifdef XPM_BACKGROUND
1130 if (rs[Rs_backgroundPixmap] != NULL 1037 if (rs[Rs_backgroundPixmap] != NULL
1131 && ! OPTION (Opt_transparent)) 1038 && !OPTION (Opt_transparent))
1132 { 1039 {
1133 const char *p = rs[Rs_backgroundPixmap]; 1040 const char *p = rs[Rs_backgroundPixmap];
1134 1041
1135 if ((p = strchr (p, ';')) != NULL) 1042 if ((p = strchr (p, ';')) != NULL)
1136 { 1043 {
… …
1142 scr_touch (true); 1049 scr_touch (true);
1143 } 1050 }
1144#endif 1051#endif
1145 1052
1146 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1147 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1148 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1149 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 0;
1057
1150 gc = XCreateGC (disp, vt, 1058 gc = XCreateGC (dpy, vt,
1151 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1152 &gcvalue); 1060 &gcvalue);
1153 1061
1154 drawable = new rxvt_drawable (display, vt); 1062 drawable = new rxvt_drawable (this, vt);
1155 1063
1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1064#ifdef RXVT_SCROLLBAR
1157 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1163#endif 1071#endif
1164 1072
1165#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1166 // initially we are in unfocused state 1074 // initially we are in unfocused state
1167 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])
1168 pix_colors = pix_colors_unfocused; 1076 pix_colors = pix_colors_unfocused;
1169#endif 1077#endif
1170 1078
1171 pointer_unblank (); 1079 pointer_unblank ();
1172 scr_recolour (); 1080 scr_recolour ();
1173
1174#if ENABLE_XEMBED
1175 if (rs[Rs_embed])
1176 {
1177 long info[2] = { 0, XEMBED_MAPPED };
1178
1179 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1180 32, PropModeReplace, (unsigned char *)&info, 2);
1181 }
1182#endif
1183} 1081}
1184 1082
1185/* ------------------------------------------------------------------------- * 1083/* ------------------------------------------------------------------------- *
1186 * GET TTY CURRENT STATE * 1084 * GET TTY CURRENT STATE *
1187 * ------------------------------------------------------------------------- */ 1085 * ------------------------------------------------------------------------- */
… …
1404rxvt_term::run_command (const char *const *argv) 1302rxvt_term::run_command (const char *const *argv)
1405{ 1303{
1406#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
1407 if (rs[Rs_pty_fd]) 1305 if (rs[Rs_pty_fd])
1408 { 1306 {
1409 pty.pty = atoi (rs[Rs_pty_fd]); 1307 pty->pty = atoi (rs[Rs_pty_fd]);
1410 1308
1309 if (pty->pty >= 0)
1310 {
1411 if (getfd_hook) 1311 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty); 1312 pty->pty = (*getfd_hook) (pty->pty);
1413 1313
1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1314 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1315 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1316 }
1416 } 1317 }
1417 else 1318 else
1418#endif 1319#endif
1419 if (!pty.get ()) 1320 if (!pty->get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1421 1322
1422 pty.set_utf8_mode (enc_utf8); 1323 pty->set_utf8_mode (enc_utf8);
1423 1324
1424 /* set initial window size */ 1325 /* set initial window size */
1425 tt_winch (); 1326 tt_winch ();
1426 1327
1427 int er; 1328 int er;
… …
1440#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1441 if (rs[Rs_pty_fd]) 1342 if (rs[Rs_pty_fd])
1442 return; 1343 return;
1443#endif 1344#endif
1444 1345
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1346 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1347 switch (cmd_pid = fork ())
1448 { 1348 {
1449 case -1: 1349 case -1:
1450 { 1350 {
… …
1452 rxvt_fatal ("can't fork, aborting.\n"); 1352 rxvt_fatal ("can't fork, aborting.\n");
1453 } 1353 }
1454 case 0: 1354 case 0:
1455 init_env (); 1355 init_env ();
1456 1356
1457 if (!pty.make_controlling_tty ()) 1357 if (!pty->make_controlling_tty ())
1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1358 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1459 else 1359 else
1460 { 1360 {
1461 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1361 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1462 dup2 (pty.tty, STDIN_FILENO); 1362 dup2 (pty->tty, STDIN_FILENO);
1463 dup2 (pty.tty, STDOUT_FILENO); 1363 dup2 (pty->tty, STDOUT_FILENO);
1464 dup2 (pty.tty, STDERR_FILENO); 1364 dup2 (pty->tty, STDERR_FILENO);
1465 1365
1466 // close all our file handles that we do no longer need 1366 // close all our file handles that we do no longer need
1467 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1367 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1468 { 1368 {
1469 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1369 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1470 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1370 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1471 } 1371 }
1472 1372
1473 run_child (argv); 1373 run_child (argv);
1474 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1374 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1475 } 1375 }
1476 1376
1477 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1478 1378
1479 default: 1379 default:
1480 { 1380 if (!OPTION (Opt_utmpInhibit))
1481#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1482 int fdstdin;
1483 1382
1484 fdstdin = dup (STDIN_FILENO); 1383 pty->close_tty ();
1485 dup2 (pty.tty, STDIN_FILENO);
1486#endif
1487 1384
1488#ifdef UTMP_SUPPORT 1385 child_ev.start (cmd_pid);
1489 privileged_utmp (SAVE);
1490#endif
1491 1386
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1493
1494 dup2 (fdstdin, STDIN_FILENO);
1495 close (fdstdin);
1496#endif
1497 }
1498
1499 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1500 break; 1388 break;
1501 } 1389 }
1502#else /* __QNX__ uses qnxspawn () */
1503 fchmod (pty.tty, 0622);
1504 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1505 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1506
1507 if (run_child (argv) == -1)
1508 exit (EXIT_FAILURE);
1509#endif
1510} 1390}
1511 1391
1512/* ------------------------------------------------------------------------- * 1392/* ------------------------------------------------------------------------- *
1513 * CHILD PROCESS OPERATIONS * 1393 * CHILD PROCESS OPERATIONS *
1514 * ------------------------------------------------------------------------- */ 1394 * ------------------------------------------------------------------------- */
… …
1558 // unblock signals (signals are blocked by iom.C 1438 // unblock signals (signals are blocked by iom.C
1559 sigset_t ss; 1439 sigset_t ss;
1560 sigemptyset (&ss); 1440 sigemptyset (&ss);
1561 sigprocmask (SIG_SETMASK, &ss, 0); 1441 sigprocmask (SIG_SETMASK, &ss, 0);
1562 1442
1563#ifndef __QNX__
1564 /* command interpreter path */ 1443 /* command interpreter path */
1565 if (argv != NULL) 1444 if (argv != NULL)
1566 { 1445 {
1567# ifdef DEBUG_CMD 1446# ifdef DEBUG_CMD
1568 int i; 1447 int i;
… …
1574 execvp (argv[0], (char *const *)argv); 1453 execvp (argv[0], (char *const *)argv);
1575 /* no error message: STDERR is closed! */ 1454 /* no error message: STDERR is closed! */
1576 } 1455 }
1577 else 1456 else
1578 { 1457 {
1579 const char *argv0, *shell; 1458 const char *argv0, *shell;
1580 1459
1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1582 shell = "/bin/sh"; 1461 shell = "/bin/sh";
1583 1462
1584 argv0 = (const char *)rxvt_r_basename (shell); 1463 argv0 = (const char *)rxvt_r_basename (shell);
… …
1589 1468
1590 login[0] = '-'; 1469 login[0] = '-';
1591 strcpy (&login[1], argv0); 1470 strcpy (&login[1], argv0);
1592 argv0 = login; 1471 argv0 = login;
1593 } 1472 }
1473
1594 execlp (shell, argv0, NULL); 1474 execlp (shell, argv0, NULL);
1595 /* no error message: STDERR is closed! */ 1475 /* no error message: STDERR is closed! */
1596 } 1476 }
1597 1477
1598#else /* __QNX__ uses qnxspawn () */
1599
1600 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1601 char *command = NULL, fullcommand[_MAX_PATH];
1602 char **arg_v, *arg_a[2] = { NULL, NULL };
1603
1604 if (argv != NULL)
1605 {
1606 if (access (argv[0], X_OK) == -1)
1607 {
1608 if (strchr (argv[0], '/') == NULL)
1609 {
1610 searchenv (argv[0], "PATH", fullcommand);
1611
1612 if (fullcommand[0] != '\0')
1613 command = fullcommand;
1614 }
1615
1616 if (access (command, X_OK) == -1)
1617 return -1;
1618 }
1619 else
1620 command = argv[0];
1621
1622 arg_v = argv;
1623 }
1624 else
1625 {
1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1627 command = "/bin/sh";
1628
1629 arg_a[0] = my_basename (command);
1630
1631 if (OPTION (Opt_loginShell))
1632 {
1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1634
1635 login[0] = '-';
1636 strcpy (&login[1], arg_a[0]);
1637 arg_a[0] = login;
1638 }
1639
1640 arg_v = arg_a;
1641 }
1642
1643 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1644 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1645 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1646 command, arg_v, environ, iov_a, 0);
1647 if (login)
1648 free (login);
1649
1650 pty.close_tty ();
1651 return pty.pty;
1652#endif
1653
1654 return -1; 1478 return -1;
1655} 1479}
1656 1480
1657/*----------------------- end-of-file (C source) -----------------------*/ 1481/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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