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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.8 by pcg, Thu Nov 27 10:12:10 2003 UTC

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

Diff Legend

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