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.126 by root, Wed Dec 21 23:40:07 2005 UTC vs.
Revision 1.167 by root, Tue Jan 31 19:54:39 2006 UTC

… …
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
… …
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#if XFT
306 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0));
308 else
309#endif
310 set (display);
311
354 extract_resources (); 312 extract_resources ();
313
355 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
319
320#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default";
323
324 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
325 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
326 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
327 {
328 rxvt_perl.init (this);
329 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
330 }
331#endif
356 332
357 /* 333 /*
358 * set any defaults not already set 334 * set any defaults not already set
359 */ 335 */
360 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
… …
393 pointerBlankDelay = 2; 369 pointerBlankDelay = 2;
394#endif 370#endif
395 371
396 /* no point having a scrollbar without having any scrollback! */ 372 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 373 if (!saveLines)
398 options &= ~Opt_scrollBar; 374 set_option (Opt_scrollBar, 0);
399 375
400#ifdef PRINTPIPE 376#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 377 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 378 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 379#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 423#endif
448 424
449#ifdef XTERM_REVERSE_VIDEO 425#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 427 if (OPTION (Opt_reverseVideo))
452 { 428 {
453 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
455 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 434 }
458#endif 435#endif
459 436
… …
461 if (!rs[Rs_color + i]) 438 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 439 rs[Rs_color + i] = def_colorName[i];
463 440
464#ifndef XTERM_REVERSE_VIDEO 441#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 442 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 443 if (OPTION (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 445#endif
469 446
470 /* convenient aliases for setting fg/bg to colors */ 447 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 448 color_aliases (Color_fg);
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
513 490
514 if (val == NULL) 491 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 493 val = XDisplayString (xdisp);
517 494
518 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
520 497
521 i = strlen (val); 498 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 500
524 sprintf (env_display, "DISPLAY=%s", val); 501 sprintf (env_display, "DISPLAY=%s", val);
525 502
526 /* avoiding the math library: 503 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 504
536 /* add entries to the environment: 505 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 506 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 507 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 508 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 510 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 511 * @ COLORFGBG: fg;bg color codes
543 */ 512 */
544 putenv (env_display); 513 putenv (env_display);
545 putenv (env_windowid); 514 putenv (env_windowid);
515
546 if (env_colorfgbg) 516 if (env_colorfgbg)
547 putenv (env_colorfgbg); 517 putenv (env_colorfgbg);
548 518
549#ifdef RXVT_TERMINFO 519#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 520 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 521#endif
552 522
553 if (display->depth <= 2) 523 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 524 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 525 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 526 putenv ("COLORTERM=" COLORTERMENVFULL);
557 527
558 if (rs[Rs_term_name] != NULL) 528 if (rs[Rs_term_name] != NULL)
… …
578 * This should support all European type languages. 548 * This should support all European type languages.
579 */ 549 */
580void 550void
581rxvt_term::set_locale (const char *locale) 551rxvt_term::set_locale (const char *locale)
582{ 552{
553 set_environ (envv);
554
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 555#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 556 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 557 this->locale = setlocale (LC_CTYPE, locale);
586 558
587 if (!this->locale) 559 if (!this->locale)
588 { 560 {
589 if (*locale) 561 if (*locale)
590 { 562 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 563 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 564 setlocale (LC_CTYPE, "C");
593 } 565 }
594 else 566 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 567 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 568
597 this->locale = ""; 569 this->locale = "C";
598 } 570 }
599 571
600 572
601 this->locale = rxvt_strdup (this->locale); 573 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 574 SET_LOCALE (this->locale);
… …
617} 589}
618 590
619void 591void
620rxvt_term::init_xlocale () 592rxvt_term::init_xlocale ()
621{ 593{
594 set_environ (envv);
595
622#ifdef USE_XIM 596#ifdef USE_XIM
623 if (!locale) 597 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 598 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 599 else
626 { 600 {
… …
648 * Initialize the command connection. 622 * Initialize the command connection.
649 * This should be called after the X server connection is established. 623 * This should be called after the X server connection is established.
650 */ 624 */
651 625
652#ifdef META8_OPTION 626#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 628#endif
655 629
656 get_ourmods (); 630 get_ourmods ();
657 631
658 if (!(options & Opt_scrollTtyOutput)) 632 if (!OPTION (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 633 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 634 if (OPTION (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 635 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 636 if (!OPTION (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 637 priv_modes |= PrivMode_smoothScroll;
664 638
665#ifndef NO_BACKSPACE_KEY 639#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 640 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 641 priv_modes |= PrivMode_HaveBackSpace;
668#endif 642#endif
669 643
670 /* add value for scrollBar */ 644 /* add value for scrollBar */
671 if (scrollbar_visible ()) 645 if (scrollBar.state)
672 { 646 {
673 priv_modes |= PrivMode_scrollBar; 647 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 648 SavedModes |= PrivMode_scrollBar;
675 } 649 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 650
688 run_command (argv); 651 run_command (argv);
689} 652}
690 653
691/*----------------------------------------------------------------------*/ 654/*----------------------------------------------------------------------*/
… …
696 659
697#ifdef OFF_FOCUS_FADING 660#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
699#endif 662#endif
700 663
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
703 rxvt_color xcol; 671 rxvt_color xcol;
704 672
705 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 674 {
710#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
713 else 678 else
714#endif 679#endif
715 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
716 681
717 if (!rs[Rs_color + i]) 682 if (!name)
718 continue; 683 continue;
719 684
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
721 { 686 {
722 switch (i) 687 switch (i)
723 { 688 {
724 case Color_fg: 689 case Color_fg:
725 case Color_bg: 690 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 692 name = "";
729 break; 693 break;
730#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 695 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 696#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 697 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg];
736 xcol = pix_colors[Color_fg]; 699 xcol = pix_colors[Color_fg];
737 break; 700 break;
738 default: 701 default:
702 name = rs[Rs_color + Color_bg];
739 xcol = pix_colors[Color_bg]; /* None */ 703 xcol = pix_colors[Color_bg];
740 break; 704 break;
741 } 705 }
742 } 706 }
743 } 707 }
744 708
745 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i); 710 rs[Rs_color + i] = name;
747 } 711 }
748 712
749#ifdef OFF_FOCUS_FADING 713#ifdef OFF_FOCUS_FADING
750 if (rs[Rs_fade]) 714 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
752 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
753#endif 721#endif
754 722
755 if (display->depth <= 2) 723 if (depth <= 2)
756 { 724 {
757 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
759 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
760 } 728 }
761 729
762 /* 730 /*
763 * get scrollBar/menuBar shadow colors 731 * get scrollBar shadow colors
764 * 732 *
765 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
766 * from the fvwm window manager. 734 * from the fvwm window manager.
767 */ 735 */
768#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
769 737
770 if (display->depth <= 2) 738 if (depth <= 2)
771 { 739 {
772 /* Monochrome */ 740 /* Monochrome */
773 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 pix_colors[Color_scroll] = pix_colors[Color_fg];
774 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 pix_colors[Color_topShadow] = pix_colors[Color_bg];
775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
780 /* xcol[0] == white 748 /* xcol[0] == white
781 * xcol[1] == top shadow 749 * xcol[1] == top shadow
782 * xcol[2] == bot shadow */ 750 * xcol[2] == bot shadow */
783 751
784 xcol[1] = pix_colors[Color_scroll]; 752 xcol[1] = pix_colors[Color_scroll];
785 xcol[0].set (display, 65535, 65535, 65535); 753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
786 754
787 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 755 rgba c0, c1;
788 756
789 xcol[0].get (display, pr0, pg0, pb0); 757 xcol[0].get (c0);
790 xcol[1].get (display, pr1, pg1, pb1); 758 xcol[1].get (c1);
791 759
792 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
793 761
794 /* topShadowColor */ 762 /* topShadowColor */
795 if (!xcol[1].set (display, 763 if (!xcol[1].set (this,
764 rgba (
796 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
797 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
798 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary
769 ));
799 xcol[1] = pix_colors[Color_White]; 770 xcol[1] = pix_colors[Color_White];
800 771
801 pix_colors[Color_topShadow] = xcol[1]; 772 pix_colors[Color_topShadow] = xcol[1];
802 } 773 }
803#endif /* KEEP_SCROLLCOLOR */ 774#endif /* KEEP_SCROLLCOLOR */
… …
813 int i = atoi (rs[Rs_color + idx]); 784 int i = atoi (rs[Rs_color + idx]);
814 785
815 if (i >= 8 && i <= 15) 786 if (i >= 8 && i <= 15)
816 { /* bright colors */ 787 { /* bright colors */
817 i -= 8; 788 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 789 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 790 return;
821#endif
822 } 791 }
823 792
824 if (i >= 0 && i <= 7) /* normal colors */ 793 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 794 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 795 }
… …
849 818
850 if (rsmod 819 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 821 requestedmeta = rsmod[3] - '0';
853 822
854 map = XGetModifierMapping (display->display); 823 map = XGetModifierMapping (xdisp);
855 kc = map->modifiermap; 824 kc = map->modifiermap;
856 825
857 for (i = 1; i < 6; i++) 826 for (i = 1; i < 6; i++)
858 { 827 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 830 for (j = map->max_keypermod; j--; k++)
862 { 831 {
863 if (kc[k] == 0) 832 if (kc[k] == 0)
864 break; 833 break;
865 834
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 835 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
867 { 836 {
868 case XK_Num_Lock: 837 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 838 ModNumLockMask = modmasks[i - 1];
870 continue; 839 continue;
871 840
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 890rxvt_term::create_windows (int argc, const char *const *argv)
922{ 891{
923 XClassHint classHint; 892 XClassHint classHint;
924 XWMHints wmHint; 893 XWMHints wmHint;
925#if ENABLE_FRILLS 894#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 895 MWMHints mwmhints;
928#endif 896#endif
929 XGCValues gcvalue; 897 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 898 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 899 Window top, parent;
934 dDisp;
935 900
936#ifdef USING_W11LIB 901 dLocal (Display *, xdisp);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 902
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 903 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 904 Get_Colours ();
943 905
944 if (options & Opt_transparent) 906 if (!set_fonts ())
945 { 907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 908
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 909 parent = display->root;
948 } 910
911 attributes.override_redirect = !!OPTION (Opt_override_redirect);
949 912
950#if ENABLE_FRILLS 913#if ENABLE_FRILLS
951 if (options & Opt_borderLess) 914 if (OPTION (Opt_borderLess))
952 { 915 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 917 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 919 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0; 920 mwmhints.flags = 0;
962 } 921 }
963 else 922 else
964 { 923 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 924 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
968 } 927 }
969 else 928 else
970 mwmhints.flags = 0; 929 mwmhints.flags = 0;
971#endif 930#endif
972 931
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED 932#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 933 if (rs[Rs_embed])
983 { 934 {
984 XWindowAttributes wattr; 935 XWindowAttributes wattr;
985 936
986 parent = strtol (rs[Rs_embed], 0, 0); 937 parent = strtol (rs[Rs_embed], 0, 0);
987 938
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 939 if (!XGetWindowAttributes (xdisp, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 941
991 window_calc (wattr.width, wattr.height); 942 window_calc (wattr.width, wattr.height);
992 } 943 }
993#endif 944#endif
994 945
995 window_calc (0, 0); 946 window_calc (0, 0);
996 947
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 948 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 949 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 950 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 951 attributes.colormap = cmap;
952
1002 top = XCreateWindow (disp, parent, 953 top = XCreateWindow (xdisp, parent,
1003 szHint.x, szHint.y, 954 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 955 szHint.width, szHint.height,
1005 ext_bwidth, 956 ext_bwidth,
1006 display->depth, InputOutput, 957 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 959 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 960
1018 this->parent[0] = top; 961 this->parent[0] = top;
1019 962
1020 old_width = szHint.width; 963 old_width = szHint.width;
1021 old_height = szHint.height; 964 old_height = szHint.height;
1022 965
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 966 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 967 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 968
1026 classHint.res_name = (char *)rs[Rs_name]; 969 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 970 classHint.res_class = (char *)RESCLASS;
1028 971
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 972 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 973 wmHint.input = True;
1031 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 975 wmHint.window_group = top;
1033 976
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 978 &szHint, &wmHint, &classHint);
979
980#if ENABLE_FRILLS
981 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif
1036 985
1037 Atom protocols[] = { 986 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 987 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 988#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 989 xa[XA_NET_WM_PING],
1041#endif 990#endif
1042 }; 991 };
1043 992
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994
995#if ENABLE_FRILLS
996 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif
1045 999
1046#if ENABLE_EWMH 1000#if ENABLE_EWMH
1047 long pid = getpid (); 1001 long pid = getpid ();
1048 1002
1049 XChangeProperty (disp, top, 1003 XChangeProperty (xdisp, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1051 PropModeReplace, (unsigned char *)&pid, 1); 1005 PropModeReplace, (unsigned char *)&pid, 1);
1052 1006
1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1054#endif 1008#endif
1055 1009
1056 XSelectInput (disp, top, 1010 XSelectInput (xdisp, top,
1057 KeyPressMask 1011 KeyPressMask
1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1059 | KeyReleaseMask 1013 | KeyReleaseMask
1060#endif 1014#endif
1061 | FocusChangeMask | VisibilityChangeMask 1015 | FocusChangeMask | VisibilityChangeMask
1062 | ExposureMask | StructureNotifyMask); 1016 | ExposureMask | StructureNotifyMask);
1063 1017
1064 termwin_ev.start (display, top); 1018 termwin_ev.start (display, top);
1065 1019
1066#if ENABLE_FRILLS
1067 if (mwmhints.flags)
1068 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1069 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1070#endif
1071
1072 /* vt cursor: Black-on-White is standard, but this is more popular */ 1020 /* vt cursor: Black-on-White is standard, but this is more popular */
1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1074 1022
1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1023#ifdef HAVE_SCROLLBARS
1076 /* cursor (menuBar/scrollBar): Black-on-White */ 1024 /* cursor scrollBar: Black-on-White */
1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1078#endif 1026#endif
1079 1027
1080 /* the vt window */ 1028 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1029 vt = XCreateSimpleWindow (xdisp, top,
1082 window_vt_x,
1083 window_vt_y, 1030 window_vt_x, window_vt_y,
1084 TermWin_TotalWidth (), 1031 width, height,
1085 TermWin_TotalHeight (),
1086 0, 1032 0,
1087 pix_colors_focused[Color_fg], 1033 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1034 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window");
1091#endif
1092 1035
1093 attributes.bit_gravity = NorthWestGravity; 1036 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1095 1038
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1040
1098#ifdef POINTER_BLANK 1041 if (OPTION (Opt_pointerBlank))
1099 if (options & Opt_pointerBlank)
1100 vt_emask |= PointerMotionMask; 1042 vt_emask |= PointerMotionMask;
1101 else 1043 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1044 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1045
1105 XSelectInput (disp, vt, vt_emask); 1046 vt_select_input ();
1047
1106 vt_ev.start (display, vt); 1048 vt_ev.start (display, vt);
1107
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 TermWin_TotalWidth (),
1114 menuBar_TotalHeight (),
1115 0,
1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]);
1118
1119#ifdef DEBUG_X
1120 XStoreName (disp, menuBar.win, "menubar");
1121#endif
1122
1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125 XDefineCursor (disp, menuBar.win,
1126 XCreateFontCursor (disp, XC_left_ptr));
1127
1128 XSelectInput (disp, menuBar.win,
1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1130 menubar_ev.start (display, menuBar.win);
1131 }
1132#endif
1133 1049
1134#ifdef XPM_BACKGROUND 1050#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1051 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! (options & Opt_transparent)) 1052 && !OPTION (Opt_transparent))
1137 { 1053 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1054 const char *p = rs[Rs_backgroundPixmap];
1139 1055
1140 if ((p = strchr (p, ';')) != NULL) 1056 if ((p = strchr (p, ';')) != NULL)
1141 { 1057 {
… …
1147 scr_touch (true); 1063 scr_touch (true);
1148 } 1064 }
1149#endif 1065#endif
1150 1066
1151 /* graphics context for the vt window */ 1067 /* graphics context for the vt window */
1152 gcvalue.foreground = pix_colors[Color_fg]; 1068 gcvalue.foreground = pix_colors[Color_fg];
1153 gcvalue.background = pix_colors[Color_bg]; 1069 gcvalue.background = pix_colors[Color_bg];
1154 gcvalue.graphics_exposures = 1; 1070 gcvalue.graphics_exposures = 1;
1071
1155 gc = XCreateGC (disp, vt, 1072 gc = XCreateGC (xdisp, vt,
1156 GCForeground | GCBackground | GCGraphicsExposures, 1073 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1074 &gcvalue);
1158 1075
1159 drawable = new rxvt_drawable (display, vt); 1076 drawable = new rxvt_drawable (this, vt);
1160 1077
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1078#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1079 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1081 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1168#endif 1085#endif
1169 1086
1170#ifdef OFF_FOCUS_FADING 1087#ifdef OFF_FOCUS_FADING
1171 // initially we are in unfocused state 1088 // initially we are in unfocused state
1172 if (rs[Rs_fade]) 1089 if (rs[Rs_fade])
1173 pix_colors = pix_colors_unfocused; 1090 pix_colors = pix_colors_unfocused;
1174#endif 1091#endif
1175 1092
1176 pointer_unblank (); 1093 pointer_unblank ();
1177 scr_recolour (); 1094 scr_recolour ();
1178
1179#if ENABLE_XEMBED
1180 if (rs[Rs_embed])
1181 {
1182 long info[2] = { 0, XEMBED_MAPPED };
1183
1184 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185 32, PropModeReplace, (unsigned char *)&info, 2);
1186 }
1187#endif
1188} 1095}
1189 1096
1190/* ------------------------------------------------------------------------- * 1097/* ------------------------------------------------------------------------- *
1191 * GET TTY CURRENT STATE * 1098 * GET TTY CURRENT STATE *
1192 * ------------------------------------------------------------------------- */ 1099 * ------------------------------------------------------------------------- */
… …
1409rxvt_term::run_command (const char *const *argv) 1316rxvt_term::run_command (const char *const *argv)
1410{ 1317{
1411#if ENABLE_FRILLS 1318#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1319 if (rs[Rs_pty_fd])
1413 { 1320 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1321 pty->pty = atoi (rs[Rs_pty_fd]);
1415 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1322
1323 if (pty->pty >= 0)
1324 {
1325 if (getfd_hook)
1326 pty->pty = (*getfd_hook) (pty->pty);
1327
1328 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1329 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1330 }
1416 } 1331 }
1417 else 1332 else
1418#endif 1333#endif
1419 if (!pty.get ()) 1334 if (!pty->get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1421 1336
1422 pty.set_utf8_mode (enc_utf8); 1337 pty->set_utf8_mode (enc_utf8);
1423 1338
1424 /* set initial window size */ 1339 /* set initial window size */
1425 tt_winch (); 1340 tt_winch ();
1426 1341
1427 int er; 1342 int er;
… …
1440#if ENABLE_FRILLS 1355#if ENABLE_FRILLS
1441 if (rs[Rs_pty_fd]) 1356 if (rs[Rs_pty_fd])
1442 return; 1357 return;
1443#endif 1358#endif
1444 1359
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1448 { 1362 {
1449 case -1: 1363 case -1:
1450 { 1364 {
… …
1452 rxvt_fatal ("can't fork, aborting.\n"); 1366 rxvt_fatal ("can't fork, aborting.\n");
1453 } 1367 }
1454 case 0: 1368 case 0:
1455 init_env (); 1369 init_env ();
1456 1370
1457 if (!pty.make_controlling_tty ()) 1371 if (!pty->make_controlling_tty ())
1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1372 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1459 else 1373 else
1460 { 1374 {
1461 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1375 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1462 dup2 (pty.tty, STDIN_FILENO); 1376 dup2 (pty->tty, STDIN_FILENO);
1463 dup2 (pty.tty, STDOUT_FILENO); 1377 dup2 (pty->tty, STDOUT_FILENO);
1464 dup2 (pty.tty, STDERR_FILENO); 1378 dup2 (pty->tty, STDERR_FILENO);
1465 1379
1466 // close all our file handles that we do no longer need 1380 // close all our file handles that we do no longer need
1467 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1381 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1468 { 1382 {
1469 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1383 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1470 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1384 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1471 } 1385 }
1472 1386
1473 run_child (argv); 1387 run_child (argv);
1474 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1388 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1475 } 1389 }
1476 1390
1477 _exit (EXIT_FAILURE); 1391 _exit (EXIT_FAILURE);
1478 1392
1479 default: 1393 default:
1480 { 1394 if (!OPTION (Opt_utmpInhibit))
1481#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1482 int fdstdin;
1483 1396
1484 fdstdin = dup (STDIN_FILENO); 1397 pty->close_tty ();
1485 dup2 (pty.tty, STDIN_FILENO);
1486#endif
1487 1398
1488#ifdef UTMP_SUPPORT 1399 child_ev.start (cmd_pid);
1489 privileged_utmp (SAVE);
1490#endif
1491 1400
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1401 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; 1402 break;
1501 } 1403 }
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} 1404}
1511 1405
1512/* ------------------------------------------------------------------------- * 1406/* ------------------------------------------------------------------------- *
1513 * CHILD PROCESS OPERATIONS * 1407 * CHILD PROCESS OPERATIONS *
1514 * ------------------------------------------------------------------------- */ 1408 * ------------------------------------------------------------------------- */
… …
1521{ 1415{
1522 char *login; 1416 char *login;
1523 1417
1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1525 1419
1526 if (options & Opt_console) 1420 if (OPTION (Opt_console))
1527 { /* be virtual console, fail silently */ 1421 { /* be virtual console, fail silently */
1528#ifdef TIOCCONS 1422#ifdef TIOCCONS
1529 unsigned int on = 1; 1423 unsigned int on = 1;
1530 1424
1531 ioctl (STDIN_FILENO, TIOCCONS, &on); 1425 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1558 // unblock signals (signals are blocked by iom.C 1452 // unblock signals (signals are blocked by iom.C
1559 sigset_t ss; 1453 sigset_t ss;
1560 sigemptyset (&ss); 1454 sigemptyset (&ss);
1561 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);
1562 1456
1563#ifndef __QNX__
1564 /* command interpreter path */ 1457 /* command interpreter path */
1565 if (argv != NULL) 1458 if (argv != NULL)
1566 { 1459 {
1567# ifdef DEBUG_CMD 1460# ifdef DEBUG_CMD
1568 int i; 1461 int i;
… …
1574 execvp (argv[0], (char *const *)argv); 1467 execvp (argv[0], (char *const *)argv);
1575 /* no error message: STDERR is closed! */ 1468 /* no error message: STDERR is closed! */
1576 } 1469 }
1577 else 1470 else
1578 { 1471 {
1579 const char *argv0, *shell; 1472 const char *argv0, *shell;
1580 1473
1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1582 shell = "/bin/sh"; 1475 shell = "/bin/sh";
1583 1476
1584 argv0 = (const char *)rxvt_r_basename (shell); 1477 argv0 = (const char *)rxvt_r_basename (shell);
1585 1478
1586 if (options & Opt_loginShell) 1479 if (OPTION (Opt_loginShell))
1587 { 1480 {
1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1589 1482
1590 login[0] = '-'; 1483 login[0] = '-';
1591 strcpy (&login[1], argv0); 1484 strcpy (&login[1], argv0);
1592 argv0 = login; 1485 argv0 = login;
1593 } 1486 }
1487
1594 execlp (shell, argv0, NULL); 1488 execlp (shell, argv0, NULL);
1595 /* no error message: STDERR is closed! */ 1489 /* no error message: STDERR is closed! */
1596 } 1490 }
1597 1491
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 (options & 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; 1492 return -1;
1655} 1493}
1656 1494
1657/*----------------------- end-of-file (C source) -----------------------*/ 1495/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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