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.22 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.50 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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