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

Diff Legend

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