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.17 by pcg, Mon Jan 19 17:26:43 2004 UTC vs.
Revision 1.49 by pcg, Fri Apr 2 15:15:25 2004 UTC

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

Diff Legend

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