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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.14 by pcg, Thu Dec 18 05:45:11 2003 UTC

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

Diff Legend

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