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.99 by root, Mon Dec 20 16:44:31 2004 UTC vs.
Revision 1.166 by root, Tue Jan 31 19:53:30 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
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.
… …
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 "rxvtutil.h"
36#include "init.h" 37#include "init.h"
38
39#include <limits>
37 40
38#include <csignal> 41#include <csignal>
39 42
40const char *const def_colorName[] = 43const char *const def_colorName[] =
41 { 44 {
42 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
44 /* low-intensity colors */ 47 /* low-intensity colors */
45 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
46#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
47 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
48 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3)
49 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
50 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
51 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
52 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
53# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
54 "Grey90", /* 7: white (#E5E5E5) */ 57# else
55# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
56 "AntiqueWhite", /* 7: white (#FAEBD7) */
57# endif 59# endif
58 /* high-intensity colors */ 60 /* high-intensity colors */
59# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
61# else 63# else
62 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
63# endif 65# endif
64#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
65 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
66 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
68 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
71 "White", /* 7/15: bright white (#FFFFFF) */
72 73
73 // 88 xterm colours 74 // 88 xterm colours
74 "rgb:00/00/00", 75 "rgb:00/00/00",
75 "rgb:00/00/8b", 76 "rgb:00/00/8b",
76 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
168 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
169#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
170#if TINTING 171#if TINTING
171 NULL, 172 NULL,
172#endif 173#endif
173 }; 174#if OFF_FOCUS_FADING
174 175 "rgb:00/00/00",
175const char *const xa_names[] =
176 {
177 "TEXT",
178 "COMPOUND_TEXT",
179 "UTF8_STRING",
180 "MULTIPLE",
181 "TARGETS",
182 "TIMESTAMP",
183 "VT_SELECTION",
184 "INCR",
185 "WM_DELETE_WINDOW",
186 "CLIPBOARD",
187#if ENABLE_FRILLS
188 "_NET_WM_PID",
189 "_MOTIF_WM_HINTS",
190 "_NET_WM_NAME",
191 "_NET_WM_ICON_NAME",
192#endif
193#if USE_XIM
194 "WM_LOCALE_NAME",
195#endif
196#ifdef TRANSPARENT
197 "_XROOTPMAP_ID",
198 "ESETROOT_PMAP_ID",
199#endif
200#ifdef OFFIX_DND
201 "DndProtocol",
202 "DndSelection",
203#endif 176#endif
204 }; 177 };
205 178
206bool 179bool
207rxvt_term::init_vars () 180rxvt_term::init_vars ()
208{ 181{
209 sw_term.start (SIGTERM); 182 pix_colors = //
210
211 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
212#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
213 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
214#endif 186#endif
215 pix_colors = pix_colors_focused;
216
217 if (pix_colors == NULL)
218 return false;
219 187
220#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
221 TermWin.pixmap = None; 189 pixmap = None;
222#endif 190#endif
223 191
224 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
225 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
226 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
227 want_refresh = 1; 195 want_refresh = 1;
228 cmd_pid = -1;
229 pty.pty = pty.tty = -1;
230 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
231 TermWin.focus = 0;
232 TermWin.ncol = 80; 197 ncol = 80;
233 TermWin.nrow = 24; 198 nrow = 24;
234 TermWin.int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
236 TermWin.lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
237 TermWin.saveLines = SAVELINES; 202 saveLines = SAVELINES;
238 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
239 204
240 refresh_limit = 1; 205 refresh_limit = 1;
241 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
242 prev_nrow = prev_ncol = 0;
243 207
244 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
245#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
246 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
247 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
248 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
249#endif 213#endif
250 214
251 last_bot = last_state = -1; 215 last_bot = last_state = -1;
252
253#ifdef MENUBAR
254 menu_readonly = 1;
255# if ! (MENUBAR_MAX > 1)
256 CurrentBar = & (BarList);
257# endif /* (MENUBAR_MAX > 1) */
258#endif
259 216
260 return true; 217 return true;
261} 218}
262 219
263void 220void
… …
331 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
332 289
333 /* 290 /*
334 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
335 */ 292 */
293
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
338 296
339 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
298
299 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301
302 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305#if XFT
306 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0));
308 else
309#endif
310 set (display);
311
312 extract_resources ();
313
314 for (int i = NUM_RESOURCES; i--; )
315 if (rs [i] == resval_undef)
316 rs [i] = 0;
317
340 free (r_argv); 318 free (r_argv);
341 319
342#ifdef LOCAL_X_IS_UNIX 320#if ENABLE_PERL
343 if (rs[Rs_display_name][0] == ':') 321 if (!rs[Rs_perl_ext_1])
344 { 322 rs[Rs_perl_ext_1] = "default";
345 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 323
346 strcpy (val, "unix"); 324 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
347 strcat (val, rs[Rs_display_name]); 325 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
348 display = displays.get (val); 326 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
349 free (val);
350 } 327 {
328 rxvt_perl.init (this);
329 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
330 }
351#endif 331#endif
352
353 if (!display
354 && ! (display = displays.get (rs[Rs_display_name])))
355 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
356
357 extract_resources (display->display, rs[Rs_name]);
358 332
359 /* 333 /*
360 * set any defaults not already set 334 * set any defaults not already set
361 */ 335 */
362 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
… …
373 if (!rs[Rs_iconName]) 347 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 348 rs[Rs_iconName] = rs[Rs_name];
375 } 349 }
376 350
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 352 saveLines = min (i, MAX_SAVELINES);
379 353
380#if ENABLE_FRILLS 354#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 355 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 356 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
357
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
385#endif
386 360
387#ifndef NO_LINESPACE
388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
389 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 362 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
390#endif 363#endif
391 364
392#ifdef POINTER_BLANK 365#ifdef POINTER_BLANK
393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
394 pointerBlankDelay = i; 367 pointerBlankDelay = i;
395 else 368 else
396 pointerBlankDelay = 2; 369 pointerBlankDelay = 2;
397#endif 370#endif
398 371
399 /* no point having a scrollbar without having any scrollback! */ 372 /* no point having a scrollbar without having any scrollback! */
400 if (!TermWin.saveLines) 373 if (!saveLines)
401 options &= ~Opt_scrollBar; 374 set_option (Opt_scrollBar, 0);
402 375
403#ifdef PRINTPIPE 376#ifdef PRINTPIPE
404 if (!rs[Rs_print_pipe]) 377 if (!rs[Rs_print_pipe])
405 rs[Rs_print_pipe] = PRINTPIPE; 378 rs[Rs_print_pipe] = PRINTPIPE;
406#endif 379#endif
… …
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 423#endif
451 424
452#ifdef XTERM_REVERSE_VIDEO 425#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
454 if (options & Opt_reverseVideo) 427 if (OPTION (Opt_reverseVideo))
455 { 428 {
456 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
458 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
460 } 434 }
461#endif 435#endif
462 436
… …
464 if (!rs[Rs_color + i]) 438 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 439 rs[Rs_color + i] = def_colorName[i];
466 440
467#ifndef XTERM_REVERSE_VIDEO 441#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 442 /* this is how we implement reverseVideo */
469 if (options & Opt_reverseVideo) 443 if (OPTION (Opt_reverseVideo))
470 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 445#endif
472 446
473 /* convenient aliases for setting fg/bg to colors */ 447 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 448 color_aliases (Color_fg);
475 color_aliases (Color_bg); 449 color_aliases (Color_bg);
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
516 490
517 if (val == NULL) 491 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 493 val = XDisplayString (xdisp);
520 494
521 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
523 497
524 i = strlen (val); 498 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 500
527 sprintf (env_display, "DISPLAY=%s", val); 501 sprintf (env_display, "DISPLAY=%s", val);
528 502
529 /* avoiding the math library: 503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
530 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
531 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
532 ;
533 MAX_IT (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535
536 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)TermWin.parent[0]);
538 504
539 /* add entries to the environment: 505 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 506 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 507 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 508 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 510 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 511 * @ COLORFGBG: fg;bg color codes
546 */ 512 */
547 putenv (env_display); 513 putenv (env_display);
548 putenv (env_windowid); 514 putenv (env_windowid);
515
549 if (env_colorfgbg) 516 if (env_colorfgbg)
550 putenv (env_colorfgbg); 517 putenv (env_colorfgbg);
551 518
552#ifdef RXVT_TERMINFO 519#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 520 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 521#endif
555 522
556 if (display->depth <= 2) 523 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 524 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 525 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 526 putenv ("COLORTERM=" COLORTERMENVFULL);
560 527
561 if (rs[Rs_term_name] != NULL) 528 if (rs[Rs_term_name] != NULL)
… …
581 * This should support all European type languages. 548 * This should support all European type languages.
582 */ 549 */
583void 550void
584rxvt_term::set_locale (const char *locale) 551rxvt_term::set_locale (const char *locale)
585{ 552{
553 set_environ (envv);
554
586#if HAVE_XSETLOCALE || HAVE_SETLOCALE 555#if HAVE_XSETLOCALE || HAVE_SETLOCALE
587 free (this->locale); 556 free (this->locale);
588 this->locale = setlocale (LC_CTYPE, locale); 557 this->locale = setlocale (LC_CTYPE, locale);
589 558
590 if (!this->locale) 559 if (!this->locale)
591 { 560 {
592 if (*locale) 561 if (*locale)
593 { 562 {
594 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 563 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
595 setlocale (LC_CTYPE, ""); 564 setlocale (LC_CTYPE, "C");
596 } 565 }
597 else 566 else
598 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 567 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
599 568
600 this->locale = ""; 569 this->locale = "C";
601 } 570 }
602 571
603 572
604 this->locale = rxvt_strdup (this->locale); 573 this->locale = rxvt_strdup (this->locale);
605 SET_LOCALE (this->locale); 574 SET_LOCALE (this->locale);
606 mbstate.reset (); 575 mbstate.reset ();
607#endif 576#endif
608 577
609#if 0
610#if HAVE_NL_LANGINFO 578#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET)); 579 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8") 580 // /^UTF.?8/i
613 || !strcasecmp (codeset, "UTF8"); 581 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
582 && (codeset[1] == 'T' || codeset[1] == 't')
583 && (codeset[2] == 'F' || codeset[2] == 'f')
584 && (codeset[3] == '8' || codeset[4] == '8');
614 free (codeset); 585 free (codeset);
615#else 586#else
616 enc_utf8 = 0; 587 enc_utf8 = 0;
617#endif 588#endif
618#endif
619} 589}
620 590
621void 591void
622rxvt_term::init_xlocale () 592rxvt_term::init_xlocale ()
623{ 593{
594 set_environ (envv);
595
624#ifdef USE_XIM 596#ifdef USE_XIM
625 if (!locale) 597 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 598 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 599 else
628 { 600 {
… …
650 * Initialize the command connection. 622 * Initialize the command connection.
651 * This should be called after the X server connection is established. 623 * This should be called after the X server connection is established.
652 */ 624 */
653 625
654#ifdef META8_OPTION 626#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 628#endif
657 629
658 get_ourmods (); 630 get_ourmods ();
659 631
660 if (!(options & Opt_scrollTtyOutput)) 632 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 633 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 634 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 635 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 636 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 637 priv_modes |= PrivMode_smoothScroll;
666 638
667#ifndef NO_BACKSPACE_KEY 639#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 640 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 641 priv_modes |= PrivMode_HaveBackSpace;
670#endif 642#endif
671 643
672 /* add value for scrollBar */ 644 /* add value for scrollBar */
673 if (scrollbar_visible ()) 645 if (scrollBar.state)
674 { 646 {
675 priv_modes |= PrivMode_scrollBar; 647 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 648 SavedModes |= PrivMode_scrollBar;
677 } 649 }
678 if (menubar_visible ())
679 {
680 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar;
682 }
683
684#ifdef CURSOR_BLINK
685 if (options & Opt_cursorBlink)
686 (void)gettimeofday (&lastcursorchange, NULL);
687#endif
688 650
689 run_command (argv); 651 run_command (argv);
690} 652}
691 653
692/*----------------------------------------------------------------------*/ 654/*----------------------------------------------------------------------*/
… …
697 659
698#ifdef OFF_FOCUS_FADING 660#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
700#endif 662#endif
701 663
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
704 rxvt_color xcol; 671 rxvt_color xcol;
705 672
706 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
707 continue;
708
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 674 {
711#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
714 else 678 else
715#endif 679#endif
716 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
717 681
718 if (!rs[Rs_color + i]) 682 if (!name)
719 continue; 683 continue;
720 684
721 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
722 { 686 {
723 switch (i) 687 switch (i)
724 { 688 {
725 case Color_fg: 689 case Color_fg:
726 case Color_bg: 690 case Color_bg:
727 /* fatal: need bg/fg color */
728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
729 /* NOTREACHED */ 692 name = "";
730 break; 693 break;
731#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
732 case Color_cursor2: 695 case Color_cursor2:
733 xcol = pix_colors[Color_fg]; 696#endif
734 break;
735#endif /* ! NO_CURSORCOLOR */
736 case Color_pointer_fg: 697 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg];
737 xcol = pix_colors[Color_fg]; 699 xcol = pix_colors[Color_fg];
738 break; 700 break;
739 default: 701 default:
702 name = rs[Rs_color + Color_bg];
740 xcol = pix_colors[Color_bg]; /* None */ 703 xcol = pix_colors[Color_bg];
741 break; 704 break;
742 } 705 }
743 } 706 }
744 } 707 }
745 708
746 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name;
711 }
712
747#ifdef OFF_FOCUS_FADING 713#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 714 if (rs[Rs_fade])
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
750#endif 716 {
751 SET_PIXCOLOR (i); 717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
752 } 720 }
721#endif
753 722
754 if (display->depth <= 2) 723 if (depth <= 2)
755 { 724 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 728 }
760 729
761 /* 730 /*
762 * get scrollBar/menuBar shadow colors 731 * get scrollBar shadow colors
763 * 732 *
764 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 734 * from the fvwm window manager.
766 */ 735 */
767#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
768 737
769 if (display->depth <= 2) 738 if (depth <= 2)
739 {
770 { /* Monochrome */ 740 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 744 }
775 else 745 else
… …
778 /* xcol[0] == white 748 /* xcol[0] == white
779 * xcol[1] == top shadow 749 * xcol[1] == top shadow
780 * xcol[2] == bot shadow */ 750 * xcol[2] == bot shadow */
781 751
782 xcol[1] = pix_colors[Color_scroll]; 752 xcol[1] = pix_colors[Color_scroll];
783 xcol[0].set (display, 65535, 65535, 65535); 753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
784 754
785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 755 rgba c0, c1;
786 756
787 xcol[0].get (display, pr0, pg0, pb0); 757 xcol[0].get (c0);
788 xcol[1].get (display, pr1, pg1, pb1); 758 xcol[1].get (c1);
789 759
790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
791 761
792 /* topShadowColor */ 762 /* topShadowColor */
793 if (!xcol[1].set (display, 763 if (!xcol[1].set (this,
764 rgba (
794 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
795 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
796 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary
769 ));
797 xcol[1] = pix_colors[Color_White]; 770 xcol[1] = pix_colors[Color_White];
798 771
799 pix_colors[Color_topShadow] = xcol[1]; 772 pix_colors[Color_topShadow] = xcol[1];
800 } 773 }
801#endif /* KEEP_SCROLLCOLOR */ 774#endif /* KEEP_SCROLLCOLOR */
… …
811 int i = atoi (rs[Rs_color + idx]); 784 int i = atoi (rs[Rs_color + idx]);
812 785
813 if (i >= 8 && i <= 15) 786 if (i >= 8 && i <= 15)
814 { /* bright colors */ 787 { /* bright colors */
815 i -= 8; 788 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 789 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 790 return;
819#endif
820 } 791 }
821 792
822 if (i >= 0 && i <= 7) /* normal colors */ 793 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 794 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 795 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 801 * Use resource ``modifier'' to override the Meta modifier
831 */ 802 */
832void 803void
833rxvt_term::get_ourmods () 804rxvt_term::get_ourmods ()
834{ 805{
835 int i, j, k; 806 int i, j, k;
836 int requestedmeta, realmeta, realalt; 807 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 808 const char *cm, *rsmod;
838 XModifierKeymap *map; 809 XModifierKeymap *map;
839 KeyCode *kc; 810 KeyCode *kc;
840 const unsigned int modmasks[] = 811 const unsigned int modmasks[] =
841 { 812 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 813 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 814 };
844 815
845 requestedmeta = realmeta = realalt = 0; 816 requestedmeta = realmeta = realalt = 0;
846 rsmod = rs[Rs_modifier]; 817 rsmod = rs[Rs_modifier];
818
847 if (rsmod 819 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 821 requestedmeta = rsmod[3] - '0';
850 822
851 map = XGetModifierMapping (display->display); 823 map = XGetModifierMapping (xdisp);
852 kc = map->modifiermap; 824 kc = map->modifiermap;
825
853 for (i = 1; i < 6; i++) 826 for (i = 1; i < 6; i++)
854 { 827 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
829
856 for (j = map->max_keypermod; j--; k++) 830 for (j = map->max_keypermod; j--; k++)
857 { 831 {
858 if (kc[k] == 0) 832 if (kc[k] == 0)
859 break; 833 break;
834
860 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 835 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
861 { 836 {
862 case XK_Num_Lock: 837 case XK_Num_Lock:
863 ModNumLockMask = modmasks[i - 1]; 838 ModNumLockMask = modmasks[i - 1];
864 /* FALLTHROUGH */ 839 continue;
865 default: 840
866 continue; /* for (;;) */ 841 case XK_ISO_Level3_Shift:
842 ModLevel3Mask = modmasks[i - 1];
843 continue;
844
867 case XK_Meta_L: 845 case XK_Meta_L:
868 case XK_Meta_R: 846 case XK_Meta_R:
869 cm = "meta"; 847 cm = "meta";
870 realmeta = i; 848 realmeta = i;
871 break; 849 break;
850
872 case XK_Alt_L: 851 case XK_Alt_L:
873 case XK_Alt_R: 852 case XK_Alt_R:
874 cm = "alt"; 853 cm = "alt";
875 realalt = i; 854 realalt = i;
876 break; 855 break;
856
877 case XK_Super_L: 857 case XK_Super_L:
878 case XK_Super_R: 858 case XK_Super_R:
879 cm = "super"; 859 cm = "super";
880 break; 860 break;
861
881 case XK_Hyper_L: 862 case XK_Hyper_L:
882 case XK_Hyper_R: 863 case XK_Hyper_R:
883 cm = "hyper"; 864 cm = "hyper";
884 break; 865 break;
866
867 default:
868 continue;
885 } 869 }
870
886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 871 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
887 requestedmeta = i; 872 requestedmeta = i;
888 } 873 }
889 } 874 }
875
890 XFreeModifiermap (map); 876 XFreeModifiermap (map);
877
891 i = (requestedmeta ? requestedmeta 878 i = requestedmeta ? requestedmeta
892 : (realmeta ? realmeta 879 : realmeta ? realmeta
893 : (realalt ? realalt : 0))); 880 : realalt ? realalt
881 : 0;
882
894 if (i) 883 if (i)
895 ModMetaMask = modmasks[i - 1]; 884 ModMetaMask = modmasks[i - 1];
896} 885}
897 886
898/*----------------------------------------------------------------------*/ 887/*----------------------------------------------------------------------*/
… …
901rxvt_term::create_windows (int argc, const char *const *argv) 890rxvt_term::create_windows (int argc, const char *const *argv)
902{ 891{
903 XClassHint classHint; 892 XClassHint classHint;
904 XWMHints wmHint; 893 XWMHints wmHint;
905#if ENABLE_FRILLS 894#if ENABLE_FRILLS
906 Atom prop = None;
907 MWMHints mwmhints; 895 MWMHints mwmhints;
908#endif 896#endif
909 XGCValues gcvalue; 897 XGCValues gcvalue;
910 long vt_emask;
911 XSetWindowAttributes attributes; 898 XSetWindowAttributes attributes;
912 XWindowAttributes gattr; 899 Window top, parent;
913 900
914#ifdef USING_W11LIB 901 dLocal (Display *, xdisp);
915 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
917#endif
918 902
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 903 /* grab colors before netscape does */
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 904 Get_Colours ();
921 905
922 if (options & Opt_transparent) 906 if (!set_fonts ())
923 { 907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 908
925 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 909 parent = display->root;
926 } 910
911 attributes.override_redirect = !!OPTION (Opt_override_redirect);
927 912
928#if ENABLE_FRILLS 913#if ENABLE_FRILLS
929 if (options & Opt_borderLess) 914 if (OPTION (Opt_borderLess))
930 { 915 {
931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
932
933 if (prop == None)
934 { 917 {
935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
936#ifdef PREFER_24BIT
937 attributes.override_redirect = TRUE; 919 attributes.override_redirect = true;
938#endif
939 mwmhints.flags = 0; 920 mwmhints.flags = 0;
940 } 921 }
941 else 922 else
942 { 923 {
943 mwmhints.flags = MWM_HINTS_DECORATIONS; 924 mwmhints.flags = MWM_HINTS_DECORATIONS;
944 mwmhints.decorations = 0; 925 mwmhints.decorations = 0;
945 } 926 }
946 } 927 }
947 else 928 else
948 {
949 mwmhints.flags = 0; 929 mwmhints.flags = 0;
930#endif
931
932#if ENABLE_XEMBED
933 if (rs[Rs_embed])
950 } 934 {
951#endif 935 XWindowAttributes wattr;
952 936
953 /* grab colors before netscape does */ 937 parent = strtol (rs[Rs_embed], 0, 0);
954 Get_Colours ();
955 938
956 if (!set_fonts ()) 939 if (!XGetWindowAttributes (xdisp, parent, &wattr))
957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941
942 window_calc (wattr.width, wattr.height);
943 }
944#endif
958 945
959 window_calc (0, 0); 946 window_calc (0, 0);
947
948 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap;
952
953 top = XCreateWindow (xdisp, parent,
954 szHint.x, szHint.y,
955 szHint.width, szHint.height,
956 ext_bwidth,
957 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
959 &attributes);
960
961 this->parent[0] = top;
962
960 old_width = szHint.width; 963 old_width = szHint.width;
961 old_height = szHint.height; 964 old_height = szHint.height;
962 965
963 /* sub-window placement & size in rxvt_resize_subwindows () */
964
965#ifdef PREFER_24BIT
966 attributes.background_pixel = pix_colors_focused[Color_border];
967 attributes.border_pixel = pix_colors_focused[Color_border];
968 attributes.colormap = display->cmap;
969 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
970 szHint.x, szHint.y,
971 szHint.width, szHint.height,
972 TermWin.ext_bwidth,
973 display->depth, InputOutput,
974 display->visual,
975 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
976#else
977 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
978 szHint.x, szHint.y,
979 szHint.width, szHint.height,
980 TermWin.ext_bwidth,
981 pix_colors_focused[Color_border],
982 pix_colors_focused[Color_border]);
983#endif
984
985 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 966 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
986 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 967 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
987 968
988 classHint.res_name = (char *)rs[Rs_name]; 969 classHint.res_name = (char *)rs[Rs_name];
989 classHint.res_class = (char *)RESCLASS; 970 classHint.res_class = (char *)RESCLASS;
990 971
991 wmHint.flags = InputHint | StateHint | WindowGroupHint; 972 wmHint.flags = InputHint | StateHint | WindowGroupHint;
992 wmHint.input = True; 973 wmHint.input = True;
993 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
994 wmHint.window_group = TermWin.parent[0]; 975 wmHint.window_group = top;
995 976
996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
997 (char **)argv, argc, &szHint, &wmHint, &classHint); 978 &szHint, &wmHint, &classHint);
998
999 /* Enable delete window protocol */
1000 XSetWMProtocols (display->display, TermWin.parent[0],
1001 &xa[XA_WMDELETEWINDOW], 1);
1002 979
1003#if ENABLE_FRILLS 980#if ENABLE_FRILLS
981 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif
985
986 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH
989 xa[XA_NET_WM_PING],
990#endif
991 };
992
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994
995#if ENABLE_FRILLS
996 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif
999
1000#if ENABLE_EWMH
1004 long pid = getpid (); 1001 long pid = getpid ();
1005 1002
1006 XChangeProperty (display->display, TermWin.parent[0], 1003 XChangeProperty (xdisp, top,
1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1008 PropModeReplace, (unsigned char *)&pid, 1); 1005 PropModeReplace, (unsigned char *)&pid, 1);
1009#endif
1010 1006
1011 XSelectInput (display->display, TermWin.parent[0], 1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif
1009
1010 XSelectInput (xdisp, top,
1012 KeyPressMask 1011 KeyPressMask
1013#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1014 | KeyReleaseMask 1013 | KeyReleaseMask
1015#endif 1014#endif
1016 | FocusChangeMask | VisibilityChangeMask 1015 | FocusChangeMask | VisibilityChangeMask
1017 | ExposureMask
1018 | StructureNotifyMask); 1016 | ExposureMask | StructureNotifyMask);
1017
1019 termwin_ev.start (display, TermWin.parent[0]); 1018 termwin_ev.start (display, top);
1020
1021#if ENABLE_FRILLS
1022 if (mwmhints.flags)
1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1025#endif
1026 1019
1027 /* vt cursor: Black-on-White is standard, but this is more popular */ 1020 /* vt cursor: Black-on-White is standard, but this is more popular */
1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1029 1022
1030#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1023#ifdef HAVE_SCROLLBARS
1031 /* cursor (menuBar/scrollBar): Black-on-White */ 1024 /* cursor scrollBar: Black-on-White */
1032 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1033#endif
1034
1035#ifdef POINTER_BLANK
1036 {
1037 XColor blackcolour;
1038 blackcolour.red = 0;
1039 blackcolour.green = 0;
1040 blackcolour.blue = 0;
1041 Font f = XLoadFont (display->display, "fixed");
1042 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1043 &blackcolour, &blackcolour);
1044 XUnloadFont (display->display, f);
1045 }
1046#endif 1026#endif
1047 1027
1048 /* the vt window */ 1028 /* the vt window */
1049 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1029 vt = XCreateSimpleWindow (xdisp, top,
1050 window_vt_x,
1051 window_vt_y, 1030 window_vt_x, window_vt_y,
1052 TermWin_TotalWidth (), 1031 width, height,
1053 TermWin_TotalHeight (),
1054 0, 1032 0,
1055 pix_colors_focused[Color_fg], 1033 pix_colors_focused[Color_fg],
1056 pix_colors_focused[Color_bg]); 1034 pix_colors_focused[Color_bg]);
1057#ifdef DEBUG_X
1058 XStoreName (display->display, TermWin.vt, "vt window");
1059#endif
1060 1035
1061 attributes.bit_gravity = NorthWestGravity; 1036 attributes.bit_gravity = NorthWestGravity;
1062 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1063 1038
1064 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1065 1040
1066 pointer_unblank (); 1041 if (OPTION (Opt_pointerBlank))
1067
1068#ifdef POINTER_BLANK
1069 if (options & Opt_pointerBlank)
1070 vt_emask |= PointerMotionMask; 1042 vt_emask |= PointerMotionMask;
1071 else 1043 else
1072#endif
1073 vt_emask |= Button1MotionMask | Button3MotionMask; 1044 vt_emask |= Button1MotionMask | Button3MotionMask;
1074 1045
1075 XSelectInput (display->display, TermWin.vt, vt_emask); 1046 vt_select_input ();
1047
1076 vt_ev.start (display, TermWin.vt); 1048 vt_ev.start (display, vt);
1077
1078#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1079 if (menuBar_height ())
1080 {
1081 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1082 window_vt_x, 0,
1083 TermWin_TotalWidth (),
1084 menuBar_TotalHeight (),
1085 0,
1086 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_scroll]);
1088
1089#ifdef DEBUG_X
1090 XStoreName (display->display, menuBar.win, "menubar");
1091#endif
1092
1093 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1094
1095 XDefineCursor (display->display, menuBar.win,
1096 XCreateFontCursor (display->display, XC_left_ptr));
1097
1098 XSelectInput (display->display, menuBar.win,
1099 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1100 | Button1MotionMask));
1101 menubar_ev.start (display, menuBar.win);
1102 }
1103#endif
1104 1049
1105#ifdef XPM_BACKGROUND 1050#ifdef XPM_BACKGROUND
1106 if (rs[Rs_backgroundPixmap] != NULL 1051 if (rs[Rs_backgroundPixmap] != NULL
1107 && ! (options & Opt_transparent)) 1052 && !OPTION (Opt_transparent))
1108 { 1053 {
1109 const char *p = rs[Rs_backgroundPixmap]; 1054 const char *p = rs[Rs_backgroundPixmap];
1110 1055
1111 if ((p = strchr (p, ';')) != NULL) 1056 if ((p = strchr (p, ';')) != NULL)
1112 { 1057 {
… …
1118 scr_touch (true); 1063 scr_touch (true);
1119 } 1064 }
1120#endif 1065#endif
1121 1066
1122 /* graphics context for the vt window */ 1067 /* graphics context for the vt window */
1123 gcvalue.foreground = pix_colors[Color_fg]; 1068 gcvalue.foreground = pix_colors[Color_fg];
1124 gcvalue.background = pix_colors[Color_bg]; 1069 gcvalue.background = pix_colors[Color_bg];
1125 gcvalue.graphics_exposures = 1; 1070 gcvalue.graphics_exposures = 1;
1126 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1071
1072 gc = XCreateGC (xdisp, vt,
1127 GCForeground | GCBackground | GCGraphicsExposures, 1073 GCForeground | GCBackground | GCGraphicsExposures,
1128 &gcvalue); 1074 &gcvalue);
1129 1075
1130 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1076 drawable = new rxvt_drawable (this, vt);
1131 1077
1132#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1078#ifdef RXVT_SCROLLBAR
1133 gcvalue.foreground = pix_colors[Color_topShadow]; 1079 gcvalue.foreground = pix_colors[Color_topShadow];
1134 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1135 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1081 gcvalue.foreground = pix_colors[Color_bottomShadow];
1136 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1137 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1138 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1139#endif 1085#endif
1140 1086
1141#ifdef OFF_FOCUS_FADING 1087#ifdef OFF_FOCUS_FADING
1142 // initially we are in unfocused state 1088 // initially we are in unfocused state
1143 if (rs[Rs_fade]) 1089 if (rs[Rs_fade])
1144 pix_colors = pix_colors_unfocused; 1090 pix_colors = pix_colors_unfocused;
1145#endif 1091#endif
1146 1092
1093 pointer_unblank ();
1147 scr_recolour (); 1094 scr_recolour ();
1148} 1095}
1149 1096
1150/* ------------------------------------------------------------------------- * 1097/* ------------------------------------------------------------------------- *
1151 * GET TTY CURRENT STATE * 1098 * GET TTY CURRENT STATE *
… …
1157 /* 1104 /*
1158 * standard System V termios interface 1105 * standard System V termios interface
1159 */ 1106 */
1160 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1161 { 1108 {
1162 /* return error - use system defaults */ 1109 // return error - use system defaults,
1110 // where possible, and zero elsewhere
1111 memset (tio, 0, sizeof (ttymode_t));
1112
1163 tio->c_cc[VINTR] = CINTR; 1113 tio->c_cc[VINTR] = CINTR;
1164 tio->c_cc[VQUIT] = CQUIT; 1114 tio->c_cc[VQUIT] = CQUIT;
1165 tio->c_cc[VERASE] = CERASE; 1115 tio->c_cc[VERASE] = CERASE;
1116#ifdef VERASE2
1117 tio->c_cc[VERASE2] = CERASE2;
1118#endif
1166 tio->c_cc[VKILL] = CKILL; 1119 tio->c_cc[VKILL] = CKILL;
1167 tio->c_cc[VSTART] = CSTART; 1120 tio->c_cc[VSTART] = CSTART;
1168 tio->c_cc[VSTOP] = CSTOP; 1121 tio->c_cc[VSTOP] = CSTOP;
1169 tio->c_cc[VSUSP] = CSUSP; 1122 tio->c_cc[VSUSP] = CSUSP;
1170# ifdef VDSUSP 1123# ifdef VDSUSP
1171
1172 tio->c_cc[VDSUSP] = CDSUSP; 1124 tio->c_cc[VDSUSP] = CDSUSP;
1173# endif 1125# endif
1174# ifdef VREPRINT 1126# ifdef VREPRINT
1175
1176 tio->c_cc[VREPRINT] = CRPRNT; 1127 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif 1128# endif
1178# ifdef VDISCRD 1129# ifdef VDISCRD
1179
1180 tio->c_cc[VDISCRD] = CFLUSH; 1130 tio->c_cc[VDISCRD] = CFLUSH;
1181# endif 1131# endif
1182# ifdef VWERSE 1132# ifdef VWERSE
1183
1184 tio->c_cc[VWERSE] = CWERASE; 1133 tio->c_cc[VWERSE] = CWERASE;
1185# endif 1134# endif
1186# ifdef VLNEXT 1135# ifdef VLNEXT
1187
1188 tio->c_cc[VLNEXT] = CLNEXT; 1136 tio->c_cc[VLNEXT] = CLNEXT;
1189# endif 1137# endif
1190
1191 } 1138 }
1139
1192 tio->c_cc[VEOF] = CEOF; 1140 tio->c_cc[VEOF] = CEOF;
1193 tio->c_cc[VEOL] = VDISABLE; 1141 tio->c_cc[VEOL] = VDISABLE;
1194# ifdef VEOL2 1142# ifdef VEOL2
1195
1196 tio->c_cc[VEOL2] = VDISABLE; 1143 tio->c_cc[VEOL2] = VDISABLE;
1197# endif 1144# endif
1198# ifdef VSWTC 1145# ifdef VSWTC
1199
1200 tio->c_cc[VSWTC] = VDISABLE; 1146 tio->c_cc[VSWTC] = VDISABLE;
1201# endif 1147# endif
1202# ifdef VSWTCH 1148# ifdef VSWTCH
1203
1204 tio->c_cc[VSWTCH] = VDISABLE; 1149 tio->c_cc[VSWTCH] = VDISABLE;
1205# endif 1150# endif
1206# if VMIN != VEOF 1151# if VMIN != VEOF
1207
1208 tio->c_cc[VMIN] = 1; 1152 tio->c_cc[VMIN] = 1;
1209# endif 1153# endif
1210# if VTIME != VEOL 1154# if VTIME != VEOL
1211
1212 tio->c_cc[VTIME] = 0; 1155 tio->c_cc[VTIME] = 0;
1213# endif 1156# endif
1214 1157
1215 if (erase != -1) 1158 if (erase != -1)
1216 tio->c_cc[VERASE] = (char)erase; 1159 tio->c_cc[VERASE] = (char)erase;
… …
1244 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1187 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1245 { 1188 {
1246 tio->sg.sg_erase = CERASE; /* ^H */ 1189 tio->sg.sg_erase = CERASE; /* ^H */
1247 tio->sg.sg_kill = CKILL; /* ^U */ 1190 tio->sg.sg_kill = CKILL; /* ^U */
1248 } 1191 }
1192
1249 if (erase != -1) 1193 if (erase != -1)
1250 tio->sg.sg_erase = (char)erase; 1194 tio->sg.sg_erase = (char)erase;
1251 1195
1252 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1196 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1253 1197
… …
1259 tio->tc.t_startc = CSTART; /* ^Q */ 1203 tio->tc.t_startc = CSTART; /* ^Q */
1260 tio->tc.t_stopc = CSTOP; /* ^S */ 1204 tio->tc.t_stopc = CSTOP; /* ^S */
1261 tio->tc.t_eofc = CEOF; /* ^D */ 1205 tio->tc.t_eofc = CEOF; /* ^D */
1262 tio->tc.t_brkc = -1; 1206 tio->tc.t_brkc = -1;
1263 } 1207 }
1208
1264 /* get local special chars */ 1209 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1210 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 { 1211 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */ 1212 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1213 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1217 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 } 1218 }
1274 /* get line discipline */ 1219 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1220 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC 1221# ifdef NTTYDISC
1277
1278 tio->line = NTTYDISC; 1222 tio->line = NTTYDISC;
1279# endif /* NTTYDISC */ 1223# endif /* NTTYDISC */
1280 1224
1281 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1225 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1282#endif /* HAVE_TERMIOS_H */ 1226#endif /* HAVE_TERMIOS_H */
… …
1305 FOO (IGNCR, "IGNCR"); 1249 FOO (IGNCR, "IGNCR");
1306 FOO (ICRNL, "ICRNL"); 1250 FOO (ICRNL, "ICRNL");
1307 FOO (IXON, "IXON"); 1251 FOO (IXON, "IXON");
1308 FOO (IXOFF, "IXOFF"); 1252 FOO (IXOFF, "IXOFF");
1309# ifdef IUCLC 1253# ifdef IUCLC
1310
1311 FOO (IUCLC, "IUCLC"); 1254 FOO (IUCLC, "IUCLC");
1312# endif 1255# endif
1313# ifdef IXANY 1256# ifdef IXANY
1314
1315 FOO (IXANY, "IXANY"); 1257 FOO (IXANY, "IXANY");
1316# endif 1258# endif
1317# ifdef IMAXBEL 1259# ifdef IMAXBEL
1318
1319 FOO (IMAXBEL, "IMAXBEL"); 1260 FOO (IMAXBEL, "IMAXBEL");
1320# endif 1261# endif
1321 1262
1322 fprintf (stderr, "\n"); 1263 fprintf (stderr, "\n");
1323 1264
… …
1330 FOO (VERASE, "VERASE"); 1271 FOO (VERASE, "VERASE");
1331 FOO (VKILL, "VKILL"); 1272 FOO (VKILL, "VKILL");
1332 FOO (VEOF, "VEOF"); 1273 FOO (VEOF, "VEOF");
1333 FOO (VEOL, "VEOL"); 1274 FOO (VEOL, "VEOL");
1334# ifdef VEOL2 1275# ifdef VEOL2
1335
1336 FOO (VEOL2, "VEOL2"); 1276 FOO (VEOL2, "VEOL2");
1337# endif 1277# endif
1338# ifdef VSWTC 1278# ifdef VSWTC
1339
1340 FOO (VSWTC, "VSWTC"); 1279 FOO (VSWTC, "VSWTC");
1341# endif 1280# endif
1342# ifdef VSWTCH 1281# ifdef VSWTCH
1343
1344 FOO (VSWTCH, "VSWTCH"); 1282 FOO (VSWTCH, "VSWTCH");
1345# endif 1283# endif
1346
1347 FOO (VSTART, "VSTART"); 1284 FOO (VSTART, "VSTART");
1348 FOO (VSTOP, "VSTOP"); 1285 FOO (VSTOP, "VSTOP");
1349 FOO (VSUSP, "VSUSP"); 1286 FOO (VSUSP, "VSUSP");
1350# ifdef VDSUSP 1287# ifdef VDSUSP
1351
1352 FOO (VDSUSP, "VDSUSP"); 1288 FOO (VDSUSP, "VDSUSP");
1353# endif 1289# endif
1354# ifdef VREPRINT 1290# ifdef VREPRINT
1355
1356 FOO (VREPRINT, "VREPRINT"); 1291 FOO (VREPRINT, "VREPRINT");
1357# endif 1292# endif
1358# ifdef VDISCRD 1293# ifdef VDISCRD
1359
1360 FOO (VDISCRD, "VDISCRD"); 1294 FOO (VDISCRD, "VDISCRD");
1361# endif 1295# endif
1362# ifdef VWERSE 1296# ifdef VWERSE
1363
1364 FOO (VWERSE, "VWERSE"); 1297 FOO (VWERSE, "VWERSE");
1365# endif 1298# endif
1366# ifdef VLNEXT 1299# ifdef VLNEXT
1367
1368 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1369# endif 1301# endif
1370 1302
1371 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1372# undef FOO 1304# undef FOO
… …
1381 * the slave. 1313 * the slave.
1382 */ 1314 */
1383void 1315void
1384rxvt_term::run_command (const char *const *argv) 1316rxvt_term::run_command (const char *const *argv)
1385{ 1317{
1318#if ENABLE_FRILLS
1319 if (rs[Rs_pty_fd])
1320 {
1321 pty->pty = atoi (rs[Rs_pty_fd]);
1322
1323 if (pty->pty >= 0)
1324 {
1325 if (getfd_hook)
1326 pty->pty = (*getfd_hook) (pty->pty);
1327
1328 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1329 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1330 }
1331 }
1332 else
1333#endif
1334 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336
1337 pty->set_utf8_mode (enc_utf8);
1338
1339 /* set initial window size */
1340 tt_winch ();
1341
1386 int er; 1342 int er;
1387
1388 if (!pty.get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1343
1391#ifndef NO_BACKSPACE_KEY 1344#ifndef NO_BACKSPACE_KEY
1392 if (key_backspace[0] && !key_backspace[1]) 1345 if (key_backspace[0] && !key_backspace[1])
1393 er = key_backspace[0]; 1346 er = key_backspace[0];
1394 else if (strcmp (key_backspace, "DEC") == 0) 1347 else if (strcmp (key_backspace, "DEC") == 0)
… …
1397#endif 1350#endif
1398 er = -1; 1351 er = -1;
1399 1352
1400 rxvt_get_ttymode (&tio, er); 1353 rxvt_get_ttymode (&tio, er);
1401 1354
1402 /* set initial window size */ 1355#if ENABLE_FRILLS
1403 tt_winch (); 1356 if (rs[Rs_pty_fd])
1357 return;
1358#endif
1404 1359
1405 sw_chld.start (SIGCHLD);
1406
1407#ifndef __QNX__
1408 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1409 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1410 { 1362 {
1411 case -1: 1363 case -1:
1364 {
1365 cmd_pid = 0;
1412 rxvt_fatal ("can't fork, aborting.\n"); 1366 rxvt_fatal ("can't fork, aborting.\n");
1367 }
1413 case 0: 1368 case 0:
1414 init_env (); 1369 init_env ();
1415 1370
1416 if (!pty.make_controlling_tty ()) 1371 if (!pty->make_controlling_tty ())
1417 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1372 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1418 else 1373 else
1419 { 1374 {
1420 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1375 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1421 dup2 (pty.tty, STDIN_FILENO); 1376 dup2 (pty->tty, STDIN_FILENO);
1422 dup2 (pty.tty, STDOUT_FILENO); 1377 dup2 (pty->tty, STDOUT_FILENO);
1423 dup2 (pty.tty, STDERR_FILENO); 1378 dup2 (pty->tty, STDERR_FILENO);
1424 1379
1425 // close all our file handles that we do no longer need 1380 // close all our file handles that we do no longer need
1426 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1381 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1427 { 1382 {
1428 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1383 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1429 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1384 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1430 } 1385 }
1431 1386
1432 run_child (argv); 1387 run_child (argv);
1433 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1388 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1434 } 1389 }
1435 1390
1436 _exit (EXIT_FAILURE); 1391 _exit (EXIT_FAILURE);
1437 1392
1438 default: 1393 default:
1439 { 1394 if (!OPTION (Opt_utmpInhibit))
1440#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1441 int fdstdin;
1442 1396
1443 fdstdin = dup (STDIN_FILENO); 1397 pty->close_tty ();
1444 dup2 (pty.tty, STDIN_FILENO);
1445#endif
1446 1398
1447#ifdef UTMP_SUPPORT 1399 child_ev.start (cmd_pid);
1448 privileged_utmp (SAVE);
1449#endif
1450 1400
1451#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1401 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1452
1453 dup2 (fdstdin, STDIN_FILENO);
1454 close (fdstdin);
1455#endif
1456 }
1457
1458 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1459 break; 1402 break;
1460 } 1403 }
1461#else /* __QNX__ uses qnxspawn () */
1462 fchmod (pty.tty, 0622);
1463 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1464 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1465
1466 if (run_child (argv) == -1)
1467 exit (EXIT_FAILURE);
1468#endif
1469} 1404}
1470 1405
1471/* ------------------------------------------------------------------------- * 1406/* ------------------------------------------------------------------------- *
1472 * CHILD PROCESS OPERATIONS * 1407 * CHILD PROCESS OPERATIONS *
1473 * ------------------------------------------------------------------------- */ 1408 * ------------------------------------------------------------------------- */
… …
1480{ 1415{
1481 char *login; 1416 char *login;
1482 1417
1483 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1484 1419
1485 if (options & Opt_console) 1420 if (OPTION (Opt_console))
1486 { /* be virtual console, fail silently */ 1421 { /* be virtual console, fail silently */
1487#ifdef TIOCCONS 1422#ifdef TIOCCONS
1488 unsigned int on = 1; 1423 unsigned int on = 1;
1489 1424
1490 ioctl (STDIN_FILENO, TIOCCONS, &on); 1425 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1517 // unblock signals (signals are blocked by iom.C 1452 // unblock signals (signals are blocked by iom.C
1518 sigset_t ss; 1453 sigset_t ss;
1519 sigemptyset (&ss); 1454 sigemptyset (&ss);
1520 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);
1521 1456
1522#ifndef __QNX__
1523 /* command interpreter path */ 1457 /* command interpreter path */
1524 if (argv != NULL) 1458 if (argv != NULL)
1525 { 1459 {
1526# ifdef DEBUG_CMD 1460# ifdef DEBUG_CMD
1527 int i; 1461 int i;
… …
1533 execvp (argv[0], (char *const *)argv); 1467 execvp (argv[0], (char *const *)argv);
1534 /* no error message: STDERR is closed! */ 1468 /* no error message: STDERR is closed! */
1535 } 1469 }
1536 else 1470 else
1537 { 1471 {
1538 const char *argv0, *shell; 1472 const char *argv0, *shell;
1539 1473
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1475 shell = "/bin/sh";
1542 1476
1543 argv0 = (const char *)rxvt_r_basename (shell); 1477 argv0 = (const char *)rxvt_r_basename (shell);
1544 1478
1545 if (options & Opt_loginShell) 1479 if (OPTION (Opt_loginShell))
1546 { 1480 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1548 1482
1549 login[0] = '-'; 1483 login[0] = '-';
1550 strcpy (&login[1], argv0); 1484 strcpy (&login[1], argv0);
1551 argv0 = login; 1485 argv0 = login;
1552 } 1486 }
1487
1553 execlp (shell, argv0, NULL); 1488 execlp (shell, argv0, NULL);
1554 /* no error message: STDERR is closed! */ 1489 /* no error message: STDERR is closed! */
1555 } 1490 }
1556 1491
1557#else /* __QNX__ uses qnxspawn () */
1558
1559 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1560 char *command = NULL, fullcommand[_MAX_PATH];
1561 char **arg_v, *arg_a[2] = { NULL, NULL };
1562
1563 if (argv != NULL)
1564 {
1565 if (access (argv[0], X_OK) == -1)
1566 {
1567 if (strchr (argv[0], '/') == NULL)
1568 {
1569 searchenv (argv[0], "PATH", fullcommand);
1570
1571 if (fullcommand[0] != '\0')
1572 command = fullcommand;
1573 }
1574
1575 if (access (command, X_OK) == -1)
1576 return -1;
1577 }
1578 else
1579 command = argv[0];
1580
1581 arg_v = argv;
1582 }
1583 else
1584 {
1585 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1586 command = "/bin/sh";
1587
1588 arg_a[0] = my_basename (command);
1589
1590 if (options & Opt_loginShell)
1591 {
1592 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1593
1594 login[0] = '-';
1595 strcpy (&login[1], arg_a[0]);
1596 arg_a[0] = login;
1597 }
1598
1599 arg_v = arg_a;
1600 }
1601
1602 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1603 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1604 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1605 command, arg_v, environ, iov_a, 0);
1606 if (login)
1607 free (login);
1608
1609 pty.close_tty ();
1610 return pty.pty;
1611#endif
1612
1613 return -1; 1492 return -1;
1614} 1493}
1615 1494
1616/*----------------------- end-of-file (C source) -----------------------*/ 1495/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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