ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.18 by pcg, Tue Jan 20 01:35:39 2004 UTC vs.
Revision 1.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.18 2004/01/20 01:35:39 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
10 * - extensive modifications 9 * - extensive modifications
11 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
12 * - extensive modifications 11 * - extensive modifications
13 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
14 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
327#endif 327#endif
328#ifdef KEEP_SCROLLCOLOR 328#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 329 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 330 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 331#endif /* KEEP_SCROLLCOLOR */
332
332 }; 333 };
333 334
334const char *const xa_names[NUM_XA] = 335const char *const xa_names[NUM_XA] =
335 { 336 {
337 "TEXT",
336 "COMPOUND_TEXT", 338 "COMPOUND_TEXT",
339 "UTF8_STRING",
337 "MULTIPLE", 340 "MULTIPLE",
338 "TARGETS", 341 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 342 "TIMESTAMP",
341 "VT_SELECTION", 343 "VT_SELECTION",
342 "INCR", 344 "INCR",
343 "WM_DELETE_WINDOW", 345 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 346#ifdef TRANSPARENT
… …
371 MEvent.time = CurrentTime; 373 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 374 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 375 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 376 want_refresh = 1;
375 cmd_pid = -1; 377 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 378 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 379 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 380 TermWin.focus = 0;
379 TermWin.ncol = 80; 381 TermWin.ncol = 80;
380 TermWin.nrow = 24; 382 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 383 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
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);
… …
799void 773void
800rxvt_term::set_locale (const char *locale) 774rxvt_term::set_locale (const char *locale)
801{ 775{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 776#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 777 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, "")); 778 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
779 SET_LOCALE (this->locale);
780 mbstate.reset ();
805#endif 781#endif
806#if HAVE_NL_LANGINFO 782#if HAVE_NL_LANGINFO
807 free (codeset); 783 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 784 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 785 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 786 || !STRCASECMP (codeset, "UTF8");
811#else 787#else
812 enc_utf8 = 1; 788 enc_utf8 = 1;
813#endif 789#endif
814} 790}
815 791
… …
821 rxvt_print_error ("Setting locale failed."); 797 rxvt_print_error ("Setting locale failed.");
822 else 798 else
823 { 799 {
824 Atom wmlocale; 800 Atom wmlocale;
825 801
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 802 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 803 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 804 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 805 (unsigned char *)locale, STRLEN (locale));
830 806
831 if (!XSupportsLocale ()) 807 if (!XSupportsLocale ())
832 { 808 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 809 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 810 return;
835 } 811 }
836 812
813 im_ev.start (display);
814
837 /* see if we can connect yet */ 815 /* see if we can connect already */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 816 im_cb ();
839
840 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL);
844 } 817 }
845#endif 818#endif
846} 819}
847 820
848/*----------------------------------------------------------------------*/ 821/*----------------------------------------------------------------------*/
849void 822void
850rxvt_term::init_command(const char *const *argv) 823rxvt_term::init_command (const char *const *argv)
851{ 824{
852 /* 825 /*
853 * Initialize the command connection. 826 * Initialize the command connection.
854 * This should be called after the X server connection is established. 827 * This should be called after the X server connection is established.
855 */ 828 */
856 int i; 829 int i;
857 830
858 for (i = 0; i < NUM_XA; i++) 831 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 832 xa[i] = XInternAtom (display->display, xa_names[i], False);
860 833
861 /* Enable delete window protocol */ 834 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 835 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 836 & (xa[XA_WMDELETEWINDOW]), 1);
864 837
865#ifdef USING_W11LIB 838#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 839 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 840 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 841#endif
869 842
870#ifdef META8_OPTION 843#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 844 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 845#endif
873 846
874 rxvt_get_ourmods (this); 847 get_ourmods ();
875 848
876 if (!(Options & Opt_scrollTtyOutput)) 849 if (! (Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 850 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 851 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 852 PrivateModes |= PrivMode_Keypress;
880 if (!(Options & Opt_jumpScroll)) 853 if (! (Options & Opt_jumpScroll))
881 PrivateModes |= PrivMode_smoothScroll; 854 PrivateModes |= PrivMode_smoothScroll;
882 855
883#ifndef NO_BACKSPACE_KEY 856#ifndef NO_BACKSPACE_KEY
884 if (STRCMP(key_backspace, "DEC") == 0) 857 if (STRCMP (key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 858 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 859#endif
887 860
888 /* add value for scrollBar */ 861 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 862 if (scrollbar_visible ())
890 { 863 {
891 PrivateModes |= PrivMode_scrollBar; 864 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 865 SavedModes |= PrivMode_scrollBar;
893 } 866 }
894 if (menubar_visible (this)) 867 if (menubar_visible ())
895 { 868 {
896 PrivateModes |= PrivMode_menuBar; 869 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 870 SavedModes |= PrivMode_menuBar;
898 } 871 }
899 872
900#ifdef GREEK_SUPPORT
901 greek_init();
902#endif
903
904 Xfd = XConnectionNumber (Xdisplay);
905
906#ifdef CURSOR_BLINK 873#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 874 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 875 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 876#endif
911 877
912 if ((cmd_fd = run_command (argv)) < 0) 878 if ((cmd_fd = run_command (argv)) < 0)
… …
915 exit (EXIT_FAILURE); 881 exit (EXIT_FAILURE);
916 } 882 }
917} 883}
918 884
919/*----------------------------------------------------------------------*/ 885/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 886void
922rxvt_Get_Colours (pR) 887rxvt_term::Get_Colours ()
923{ 888{
924 int i; 889 int i;
925 890
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 891 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 892 {
928 rxvt_color xcol; 893 rxvt_color xcol;
929 894
930 if (!R->rs[Rs_color + i]) 895 if (!rs[Rs_color + i])
931 continue; 896 continue;
932 897
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 898 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 899 {
935#ifndef XTERM_REVERSE_VIDEO 900#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 901 if (i < 2 && (Options & Opt_reverseVideo))
937 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 902 rs[Rs_color + i] = def_colorName[!i];
939 }
940 else 903 else
941#endif 904#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 905 rs[Rs_color + i] = def_colorName[i];
943 906
944 if (!R->rs[Rs_color + i]) 907 if (!rs[Rs_color + i])
945 continue; 908 continue;
946 909
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 910 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 911 {
949 switch (i) 912 switch (i)
950 { 913 {
951 case Color_fg: 914 case Color_fg:
952 case Color_bg: 915 case Color_bg:
953 /* fatal: need bg/fg color */ 916 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 917 rxvt_print_error ("aborting");
955 exit (EXIT_FAILURE); 918 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 919 /* NOTREACHED */
957 break; 920 break;
958#ifndef NO_CURSORCOLOR 921#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 922 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 923 xcol = PixColors[Color_fg];
961 break; 924 break;
962#endif /* ! NO_CURSORCOLOR */ 925#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 926 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 927 xcol = PixColors[Color_fg];
965 break; 928 break;
966 default: 929 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 930 xcol = PixColors[Color_bg]; /* None */
968 break; 931 break;
969 } 932 }
970 } 933 }
971 } 934 }
972 935
973 R->PixColors[i] = xcol; 936 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 937 SET_PIXCOLOR (i);
975 } 938 }
976 939
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 940 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 941 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 942 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 943 PixColors[Color_border] = PixColors[Color_fg];
981 944
982 /* 945 /*
983 * get scrollBar/menuBar shadow colors 946 * get scrollBar/menuBar shadow colors
984 * 947 *
985 * The calculations of topShadow/bottomShadow values are adapted 948 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 950 */
988#ifdef KEEP_SCROLLCOLOR 951#ifdef KEEP_SCROLLCOLOR
989 952
990 if (XDEPTH <= 2) 953 if (XDEPTH <= 2)
991 { /* Monochrome */ 954 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 955 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 956 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 957 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 958 }
996 else 959 else
997 { 960 {
998 rxvt_color xcol[3]; 961 rxvt_color xcol[3];
999 /* xcol[0] == white 962 /* xcol[0] == white
1000 * xcol[1] == top shadow 963 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 964 * xcol[2] == bot shadow */
1002 965
1003 xcol[1] = R->PixColors[Color_scroll]; 966 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 967# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 968 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 969 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
1007# else 970# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 971 xcol[0].set (display, WhitePixel (display->display, display->screen));
1009# endif 972# endif
1010 973
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 974 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 975
1013 xcol[0].get (R, pr0, pg0, pb0); 976 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 977 xcol[1].get (display, pr1, pg1, pb1);
1015 978
1016 /* bottomShadowColor */ 979 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 980 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 981 xcol[2] = PixColors[Color_Black];
1019 982
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 983 PixColors[Color_bottomShadow] = xcol[2];
1021 984
1022 /* topShadowColor */ 985 /* topShadowColor */
1023 if (!xcol[1].set (aR_ 986 if (!xcol[1].set (display,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 987 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 988 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 989 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1027 xcol[1] = R->PixColors[Color_White]; 990 xcol[1] = PixColors[Color_White];
1028 991
1029 R->PixColors[Color_topShadow] = xcol[1]; 992 PixColors[Color_topShadow] = xcol[1];
1030 } 993 }
1031#endif /* KEEP_SCROLLCOLOR */ 994#endif /* KEEP_SCROLLCOLOR */
1032} 995}
1033 996
1034/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
1035/* color aliases, fg/bg bright-bold */ 998/* color aliases, fg/bg bright-bold */
1036void 999void
1037rxvt_term::color_aliases(int idx) 1000rxvt_term::color_aliases (int idx)
1038{ 1001{
1039 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 1002 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1040 { 1003 {
1041 int i = atoi (rs[Rs_color + idx]); 1004 int i = atoi (rs[Rs_color + idx]);
1042 1005
1043 if (i >= 8 && i <= 15) 1006 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1007 { /* bright colors */
1045 i -= 8; 1008 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1009#ifndef NO_BRIGHTCOLOR
1047 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1010 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1048 return; 1011 return;
1049#endif 1012#endif
1013
1050 } 1014 }
1051 1015
1052 if (i >= 0 && i <= 7) /* normal colors */ 1016 if (i >= 0 && i <= 7) /* normal colors */
1053 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1017 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1054 } 1018 }
… …
1057/*----------------------------------------------------------------------*/ 1021/*----------------------------------------------------------------------*/
1058/* 1022/*
1059 * 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
1060 * Use resource ``modifier'' to override the Meta modifier 1024 * Use resource ``modifier'' to override the Meta modifier
1061 */ 1025 */
1062/* INTPROTO */
1063void 1026void
1064rxvt_get_ourmods(pR) 1027rxvt_term::get_ourmods ()
1065{ 1028{
1066 int i, j, k; 1029 int i, j, k;
1067 int requestedmeta, realmeta, realalt; 1030 int requestedmeta, realmeta, realalt;
1068 const char *cm, *rsmod; 1031 const char *cm, *rsmod;
1069 XModifierKeymap *map; 1032 XModifierKeymap *map;
… …
1072 { 1035 {
1073 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1036 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1074 }; 1037 };
1075 1038
1076 requestedmeta = realmeta = realalt = 0; 1039 requestedmeta = realmeta = realalt = 0;
1077 rsmod = R->rs[Rs_modifier]; 1040 rsmod = rs[Rs_modifier];
1078 if (rsmod 1041 if (rsmod
1079 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1042 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0)
1080 requestedmeta = rsmod[3] - '0'; 1043 requestedmeta = rsmod[3] - '0';
1081 1044
1082 map = XGetModifierMapping(R->Xdisplay); 1045 map = XGetModifierMapping (display->display);
1083 kc = map->modifiermap; 1046 kc = map->modifiermap;
1084 for (i = 1; i < 6; i++) 1047 for (i = 1; i < 6; i++)
1085 { 1048 {
1086 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1049 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1087 for (j = map->max_keypermod; j--; k++) 1050 for (j = map->max_keypermod; j--; k++)
1088 { 1051 {
1089 if (kc[k] == 0) 1052 if (kc[k] == 0)
1090 break; 1053 break;
1091 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1054 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1092 { 1055 {
1093 case XK_Num_Lock: 1056 case XK_Num_Lock:
1094 R->ModNumLockMask = modmasks[i - 1]; 1057 ModNumLockMask = modmasks[i - 1];
1095 /* FALLTHROUGH */ 1058 /* FALLTHROUGH */
1096 default: 1059 default:
1097 continue; /* for(;;) */ 1060 continue; /* for (;;) */
1098 case XK_Meta_L: 1061 case XK_Meta_L:
1099 case XK_Meta_R: 1062 case XK_Meta_R:
1100 cm = "meta"; 1063 cm = "meta";
1101 realmeta = i; 1064 realmeta = i;
1102 break; 1065 break;
1103 case XK_Alt_L: 1066 case XK_Alt_L:
1104 case XK_Alt_R: 1067 case XK_Alt_R:
1105 cm = "alt"; 1068 cm = "alt";
1106 realalt = i; 1069 realalt = i;
1107 break; 1070 break;
1108 case XK_Super_L: 1071 case XK_Super_L:
1109 case XK_Super_R: 1072 case XK_Super_R:
1110 cm = "super"; 1073 cm = "super";
1111 break; 1074 break;
1112 case XK_Hyper_L: 1075 case XK_Hyper_L:
1113 case XK_Hyper_R: 1076 case XK_Hyper_R:
1114 cm = "hyper"; 1077 cm = "hyper";
1115 break; 1078 break;
1116 } 1079 }
1117 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1080 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0)
1118 requestedmeta = i; 1081 requestedmeta = i;
1119 } 1082 }
1120 } 1083 }
1121 XFreeModifiermap(map); 1084 XFreeModifiermap (map);
1122 i = (requestedmeta ? requestedmeta 1085 i = (requestedmeta ? requestedmeta
1123 : (realmeta ? realmeta 1086 : (realmeta ? realmeta
1124 : (realalt ? realalt : 0))); 1087 : (realalt ? realalt : 0)));
1125 if (i) 1088 if (i)
1126 R->ModMetaMask = modmasks[i - 1]; 1089 ModMetaMask = modmasks[i - 1];
1127} 1090}
1128 1091
1129/*----------------------------------------------------------------------*/ 1092/*----------------------------------------------------------------------*/
1130/* rxvt_Create_Windows() - Open and map the window */ 1093/* rxvt_Create_Windows () - Open and map the window */
1131void 1094void
1132rxvt_term::create_windows (int argc, const char *const *argv) 1095rxvt_term::create_windows (int argc, const char *const *argv)
1133{ 1096{
1134 XClassHint classHint; 1097 XClassHint classHint;
1135 XWMHints wmHint; 1098 XWMHints wmHint;
1136 XGCValues gcvalue; 1099 XGCValues gcvalue;
1137 long vt_emask; 1100 long vt_emask;
1138 1101
1139 XSetWindowAttributes attributes;
1140 XWindowAttributes gattr; 1102 XWindowAttributes gattr;
1141 1103
1142 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1143 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1144 Xscreen = DefaultScreen (Xdisplay);
1145
1146 if (Options & Opt_transparent) 1104 if (Options & Opt_transparent)
1147 { 1105 {
1148 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1106 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1149 Xdepth = gattr.depth; 1107 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1150 }
1151 else
1152 {
1153 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1154#ifdef PREFER_24BIT
1155 /*
1156 * If depth is not 24, look for a 24bit visual.
1157 */
1158 if (Xdepth != 24)
1159 {
1160 XVisualInfo vinfo;
1161
1162 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1163 {
1164 Xdepth = 24;
1165 Xvisual = vinfo.visual;
1166 Xcmap = XCreateColormap(Xdisplay,
1167 RootWindow(Xdisplay, Xscreen),
1168 Xvisual, AllocNone);
1169 }
1170 }
1171#endif
1172 } 1108 }
1173 1109
1174 /* grab colors before netscape does */ 1110 /* grab colors before netscape does */
1175 rxvt_Get_Colours (this); 1111 Get_Colours ();
1176 1112
1177 rxvt_change_font (this, 1, NULL); 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
1178 window_calc (0, 0); 1120 window_calc (0, 0);
1179 old_width = szHint.width; 1121 old_width = szHint.width;
1180 old_height = szHint.height; 1122 old_height = szHint.height;
1181 1123
1182 /* parent window - reverse video so we can see placement errors 1124 /* parent window - reverse video so we can see placement errors
1183 * sub-window placement & size in rxvt_resize_subwindows() 1125 * sub-window placement & size in rxvt_resize_subwindows ()
1184 */ 1126 */
1185 1127
1186#ifdef PREFER_24BIT 1128#ifdef PREFER_24BIT
1129 XSetWindowAttributes attributes;
1130
1187 attributes.background_pixel = PixColors[Color_fg]; 1131 attributes.background_pixel = PixColors[Color_fg];
1188 attributes.border_pixel = PixColors[Color_border]; 1132 attributes.border_pixel = PixColors[Color_border];
1189 attributes.colormap = Xcmap; 1133 attributes.colormap = display->cmap;
1190 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1134 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1191 szHint.x, szHint.y, 1135 szHint.x, szHint.y,
1192 szHint.width, szHint.height, 1136 szHint.width, szHint.height,
1193 TermWin.ext_bwidth, 1137 TermWin.ext_bwidth,
1194 Xdepth, InputOutput, 1138 display->depth, InputOutput,
1195 Xvisual, 1139 display->visual,
1196 CWBackPixel | CWBorderPixel
1197 | CWColormap, &attributes); 1140 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1198#else 1141#else
1199 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1142 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1200 szHint.x, szHint.y, 1143 szHint.x, szHint.y,
1201 szHint.width, 1144 szHint.width,
1202 szHint.height, 1145 szHint.height,
1203 TermWin.ext_bwidth, 1146 TermWin.ext_bwidth,
1204 PixColors[Color_border], 1147 PixColors[Color_border],
1205 PixColors[Color_fg]); 1148 PixColors[Color_fg]);
1206#endif 1149#endif
1207 1150
1208 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1151 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1209 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1152 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1210 1153
1211 classHint.res_name = (char *)rs[Rs_name]; 1154 classHint.res_name = (char *)rs[Rs_name];
1212 classHint.res_class = (char *)APL_CLASS; 1155 classHint.res_class = (char *)RESCLASS;
1213 1156
1214 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1157 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1215 wmHint.input = True; 1158 wmHint.input = True;
1216 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1159 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1217 : NormalState); 1160 : NormalState);
1218 wmHint.window_group = TermWin.parent[0]; 1161 wmHint.window_group = TermWin.parent[0];
1219 1162
1220 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1163 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1221 (char **)argv, argc, &szHint, &wmHint, &classHint); 1164 (char **)argv, argc, &szHint, &wmHint, &classHint);
1165
1222 XSelectInput(Xdisplay, TermWin.parent[0], 1166 XSelectInput (display->display, TermWin.parent[0],
1223 (KeyPressMask 1167 KeyPressMask
1224#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1225 | KeyReleaseMask 1169 | KeyReleaseMask
1226#endif 1170#endif
1227 | FocusChangeMask | VisibilityChangeMask 1171 | FocusChangeMask | VisibilityChangeMask
1228 | StructureNotifyMask)); 1172 | StructureNotifyMask);
1173 termwin_ev.start (display, TermWin.parent[0]);
1229 1174
1230 /* 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 */
1231 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1176 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1232 1177
1233#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1178#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1234 /* cursor (menuBar/scrollBar): Black-on-White */ 1179 /* cursor (menuBar/scrollBar): Black-on-White */
1235 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1180 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1236#endif 1181#endif
1237 1182
1238#ifdef POINTER_BLANK 1183#ifdef POINTER_BLANK
1239
1240 { 1184 {
1241 XColor blackcolour; 1185 XColor blackcolour;
1242 blackcolour.red = 0; 1186 blackcolour.red = 0;
1243 blackcolour.green = 0; 1187 blackcolour.green = 0;
1244 blackcolour.blue = 0; 1188 blackcolour.blue = 0;
1245 Font f = XLoadFont (Xdisplay, "fixed"); 1189 Font f = XLoadFont (display->display, "fixed");
1246 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1190 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1247 &blackcolour, &blackcolour); 1191 &blackcolour, &blackcolour);
1248 XUnloadFont (Xdisplay, f); 1192 XUnloadFont (display->display, f);
1249 } 1193 }
1250#endif 1194#endif
1251 1195
1252 /* the vt window */ 1196 /* the vt window */
1253 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1197 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1254 window_vt_x, window_vt_y, 1198 window_vt_x, window_vt_y,
1255 TermWin_TotalWidth(), 1199 TermWin_TotalWidth (),
1256 TermWin_TotalHeight(), 1200 TermWin_TotalHeight (),
1257 0, 1201 0,
1258 PixColors[Color_fg], 1202 PixColors[Color_fg],
1259 PixColors[Color_bg]); 1203 PixColors[Color_bg]);
1204
1260#ifdef DEBUG_X 1205#ifdef DEBUG_X
1261 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1206 XStoreName (display->display, TermWin.vt, "vt window");
1262#endif 1207#endif
1263 1208
1264 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1209 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | PropertyChangeMask); 1210 | PropertyChangeMask);
1266 1211
… …
1271 vt_emask |= PointerMotionMask; 1216 vt_emask |= PointerMotionMask;
1272 else 1217 else
1273#endif 1218#endif
1274 vt_emask |= (Button1MotionMask | Button3MotionMask); 1219 vt_emask |= (Button1MotionMask | Button3MotionMask);
1275 1220
1276 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1221 XSelectInput (display->display, TermWin.vt, vt_emask);
1222 vt_ev.start (display, TermWin.vt);
1277 1223
1278#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1224#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1279
1280 if (menuBar_height()) 1225 if (menuBar_height ())
1281 { 1226 {
1282 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1227 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1283 window_vt_x, 0, 1228 window_vt_x, 0,
1284 TermWin_TotalWidth(), 1229 TermWin_TotalWidth (),
1285 menuBar_TotalHeight(), 1230 menuBar_TotalHeight (),
1286 0, 1231 0,
1287 PixColors[Color_fg], 1232 PixColors[Color_fg],
1288 PixColors[Color_scroll]); 1233 PixColors[Color_scroll]);
1234
1289#ifdef DEBUG_X 1235#ifdef DEBUG_X
1290
1291 XStoreName(Xdisplay, menuBar.win, "menubar"); 1236 XStoreName (display->display, menuBar.win, "menubar");
1292#endif 1237#endif
1293 1238
1294 XDefineCursor(Xdisplay, menuBar.win, 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
1295 XSelectInput(Xdisplay, menuBar.win, 1244 XSelectInput (display->display, menuBar.win,
1296 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1245 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1297 | Button1MotionMask)); 1246 | Button1MotionMask));
1247 menubar_ev.start (display, menuBar.win);
1298 } 1248 }
1299#endif 1249#endif
1250
1300#ifdef XPM_BACKGROUND 1251#ifdef XPM_BACKGROUND
1301 if (rs[Rs_backgroundPixmap] != NULL 1252 if (rs[Rs_backgroundPixmap] != NULL
1302 && !(Options & Opt_transparent)) 1253 && ! (Options & Opt_transparent))
1303 { 1254 {
1304 const char *p = rs[Rs_backgroundPixmap]; 1255 const char *p = rs[Rs_backgroundPixmap];
1305 1256
1306 if ((p = STRCHR(p, ';')) != NULL) 1257 if ((p = STRCHR (p, ';')) != NULL)
1307 { 1258 {
1308 p++; 1259 p++;
1309 rxvt_scale_pixmap (this, p); 1260 scale_pixmap (p);
1310 } 1261 }
1311 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1262 set_bgPixmap (rs[Rs_backgroundPixmap]);
1312 rxvt_scr_touch (this, True); 1263 scr_touch (True);
1313 } 1264 }
1314#endif 1265#endif
1315 1266
1316 /* graphics context for the vt window */ 1267 /* graphics context for the vt window */
1317 gcvalue.foreground = PixColors[Color_fg]; 1268 gcvalue.foreground = PixColors[Color_fg];
1318 gcvalue.background = PixColors[Color_bg]; 1269 gcvalue.background = PixColors[Color_bg];
1319 gcvalue.graphics_exposures = 1; 1270 gcvalue.graphics_exposures = 1;
1320 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1271 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1321 GCForeground | GCBackground 1272 GCForeground | GCBackground
1322 | GCGraphicsExposures, &gcvalue); 1273 | GCGraphicsExposures, &gcvalue);
1274
1275 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1323 1276
1324#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1277#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1325
1326 gcvalue.foreground = PixColors[Color_topShadow]; 1278 gcvalue.foreground = PixColors[Color_topShadow];
1327 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1279 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1328 GCForeground, &gcvalue);
1329 gcvalue.foreground = PixColors[Color_bottomShadow]; 1280 gcvalue.foreground = PixColors[Color_bottomShadow];
1330 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1281 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1331 GCForeground, &gcvalue);
1332 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1282 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1333 : Color_scroll)]; 1283 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1334 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt,
1335 GCForeground, &gcvalue);
1336#endif 1284#endif
1337} 1285}
1338 1286
1339/*----------------------------------------------------------------------*/ 1287/*----------------------------------------------------------------------*/
1340/* 1288/*
… …
1346rxvt_term::run_command (const char *const *argv) 1294rxvt_term::run_command (const char *const *argv)
1347{ 1295{
1348 int cfd, er; 1296 int cfd, er;
1349 1297
1350 /* get master (pty) */ 1298 /* get master (pty) */
1351 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1299 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1352 { 1300 {
1353 rxvt_print_error("can't open pseudo-tty"); 1301 rxvt_print_error ("can't open pseudo-tty");
1354 return -1; 1302 return -1;
1355 } 1303 }
1356
1357#ifdef FD_SETSIZE
1358 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1359 {
1360 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1361 rxvt_clean_exit();
1362 exit(EXIT_FAILURE);
1363 }
1364#endif
1365 1304
1366 fcntl (cfd, F_SETFL, O_NONBLOCK); 1305 fcntl (cfd, F_SETFL, O_NONBLOCK);
1367 1306
1368 /* get slave (tty) */ 1307 /* get slave (tty) */
1369 if (tty_fd < 0) 1308 if (tty_fd < 0)
1370 { 1309 {
1371#ifndef NO_SETOWNER_TTYDEV 1310#ifndef NO_SETOWNER_TTYDEV
1372 rxvt_privileged_ttydev (aR_ SAVE); 1311 privileged_ttydev (SAVE);
1373#endif 1312#endif
1374 1313
1375 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1314 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1376 { 1315 {
1377 close(cfd); 1316 close (cfd);
1378 rxvt_print_error("can't open slave tty %s", ttydev); 1317 rxvt_print_error ("can't open slave tty %s", ttydev);
1379 return -1; 1318 return -1;
1380 } 1319 }
1381 } 1320 }
1382#ifndef NO_BACKSPACE_KEY 1321#ifndef NO_BACKSPACE_KEY
1383 if (key_backspace[0] && !key_backspace[1]) 1322 if (key_backspace[0] && !key_backspace[1])
1384 er = key_backspace[0]; 1323 er = key_backspace[0];
1385 else if (STRCMP(key_backspace, "DEC") == 0) 1324 else if (STRCMP (key_backspace, "DEC") == 0)
1386 er = '\177'; /* the initial state anyway */ 1325 er = '\177'; /* the initial state anyway */
1387 else 1326 else
1388#endif 1327#endif
1389 1328
1390 er = -1; 1329 er = -1;
1391 1330
1392 rxvt_get_ttymode (&(tio), er); 1331 rxvt_get_ttymode (& (tio), er);
1393 1332
1394#ifndef __QNX__ 1333#ifndef __QNX__
1395 /* spin off the command interpreter */ 1334 /* spin off the command interpreter */
1396 switch (cmd_pid = fork ()) 1335 switch (cmd_pid = fork ())
1397 { 1336 {
1398 case -1: 1337 case -1:
1399 rxvt_print_error("can't fork"); 1338 rxvt_print_error ("can't fork");
1400 return -1; 1339 return -1;
1401 case 0: 1340 case 0:
1402 close (cfd); /* only keep tty_fd and STDERR open */ 1341 close (cfd); /* only keep tty_fd and STDERR open */
1403 close (Xfd); 1342
1343 init_env ();
1344
1404 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1345 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1405 rxvt_print_error ("could not obtain control of tty"); 1346 rxvt_print_error ("could not obtain control of tty");
1406 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:
1407 { 1362 {
1408 /* 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);
1409 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
1410 dup2 (tty_fd, STDOUT_FILENO); 1376 dup2 (fdstdin, STDIN_FILENO);
1411 dup2 (tty_fd, STDERR_FILENO);
1412
1413 if (tty_fd > 2)
1414 close (tty_fd); 1377 close (fdstdin);
1378#endif
1415 1379
1416 run_child (argv);
1417 } 1380 }
1418 exit (EXIT_FAILURE);
1419 /* NOTREACHED */
1420 default:
1421 {
1422#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1423 int fdstdin;
1424
1425 fdstdin = dup (STDIN_FILENO);
1426 dup2 (tty_fd, STDIN_FILENO);
1427#endif
1428
1429#ifdef UTMP_SUPPORT
1430 rxvt_privileged_utmp (this, SAVE);
1431#endif
1432
1433#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1434
1435 dup2 (fdstdin, STDIN_FILENO);
1436 close (fdstdin);
1437#endif
1438
1439 }
1440 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1381 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1441 break; 1382 break;
1442 } 1383 }
1443#else /* __QNX__ uses qnxspawn() */ 1384#else /* __QNX__ uses qnxspawn () */
1444 fchmod (tty_fd, 0622); 1385 fchmod (tty_fd, 0622);
1445 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1386 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1446 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1387 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1447 1388
1448 if (run_child (argv) == -1) 1389 if (run_child (argv) == -1)
… …
1462int 1403int
1463rxvt_term::run_child (const char *const *argv) 1404rxvt_term::run_child (const char *const *argv)
1464{ 1405{
1465 char *login; 1406 char *login;
1466 1407
1467 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1408 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1468 1409
1469 if (Options & Opt_console) 1410 if (Options & Opt_console)
1470 { /* be virtual console, fail silently */ 1411 { /* be virtual console, fail silently */
1471#ifdef TIOCCONS 1412#ifdef TIOCCONS
1472 unsigned int on = 1; 1413 unsigned int on = 1;
… …
1480 { 1421 {
1481 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1422 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1482 close (fd); 1423 close (fd);
1483 } 1424 }
1484#endif /* SRIOCSREDIR */ 1425#endif /* SRIOCSREDIR */
1426
1485 } 1427 }
1486 1428
1487 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1488 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1489 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1517 { 1459 {
1518# ifdef DEBUG_CMD 1460# ifdef DEBUG_CMD
1519 int i; 1461 int i;
1520 1462
1521 for (i = 0; argv[i]; i++) 1463 for (i = 0; argv[i]; i++)
1522 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1464 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1523# endif 1465# endif
1524 1466
1525 execvp(argv[0], (char *const *)argv); 1467 execvp (argv[0], (char *const *)argv);
1526 /* no error message: STDERR is closed! */ 1468 /* no error message: STDERR is closed! */
1527 } 1469 }
1528 else 1470 else
1529 { 1471 {
1530 const char *argv0, *shell; 1472 const char *argv0, *shell;
1531 1473
1532 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1533 shell = "/bin/sh"; 1475 shell = "/bin/sh";
1534 1476
1535 argv0 = (const char *)rxvt_r_basename(shell); 1477 argv0 = (const char *)rxvt_r_basename (shell);
1536 if (Options & Opt_loginShell) 1478 if (Options & Opt_loginShell)
1537 { 1479 {
1538 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1480 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1539 1481
1540 login[0] = '-'; 1482 login[0] = '-';
1541 STRCPY(&login[1], argv0); 1483 STRCPY (&login[1], argv0);
1542 argv0 = login; 1484 argv0 = login;
1543 } 1485 }
1544 execlp(shell, argv0, NULL); 1486 execlp (shell, argv0, NULL);
1545 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1546 } 1488 }
1547 1489
1548#else /* __QNX__ uses qnxspawn() */ 1490#else /* __QNX__ uses qnxspawn () */
1549 1491
1550 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 };
1551 char *command = NULL, fullcommand[_MAX_PATH]; 1493 char *command = NULL, fullcommand[_MAX_PATH];
1552 char **arg_v, *arg_a[2] = { NULL, NULL }; 1494 char **arg_v, *arg_a[2] = { NULL, NULL };
1553 1495
1554 if (argv != NULL) 1496 if (argv != NULL)
1555 { 1497 {
1556 if (access(argv[0], X_OK) == -1) 1498 if (access (argv[0], X_OK) == -1)
1557 { 1499 {
1558 if (STRCHR(argv[0], '/') == NULL) 1500 if (STRCHR (argv[0], '/') == NULL)
1559 { 1501 {
1560 searchenv(argv[0], "PATH", fullcommand); 1502 searchenv (argv[0], "PATH", fullcommand);
1561 if (fullcommand[0] != '\0') 1503 if (fullcommand[0] != '\0')
1562 command = fullcommand; 1504 command = fullcommand;
1563 } 1505 }
1564 if (access(command, X_OK) == -1) 1506 if (access (command, X_OK) == -1)
1565 return -1; 1507 return -1;
1566 } 1508 }
1567 else 1509 else
1568 command = argv[0]; 1510 command = argv[0];
1569 arg_v = argv; 1511 arg_v = argv;
1570 } 1512 }
1571 else 1513 else
1572 { 1514 {
1573 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1515 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1574 command = "/bin/sh"; 1516 command = "/bin/sh";
1575 1517
1576 arg_a[0] = my_basename(command); 1518 arg_a[0] = my_basename (command);
1577 if (Options & Opt_loginShell) 1519 if (Options & Opt_loginShell)
1578 { 1520 {
1579 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1521 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1580 1522
1581 login[0] = '-'; 1523 login[0] = '-';
1582 STRCPY(&login[1], arg_a[0]); 1524 STRCPY (&login[1], arg_a[0]);
1583 arg_a[0] = login; 1525 arg_a[0] = login;
1584 } 1526 }
1585 arg_v = arg_a; 1527 arg_v = arg_a;
1586 } 1528 }
1587 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1529 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1588 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1530 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1589 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1531 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1590 command, arg_v, environ, iov_a, 0); 1532 command, arg_v, environ, iov_a, 0);
1591 if (login) 1533 if (login)
1592 free(login); 1534 free (login);
1593 1535
1594 close(tty_fd); 1536 close (tty_fd);
1595 return cmd_fd; 1537 return cmd_fd;
1596 1538
1597#endif 1539#endif
1598 return -1; 1540 return -1;
1599} 1541}
1600 1542
1601/* ------------------------------------------------------------------------- * 1543/* ------------------------------------------------------------------------- *
1602 * GET TTY CURRENT STATE * 1544 * GET TTY CURRENT STATE *
1603 * ------------------------------------------------------------------------- */ 1545 * ------------------------------------------------------------------------- */
1604/* rxvt_get_ttymode() */ 1546/* rxvt_get_ttymode () */
1605/* INTPROTO */ 1547/* EXTPROTO */
1606void 1548void
1607rxvt_get_ttymode(ttymode_t *tio, int erase) 1549rxvt_get_ttymode (ttymode_t *tio, int erase)
1608{ 1550{
1609#ifdef HAVE_TERMIOS_H 1551#ifdef HAVE_TERMIOS_H
1610 /* 1552 /*
1611 * standard System V termios interface 1553 * standard System V termios interface
1612 */ 1554 */
1613 if (GET_TERMIOS(STDIN_FILENO, tio) < 0) 1555 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1614 { 1556 {
1615 /* return error - use system defaults */ 1557 /* return error - use system defaults */
1616 tio->c_cc[VINTR] = CINTR; 1558 tio->c_cc[VINTR] = CINTR;
1617 tio->c_cc[VQUIT] = CQUIT; 1559 tio->c_cc[VQUIT] = CQUIT;
1618 tio->c_cc[VERASE] = CERASE; 1560 tio->c_cc[VERASE] = CERASE;
… …
1692 /* 1634 /*
1693 * sgtty interface 1635 * sgtty interface
1694 */ 1636 */
1695 1637
1696 /* get parameters -- gtty */ 1638 /* get parameters -- gtty */
1697 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0) 1639 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1698 { 1640 {
1699 tio->sg.sg_erase = CERASE; /* ^H */ 1641 tio->sg.sg_erase = CERASE; /* ^H */
1700 tio->sg.sg_kill = CKILL; /* ^U */ 1642 tio->sg.sg_kill = CKILL; /* ^U */
1701 } 1643 }
1702 if (erase != -1) 1644 if (erase != -1)
1703 tio->sg.sg_erase = (char)erase; 1645 tio->sg.sg_erase = (char)erase;
1704 1646
1705 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1647 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1706 1648
1707 /* get special characters */ 1649 /* get special characters */
1708 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0) 1650 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1709 { 1651 {
1710 tio->tc.t_intrc = CINTR; /* ^C */ 1652 tio->tc.t_intrc = CINTR; /* ^C */
1711 tio->tc.t_quitc = CQUIT; /* ^\ */ 1653 tio->tc.t_quitc = CQUIT; /* ^\ */
1712 tio->tc.t_startc = CSTART; /* ^Q */ 1654 tio->tc.t_startc = CSTART; /* ^Q */
1713 tio->tc.t_stopc = CSTOP; /* ^S */ 1655 tio->tc.t_stopc = CSTOP; /* ^S */
1714 tio->tc.t_eofc = CEOF; /* ^D */ 1656 tio->tc.t_eofc = CEOF; /* ^D */
1715 tio->tc.t_brkc = -1; 1657 tio->tc.t_brkc = -1;
1716 } 1658 }
1717 /* get local special chars */ 1659 /* get local special chars */
1718 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0) 1660 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1719 { 1661 {
1720 tio->lc.t_suspc = CSUSP; /* ^Z */ 1662 tio->lc.t_suspc = CSUSP; /* ^Z */
1721 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1663 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1722 tio->lc.t_rprntc = CRPRNT; /* ^R */ 1664 tio->lc.t_rprntc = CRPRNT; /* ^R */
1723 tio->lc.t_flushc = CFLUSH; /* ^O */ 1665 tio->lc.t_flushc = CFLUSH; /* ^O */
1724 tio->lc.t_werasc = CWERASE; /* ^W */ 1666 tio->lc.t_werasc = CWERASE; /* ^W */
1725 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1667 tio->lc.t_lnextc = CLNEXT; /* ^V */
1726 } 1668 }
1727 /* get line discipline */ 1669 /* get line discipline */
1728 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line)); 1670 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1729# ifdef NTTYDISC 1671# ifdef NTTYDISC
1730 1672
1731 tio->line = NTTYDISC; 1673 tio->line = NTTYDISC;
1732# endif /* NTTYDISC */ 1674# endif /* NTTYDISC */
1733 1675
… …
1738 * Debugging 1680 * Debugging
1739 */ 1681 */
1740#ifdef DEBUG_TTYMODE 1682#ifdef DEBUG_TTYMODE
1741#ifdef HAVE_TERMIOS_H 1683#ifdef HAVE_TERMIOS_H
1742 /* c_iflag bits */ 1684 /* c_iflag bits */
1743 fprintf(stderr, "Input flags\n"); 1685 fprintf (stderr, "Input flags\n");
1744 1686
1745 /* cpp token stringize doesn't work on all machines <sigh> */ 1687 /* cpp token stringize doesn't work on all machines <sigh> */
1746# define FOO(flag,name) \ 1688# define FOO(flag,name) \
1747 if ((tio->c_iflag) & flag) \ 1689 if ((tio->c_iflag) & flag) \
1748 fprintf (stderr, "%s ", name) 1690 fprintf (stderr, "%s ", name)
1749 1691
1750 /* c_iflag bits */ 1692 /* c_iflag bits */
1751 FOO(IGNBRK, "IGNBRK"); 1693 FOO (IGNBRK, "IGNBRK");
1752 FOO(BRKINT, "BRKINT"); 1694 FOO (BRKINT, "BRKINT");
1753 FOO(IGNPAR, "IGNPAR"); 1695 FOO (IGNPAR, "IGNPAR");
1754 FOO(PARMRK, "PARMRK"); 1696 FOO (PARMRK, "PARMRK");
1755 FOO(INPCK, "INPCK"); 1697 FOO (INPCK, "INPCK");
1756 FOO(ISTRIP, "ISTRIP"); 1698 FOO (ISTRIP, "ISTRIP");
1757 FOO(INLCR, "INLCR"); 1699 FOO (INLCR, "INLCR");
1758 FOO(IGNCR, "IGNCR"); 1700 FOO (IGNCR, "IGNCR");
1759 FOO(ICRNL, "ICRNL"); 1701 FOO (ICRNL, "ICRNL");
1760 FOO(IXON, "IXON"); 1702 FOO (IXON, "IXON");
1761 FOO(IXOFF, "IXOFF"); 1703 FOO (IXOFF, "IXOFF");
1762# ifdef IUCLC 1704# ifdef IUCLC
1763 1705
1764 FOO(IUCLC, "IUCLC"); 1706 FOO (IUCLC, "IUCLC");
1765# endif 1707# endif
1766# ifdef IXANY 1708# ifdef IXANY
1767 1709
1768 FOO(IXANY, "IXANY"); 1710 FOO (IXANY, "IXANY");
1769# endif 1711# endif
1770# ifdef IMAXBEL 1712# ifdef IMAXBEL
1771 1713
1772 FOO(IMAXBEL, "IMAXBEL"); 1714 FOO (IMAXBEL, "IMAXBEL");
1773# endif 1715# endif
1774 1716
1775 fprintf(stderr, "\n"); 1717 fprintf (stderr, "\n");
1776 1718
1777# undef FOO 1719# undef FOO
1778# define FOO(entry, name) \ 1720# define FOO(entry, name) \
1779 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry]) 1721 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1780 1722
1781 FOO(VINTR, "VINTR"); 1723 FOO (VINTR, "VINTR");
1782 FOO(VQUIT, "VQUIT"); 1724 FOO (VQUIT, "VQUIT");
1783 FOO(VERASE, "VERASE"); 1725 FOO (VERASE, "VERASE");
1784 FOO(VKILL, "VKILL"); 1726 FOO (VKILL, "VKILL");
1785 FOO(VEOF, "VEOF"); 1727 FOO (VEOF, "VEOF");
1786 FOO(VEOL, "VEOL"); 1728 FOO (VEOL, "VEOL");
1787# ifdef VEOL2 1729# ifdef VEOL2
1788 1730
1789 FOO(VEOL2, "VEOL2"); 1731 FOO (VEOL2, "VEOL2");
1790# endif 1732# endif
1791# ifdef VSWTC 1733# ifdef VSWTC
1792 1734
1793 FOO(VSWTC, "VSWTC"); 1735 FOO (VSWTC, "VSWTC");
1794# endif 1736# endif
1795# ifdef VSWTCH 1737# ifdef VSWTCH
1796 1738
1797 FOO(VSWTCH, "VSWTCH"); 1739 FOO (VSWTCH, "VSWTCH");
1798# endif 1740# endif
1799 1741
1800 FOO(VSTART, "VSTART"); 1742 FOO (VSTART, "VSTART");
1801 FOO(VSTOP, "VSTOP"); 1743 FOO (VSTOP, "VSTOP");
1802 FOO(VSUSP, "VSUSP"); 1744 FOO (VSUSP, "VSUSP");
1803# ifdef VDSUSP 1745# ifdef VDSUSP
1804 1746
1805 FOO(VDSUSP, "VDSUSP"); 1747 FOO (VDSUSP, "VDSUSP");
1806# endif 1748# endif
1807# ifdef VREPRINT 1749# ifdef VREPRINT
1808 1750
1809 FOO(VREPRINT, "VREPRINT"); 1751 FOO (VREPRINT, "VREPRINT");
1810# endif 1752# endif
1811# ifdef VDISCRD 1753# ifdef VDISCRD
1812 1754
1813 FOO(VDISCRD, "VDISCRD"); 1755 FOO (VDISCRD, "VDISCRD");
1814# endif 1756# endif
1815# ifdef VWERSE 1757# ifdef VWERSE
1816 1758
1817 FOO(VWERSE, "VWERSE"); 1759 FOO (VWERSE, "VWERSE");
1818# endif 1760# endif
1819# ifdef VLNEXT 1761# ifdef VLNEXT
1820 1762
1821 FOO(VLNEXT, "VLNEXT"); 1763 FOO (VLNEXT, "VLNEXT");
1822# endif 1764# endif
1823 1765
1824 fprintf(stderr, "\n"); 1766 fprintf (stderr, "\n");
1825# undef FOO 1767# undef FOO
1826# endif /* HAVE_TERMIOS_H */ 1768# endif /* HAVE_TERMIOS_H */
1827#endif /* DEBUG_TTYMODE */ 1769#endif /* DEBUG_TTYMODE */
1828} 1770}
1829 1771

Diff Legend

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