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.14 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.39 by pcg, Sun Mar 14 17:33:07 2004 UTC

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

Diff Legend

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