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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.14 by pcg, Thu Dec 18 05:45:11 2003 UTC

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

Diff Legend

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