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.20 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.40 by pcg, Sun Mar 14 23:14:39 2004 UTC

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

Diff Legend

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