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.21 by pcg, Sat Jan 31 02:14:58 2004 UTC vs.
Revision 1.65 by root, Fri Jul 30 16:13:46 2004 UTC

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

Diff Legend

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