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.19 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.57 by root, Mon Jun 21 22:24:07 2004 UTC

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

Diff Legend

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