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

Diff Legend

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