ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.14 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.68 by root, Tue Aug 10 20:39:19 2004 UTC

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

Diff Legend

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