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

Diff Legend

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