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.18 by pcg, Tue Jan 20 01:35:39 2004 UTC vs.
Revision 1.37 by pcg, Tue Feb 24 21:46:14 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.18 2004/01/20 01:35:39 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
10 * - extensive modifications 9 * - extensive modifications
11 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
12 * - extensive modifications 11 * - extensive modifications
13 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
14 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 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.
… …
327#endif 327#endif
328#ifdef KEEP_SCROLLCOLOR 328#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 329 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 330 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
332
332 }; 333 };
333 334
334const char *const xa_names[NUM_XA] = 335const char *const xa_names[NUM_XA] =
335 { 336 {
337 "TEXT",
336 "COMPOUND_TEXT", 338 "COMPOUND_TEXT",
339 "UTF8_STRING",
337 "MULTIPLE", 340 "MULTIPLE",
338 "TARGETS", 341 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 342 "TIMESTAMP",
341 "VT_SELECTION", 343 "VT_SELECTION",
342 "INCR", 344 "INCR",
343 "WM_DELETE_WINDOW", 345 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 346#ifdef TRANSPARENT
… …
371 MEvent.time = CurrentTime; 373 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 374 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 375 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 376 want_refresh = 1;
375 cmd_pid = -1; 377 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 378 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 379 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 380 TermWin.focus = 0;
379 TermWin.ncol = 80; 381 TermWin.ncol = 80;
380 TermWin.nrow = 24; 382 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 383 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
397#if defined (HOTKEY_CTRL) || defined (HOTKEY_META) 399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
398 ks_bigfont = XK_greater; 400 ks_bigfont = XK_greater;
399 ks_smallfont = XK_less; 401 ks_smallfont = XK_less;
400#endif 402#endif
401 403
402#ifdef GREEK_SUPPORT
403 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
404#endif
405
406 refresh_limit = 1; 404 refresh_limit = 1;
407 refresh_type = SLOW_REFRESH; 405 refresh_type = SLOW_REFRESH;
408 prev_nrow = prev_ncol = 0; 406 prev_nrow = prev_ncol = 0;
409#ifdef MULTICHAR_SET
410# ifdef MULTICHAR_ENCODING
411 encoding_method = MULTICHAR_ENCODING;
412# endif
413 multichar_decode = rxvt_euc2jis;
414#endif
415 407
416 oldcursor.row = oldcursor.col = -1; 408 oldcursor.row = oldcursor.col = -1;
417#ifdef XPM_BACKGROUND 409#ifdef XPM_BACKGROUND
418 /* bgPixmap.w = bgPixmap.h = 0; */ 410 /* bgPixmap.w = bgPixmap.h = 0; */
419 bgPixmap.x = bgPixmap.y = 50; 411 bgPixmap.x = bgPixmap.y = 50;
… …
422 414
423 last_bot = last_state = -1; 415 last_bot = last_state = -1;
424 416
425#ifdef MENUBAR 417#ifdef MENUBAR
426 menu_readonly = 1; 418 menu_readonly = 1;
427# if !(MENUBAR_MAX > 1) 419# if ! (MENUBAR_MAX > 1)
428 CurrentBar = &(BarList); 420 CurrentBar = & (BarList);
429# endif /* (MENUBAR_MAX > 1) */ 421# endif /* (MENUBAR_MAX > 1) */
430#endif 422#endif
431 423
432 return true; 424 return true;
433} 425}
… …
444 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 436 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
445 ttygid = gr->gr_gid; 437 ttygid = gr->gr_gid;
446 } 438 }
447 else 439 else
448#endif /* TTY_GID_SUPPORT */ 440#endif /* TTY_GID_SUPPORT */
441
449 { 442 {
450 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 443 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
451 ttygid = getgid (); 444 ttygid = getgid ();
452 } 445 }
453 446
… …
473 { 466 {
474#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 467#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
475 if (i == 4 || i == 7) 468 if (i == 4 || i == 7)
476 continue; 469 continue;
477#endif 470#endif
478 close(i); 471 close (i);
479 } 472 }
480#endif 473#endif
481} 474}
482 475
483/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
… …
490 483
491 /* 484 /*
492 * Look for -exec option. Find => split and make cmd_argv[] of command args 485 * Look for -exec option. Find => split and make cmd_argv[] of command args
493 */ 486 */
494 for (r_argc = 0; r_argc < argc; r_argc++) 487 for (r_argc = 0; r_argc < argc; r_argc++)
495 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 488 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec"))
496 break; 489 break;
497 490
498 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 491 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
499 492
500 for (i = 0; i < r_argc; i++) 493 for (i = 0; i < r_argc; i++)
501 r_argv[i] = (const char *)argv[i]; 494 r_argv[i] = (const char *)argv[i];
502 495
503 r_argv[i] = NULL; 496 r_argv[i] = NULL;
504 497
505 if (r_argc == argc) 498 if (r_argc == argc)
506 cmd_argv = NULL; 499 cmd_argv = NULL;
507 else 500 else
508 { 501 {
509 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 502 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
510 503
511 for (i = 0; i < argc - r_argc - 1; i++) 504 for (i = 0; i < argc - r_argc - 1; i++)
512 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 505 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
513 506
514 cmd_argv[i] = NULL; 507 cmd_argv[i] = NULL;
… …
516 509
517 /* clear all resources */ 510 /* clear all resources */
518 for (i = 0; i < NUM_RESOURCES;) 511 for (i = 0; i < NUM_RESOURCES;)
519 rs[i++] = NULL; 512 rs[i++] = NULL;
520 513
521 rs[Rs_name] = rxvt_r_basename(argv[0]); 514 rs[Rs_name] = rxvt_r_basename (argv[0]);
522 515
523 /* 516 /*
524 * Open display, get options/resources and create the window 517 * Open display, get options/resources and create the window
525 */ 518 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 519 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
527 rs[Rs_display_name] = ":0"; 520 rs[Rs_display_name] = ":0";
528 521
529 rxvt_get_options (this, r_argc, r_argv); 522 get_options (r_argc, r_argv);
530 free (r_argv); 523 free (r_argv);
531 524
532#ifdef LOCAL_X_IS_UNIX 525#ifdef LOCAL_X_IS_UNIX
533 if (rs[Rs_display_name][0] == ':') 526 if (rs[Rs_display_name][0] == ':')
534 { 527 {
535 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 528 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
536 STRCPY (val, "unix"); 529 STRCPY (val, "unix");
537 STRCAT (val, rs[Rs_display_name]); 530 STRCAT (val, rs[Rs_display_name]);
538 Xdisplay = XOpenDisplay (val); 531 display = displays.get (val);
539 free (val); 532 free (val);
540 } 533 }
541#endif 534#endif
542 535
543 if (Xdisplay == NULL 536 if (!display
544 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 537 && ! (display = displays.get (rs[Rs_display_name])))
545 { 538 {
546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 539 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
547 exit (EXIT_FAILURE); 540 exit (EXIT_FAILURE);
548 } 541 }
549 542
550 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 543 extract_resources (display->display, rs[Rs_name]);
551 544
552 /* 545 /*
553 * set any defaults not already set 546 * set any defaults not already set
554 */ 547 */
555 if (cmd_argv && cmd_argv[0]) 548 if (cmd_argv && cmd_argv[0])
556 { 549 {
557 if (!rs[Rs_title]) 550 if (!rs[Rs_title])
558 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 551 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
559 if (!rs[Rs_iconName]) 552 if (!rs[Rs_iconName])
560 rs[Rs_iconName] = rs[Rs_title]; 553 rs[Rs_iconName] = rs[Rs_title];
561 } 554 }
562 else 555 else
563 { 556 {
… …
565 rs[Rs_title] = rs[Rs_name]; 558 rs[Rs_title] = rs[Rs_name];
566 if (!rs[Rs_iconName]) 559 if (!rs[Rs_iconName])
567 rs[Rs_iconName] = rs[Rs_name]; 560 rs[Rs_iconName] = rs[Rs_name];
568 } 561 }
569 562
570 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 563 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
571 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 564 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
572 565
573#ifndef NO_FRILLS 566#ifndef NO_FRILLS
574 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 567 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
575 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 568 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
576 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 569 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
577 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 570 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
578#endif 571#endif
579 572
580#ifndef NO_LINESPACE 573#ifndef NO_LINESPACE
581 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 574 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
582 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 575 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
583#endif 576#endif
584 577
585#ifdef POINTER_BLANK 578#ifdef POINTER_BLANK
586 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 579 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
587 pointerBlankDelay = i; 580 pointerBlankDelay = i;
588 else 581 else
589 pointerBlankDelay = 2; 582 pointerBlankDelay = 2;
590#endif 583#endif
591 584
… …
602 rs[Rs_cutchars] = CUTCHARS; 595 rs[Rs_cutchars] = CUTCHARS;
603 596
604#ifdef ACS_ASCII 597#ifdef ACS_ASCII
605 if (!rs[Rs_acs_chars]) 598 if (!rs[Rs_acs_chars])
606 rs[Rs_acs_chars] = ACS_CHARS; 599 rs[Rs_acs_chars] = ACS_CHARS;
607 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20) 600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
608 { 601 {
609 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20); 602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
610 for (; i < 0x20; ) 603 for (; i < 0x20; )
611 val[i] = ' '; 604 val[i] = ' ';
612 rs[Rs_acs_chars] = val; 605 rs[Rs_acs_chars] = val;
613 } 606 }
614#endif 607#endif
… …
620# else 613# else
621 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 614 key_backspace = "DEC"; /* can toggle between \010 or \177 */
622# endif 615# endif
623 else 616 else
624 { 617 {
625 val = STRDUP(rs[Rs_backspace_key]); 618 val = STRDUP (rs[Rs_backspace_key]);
626 rxvt_Str_trim(val); 619 rxvt_Str_trim (val);
627 rxvt_Str_escaped(val); 620 rxvt_Str_escaped (val);
628 key_backspace = val; 621 key_backspace = val;
629 } 622 }
630#endif 623#endif
631 624
632#ifndef NO_DELETE_KEY 625#ifndef NO_DELETE_KEY
… …
636# else 629# else
637 key_delete = "\033[3~"; 630 key_delete = "\033[3~";
638# endif 631# endif
639 else 632 else
640 { 633 {
641 val = STRDUP(rs[Rs_delete_key]); 634 val = STRDUP (rs[Rs_delete_key]);
642 rxvt_Str_trim(val); 635 rxvt_Str_trim (val);
643 rxvt_Str_escaped(val); 636 rxvt_Str_escaped (val);
644 key_delete = val; 637 key_delete = val;
645 } 638 }
646#endif 639#endif
647 if (rs[Rs_answerbackstring]) 640 if (rs[Rs_answerbackstring])
648 { 641 {
649 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
650 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
651 } 644 }
652 645
653 if (rs[Rs_selectstyle]) 646 if (rs[Rs_selectstyle])
654 { 647 {
655 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0) 648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
656 selection_style = OLD_WORD_SELECT; 649 selection_style = OLD_WORD_SELECT;
657#ifndef NO_OLD_SELECTION 650#ifndef NO_OLD_SELECTION
658 651
659 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
660 selection_style = OLD_SELECT; 653 selection_style = OLD_SELECT;
661#endif 654#endif
655
662 } 656 }
663 657
664#ifdef HAVE_SCROLLBARS 658#ifdef HAVE_SCROLLBARS
665 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 660 rs[Rs_scrollBar_thickness]);
667#endif 661#endif
668
669 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]);
671 TermWin.fwidth = TermWin.fontset->base_font ()->width;
672 TermWin.fheight = TermWin.fontset->base_font ()->height;
673 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
674 662
675#ifdef XTERM_REVERSE_VIDEO 663#ifdef XTERM_REVERSE_VIDEO
676 /* this is how xterm implements reverseVideo */ 664 /* this is how xterm implements reverseVideo */
677 if (Options & Opt_reverseVideo) 665 if (Options & Opt_reverseVideo)
678 { 666 {
… …
688 rs[Rs_color + i] = def_colorName[i]; 676 rs[Rs_color + i] = def_colorName[i];
689 677
690#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
691 /* this is how we implement reverseVideo */ 679 /* this is how we implement reverseVideo */
692 if (Options & Opt_reverseVideo) 680 if (Options & Opt_reverseVideo)
693 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 681 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
694#endif 682#endif
695 683
696 /* convenient aliases for setting fg/bg to colors */ 684 /* convenient aliases for setting fg/bg to colors */
697 color_aliases (Color_fg); 685 color_aliases (Color_fg);
698 color_aliases (Color_bg); 686 color_aliases (Color_bg);
… …
721 709
722#ifdef DISPLAY_IS_IP 710#ifdef DISPLAY_IS_IP
723 /* Fixup display_name for export over pty to any interested terminal 711 /* Fixup display_name for export over pty to any interested terminal
724 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 712 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
725 * (for the first non-loopback interface) that we get from 713 * (for the first non-loopback interface) that we get from
726 * rxvt_network_display(). This is more "name-resolution-portable", if you 714 * rxvt_network_display (). This is more "name-resolution-portable", if you
727 * will, and probably allows for faster x-client startup if your name 715 * will, and probably allows for faster x-client startup if your name
728 * server is beyond a slow link or overloaded at client startup. Of 716 * server is beyond a slow link or overloaded at client startup. Of
729 * course that only helps the shell's child processes, not us. 717 * course that only helps the shell's child processes, not us.
730 * 718 *
731 * Giving out the display_name also affords a potential security hole 719 * Giving out the display_name also affords a potential security hole
… …
733 val = rxvt_network_display (rs[Rs_display_name]); 721 val = rxvt_network_display (rs[Rs_display_name]);
734 rs[Rs_display_name] = (const char *)val; 722 rs[Rs_display_name] = (const char *)val;
735 723
736 if (val == NULL) 724 if (val == NULL)
737#endif /* DISPLAY_IS_IP */ 725#endif /* DISPLAY_IS_IP */
738 val = XDisplayString(Xdisplay); 726 val = XDisplayString (display->display);
739 727
740 if (rs[Rs_display_name] == NULL) 728 if (rs[Rs_display_name] == NULL)
741 rs[Rs_display_name] = val; /* use broken `:0' value */ 729 rs[Rs_display_name] = val; /* use broken `:0' value */
742 730
743 i = STRLEN (val); 731 i = STRLEN (val);
744 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 732 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
745 733
746 sprintf (env_display, "DISPLAY=%s", val); 734 sprintf (env_display, "DISPLAY=%s", val);
747 735
748 /* avoiding the math library: 736 /* avoiding the math library:
749 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 737 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
750 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 738 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
751 ; 739 ;
752 MAX_IT(i, 1); 740 MAX_IT (i, 1);
753 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 741 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
754 742
755 sprintf (env_windowid, "WINDOWID=%u", 743 sprintf (env_windowid, "WINDOWID=%u",
756 (unsigned int)TermWin.parent[0]); 744 (unsigned int)TermWin.parent[0]);
757 745
758 /* add entries to the environment: 746 /* add entries to the environment:
759 * @ DISPLAY: in case we started with -display 747 * @ DISPLAY: in case we started with -display
760 * @ WINDOWID: X window id number of the window 748 * @ WINDOWID: X window id number of the window
761 * @ COLORTERM: terminal sub-name and also indicates its color 749 * @ COLORTERM: terminal sub-name and also indicates its color
762 * @ TERM: terminal name 750 * @ TERM: terminal name
763 * @ TERMINFO: path to terminfo directory 751 * @ TERMINFO: path to terminfo directory
752 * @ COLORFGBG: fg;bg color codes
764 */ 753 */
765 putenv (env_display); 754 putenv (env_display);
766 putenv (env_windowid); 755 putenv (env_windowid);
756 if (env_colorfgbg)
757 putenv (env_colorfgbg);
767 758
768#ifdef RXVT_TERMINFO 759#ifdef RXVT_TERMINFO
769 putenv ("TERMINFO=" RXVT_TERMINFO); 760 putenv ("TERMINFO=" RXVT_TERMINFO);
770#endif 761#endif
771 762
772 if (Xdepth <= 2) 763 if (display->depth <= 2)
773 putenv ("COLORTERM=" COLORTERMENV "-mono"); 764 putenv ("COLORTERM=" COLORTERMENV "-mono");
774 else 765 else
775 putenv ("COLORTERM=" COLORTERMENVFULL); 766 putenv ("COLORTERM=" COLORTERMENVFULL);
776 767
777 if (rs[Rs_term_name] != NULL) 768 if (rs[Rs_term_name] != NULL)
778 { 769 {
779 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 770 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char));
780 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 771 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
781 putenv (env_term); 772 putenv (env_term);
782 } 773 }
783 else 774 else
784 putenv ("TERM=" TERMENV); 775 putenv ("TERM=" TERMENV);
… …
799void 790void
800rxvt_term::set_locale (const char *locale) 791rxvt_term::set_locale (const char *locale)
801{ 792{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 793#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 794 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, "")); 795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
796 SET_LOCALE (this->locale);
797 mbstate.reset ();
805#endif 798#endif
806#if HAVE_NL_LANGINFO 799#if HAVE_NL_LANGINFO
807 free (codeset); 800 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 801 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 802 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 803 || !STRCASECMP (codeset, "UTF8");
811#else 804#else
812 enc_utf8 = 1; 805 enc_utf8 = 1;
813#endif 806#endif
814} 807}
815 808
… …
821 rxvt_print_error ("Setting locale failed."); 814 rxvt_print_error ("Setting locale failed.");
822 else 815 else
823 { 816 {
824 Atom wmlocale; 817 Atom wmlocale;
825 818
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 819 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 820 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 821 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 822 (unsigned char *)locale, STRLEN (locale));
830 823
831 if (!XSupportsLocale ()) 824 if (!XSupportsLocale ())
832 { 825 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 826 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 827 return;
835 } 828 }
836 829
830 im_ev.start (display);
831
837 /* see if we can connect yet */ 832 /* see if we can connect already */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 833 im_cb ();
839
840 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL);
844 } 834 }
845#endif 835#endif
846} 836}
847 837
848/*----------------------------------------------------------------------*/ 838/*----------------------------------------------------------------------*/
849void 839void
850rxvt_term::init_command(const char *const *argv) 840rxvt_term::init_command (const char *const *argv)
851{ 841{
852 /* 842 /*
853 * Initialize the command connection. 843 * Initialize the command connection.
854 * This should be called after the X server connection is established. 844 * This should be called after the X server connection is established.
855 */ 845 */
856 int i; 846 int i;
857 847
858 for (i = 0; i < NUM_XA; i++) 848 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 849 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 850
861 /* Enable delete window protocol */ 851 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 852 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 853 & (xa[XA_WMDELETEWINDOW]), 1);
864 854
865#ifdef USING_W11LIB 855#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 856 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 857 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 858#endif
869 859
870#ifdef META8_OPTION 860#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 861 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 862#endif
873 863
874 rxvt_get_ourmods (this); 864 get_ourmods ();
875 865
876 if (!(Options & Opt_scrollTtyOutput)) 866 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 867 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 868 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 869 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 870 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 871 PrivateModes |= PrivMode_smoothScroll;
882 872
883#ifndef NO_BACKSPACE_KEY 873#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 874 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 875 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 876#endif
887 877
888 /* add value for scrollBar */ 878 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 879 if (scrollbar_visible ())
890 { 880 {
891 PrivateModes |= PrivMode_scrollBar; 881 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 882 SavedModes |= PrivMode_scrollBar;
893 } 883 }
894 if (menubar_visible (this)) 884 if (menubar_visible ())
895 { 885 {
896 PrivateModes |= PrivMode_menuBar; 886 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 887 SavedModes |= PrivMode_menuBar;
898 } 888 }
899 889
900#ifdef GREEK_SUPPORT
901 greek_init();
902#endif
903
904 Xfd = XConnectionNumber (Xdisplay);
905
906#ifdef CURSOR_BLINK 890#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 891 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 892 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 893#endif
911 894
912 if ((cmd_fd = run_command (argv)) < 0) 895 if ((cmd_fd = run_command (argv)) < 0)
… …
915 exit (EXIT_FAILURE); 898 exit (EXIT_FAILURE);
916 } 899 }
917} 900}
918 901
919/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 903void
922rxvt_Get_Colours (pR) 904rxvt_term::Get_Colours ()
923{ 905{
924 int i; 906 int i;
925 907
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 908 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 909 {
928 rxvt_color xcol; 910 rxvt_color xcol;
929 911
930 if (!R->rs[Rs_color + i]) 912 if (!rs[Rs_color + i])
931 continue; 913 continue;
932 914
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 915 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 916 {
935#ifndef XTERM_REVERSE_VIDEO 917#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 918 if (i < 2 && (Options & Opt_reverseVideo))
937 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 919 rs[Rs_color + i] = def_colorName[!i];
939 }
940 else 920 else
941#endif 921#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 922 rs[Rs_color + i] = def_colorName[i];
943 923
944 if (!R->rs[Rs_color + i]) 924 if (!rs[Rs_color + i])
945 continue; 925 continue;
946 926
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 927 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 928 {
949 switch (i) 929 switch (i)
950 { 930 {
951 case Color_fg: 931 case Color_fg:
952 case Color_bg: 932 case Color_bg:
953 /* fatal: need bg/fg color */ 933 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 934 rxvt_print_error ("aborting");
955 exit (EXIT_FAILURE); 935 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 936 /* NOTREACHED */
957 break; 937 break;
958#ifndef NO_CURSORCOLOR 938#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 939 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 940 xcol = PixColors[Color_fg];
961 break; 941 break;
962#endif /* ! NO_CURSORCOLOR */ 942#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 943 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 944 xcol = PixColors[Color_fg];
965 break; 945 break;
966 default: 946 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 947 xcol = PixColors[Color_bg]; /* None */
968 break; 948 break;
969 } 949 }
970 } 950 }
971 } 951 }
972 952
973 R->PixColors[i] = xcol; 953 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 954 SET_PIXCOLOR (i);
975 } 955 }
976 956
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 957 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 958 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 959 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 960 PixColors[Color_border] = PixColors[Color_fg];
981 961
982 /* 962 /*
983 * get scrollBar/menuBar shadow colors 963 * get scrollBar/menuBar shadow colors
984 * 964 *
985 * The calculations of topShadow/bottomShadow values are adapted 965 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 967 */
988#ifdef KEEP_SCROLLCOLOR 968#ifdef KEEP_SCROLLCOLOR
989 969
990 if (XDEPTH <= 2) 970 if (XDEPTH <= 2)
991 { /* Monochrome */ 971 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 972 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 973 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 974 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 975 }
996 else 976 else
997 { 977 {
998 rxvt_color xcol[3]; 978 rxvt_color xcol[3];
999 /* xcol[0] == white 979 /* xcol[0] == white
1000 * xcol[1] == top shadow 980 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 981 * xcol[2] == bot shadow */
1002 982
1003 xcol[1] = R->PixColors[Color_scroll]; 983 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 984# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 985 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 986 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1007# else 987# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 988 xcol[0].set (display, WhitePixel (display->display, display->screen));
1009# endif 989# endif
1010 990
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 991 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 992
1013 xcol[0].get (R, pr0, pg0, pb0); 993 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 994 xcol[1].get (display, pr1, pg1, pb1);
1015 995
1016 /* bottomShadowColor */ 996 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 997 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 998 xcol[2] = PixColors[Color_Black];
1019 999
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 1000 PixColors[Color_bottomShadow] = xcol[2];
1021 1001
1022 /* topShadowColor */ 1002 /* topShadowColor */
1023 if (!xcol[1].set (aR_ 1003 if (!xcol[1].set (display,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1004 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1005 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1006 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1027 xcol[1] = R->PixColors[Color_White]; 1007 xcol[1] = PixColors[Color_White];
1028 1008
1029 R->PixColors[Color_topShadow] = xcol[1]; 1009 PixColors[Color_topShadow] = xcol[1];
1030 } 1010 }
1031#endif /* KEEP_SCROLLCOLOR */ 1011#endif /* KEEP_SCROLLCOLOR */
1032} 1012}
1033 1013
1034/*----------------------------------------------------------------------*/ 1014/*----------------------------------------------------------------------*/
1035/* color aliases, fg/bg bright-bold */ 1015/* color aliases, fg/bg bright-bold */
1036void 1016void
1037rxvt_term::color_aliases(int idx) 1017rxvt_term::color_aliases (int idx)
1038{ 1018{
1039 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1019 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1040 { 1020 {
1041 int i = atoi (rs[Rs_color + idx]); 1021 int i = atoi (rs[Rs_color + idx]);
1042 1022
1043 if (i >= 8 && i <= 15) 1023 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1024 { /* bright colors */
1045 i -= 8; 1025 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1026#ifndef NO_BRIGHTCOLOR
1047 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1027 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1048 return; 1028 return;
1049#endif 1029#endif
1030
1050 } 1031 }
1051 1032
1052 if (i >= 0 && i <= 7) /* normal colors */ 1033 if (i >= 0 && i <= 7) /* normal colors */
1053 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1034 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1054 } 1035 }
… …
1057/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
1058/* 1039/*
1059 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1040 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1060 * Use resource ``modifier'' to override the Meta modifier 1041 * Use resource ``modifier'' to override the Meta modifier
1061 */ 1042 */
1062/* INTPROTO */
1063void 1043void
1064rxvt_get_ourmods(pR) 1044rxvt_term::get_ourmods ()
1065{ 1045{
1066 int i, j, k; 1046 int i, j, k;
1067 int requestedmeta, realmeta, realalt; 1047 int requestedmeta, realmeta, realalt;
1068 const char *cm, *rsmod; 1048 const char *cm, *rsmod;
1069 XModifierKeymap *map; 1049 XModifierKeymap *map;
… …
1072 { 1052 {
1073 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1053 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1074 }; 1054 };
1075 1055
1076 requestedmeta = realmeta = realalt = 0; 1056 requestedmeta = realmeta = realalt = 0;
1077 rsmod = R->rs[Rs_modifier]; 1057 rsmod = rs[Rs_modifier];
1078 if (rsmod 1058 if (rsmod
1079 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1059 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1080 requestedmeta = rsmod[3] - '0'; 1060 requestedmeta = rsmod[3] - '0';
1081 1061
1082 map = XGetModifierMapping(R->Xdisplay); 1062 map = XGetModifierMapping (display->display);
1083 kc = map->modifiermap; 1063 kc = map->modifiermap;
1084 for (i = 1; i < 6; i++) 1064 for (i = 1; i < 6; i++)
1085 { 1065 {
1086 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1066 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1087 for (j = map->max_keypermod; j--; k++) 1067 for (j = map->max_keypermod; j--; k++)
1088 { 1068 {
1089 if (kc[k] == 0) 1069 if (kc[k] == 0)
1090 break; 1070 break;
1091 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1071 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1092 { 1072 {
1093 case XK_Num_Lock: 1073 case XK_Num_Lock:
1094 R->ModNumLockMask = modmasks[i - 1]; 1074 ModNumLockMask = modmasks[i - 1];
1095 /* FALLTHROUGH */ 1075 /* FALLTHROUGH */
1096 default: 1076 default:
1097 continue; /* for(;;) */ 1077 continue; /* for (;;) */
1098 case XK_Meta_L: 1078 case XK_Meta_L:
1099 case XK_Meta_R: 1079 case XK_Meta_R:
1100 cm = "meta"; 1080 cm = "meta";
1101 realmeta = i; 1081 realmeta = i;
1102 break; 1082 break;
1103 case XK_Alt_L: 1083 case XK_Alt_L:
1104 case XK_Alt_R: 1084 case XK_Alt_R:
1105 cm = "alt"; 1085 cm = "alt";
1106 realalt = i; 1086 realalt = i;
1107 break; 1087 break;
1108 case XK_Super_L: 1088 case XK_Super_L:
1109 case XK_Super_R: 1089 case XK_Super_R:
1110 cm = "super"; 1090 cm = "super";
1111 break; 1091 break;
1112 case XK_Hyper_L: 1092 case XK_Hyper_L:
1113 case XK_Hyper_R: 1093 case XK_Hyper_R:
1114 cm = "hyper"; 1094 cm = "hyper";
1115 break; 1095 break;
1116 } 1096 }
1117 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1097 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1118 requestedmeta = i; 1098 requestedmeta = i;
1119 } 1099 }
1120 } 1100 }
1121 XFreeModifiermap(map); 1101 XFreeModifiermap (map);
1122 i = (requestedmeta ? requestedmeta 1102 i = (requestedmeta ? requestedmeta
1123 : (realmeta ? realmeta 1103 : (realmeta ? realmeta
1124 : (realalt ? realalt : 0))); 1104 : (realalt ? realalt : 0)));
1125 if (i) 1105 if (i)
1126 R->ModMetaMask = modmasks[i - 1]; 1106 ModMetaMask = modmasks[i - 1];
1127} 1107}
1128 1108
1129/*----------------------------------------------------------------------*/ 1109/*----------------------------------------------------------------------*/
1130/* rxvt_Create_Windows() - Open and map the window */ 1110/* rxvt_Create_Windows () - Open and map the window */
1131void 1111void
1132rxvt_term::create_windows (int argc, const char *const *argv) 1112rxvt_term::create_windows (int argc, const char *const *argv)
1133{ 1113{
1134 XClassHint classHint; 1114 XClassHint classHint;
1135 XWMHints wmHint; 1115 XWMHints wmHint;
1136 XGCValues gcvalue; 1116 XGCValues gcvalue;
1137 long vt_emask; 1117 long vt_emask;
1138 1118
1139 XSetWindowAttributes attributes;
1140 XWindowAttributes gattr; 1119 XWindowAttributes gattr;
1141 1120
1142 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1143 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1144 Xscreen = DefaultScreen (Xdisplay);
1145
1146 if (Options & Opt_transparent) 1121 if (Options & Opt_transparent)
1147 { 1122 {
1148 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1123 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1149 Xdepth = gattr.depth; 1124 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1150 }
1151 else
1152 {
1153 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1154#ifdef PREFER_24BIT
1155 /*
1156 * If depth is not 24, look for a 24bit visual.
1157 */
1158 if (Xdepth != 24)
1159 {
1160 XVisualInfo vinfo;
1161
1162 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1163 {
1164 Xdepth = 24;
1165 Xvisual = vinfo.visual;
1166 Xcmap = XCreateColormap(Xdisplay,
1167 RootWindow(Xdisplay, Xscreen),
1168 Xvisual, AllocNone);
1169 }
1170 }
1171#endif
1172 } 1125 }
1173 1126
1174 /* grab colors before netscape does */ 1127 /* grab colors before netscape does */
1175 rxvt_Get_Colours (this); 1128 Get_Colours ();
1176 1129
1177 rxvt_change_font (this, 1, NULL); 1130 if (!change_font (rs[Rs_font]))
1131 {
1132 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1133 destroy ();
1134 return;
1135 }
1136
1178 window_calc (0, 0); 1137 window_calc (0, 0);
1179 old_width = szHint.width; 1138 old_width = szHint.width;
1180 old_height = szHint.height; 1139 old_height = szHint.height;
1181 1140
1182 /* parent window - reverse video so we can see placement errors 1141 /* parent window - reverse video so we can see placement errors
1183 * sub-window placement & size in rxvt_resize_subwindows() 1142 * sub-window placement & size in rxvt_resize_subwindows ()
1184 */ 1143 */
1185 1144
1186#ifdef PREFER_24BIT 1145#ifdef PREFER_24BIT
1146 XSetWindowAttributes attributes;
1147
1187 attributes.background_pixel = PixColors[Color_fg]; 1148 attributes.background_pixel = PixColors[Color_fg];
1188 attributes.border_pixel = PixColors[Color_border]; 1149 attributes.border_pixel = PixColors[Color_border];
1189 attributes.colormap = Xcmap; 1150 attributes.colormap = display->cmap;
1190 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1151 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1191 szHint.x, szHint.y, 1152 szHint.x, szHint.y,
1192 szHint.width, szHint.height, 1153 szHint.width, szHint.height,
1193 TermWin.ext_bwidth, 1154 TermWin.ext_bwidth,
1194 Xdepth, InputOutput, 1155 display->depth, InputOutput,
1195 Xvisual, 1156 display->visual,
1196 CWBackPixel | CWBorderPixel
1197 | CWColormap, &attributes); 1157 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1198#else 1158#else
1199 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1159 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1200 szHint.x, szHint.y, 1160 szHint.x, szHint.y,
1201 szHint.width, 1161 szHint.width,
1202 szHint.height, 1162 szHint.height,
1203 TermWin.ext_bwidth, 1163 TermWin.ext_bwidth,
1204 PixColors[Color_border], 1164 PixColors[Color_border],
1205 PixColors[Color_fg]); 1165 PixColors[Color_fg]);
1206#endif 1166#endif
1207 1167
1208 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1209 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1210 1170
1211 classHint.res_name = (char *)rs[Rs_name]; 1171 classHint.res_name = (char *)rs[Rs_name];
1212 classHint.res_class = (char *)APL_CLASS; 1172 classHint.res_class = (char *)APL_CLASS;
1213 1173
1214 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1215 wmHint.input = True; 1175 wmHint.input = True;
1216 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1217 : NormalState); 1177 : NormalState);
1218 wmHint.window_group = TermWin.parent[0]; 1178 wmHint.window_group = TermWin.parent[0];
1219 1179
1220 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1180 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1221 (char **)argv, argc, &szHint, &wmHint, &classHint); 1181 (char **)argv, argc, &szHint, &wmHint, &classHint);
1182
1222 XSelectInput(Xdisplay, TermWin.parent[0], 1183 XSelectInput (display->display, TermWin.parent[0],
1223 (KeyPressMask 1184 KeyPressMask
1224#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1185#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1225 | KeyReleaseMask 1186 | KeyReleaseMask
1226#endif 1187#endif
1227 | FocusChangeMask | VisibilityChangeMask 1188 | FocusChangeMask | VisibilityChangeMask
1228 | StructureNotifyMask)); 1189 | StructureNotifyMask);
1190 termwin_ev.start (display, TermWin.parent[0]);
1229 1191
1230 /* vt cursor: Black-on-White is standard, but this is more popular */ 1192 /* vt cursor: Black-on-White is standard, but this is more popular */
1231 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1193 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1232 1194
1233#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1195#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1234 /* cursor (menuBar/scrollBar): Black-on-White */ 1196 /* cursor (menuBar/scrollBar): Black-on-White */
1235 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1197 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1236#endif 1198#endif
1237 1199
1238#ifdef POINTER_BLANK 1200#ifdef POINTER_BLANK
1239
1240 { 1201 {
1241 XColor blackcolour; 1202 XColor blackcolour;
1242 blackcolour.red = 0; 1203 blackcolour.red = 0;
1243 blackcolour.green = 0; 1204 blackcolour.green = 0;
1244 blackcolour.blue = 0; 1205 blackcolour.blue = 0;
1245 Font f = XLoadFont (Xdisplay, "fixed"); 1206 Font f = XLoadFont (display->display, "fixed");
1246 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1207 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1247 &blackcolour, &blackcolour); 1208 &blackcolour, &blackcolour);
1248 XUnloadFont (Xdisplay, f); 1209 XUnloadFont (display->display, f);
1249 } 1210 }
1250#endif 1211#endif
1251 1212
1252 /* the vt window */ 1213 /* the vt window */
1253 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1214 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1254 window_vt_x, window_vt_y, 1215 window_vt_x, window_vt_y,
1255 TermWin_TotalWidth(), 1216 TermWin_TotalWidth (),
1256 TermWin_TotalHeight(), 1217 TermWin_TotalHeight (),
1257 0, 1218 0,
1258 PixColors[Color_fg], 1219 PixColors[Color_fg],
1259 PixColors[Color_bg]); 1220 PixColors[Color_bg]);
1221
1260#ifdef DEBUG_X 1222#ifdef DEBUG_X
1261 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1223 XStoreName (display->display, TermWin.vt, "vt window");
1262#endif 1224#endif
1263 1225
1264 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1226 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | PropertyChangeMask); 1227 | PropertyChangeMask);
1266 1228
… …
1271 vt_emask |= PointerMotionMask; 1233 vt_emask |= PointerMotionMask;
1272 else 1234 else
1273#endif 1235#endif
1274 vt_emask |= (Button1MotionMask | Button3MotionMask); 1236 vt_emask |= (Button1MotionMask | Button3MotionMask);
1275 1237
1276 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1238 XSelectInput (display->display, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt);
1277 1240
1278#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1241#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1279
1280 if (menuBar_height()) 1242 if (menuBar_height ())
1281 { 1243 {
1282 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1283 window_vt_x, 0, 1245 window_vt_x, 0,
1284 TermWin_TotalWidth(), 1246 TermWin_TotalWidth (),
1285 menuBar_TotalHeight(), 1247 menuBar_TotalHeight (),
1286 0, 1248 0,
1287 PixColors[Color_fg], 1249 PixColors[Color_fg],
1288 PixColors[Color_scroll]); 1250 PixColors[Color_scroll]);
1251
1289#ifdef DEBUG_X 1252#ifdef DEBUG_X
1290
1291 XStoreName(Xdisplay, menuBar.win, "menubar"); 1253 XStoreName (display->display, menuBar.win, "menubar");
1292#endif 1254#endif
1293 1255
1294 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257
1258 XDefineCursor (display->display, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr));
1260
1295 XSelectInput(Xdisplay, menuBar.win, 1261 XSelectInput (display->display, menuBar.win,
1296 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1297 | Button1MotionMask)); 1263 | Button1MotionMask));
1264 menubar_ev.start (display, menuBar.win);
1298 } 1265 }
1299#endif 1266#endif
1267
1300#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1301 if (rs[Rs_backgroundPixmap] != NULL 1269 if (rs[Rs_backgroundPixmap] != NULL
1302 && !(Options & Opt_transparent)) 1270 && ! (Options & Opt_transparent))
1303 { 1271 {
1304 const char *p = rs[Rs_backgroundPixmap]; 1272 const char *p = rs[Rs_backgroundPixmap];
1305 1273
1306 if ((p = STRCHR(p, ';')) != NULL) 1274 if ((p = STRCHR (p, ';')) != NULL)
1307 { 1275 {
1308 p++; 1276 p++;
1309 rxvt_scale_pixmap (this, p); 1277 scale_pixmap (p);
1310 } 1278 }
1311 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1279 set_bgPixmap (rs[Rs_backgroundPixmap]);
1312 rxvt_scr_touch (this, True); 1280 scr_touch (True);
1313 } 1281 }
1314#endif 1282#endif
1315 1283
1316 /* graphics context for the vt window */ 1284 /* graphics context for the vt window */
1317 gcvalue.foreground = PixColors[Color_fg]; 1285 gcvalue.foreground = PixColors[Color_fg];
1318 gcvalue.background = PixColors[Color_bg]; 1286 gcvalue.background = PixColors[Color_bg];
1319 gcvalue.graphics_exposures = 1; 1287 gcvalue.graphics_exposures = 1;
1320 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1288 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1321 GCForeground | GCBackground 1289 GCForeground | GCBackground
1322 | GCGraphicsExposures, &gcvalue); 1290 | GCGraphicsExposures, &gcvalue);
1291
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1323 1293
1324#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1325
1326 gcvalue.foreground = PixColors[Color_topShadow]; 1295 gcvalue.foreground = PixColors[Color_topShadow];
1327 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1328 GCForeground, &gcvalue);
1329 gcvalue.foreground = PixColors[Color_bottomShadow]; 1297 gcvalue.foreground = PixColors[Color_bottomShadow];
1330 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1331 GCForeground, &gcvalue);
1332 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1299 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1333 : Color_scroll)]; 1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1334 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1335 GCForeground, &gcvalue);
1336#endif 1301#endif
1337} 1302}
1338 1303
1339/*----------------------------------------------------------------------*/ 1304/*----------------------------------------------------------------------*/
1340/* 1305/*
… …
1346rxvt_term::run_command (const char *const *argv) 1311rxvt_term::run_command (const char *const *argv)
1347{ 1312{
1348 int cfd, er; 1313 int cfd, er;
1349 1314
1350 /* get master (pty) */ 1315 /* get master (pty) */
1351 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1316 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1352 { 1317 {
1353 rxvt_print_error("can't open pseudo-tty"); 1318 rxvt_print_error ("can't open pseudo-tty");
1354 return -1; 1319 return -1;
1355 } 1320 }
1356
1357#ifdef FD_SETSIZE
1358 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1359 {
1360 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1361 rxvt_clean_exit();
1362 exit(EXIT_FAILURE);
1363 }
1364#endif
1365 1321
1366 fcntl (cfd, F_SETFL, O_NONBLOCK); 1322 fcntl (cfd, F_SETFL, O_NONBLOCK);
1367 1323
1368 /* get slave (tty) */ 1324 /* get slave (tty) */
1369 if (tty_fd < 0) 1325 if (tty_fd < 0)
1370 { 1326 {
1371#ifndef NO_SETOWNER_TTYDEV 1327#ifndef NO_SETOWNER_TTYDEV
1372 rxvt_privileged_ttydev (aR_ SAVE); 1328 privileged_ttydev (SAVE);
1373#endif 1329#endif
1374 1330
1375 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1331 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1376 { 1332 {
1377 close(cfd); 1333 close (cfd);
1378 rxvt_print_error("can't open slave tty %s", ttydev); 1334 rxvt_print_error ("can't open slave tty %s", ttydev);
1379 return -1; 1335 return -1;
1380 } 1336 }
1381 } 1337 }
1382#ifndef NO_BACKSPACE_KEY 1338#ifndef NO_BACKSPACE_KEY
1383 if (key_backspace[0] && !key_backspace[1]) 1339 if (key_backspace[0] && !key_backspace[1])
1384 er = key_backspace[0]; 1340 er = key_backspace[0];
1385 else if (STRCMP(key_backspace, "DEC") == 0) 1341 else if (STRCMP (key_backspace, "DEC") == 0)
1386 er = '\177'; /* the initial state anyway */ 1342 er = '\177'; /* the initial state anyway */
1387 else 1343 else
1388#endif 1344#endif
1389 1345
1390 er = -1; 1346 er = -1;
1391 1347
1392 rxvt_get_ttymode (&(tio), er); 1348 rxvt_get_ttymode (& (tio), er);
1393 1349
1394#ifndef __QNX__ 1350#ifndef __QNX__
1395 /* spin off the command interpreter */ 1351 /* spin off the command interpreter */
1396 switch (cmd_pid = fork ()) 1352 switch (cmd_pid = fork ())
1397 { 1353 {
1398 case -1: 1354 case -1:
1399 rxvt_print_error("can't fork"); 1355 rxvt_print_error ("can't fork");
1400 return -1; 1356 return -1;
1401 case 0: 1357 case 0:
1402 close (cfd); /* only keep tty_fd and STDERR open */ 1358 close (cfd); /* only keep tty_fd and STDERR open */
1403 close (Xfd); 1359
1360 init_env ();
1361
1404 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1362 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1405 rxvt_print_error ("could not obtain control of tty"); 1363 rxvt_print_error ("could not obtain control of tty");
1406 else 1364 else
1365 {
1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1367 dup2 (tty_fd, STDIN_FILENO);
1368 dup2 (tty_fd, STDOUT_FILENO);
1369 dup2 (tty_fd, STDERR_FILENO);
1370
1371 if (tty_fd > 2)
1372 close (tty_fd);
1373
1374 run_child (argv);
1375 }
1376 exit (EXIT_FAILURE);
1377 /* NOTREACHED */
1378 default:
1407 { 1379 {
1408 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1380#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1381 int fdstdin;
1382
1383 fdstdin = dup (STDIN_FILENO);
1409 dup2 (tty_fd, STDIN_FILENO); 1384 dup2 (tty_fd, STDIN_FILENO);
1385#endif
1386
1387#ifdef UTMP_SUPPORT
1388 privileged_utmp (SAVE);
1389#endif
1390
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392
1410 dup2 (tty_fd, STDOUT_FILENO); 1393 dup2 (fdstdin, STDIN_FILENO);
1411 dup2 (tty_fd, STDERR_FILENO);
1412
1413 if (tty_fd > 2)
1414 close (tty_fd); 1394 close (fdstdin);
1395#endif
1415 1396
1416 run_child (argv);
1417 } 1397 }
1418 exit (EXIT_FAILURE);
1419 /* NOTREACHED */
1420 default:
1421 {
1422#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1423 int fdstdin;
1424
1425 fdstdin = dup (STDIN_FILENO);
1426 dup2 (tty_fd, STDIN_FILENO);
1427#endif
1428
1429#ifdef UTMP_SUPPORT
1430 rxvt_privileged_utmp (this, SAVE);
1431#endif
1432
1433#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1434
1435 dup2 (fdstdin, STDIN_FILENO);
1436 close (fdstdin);
1437#endif
1438
1439 }
1440 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1398 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1441 break; 1399 break;
1442 } 1400 }
1443#else /* __QNX__ uses qnxspawn() */ 1401#else /* __QNX__ uses qnxspawn () */
1444 fchmod (tty_fd, 0622); 1402 fchmod (tty_fd, 0622);
1445 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1403 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1446 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1404 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1447 1405
1448 if (run_child (argv) == -1) 1406 if (run_child (argv) == -1)
… …
1462int 1420int
1463rxvt_term::run_child (const char *const *argv) 1421rxvt_term::run_child (const char *const *argv)
1464{ 1422{
1465 char *login; 1423 char *login;
1466 1424
1467 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1425 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1468 1426
1469 if (Options & Opt_console) 1427 if (Options & Opt_console)
1470 { /* be virtual console, fail silently */ 1428 { /* be virtual console, fail silently */
1471#ifdef TIOCCONS 1429#ifdef TIOCCONS
1472 unsigned int on = 1; 1430 unsigned int on = 1;
… …
1480 { 1438 {
1481 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1439 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1482 close (fd); 1440 close (fd);
1483 } 1441 }
1484#endif /* SRIOCSREDIR */ 1442#endif /* SRIOCSREDIR */
1443
1485 } 1444 }
1486 1445
1487 /* reset signals and spin off the command interpreter */ 1446 /* reset signals and spin off the command interpreter */
1488 signal (SIGINT, SIG_DFL); 1447 signal (SIGINT, SIG_DFL);
1489 signal (SIGQUIT, SIG_DFL); 1448 signal (SIGQUIT, SIG_DFL);
… …
1517 { 1476 {
1518# ifdef DEBUG_CMD 1477# ifdef DEBUG_CMD
1519 int i; 1478 int i;
1520 1479
1521 for (i = 0; argv[i]; i++) 1480 for (i = 0; argv[i]; i++)
1522 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1481 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1523# endif 1482# endif
1524 1483
1525 execvp(argv[0], (char *const *)argv); 1484 execvp (argv[0], (char *const *)argv);
1526 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1527 } 1486 }
1528 else 1487 else
1529 { 1488 {
1530 const char *argv0, *shell; 1489 const char *argv0, *shell;
1531 1490
1532 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1491 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1533 shell = "/bin/sh"; 1492 shell = "/bin/sh";
1534 1493
1535 argv0 = (const char *)rxvt_r_basename(shell); 1494 argv0 = (const char *)rxvt_r_basename (shell);
1536 if (Options & Opt_loginShell) 1495 if (Options & Opt_loginShell)
1537 { 1496 {
1538 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1497 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1539 1498
1540 login[0] = '-'; 1499 login[0] = '-';
1541 STRCPY(&login[1], argv0); 1500 STRCPY (&login[1], argv0);
1542 argv0 = login; 1501 argv0 = login;
1543 } 1502 }
1544 execlp(shell, argv0, NULL); 1503 execlp (shell, argv0, NULL);
1545 /* no error message: STDERR is closed! */ 1504 /* no error message: STDERR is closed! */
1546 } 1505 }
1547 1506
1548#else /* __QNX__ uses qnxspawn() */ 1507#else /* __QNX__ uses qnxspawn () */
1549 1508
1550 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1509 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1551 char *command = NULL, fullcommand[_MAX_PATH]; 1510 char *command = NULL, fullcommand[_MAX_PATH];
1552 char **arg_v, *arg_a[2] = { NULL, NULL }; 1511 char **arg_v, *arg_a[2] = { NULL, NULL };
1553 1512
1554 if (argv != NULL) 1513 if (argv != NULL)
1555 { 1514 {
1556 if (access(argv[0], X_OK) == -1) 1515 if (access (argv[0], X_OK) == -1)
1557 { 1516 {
1558 if (STRCHR(argv[0], '/') == NULL) 1517 if (STRCHR (argv[0], '/') == NULL)
1559 { 1518 {
1560 searchenv(argv[0], "PATH", fullcommand); 1519 searchenv (argv[0], "PATH", fullcommand);
1561 if (fullcommand[0] != '\0') 1520 if (fullcommand[0] != '\0')
1562 command = fullcommand; 1521 command = fullcommand;
1563 } 1522 }
1564 if (access(command, X_OK) == -1) 1523 if (access (command, X_OK) == -1)
1565 return -1; 1524 return -1;
1566 } 1525 }
1567 else 1526 else
1568 command = argv[0]; 1527 command = argv[0];
1569 arg_v = argv; 1528 arg_v = argv;
1570 } 1529 }
1571 else 1530 else
1572 { 1531 {
1573 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1532 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1574 command = "/bin/sh"; 1533 command = "/bin/sh";
1575 1534
1576 arg_a[0] = my_basename(command); 1535 arg_a[0] = my_basename (command);
1577 if (Options & Opt_loginShell) 1536 if (Options & Opt_loginShell)
1578 { 1537 {
1579 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1538 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1580 1539
1581 login[0] = '-'; 1540 login[0] = '-';
1582 STRCPY(&login[1], arg_a[0]); 1541 STRCPY (&login[1], arg_a[0]);
1583 arg_a[0] = login; 1542 arg_a[0] = login;
1584 } 1543 }
1585 arg_v = arg_a; 1544 arg_v = arg_a;
1586 } 1545 }
1587 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1546 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1588 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1547 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1589 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1548 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1590 command, arg_v, environ, iov_a, 0); 1549 command, arg_v, environ, iov_a, 0);
1591 if (login) 1550 if (login)
1592 free(login); 1551 free (login);
1593 1552
1594 close(tty_fd); 1553 close (tty_fd);
1595 return cmd_fd; 1554 return cmd_fd;
1596 1555
1597#endif 1556#endif
1598 return -1; 1557 return -1;
1599} 1558}
1600 1559
1601/* ------------------------------------------------------------------------- * 1560/* ------------------------------------------------------------------------- *
1602 * GET TTY CURRENT STATE * 1561 * GET TTY CURRENT STATE *
1603 * ------------------------------------------------------------------------- */ 1562 * ------------------------------------------------------------------------- */
1604/* rxvt_get_ttymode() */ 1563/* rxvt_get_ttymode () */
1605/* INTPROTO */ 1564/* EXTPROTO */
1606void 1565void
1607rxvt_get_ttymode(ttymode_t *tio, int erase) 1566rxvt_get_ttymode (ttymode_t *tio, int erase)
1608{ 1567{
1609#ifdef HAVE_TERMIOS_H 1568#ifdef HAVE_TERMIOS_H
1610 /* 1569 /*
1611 * standard System V termios interface 1570 * standard System V termios interface
1612 */ 1571 */
1613 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1572 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1614 { 1573 {
1615 /* return error - use system defaults */ 1574 /* return error - use system defaults */
1616 tio->c_cc[VINTR] = CINTR; 1575 tio->c_cc[VINTR] = CINTR;
1617 tio->c_cc[VQUIT] = CQUIT; 1576 tio->c_cc[VQUIT] = CQUIT;
1618 tio->c_cc[VERASE] = CERASE; 1577 tio->c_cc[VERASE] = CERASE;
… …
1692 /* 1651 /*
1693 * sgtty interface 1652 * sgtty interface
1694 */ 1653 */
1695 1654
1696 /* get parameters -- gtty */ 1655 /* get parameters -- gtty */
1697 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1656 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1698 { 1657 {
1699 tio->sg.sg_erase = CERASE; /* ^H */ 1658 tio->sg.sg_erase = CERASE; /* ^H */
1700 tio->sg.sg_kill = CKILL; /* ^U */ 1659 tio->sg.sg_kill = CKILL; /* ^U */
1701 } 1660 }
1702 if (erase != -1) 1661 if (erase != -1)
1703 tio->sg.sg_erase = (char)erase; 1662 tio->sg.sg_erase = (char)erase;
1704 1663
1705 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1664 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1706 1665
1707 /* get special characters */ 1666 /* get special characters */
1708 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1667 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1709 { 1668 {
1710 tio->tc.t_intrc = CINTR; /* ^C */ 1669 tio->tc.t_intrc = CINTR; /* ^C */
1711 tio->tc.t_quitc = CQUIT; /* ^\ */ 1670 tio->tc.t_quitc = CQUIT; /* ^\ */
1712 tio->tc.t_startc = CSTART; /* ^Q */ 1671 tio->tc.t_startc = CSTART; /* ^Q */
1713 tio->tc.t_stopc = CSTOP; /* ^S */ 1672 tio->tc.t_stopc = CSTOP; /* ^S */
1714 tio->tc.t_eofc = CEOF; /* ^D */ 1673 tio->tc.t_eofc = CEOF; /* ^D */
1715 tio->tc.t_brkc = -1; 1674 tio->tc.t_brkc = -1;
1716 } 1675 }
1717 /* get local special chars */ 1676 /* get local special chars */
1718 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1677 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1719 { 1678 {
1720 tio->lc.t_suspc = CSUSP; /* ^Z */ 1679 tio->lc.t_suspc = CSUSP; /* ^Z */
1721 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1680 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1722 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1681 tio->lc.t_rprntc = CRPRNT; /* ^R */
1723 tio->lc.t_flushc = CFLUSH; /* ^O */ 1682 tio->lc.t_flushc = CFLUSH; /* ^O */
1724 tio->lc.t_werasc = CWERASE; /* ^W */ 1683 tio->lc.t_werasc = CWERASE; /* ^W */
1725 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1684 tio->lc.t_lnextc = CLNEXT; /* ^V */
1726 } 1685 }
1727 /* get line discipline */ 1686 /* get line discipline */
1728 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1687 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1729# ifdef NTTYDISC 1688# ifdef NTTYDISC
1730 1689
1731 tio->line = NTTYDISC; 1690 tio->line = NTTYDISC;
1732# endif /* NTTYDISC */ 1691# endif /* NTTYDISC */
1733 1692
… …
1738 * Debugging 1697 * Debugging
1739 */ 1698 */
1740#ifdef DEBUG_TTYMODE 1699#ifdef DEBUG_TTYMODE
1741#ifdef HAVE_TERMIOS_H 1700#ifdef HAVE_TERMIOS_H
1742 /* c_iflag bits */ 1701 /* c_iflag bits */
1743 fprintf(stderr, "Input flags\n"); 1702 fprintf (stderr, "Input flags\n");
1744 1703
1745 /* cpp token stringize doesn't work on all machines <sigh> */ 1704 /* cpp token stringize doesn't work on all machines <sigh> */
1746# define FOO(flag,name) \ 1705# define FOO(flag,name) \
1747 if ((tio->c_iflag) & flag) \ 1706 if ((tio->c_iflag) & flag) \
1748 fprintf (stderr, "%s ", name) 1707 fprintf (stderr, "%s ", name)
1749 1708
1750 /* c_iflag bits */ 1709 /* c_iflag bits */
1751 FOO(IGNBRK, "IGNBRK"); 1710 FOO (IGNBRK, "IGNBRK");
1752 FOO(BRKINT, "BRKINT"); 1711 FOO (BRKINT, "BRKINT");
1753 FOO(IGNPAR, "IGNPAR"); 1712 FOO (IGNPAR, "IGNPAR");
1754 FOO(PARMRK, "PARMRK"); 1713 FOO (PARMRK, "PARMRK");
1755 FOO(INPCK, "INPCK"); 1714 FOO (INPCK, "INPCK");
1756 FOO(ISTRIP, "ISTRIP"); 1715 FOO (ISTRIP, "ISTRIP");
1757 FOO(INLCR, "INLCR"); 1716 FOO (INLCR, "INLCR");
1758 FOO(IGNCR, "IGNCR"); 1717 FOO (IGNCR, "IGNCR");
1759 FOO(ICRNL, "ICRNL"); 1718 FOO (ICRNL, "ICRNL");
1760 FOO(IXON, "IXON"); 1719 FOO (IXON, "IXON");
1761 FOO(IXOFF, "IXOFF"); 1720 FOO (IXOFF, "IXOFF");
1762# ifdef IUCLC 1721# ifdef IUCLC
1763 1722
1764 FOO(IUCLC, "IUCLC"); 1723 FOO (IUCLC, "IUCLC");
1765# endif 1724# endif
1766# ifdef IXANY 1725# ifdef IXANY
1767 1726
1768 FOO(IXANY, "IXANY"); 1727 FOO (IXANY, "IXANY");
1769# endif 1728# endif
1770# ifdef IMAXBEL 1729# ifdef IMAXBEL
1771 1730
1772 FOO(IMAXBEL, "IMAXBEL"); 1731 FOO (IMAXBEL, "IMAXBEL");
1773# endif 1732# endif
1774 1733
1775 fprintf(stderr, "\n"); 1734 fprintf (stderr, "\n");
1776 1735
1777# undef FOO 1736# undef FOO
1778# define FOO(entry, name) \ 1737# define FOO(entry, name) \
1779 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1738 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1780 1739
1781 FOO(VINTR, "VINTR"); 1740 FOO (VINTR, "VINTR");
1782 FOO(VQUIT, "VQUIT"); 1741 FOO (VQUIT, "VQUIT");
1783 FOO(VERASE, "VERASE"); 1742 FOO (VERASE, "VERASE");
1784 FOO(VKILL, "VKILL"); 1743 FOO (VKILL, "VKILL");
1785 FOO(VEOF, "VEOF"); 1744 FOO (VEOF, "VEOF");
1786 FOO(VEOL, "VEOL"); 1745 FOO (VEOL, "VEOL");
1787# ifdef VEOL2 1746# ifdef VEOL2
1788 1747
1789 FOO(VEOL2, "VEOL2"); 1748 FOO (VEOL2, "VEOL2");
1790# endif 1749# endif
1791# ifdef VSWTC 1750# ifdef VSWTC
1792 1751
1793 FOO(VSWTC, "VSWTC"); 1752 FOO (VSWTC, "VSWTC");
1794# endif 1753# endif
1795# ifdef VSWTCH 1754# ifdef VSWTCH
1796 1755
1797 FOO(VSWTCH, "VSWTCH"); 1756 FOO (VSWTCH, "VSWTCH");
1798# endif 1757# endif
1799 1758
1800 FOO(VSTART, "VSTART"); 1759 FOO (VSTART, "VSTART");
1801 FOO(VSTOP, "VSTOP"); 1760 FOO (VSTOP, "VSTOP");
1802 FOO(VSUSP, "VSUSP"); 1761 FOO (VSUSP, "VSUSP");
1803# ifdef VDSUSP 1762# ifdef VDSUSP
1804 1763
1805 FOO(VDSUSP, "VDSUSP"); 1764 FOO (VDSUSP, "VDSUSP");
1806# endif 1765# endif
1807# ifdef VREPRINT 1766# ifdef VREPRINT
1808 1767
1809 FOO(VREPRINT, "VREPRINT"); 1768 FOO (VREPRINT, "VREPRINT");
1810# endif 1769# endif
1811# ifdef VDISCRD 1770# ifdef VDISCRD
1812 1771
1813 FOO(VDISCRD, "VDISCRD"); 1772 FOO (VDISCRD, "VDISCRD");
1814# endif 1773# endif
1815# ifdef VWERSE 1774# ifdef VWERSE
1816 1775
1817 FOO(VWERSE, "VWERSE"); 1776 FOO (VWERSE, "VWERSE");
1818# endif 1777# endif
1819# ifdef VLNEXT 1778# ifdef VLNEXT
1820 1779
1821 FOO(VLNEXT, "VLNEXT"); 1780 FOO (VLNEXT, "VLNEXT");
1822# endif 1781# endif
1823 1782
1824 fprintf(stderr, "\n"); 1783 fprintf (stderr, "\n");
1825# undef FOO 1784# undef FOO
1826# endif /* HAVE_TERMIOS_H */ 1785# endif /* HAVE_TERMIOS_H */
1827#endif /* DEBUG_TTYMODE */ 1786#endif /* DEBUG_TTYMODE */
1828} 1787}
1829 1788

Diff Legend

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