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

Diff Legend

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