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.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 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.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
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 }; 174#if OFF_FOCUS_FADING
175 175 "black",
176const char *const xa_names[] =
177 {
178 "TEXT",
179 "COMPOUND_TEXT",
180 "UTF8_STRING",
181 "MULTIPLE",
182 "TARGETS",
183 "TIMESTAMP",
184 "VT_SELECTION",
185 "INCR",
186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
197#ifdef TRANSPARENT
198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
200#endif
201#ifdef OFFIX_DND
202 "DndProtocol",
203 "DndSelection",
204#endif 176#endif
205 }; 177 };
206 178
207bool 179bool
208rxvt_term::init_vars () 180rxvt_term::init_vars ()
209{ 181{
210 sw_term.start (SIGTERM);
211 sw_int.start (SIGINT);
212
213 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
214#ifdef OFF_FOCUS_FADING 183#ifdef OFF_FOCUS_FADING
215 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
216#endif 185#endif
217 pix_colors = pix_colors_focused; 186 pix_colors = pix_colors_focused;
218 187
219 if (pix_colors == NULL) 188 if (pix_colors == NULL)
220 return false; 189 return false;
221 190
222#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
223 TermWin.pixmap = None; 192 pixmap = None;
224#endif 193#endif
225 194
226 MEvent.time = CurrentTime; 195 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 196 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 197 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 198 want_refresh = 1;
230 priv_modes = SavedModes = PrivMode_Default; 199 priv_modes = SavedModes = PrivMode_Default;
231 TermWin.focus = 0; 200 focus = 0;
232 TermWin.ncol = 80; 201 ncol = 80;
233 TermWin.nrow = 24; 202 nrow = 24;
234 TermWin.int_bwidth = INTERNALBORDERWIDTH; 203 int_bwidth = INTERNALBORDERWIDTH;
235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 204 ext_bwidth = EXTERNALBORDERWIDTH;
236 TermWin.lineSpace = LINESPACE; 205 lineSpace = LINESPACE;
237 TermWin.saveLines = SAVELINES; 206 saveLines = SAVELINES;
238 numpix_colors = TOTAL_COLORS; 207 numpix_colors = TOTAL_COLORS;
239 208
240 refresh_limit = 1; 209 refresh_limit = 1;
241 refresh_type = SLOW_REFRESH; 210 refresh_type = SLOW_REFRESH;
242 prev_nrow = prev_ncol = 0; 211 prev_nrow = prev_ncol = 0;
… …
247 bgPixmap.x = bgPixmap.y = 50; 216 bgPixmap.x = bgPixmap.y = 50;
248 bgPixmap.pixmap = None; 217 bgPixmap.pixmap = None;
249#endif 218#endif
250 219
251 last_bot = last_state = -1; 220 last_bot = last_state = -1;
252
253#ifdef MENUBAR
254 menu_readonly = 1;
255# if ! (MENUBAR_MAX > 1)
256 CurrentBar = &BarList;
257# endif /* (MENUBAR_MAX > 1) */
258#endif
259 221
260 return true; 222 return true;
261} 223}
262 224
263void 225void
… …
331 rs[Rs_name] = rxvt_r_basename (argv[0]); 293 rs[Rs_name] = rxvt_r_basename (argv[0]);
332 294
333 /* 295 /*
334 * Open display, get options/resources and create the window 296 * Open display, get options/resources and create the window
335 */ 297 */
298
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 299 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 300 rs[Rs_display_name] = ":0";
338 301
339 get_options (r_argc, r_argv); 302 get_options (r_argc, r_argv);
340 303
341#ifdef LOCAL_X_IS_UNIX
342 if (rs[Rs_display_name][0] == ':')
343 {
344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345 strcpy (val, "unix");
346 strcat (val, rs[Rs_display_name]);
347 display = displays.get (val);
348 free (val);
349 }
350#endif
351
352 if (!display
353 && ! (display = displays.get (rs[Rs_display_name]))) 304 if (!(display = displays.get (rs[Rs_display_name])))
354 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355 306
356 extract_resources (); 307 extract_resources ();
308
357 free (r_argv); 309 free (r_argv);
310
311#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default";
314
315 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
316 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
317 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
318 {
319 rxvt_perl.init (this);
320 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
321 }
322#endif
358 323
359 /* 324 /*
360 * set any defaults not already set 325 * set any defaults not already set
361 */ 326 */
362 if (cmd_argv && cmd_argv[0]) 327 if (cmd_argv && cmd_argv[0])
… …
373 if (!rs[Rs_iconName]) 338 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 339 rs[Rs_iconName] = rs[Rs_name];
375 } 340 }
376 341
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 342 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 343 saveLines = min (i, MAX_SAVELINES);
379 344
380#if ENABLE_FRILLS 345#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 346 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 347 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
348
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 349 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 350 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
351
385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 352 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
386 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 353 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
387#endif 354#endif
388 355
389#ifdef POINTER_BLANK 356#ifdef POINTER_BLANK
390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 357 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
391 pointerBlankDelay = i; 358 pointerBlankDelay = i;
392 else 359 else
393 pointerBlankDelay = 2; 360 pointerBlankDelay = 2;
394#endif 361#endif
395 362
396 /* no point having a scrollbar without having any scrollback! */ 363 /* no point having a scrollbar without having any scrollback! */
397 if (!TermWin.saveLines) 364 if (!saveLines)
398 options &= ~Opt_scrollBar; 365 set_option (Opt_scrollBar, 0);
399 366
400#ifdef PRINTPIPE 367#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 368 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 369 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 370#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 413 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 414#endif
448 415
449#ifdef XTERM_REVERSE_VIDEO 416#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 417 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 418 if (OPTION (Opt_reverseVideo))
452 { 419 {
453 if (!rs[Rs_color + Color_fg]) 420 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 421 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455 if (!rs[Rs_color + Color_bg]) 422 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 423 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
461 if (!rs[Rs_color + i]) 428 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 429 rs[Rs_color + i] = def_colorName[i];
463 430
464#ifndef XTERM_REVERSE_VIDEO 431#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 432 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 433 if (OPTION (Opt_reverseVideo))
467 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 435#endif
469 436
470 /* convenient aliases for setting fg/bg to colors */ 437 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 438 color_aliases (Color_fg);
472 color_aliases (Color_bg); 439 color_aliases (Color_bg);
… …
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 490
524 sprintf (env_display, "DISPLAY=%s", val); 491 sprintf (env_display, "DISPLAY=%s", val);
525 492
526 /* avoiding the math library: 493 /* avoiding the math library:
527 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ; 496 ;
530 MAX_IT (i, 1); 497 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532 499
533 sprintf (env_windowid, "WINDOWID=%u", 500 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)TermWin.parent[0]); 501 (unsigned int)parent[0]);
535 502
536 /* add entries to the environment: 503 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 504 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 505 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 506 * @ COLORTERM: terminal sub-name and also indicates its color
… …
578 * This should support all European type languages. 545 * This should support all European type languages.
579 */ 546 */
580void 547void
581rxvt_term::set_locale (const char *locale) 548rxvt_term::set_locale (const char *locale)
582{ 549{
550 set_environ (envv);
551
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 552#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 553 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 554 this->locale = setlocale (LC_CTYPE, locale);
586 555
587 if (!this->locale) 556 if (!this->locale)
588 { 557 {
589 if (*locale) 558 if (*locale)
590 { 559 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 560 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 561 setlocale (LC_CTYPE, "C");
593 } 562 }
594 else 563 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 564 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 565
597 this->locale = ""; 566 this->locale = "C";
598 } 567 }
599 568
600 569
601 this->locale = rxvt_strdup (this->locale); 570 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 571 SET_LOCALE (this->locale);
… …
617} 586}
618 587
619void 588void
620rxvt_term::init_xlocale () 589rxvt_term::init_xlocale ()
621{ 590{
591 set_environ (envv);
592
622#ifdef USE_XIM 593#ifdef USE_XIM
623 if (!locale) 594 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 595 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 596 else
626 { 597 {
… …
648 * Initialize the command connection. 619 * Initialize the command connection.
649 * This should be called after the X server connection is established. 620 * This should be called after the X server connection is established.
650 */ 621 */
651 622
652#ifdef META8_OPTION 623#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 625#endif
655 626
656 get_ourmods (); 627 get_ourmods ();
657 628
658 if (!(options & Opt_scrollTtyOutput)) 629 if (!OPTION (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 630 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 631 if (OPTION (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 632 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 633 if (!OPTION (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 634 priv_modes |= PrivMode_smoothScroll;
664 635
665#ifndef NO_BACKSPACE_KEY 636#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 637 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 638 priv_modes |= PrivMode_HaveBackSpace;
668#endif 639#endif
669 640
670 /* add value for scrollBar */ 641 /* add value for scrollBar */
671 if (scrollbar_visible ()) 642 if (scrollBar.state)
672 { 643 {
673 priv_modes |= PrivMode_scrollBar; 644 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 645 SavedModes |= PrivMode_scrollBar;
675 } 646 }
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 647
688 run_command (argv); 648 run_command (argv);
689} 649}
690 650
691/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
… …
706 continue; 666 continue;
707 667
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 669 {
710#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 672 rs[Rs_color + i] = def_colorName[!i];
713 else 673 else
714#endif 674#endif
715 rs[Rs_color + i] = def_colorName[i]; 675 rs[Rs_color + i] = def_colorName[i];
716 676
… …
741 } 701 }
742 } 702 }
743 } 703 }
744 704
745 pix_colors[i] = xcol; 705 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i);
707 }
708
746#ifdef OFF_FOCUS_FADING 709#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 710 if (rs[Rs_fade])
711 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 712 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 713#endif
750 SET_PIXCOLOR (i);
751 }
752 714
753 if (display->depth <= 2) 715 if (display->depth <= 2)
754 { 716 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 717 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]; 718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
757 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
758 } 720 }
759 721
760 /* 722 /*
761 * get scrollBar/menuBar shadow colors 723 * get scrollBar shadow colors
762 * 724 *
763 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 726 * from the fvwm window manager.
765 */ 727 */
766#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
767 729
768 if (display->depth <= 2) 730 if (display->depth <= 2)
731 {
769 { /* Monochrome */ 732 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 736 }
774 else 737 else
… …
810 int i = atoi (rs[Rs_color + idx]); 773 int i = atoi (rs[Rs_color + idx]);
811 774
812 if (i >= 8 && i <= 15) 775 if (i >= 8 && i <= 15)
813 { /* bright colors */ 776 { /* bright colors */
814 i -= 8; 777 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817 return; 779 return;
818#endif
819 } 780 }
820 781
821 if (i >= 0 && i <= 7) /* normal colors */ 782 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 784 }
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
919{ 880{
920 XClassHint classHint; 881 XClassHint classHint;
921 XWMHints wmHint; 882 XWMHints wmHint;
922#if ENABLE_FRILLS 883#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 884 MWMHints mwmhints;
925#endif 885#endif
926 XGCValues gcvalue; 886 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
929 XWindowAttributes gattr;
930 Window top; 888 Window top, parent;
931 dDisp; 889 dDisp;
932 890
933#ifdef USING_W11LIB 891 xa = display->xa;
934 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event);
936#endif
937 892
938 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 893 /* grab colors before netscape does */
939 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 894 Get_Colours ();
940 895
941 if (options & Opt_transparent) 896 if (!set_fonts ())
942 { 897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 898
944 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 899 parent = display->root;
945 } 900
901 attributes.override_redirect = !!OPTION (Opt_override_redirect);
946 902
947#if ENABLE_FRILLS 903#if ENABLE_FRILLS
948 if (options & Opt_borderLess) 904 if (OPTION (Opt_borderLess))
949 { 905 {
950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
951
952 if (prop == None)
953 { 907 {
954 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
955#ifdef PREFER_24BIT
956 attributes.override_redirect = TRUE; 909 attributes.override_redirect = TRUE;
957#endif
958 mwmhints.flags = 0; 910 mwmhints.flags = 0;
959 } 911 }
960 else 912 else
961 { 913 {
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 914 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 915 mwmhints.decorations = 0;
964 } 916 }
965 } 917 }
966 else 918 else
967 {
968 mwmhints.flags = 0; 919 mwmhints.flags = 0;
969 }
970#endif 920#endif
971 921
972 /* grab colors before netscape does */ 922#if ENABLE_XEMBED
973 Get_Colours ();
974
975 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977
978#if ENABLE_FRILLS
979 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
980 { 924 {
981 top = strtol (rs[Rs_embed], 0, 0);
982
983 XWindowAttributes wattr; 925 XWindowAttributes wattr;
926
927 parent = strtol (rs[Rs_embed], 0, 0);
928
984 XGetWindowAttributes (disp, top, &wattr); 929 if (!XGetWindowAttributes (disp, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985 931
986 window_calc (wattr.width, wattr.height); 932 window_calc (wattr.width, wattr.height);
987
988#if 0
989 if (wattr.map_state == IsViewable)
990 {
991 TermWin.mapped = 1;
992 refresh_type = FAST_REFRESH;
993 XClearWindow (disp, top);
994 // TODO: make XMapNotify-event-code a function and call it
995 // TODO: how can I detetc visibility without unmpa/map?
996 // TODO: focusin etc.
997 }
998#else
999 // it'S easiets just to unmap/map to get all state correctly set-up
1000 XUnmapWindow (disp, top);
1001#endif
1002 }
1003 else
1004#endif
1005 { 933 }
934#endif
935
1006 window_calc (0, 0); 936 window_calc (0, 0);
1007 937
1008 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
1009#ifdef PREFER_24BIT
1010 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused[Color_border];
1011 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused[Color_border];
1012 attributes.colormap = display->cmap; 941 attributes.colormap = display->cmap;
1013 top = XCreateWindow (disp, DefaultRootWindow (disp), 942
943 top = XCreateWindow (disp, parent,
1014 szHint.x, szHint.y, 944 szHint.x, szHint.y,
1015 szHint.width, szHint.height, 945 szHint.width, szHint.height,
1016 TermWin.ext_bwidth, 946 ext_bwidth,
1017 display->depth, InputOutput, 947 display->depth, InputOutput,
1018 display->visual, 948 display->visual,
1019 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1020#else 950 &attributes);
1021 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1022 szHint.x, szHint.y,
1023 szHint.width, szHint.height,
1024 TermWin.ext_bwidth,
1025 pix_colors_focused[Color_border],
1026 pix_colors_focused[Color_border]);
1027#endif
1028 }
1029 951
1030 TermWin.parent[0] = top; 952 this->parent[0] = top;
1031 953
1032 old_width = szHint.width; 954 old_width = szHint.width;
1033 old_height = szHint.height; 955 old_height = szHint.height;
1034 956
1035 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1036 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1037 959
1038 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
1039 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
1040 962
1041 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1042 wmHint.input = True; 964 wmHint.input = True;
1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1044 wmHint.window_group = top; 966 wmHint.window_group = top;
1045 967
1046 XSetWMProperties (disp, top, NULL, NULL, 968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1047 (char **)argv, argc, &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
1048
1049 /* Enable delete window protocol */
1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1051 970
1052#if ENABLE_FRILLS 971#if ENABLE_FRILLS
972 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif
976
977 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH
980 xa[XA_NET_WM_PING],
981#endif
982 };
983
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985
986#if ENABLE_FRILLS
987 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif
990
991#if ENABLE_EWMH
1053 long pid = getpid (); 992 long pid = getpid ();
1054 993
1055 XChangeProperty (disp, top, 994 XChangeProperty (disp, top,
1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 995 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1057 PropModeReplace, (unsigned char *)&pid, 1); 996 PropModeReplace, (unsigned char *)&pid, 1);
997
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 999#endif
1059 1000
1060 XSelectInput (disp, top, 1001 XSelectInput (disp, top,
1061 KeyPressMask 1002 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1004 | KeyReleaseMask
1064#endif 1005#endif
1065 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask
1067 | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1008
1068 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1069
1070#if ENABLE_FRILLS
1071 if (mwmhints.flags)
1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1073 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1074#endif
1075 1010
1076 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1077 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1078 1013
1079#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1014#ifdef HAVE_SCROLLBARS
1080 /* cursor (menuBar/scrollBar): Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1082#endif 1017#endif
1083 1018
1084 /* the vt window */ 1019 /* the vt window */
1085 TermWin.vt = XCreateSimpleWindow (disp, top, 1020 vt = XCreateSimpleWindow (disp, top,
1086 window_vt_x,
1087 window_vt_y, 1021 window_vt_x, window_vt_y,
1088 TermWin_TotalWidth (), 1022 width, height,
1089 TermWin_TotalHeight (),
1090 0, 1023 0,
1091 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1093#ifdef DEBUG_X
1094 XStoreName (disp, TermWin.vt, "vt window");
1095#endif
1096 1026
1097 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1099 1029
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1031
1102 pointer_unblank (); 1032 if (OPTION (Opt_pointerBlank))
1103
1104#ifdef POINTER_BLANK
1105 if (options & Opt_pointerBlank)
1106 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1107 else 1034 else
1108#endif
1109 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1110 1036
1111 XSelectInput (disp, TermWin.vt, vt_emask); 1037 vt_select_input ();
1038
1112 vt_ev.start (display, TermWin.vt); 1039 vt_ev.start (display, vt);
1113
1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1115 if (menuBar_height ())
1116 {
1117 menuBar.win = XCreateSimpleWindow (disp, top,
1118 window_vt_x, 0,
1119 TermWin_TotalWidth (),
1120 menuBar_TotalHeight (),
1121 0,
1122 pix_colors_focused[Color_fg],
1123 pix_colors_focused[Color_scroll]);
1124
1125#ifdef DEBUG_X
1126 XStoreName (disp, menuBar.win, "menubar");
1127#endif
1128
1129 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1130
1131 XDefineCursor (disp, menuBar.win,
1132 XCreateFontCursor (disp, XC_left_ptr));
1133
1134 XSelectInput (disp, menuBar.win,
1135 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1136 menubar_ev.start (display, menuBar.win);
1137 }
1138#endif
1139 1040
1140#ifdef XPM_BACKGROUND 1041#ifdef XPM_BACKGROUND
1141 if (rs[Rs_backgroundPixmap] != NULL 1042 if (rs[Rs_backgroundPixmap] != NULL
1142 && ! (options & Opt_transparent)) 1043 && ! OPTION (Opt_transparent))
1143 { 1044 {
1144 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1145 1046
1146 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1147 { 1048 {
… …
1153 scr_touch (true); 1054 scr_touch (true);
1154 } 1055 }
1155#endif 1056#endif
1156 1057
1157 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1158 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1159 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1160 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 1;
1062
1161 TermWin.gc = XCreateGC (disp, TermWin.vt, 1063 gc = XCreateGC (disp, vt,
1162 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1163 &gcvalue); 1065 &gcvalue);
1164 1066
1165 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1067 drawable = new rxvt_drawable (display, vt);
1166 1068
1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1168 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1169 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1170 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1171 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1173 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1174#endif 1076#endif
1175 1077
1176#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1177 // initially we are in unfocused state 1079 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1180#endif 1082#endif
1181 1083
1084 pointer_unblank ();
1182 scr_recolour (); 1085 scr_recolour ();
1183} 1086}
1184 1087
1185/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1186 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
… …
1192 /* 1095 /*
1193 * standard System V termios interface 1096 * standard System V termios interface
1194 */ 1097 */
1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1196 { 1099 {
1197 /* return error - use system defaults */ 1100 // return error - use system defaults,
1101 // where possible, and zero elsewhere
1102 memset (tio, 0, sizeof (ttymode_t));
1103
1198 tio->c_cc[VINTR] = CINTR; 1104 tio->c_cc[VINTR] = CINTR;
1199 tio->c_cc[VQUIT] = CQUIT; 1105 tio->c_cc[VQUIT] = CQUIT;
1200 tio->c_cc[VERASE] = CERASE; 1106 tio->c_cc[VERASE] = CERASE;
1107#ifdef VERASE2
1108 tio->c_cc[VERASE2] = CERASE2;
1109#endif
1201 tio->c_cc[VKILL] = CKILL; 1110 tio->c_cc[VKILL] = CKILL;
1202 tio->c_cc[VSTART] = CSTART; 1111 tio->c_cc[VSTART] = CSTART;
1203 tio->c_cc[VSTOP] = CSTOP; 1112 tio->c_cc[VSTOP] = CSTOP;
1204 tio->c_cc[VSUSP] = CSUSP; 1113 tio->c_cc[VSUSP] = CSUSP;
1205# ifdef VDSUSP 1114# ifdef VDSUSP
1206
1207 tio->c_cc[VDSUSP] = CDSUSP; 1115 tio->c_cc[VDSUSP] = CDSUSP;
1208# endif 1116# endif
1209# ifdef VREPRINT 1117# ifdef VREPRINT
1210
1211 tio->c_cc[VREPRINT] = CRPRNT; 1118 tio->c_cc[VREPRINT] = CRPRNT;
1212# endif 1119# endif
1213# ifdef VDISCRD 1120# ifdef VDISCRD
1214
1215 tio->c_cc[VDISCRD] = CFLUSH; 1121 tio->c_cc[VDISCRD] = CFLUSH;
1216# endif 1122# endif
1217# ifdef VWERSE 1123# ifdef VWERSE
1218
1219 tio->c_cc[VWERSE] = CWERASE; 1124 tio->c_cc[VWERSE] = CWERASE;
1220# endif 1125# endif
1221# ifdef VLNEXT 1126# ifdef VLNEXT
1222
1223 tio->c_cc[VLNEXT] = CLNEXT; 1127 tio->c_cc[VLNEXT] = CLNEXT;
1224# endif 1128# endif
1225
1226 } 1129 }
1130
1227 tio->c_cc[VEOF] = CEOF; 1131 tio->c_cc[VEOF] = CEOF;
1228 tio->c_cc[VEOL] = VDISABLE; 1132 tio->c_cc[VEOL] = VDISABLE;
1229# ifdef VEOL2 1133# ifdef VEOL2
1230
1231 tio->c_cc[VEOL2] = VDISABLE; 1134 tio->c_cc[VEOL2] = VDISABLE;
1232# endif 1135# endif
1233# ifdef VSWTC 1136# ifdef VSWTC
1234
1235 tio->c_cc[VSWTC] = VDISABLE; 1137 tio->c_cc[VSWTC] = VDISABLE;
1236# endif 1138# endif
1237# ifdef VSWTCH 1139# ifdef VSWTCH
1238
1239 tio->c_cc[VSWTCH] = VDISABLE; 1140 tio->c_cc[VSWTCH] = VDISABLE;
1240# endif 1141# endif
1241# if VMIN != VEOF 1142# if VMIN != VEOF
1242
1243 tio->c_cc[VMIN] = 1; 1143 tio->c_cc[VMIN] = 1;
1244# endif 1144# endif
1245# if VTIME != VEOL 1145# if VTIME != VEOL
1246
1247 tio->c_cc[VTIME] = 0; 1146 tio->c_cc[VTIME] = 0;
1248# endif 1147# endif
1249 1148
1250 if (erase != -1) 1149 if (erase != -1)
1251 tio->c_cc[VERASE] = (char)erase; 1150 tio->c_cc[VERASE] = (char)erase;
… …
1279 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1178 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1280 { 1179 {
1281 tio->sg.sg_erase = CERASE; /* ^H */ 1180 tio->sg.sg_erase = CERASE; /* ^H */
1282 tio->sg.sg_kill = CKILL; /* ^U */ 1181 tio->sg.sg_kill = CKILL; /* ^U */
1283 } 1182 }
1183
1284 if (erase != -1) 1184 if (erase != -1)
1285 tio->sg.sg_erase = (char)erase; 1185 tio->sg.sg_erase = (char)erase;
1286 1186
1287 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1187 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1288 1188
… …
1294 tio->tc.t_startc = CSTART; /* ^Q */ 1194 tio->tc.t_startc = CSTART; /* ^Q */
1295 tio->tc.t_stopc = CSTOP; /* ^S */ 1195 tio->tc.t_stopc = CSTOP; /* ^S */
1296 tio->tc.t_eofc = CEOF; /* ^D */ 1196 tio->tc.t_eofc = CEOF; /* ^D */
1297 tio->tc.t_brkc = -1; 1197 tio->tc.t_brkc = -1;
1298 } 1198 }
1199
1299 /* get local special chars */ 1200 /* get local special chars */
1300 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1201 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1301 { 1202 {
1302 tio->lc.t_suspc = CSUSP; /* ^Z */ 1203 tio->lc.t_suspc = CSUSP; /* ^Z */
1303 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1204 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1307 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1208 tio->lc.t_lnextc = CLNEXT; /* ^V */
1308 } 1209 }
1309 /* get line discipline */ 1210 /* get line discipline */
1310 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1211 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1311# ifdef NTTYDISC 1212# ifdef NTTYDISC
1312
1313 tio->line = NTTYDISC; 1213 tio->line = NTTYDISC;
1314# endif /* NTTYDISC */ 1214# endif /* NTTYDISC */
1315 1215
1316 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1216 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1317#endif /* HAVE_TERMIOS_H */ 1217#endif /* HAVE_TERMIOS_H */
… …
1340 FOO (IGNCR, "IGNCR"); 1240 FOO (IGNCR, "IGNCR");
1341 FOO (ICRNL, "ICRNL"); 1241 FOO (ICRNL, "ICRNL");
1342 FOO (IXON, "IXON"); 1242 FOO (IXON, "IXON");
1343 FOO (IXOFF, "IXOFF"); 1243 FOO (IXOFF, "IXOFF");
1344# ifdef IUCLC 1244# ifdef IUCLC
1345
1346 FOO (IUCLC, "IUCLC"); 1245 FOO (IUCLC, "IUCLC");
1347# endif 1246# endif
1348# ifdef IXANY 1247# ifdef IXANY
1349
1350 FOO (IXANY, "IXANY"); 1248 FOO (IXANY, "IXANY");
1351# endif 1249# endif
1352# ifdef IMAXBEL 1250# ifdef IMAXBEL
1353
1354 FOO (IMAXBEL, "IMAXBEL"); 1251 FOO (IMAXBEL, "IMAXBEL");
1355# endif 1252# endif
1356 1253
1357 fprintf (stderr, "\n"); 1254 fprintf (stderr, "\n");
1358 1255
… …
1365 FOO (VERASE, "VERASE"); 1262 FOO (VERASE, "VERASE");
1366 FOO (VKILL, "VKILL"); 1263 FOO (VKILL, "VKILL");
1367 FOO (VEOF, "VEOF"); 1264 FOO (VEOF, "VEOF");
1368 FOO (VEOL, "VEOL"); 1265 FOO (VEOL, "VEOL");
1369# ifdef VEOL2 1266# ifdef VEOL2
1370
1371 FOO (VEOL2, "VEOL2"); 1267 FOO (VEOL2, "VEOL2");
1372# endif 1268# endif
1373# ifdef VSWTC 1269# ifdef VSWTC
1374
1375 FOO (VSWTC, "VSWTC"); 1270 FOO (VSWTC, "VSWTC");
1376# endif 1271# endif
1377# ifdef VSWTCH 1272# ifdef VSWTCH
1378
1379 FOO (VSWTCH, "VSWTCH"); 1273 FOO (VSWTCH, "VSWTCH");
1380# endif 1274# endif
1381
1382 FOO (VSTART, "VSTART"); 1275 FOO (VSTART, "VSTART");
1383 FOO (VSTOP, "VSTOP"); 1276 FOO (VSTOP, "VSTOP");
1384 FOO (VSUSP, "VSUSP"); 1277 FOO (VSUSP, "VSUSP");
1385# ifdef VDSUSP 1278# ifdef VDSUSP
1386
1387 FOO (VDSUSP, "VDSUSP"); 1279 FOO (VDSUSP, "VDSUSP");
1388# endif 1280# endif
1389# ifdef VREPRINT 1281# ifdef VREPRINT
1390
1391 FOO (VREPRINT, "VREPRINT"); 1282 FOO (VREPRINT, "VREPRINT");
1392# endif 1283# endif
1393# ifdef VDISCRD 1284# ifdef VDISCRD
1394
1395 FOO (VDISCRD, "VDISCRD"); 1285 FOO (VDISCRD, "VDISCRD");
1396# endif 1286# endif
1397# ifdef VWERSE 1287# ifdef VWERSE
1398
1399 FOO (VWERSE, "VWERSE"); 1288 FOO (VWERSE, "VWERSE");
1400# endif 1289# endif
1401# ifdef VLNEXT 1290# ifdef VLNEXT
1402
1403 FOO (VLNEXT, "VLNEXT"); 1291 FOO (VLNEXT, "VLNEXT");
1404# endif 1292# endif
1405 1293
1406 fprintf (stderr, "\n"); 1294 fprintf (stderr, "\n");
1407# undef FOO 1295# undef FOO
… …
1419rxvt_term::run_command (const char *const *argv) 1307rxvt_term::run_command (const char *const *argv)
1420{ 1308{
1421#if ENABLE_FRILLS 1309#if ENABLE_FRILLS
1422 if (rs[Rs_pty_fd]) 1310 if (rs[Rs_pty_fd])
1423 { 1311 {
1424 pty.pty = atoi (rs[Rs_pty_fd]); 1312 pty->pty = atoi (rs[Rs_pty_fd]);
1425 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1313
1314 if (pty->pty >= 0)
1315 {
1316 if (getfd_hook)
1317 pty->pty = (*getfd_hook) (pty->pty);
1318
1319 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1320 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1321 }
1426 } 1322 }
1427 else 1323 else
1428#endif 1324#endif
1429 if (!pty.get ()) 1325 if (!pty->get ())
1430 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1431 1327
1432 pty.set_utf8_mode (enc_utf8); 1328 pty->set_utf8_mode (enc_utf8);
1433 1329
1434 /* set initial window size */ 1330 /* set initial window size */
1435 tt_winch (); 1331 tt_winch ();
1436 1332
1437 int er; 1333 int er;
… …
1450#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1451 if (rs[Rs_pty_fd]) 1347 if (rs[Rs_pty_fd])
1452 return; 1348 return;
1453#endif 1349#endif
1454 1350
1455 sw_chld.start (SIGCHLD);
1456
1457#ifndef __QNX__
1458 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1459 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1460 { 1353 {
1461 case -1: 1354 case -1:
1462 { 1355 {
… …
1464 rxvt_fatal ("can't fork, aborting.\n"); 1357 rxvt_fatal ("can't fork, aborting.\n");
1465 } 1358 }
1466 case 0: 1359 case 0:
1467 init_env (); 1360 init_env ();
1468 1361
1469 if (!pty.make_controlling_tty ()) 1362 if (!pty->make_controlling_tty ())
1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1363 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1471 else 1364 else
1472 { 1365 {
1473 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1474 dup2 (pty.tty, STDIN_FILENO); 1367 dup2 (pty->tty, STDIN_FILENO);
1475 dup2 (pty.tty, STDOUT_FILENO); 1368 dup2 (pty->tty, STDOUT_FILENO);
1476 dup2 (pty.tty, STDERR_FILENO); 1369 dup2 (pty->tty, STDERR_FILENO);
1477 1370
1478 // close all our file handles that we do no longer need 1371 // close all our file handles that we do no longer need
1479 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1372 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1480 { 1373 {
1481 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1374 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1482 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1375 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1483 } 1376 }
1484 1377
1485 run_child (argv); 1378 run_child (argv);
1486 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1379 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1487 } 1380 }
1488 1381
1489 _exit (EXIT_FAILURE); 1382 _exit (EXIT_FAILURE);
1490 1383
1491 default: 1384 default:
1492 { 1385 if (!OPTION (Opt_utmpInhibit))
1493#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1494 int fdstdin;
1495 1387
1496 fdstdin = dup (STDIN_FILENO); 1388 pty->close_tty ();
1497 dup2 (pty.tty, STDIN_FILENO);
1498#endif
1499 1389
1500#ifdef UTMP_SUPPORT 1390 child_ev.start (cmd_pid);
1501 privileged_utmp (SAVE);
1502#endif
1503 1391
1504#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1392 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1505
1506 dup2 (fdstdin, STDIN_FILENO);
1507 close (fdstdin);
1508#endif
1509 }
1510
1511 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1512 break; 1393 break;
1513 } 1394 }
1514#else /* __QNX__ uses qnxspawn () */
1515 fchmod (pty.tty, 0622);
1516 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1517 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1518
1519 if (run_child (argv) == -1)
1520 exit (EXIT_FAILURE);
1521#endif
1522} 1395}
1523 1396
1524/* ------------------------------------------------------------------------- * 1397/* ------------------------------------------------------------------------- *
1525 * CHILD PROCESS OPERATIONS * 1398 * CHILD PROCESS OPERATIONS *
1526 * ------------------------------------------------------------------------- */ 1399 * ------------------------------------------------------------------------- */
… …
1533{ 1406{
1534 char *login; 1407 char *login;
1535 1408
1536 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1537 1410
1538 if (options & Opt_console) 1411 if (OPTION (Opt_console))
1539 { /* be virtual console, fail silently */ 1412 { /* be virtual console, fail silently */
1540#ifdef TIOCCONS 1413#ifdef TIOCCONS
1541 unsigned int on = 1; 1414 unsigned int on = 1;
1542 1415
1543 ioctl (STDIN_FILENO, TIOCCONS, &on); 1416 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1570 // unblock signals (signals are blocked by iom.C 1443 // unblock signals (signals are blocked by iom.C
1571 sigset_t ss; 1444 sigset_t ss;
1572 sigemptyset (&ss); 1445 sigemptyset (&ss);
1573 sigprocmask (SIG_SETMASK, &ss, 0); 1446 sigprocmask (SIG_SETMASK, &ss, 0);
1574 1447
1575#ifndef __QNX__
1576 /* command interpreter path */ 1448 /* command interpreter path */
1577 if (argv != NULL) 1449 if (argv != NULL)
1578 { 1450 {
1579# ifdef DEBUG_CMD 1451# ifdef DEBUG_CMD
1580 int i; 1452 int i;
… …
1586 execvp (argv[0], (char *const *)argv); 1458 execvp (argv[0], (char *const *)argv);
1587 /* no error message: STDERR is closed! */ 1459 /* no error message: STDERR is closed! */
1588 } 1460 }
1589 else 1461 else
1590 { 1462 {
1591 const char *argv0, *shell; 1463 const char *argv0, *shell;
1592 1464
1593 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1594 shell = "/bin/sh"; 1466 shell = "/bin/sh";
1595 1467
1596 argv0 = (const char *)rxvt_r_basename (shell); 1468 argv0 = (const char *)rxvt_r_basename (shell);
1597 1469
1598 if (options & Opt_loginShell) 1470 if (OPTION (Opt_loginShell))
1599 { 1471 {
1600 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1601 1473
1602 login[0] = '-'; 1474 login[0] = '-';
1603 strcpy (&login[1], argv0); 1475 strcpy (&login[1], argv0);
1604 argv0 = login; 1476 argv0 = login;
1605 } 1477 }
1478
1606 execlp (shell, argv0, NULL); 1479 execlp (shell, argv0, NULL);
1607 /* no error message: STDERR is closed! */ 1480 /* no error message: STDERR is closed! */
1608 } 1481 }
1609 1482
1610#else /* __QNX__ uses qnxspawn () */
1611
1612 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1613 char *command = NULL, fullcommand[_MAX_PATH];
1614 char **arg_v, *arg_a[2] = { NULL, NULL };
1615
1616 if (argv != NULL)
1617 {
1618 if (access (argv[0], X_OK) == -1)
1619 {
1620 if (strchr (argv[0], '/') == NULL)
1621 {
1622 searchenv (argv[0], "PATH", fullcommand);
1623
1624 if (fullcommand[0] != '\0')
1625 command = fullcommand;
1626 }
1627
1628 if (access (command, X_OK) == -1)
1629 return -1;
1630 }
1631 else
1632 command = argv[0];
1633
1634 arg_v = argv;
1635 }
1636 else
1637 {
1638 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1639 command = "/bin/sh";
1640
1641 arg_a[0] = my_basename (command);
1642
1643 if (options & Opt_loginShell)
1644 {
1645 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1646
1647 login[0] = '-';
1648 strcpy (&login[1], arg_a[0]);
1649 arg_a[0] = login;
1650 }
1651
1652 arg_v = arg_a;
1653 }
1654
1655 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1656 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1657 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1658 command, arg_v, environ, iov_a, 0);
1659 if (login)
1660 free (login);
1661
1662 pty.close_tty ();
1663 return pty.pty;
1664#endif
1665
1666 return -1; 1483 return -1;
1667} 1484}
1668 1485
1669/*----------------------- end-of-file (C source) -----------------------*/ 1486/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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