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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.6 by pcg, Tue Nov 25 17:11:33 2003 UTC

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

Diff Legend

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