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

Diff Legend

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