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.157 by root, Wed Jan 25 21:09:21 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 "Black", /* 0: black (#000000) */
46#ifndef NO_BRIGHTCOLOR
47 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
48 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
49 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
50 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
51 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
59# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
61# else 63# else
62 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
63# endif 65# endif
64#endif /* NO_BRIGHTCOLOR */
65 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
66 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
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 "black",
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 xa = display->xa;
303
304#if ENABLE_FRILLS
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
310
311 extract_resources ();
312
340 free (r_argv); 313 free (r_argv);
341 314
342#ifdef LOCAL_X_IS_UNIX 315#if ENABLE_PERL
343 if (rs[Rs_display_name][0] == ':') 316 if (!rs[Rs_perl_ext_1])
344 { 317 rs[Rs_perl_ext_1] = "default";
345 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 318
346 strcpy (val, "unix"); 319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
347 strcat (val, rs[Rs_display_name]); 320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
348 display = displays.get (val); 321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
349 free (val);
350 } 322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
351#endif 326#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 327
359 /* 328 /*
360 * set any defaults not already set 329 * set any defaults not already set
361 */ 330 */
362 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
373 if (!rs[Rs_iconName]) 342 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 343 rs[Rs_iconName] = rs[Rs_name];
375 } 344 }
376 345
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 347 saveLines = min (i, MAX_SAVELINES);
379 348
380#if ENABLE_FRILLS 349#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 350 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 351 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
352
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
385#endif
386 355
387#ifndef NO_LINESPACE
388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
389 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 357 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
390#endif 358#endif
391 359
392#ifdef POINTER_BLANK 360#ifdef POINTER_BLANK
393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
394 pointerBlankDelay = i; 362 pointerBlankDelay = i;
395 else 363 else
396 pointerBlankDelay = 2; 364 pointerBlankDelay = 2;
397#endif 365#endif
398 366
399 /* no point having a scrollbar without having any scrollback! */ 367 /* no point having a scrollbar without having any scrollback! */
400 if (!TermWin.saveLines) 368 if (!saveLines)
401 options &= ~Opt_scrollBar; 369 set_option (Opt_scrollBar, 0);
402 370
403#ifdef PRINTPIPE 371#ifdef PRINTPIPE
404 if (!rs[Rs_print_pipe]) 372 if (!rs[Rs_print_pipe])
405 rs[Rs_print_pipe] = PRINTPIPE; 373 rs[Rs_print_pipe] = PRINTPIPE;
406#endif 374#endif
… …
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 418#endif
451 419
452#ifdef XTERM_REVERSE_VIDEO 420#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
454 if (options & Opt_reverseVideo) 422 if (OPTION (Opt_reverseVideo))
455 { 423 {
456 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
458 if (!rs[Rs_color + Color_bg]) 426 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 427 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
464 if (!rs[Rs_color + i]) 432 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 433 rs[Rs_color + i] = def_colorName[i];
466 434
467#ifndef XTERM_REVERSE_VIDEO 435#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 436 /* this is how we implement reverseVideo */
469 if (options & Opt_reverseVideo) 437 if (OPTION (Opt_reverseVideo))
470 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 439#endif
472 440
473 /* convenient aliases for setting fg/bg to colors */ 441 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 442 color_aliases (Color_fg);
475 color_aliases (Color_bg); 443 color_aliases (Color_bg);
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
516 484
517 if (val == NULL) 485 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
520 488
521 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
523 491
524 i = strlen (val); 492 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 494
527 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
528 496
529 /* avoiding the math library: 497 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 498
539 /* add entries to the environment: 499 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
546 */ 506 */
547 putenv (env_display); 507 putenv (env_display);
548 putenv (env_windowid); 508 putenv (env_windowid);
509
549 if (env_colorfgbg) 510 if (env_colorfgbg)
550 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
551 512
552#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 515#endif
555 516
556 if (display->depth <= 2) 517 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 519 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
560 521
561 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
581 * This should support all European type languages. 542 * This should support all European type languages.
582 */ 543 */
583void 544void
584rxvt_term::set_locale (const char *locale) 545rxvt_term::set_locale (const char *locale)
585{ 546{
547 set_environ (envv);
548
586#if HAVE_XSETLOCALE || HAVE_SETLOCALE 549#if HAVE_XSETLOCALE || HAVE_SETLOCALE
587 free (this->locale); 550 free (this->locale);
588 this->locale = setlocale (LC_CTYPE, locale); 551 this->locale = setlocale (LC_CTYPE, locale);
589 552
590 if (!this->locale) 553 if (!this->locale)
591 { 554 {
592 if (*locale) 555 if (*locale)
593 { 556 {
594 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 557 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
595 setlocale (LC_CTYPE, ""); 558 setlocale (LC_CTYPE, "C");
596 } 559 }
597 else 560 else
598 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 561 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
599 562
600 this->locale = ""; 563 this->locale = "C";
601 } 564 }
602 565
603 566
604 this->locale = rxvt_strdup (this->locale); 567 this->locale = rxvt_strdup (this->locale);
605 SET_LOCALE (this->locale); 568 SET_LOCALE (this->locale);
606 mbstate.reset (); 569 mbstate.reset ();
607#endif 570#endif
608 571
609#if 0
610#if HAVE_NL_LANGINFO 572#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET)); 573 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8") 574 // /^UTF.?8/i
613 || !strcasecmp (codeset, "UTF8"); 575 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
576 && (codeset[1] == 'T' || codeset[1] == 't')
577 && (codeset[2] == 'F' || codeset[2] == 'f')
578 && (codeset[3] == '8' || codeset[4] == '8');
614 free (codeset); 579 free (codeset);
615#else 580#else
616 enc_utf8 = 0; 581 enc_utf8 = 0;
617#endif 582#endif
618#endif
619} 583}
620 584
621void 585void
622rxvt_term::init_xlocale () 586rxvt_term::init_xlocale ()
623{ 587{
588 set_environ (envv);
589
624#ifdef USE_XIM 590#ifdef USE_XIM
625 if (!locale) 591 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 592 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 593 else
628 { 594 {
… …
650 * Initialize the command connection. 616 * Initialize the command connection.
651 * This should be called after the X server connection is established. 617 * This should be called after the X server connection is established.
652 */ 618 */
653 619
654#ifdef META8_OPTION 620#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 622#endif
657 623
658 get_ourmods (); 624 get_ourmods ();
659 625
660 if (!(options & Opt_scrollTtyOutput)) 626 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 627 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 628 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 629 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 630 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 631 priv_modes |= PrivMode_smoothScroll;
666 632
667#ifndef NO_BACKSPACE_KEY 633#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 634 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 635 priv_modes |= PrivMode_HaveBackSpace;
670#endif 636#endif
671 637
672 /* add value for scrollBar */ 638 /* add value for scrollBar */
673 if (scrollbar_visible ()) 639 if (scrollBar.state)
674 { 640 {
675 priv_modes |= PrivMode_scrollBar; 641 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 642 SavedModes |= PrivMode_scrollBar;
677 } 643 }
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 644
689 run_command (argv); 645 run_command (argv);
690} 646}
691 647
692/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
… …
697 653
698#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
700#endif 656#endif
701 657
702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
703 { 659 {
704 rxvt_color xcol; 660 rxvt_color xcol;
705 661
706 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
707 continue; 663 continue;
708 664
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 666 {
711#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
714 else 670 else
715#endif 671#endif
716 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
717 673
… …
742 } 698 }
743 } 699 }
744 } 700 }
745 701
746 pix_colors[i] = xcol; 702 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i);
704 }
705
747#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
750#endif 710#endif
751 SET_PIXCOLOR (i);
752 }
753 711
754 if (display->depth <= 2) 712 if (depth <= 2)
755 { 713 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 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]; 715 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]; 716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 717 }
760 718
761 /* 719 /*
762 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
763 * 721 *
764 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 723 * from the fvwm window manager.
766 */ 724 */
767#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
768 726
769 if (display->depth <= 2) 727 if (depth <= 2)
728 {
770 { /* Monochrome */ 729 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 733 }
775 else 734 else
… …
778 /* xcol[0] == white 737 /* xcol[0] == white
779 * xcol[1] == top shadow 738 * xcol[1] == top shadow
780 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
781 740
782 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
783 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, 65535, 65535, 65535);
784 743
785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
786 745
787 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, pr0, pg0, pb0);
788 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, pr1, pg1, pb1);
789 748
790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
791 750
792 /* topShadowColor */ 751 /* topShadowColor */
793 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
794 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
795 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
796 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
797 xcol[1] = pix_colors[Color_White]; 756 xcol[1] = pix_colors[Color_White];
798 757
… …
811 int i = atoi (rs[Rs_color + idx]); 770 int i = atoi (rs[Rs_color + idx]);
812 771
813 if (i >= 8 && i <= 15) 772 if (i >= 8 && i <= 15)
814 { /* bright colors */ 773 { /* bright colors */
815 i -= 8; 774 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 776 return;
819#endif
820 } 777 }
821 778
822 if (i >= 0 && i <= 7) /* normal colors */ 779 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 781 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 787 * Use resource ``modifier'' to override the Meta modifier
831 */ 788 */
832void 789void
833rxvt_term::get_ourmods () 790rxvt_term::get_ourmods ()
834{ 791{
835 int i, j, k; 792 int i, j, k;
836 int requestedmeta, realmeta, realalt; 793 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 794 const char *cm, *rsmod;
838 XModifierKeymap *map; 795 XModifierKeymap *map;
839 KeyCode *kc; 796 KeyCode *kc;
840 const unsigned int modmasks[] = 797 const unsigned int modmasks[] =
841 { 798 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 799 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 800 };
844 801
845 requestedmeta = realmeta = realalt = 0; 802 requestedmeta = realmeta = realalt = 0;
846 rsmod = rs[Rs_modifier]; 803 rsmod = rs[Rs_modifier];
804
847 if (rsmod 805 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
850 808
851 map = XGetModifierMapping (display->display); 809 map = XGetModifierMapping (xdisp);
852 kc = map->modifiermap; 810 kc = map->modifiermap;
811
853 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
854 { 813 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
815
856 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
857 { 817 {
858 if (kc[k] == 0) 818 if (kc[k] == 0)
859 break; 819 break;
820
860 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 821 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
861 { 822 {
862 case XK_Num_Lock: 823 case XK_Num_Lock:
863 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
864 /* FALLTHROUGH */ 825 continue;
865 default: 826
866 continue; /* for (;;) */ 827 case XK_ISO_Level3_Shift:
828 ModLevel3Mask = modmasks[i - 1];
829 continue;
830
867 case XK_Meta_L: 831 case XK_Meta_L:
868 case XK_Meta_R: 832 case XK_Meta_R:
869 cm = "meta"; 833 cm = "meta";
870 realmeta = i; 834 realmeta = i;
871 break; 835 break;
836
872 case XK_Alt_L: 837 case XK_Alt_L:
873 case XK_Alt_R: 838 case XK_Alt_R:
874 cm = "alt"; 839 cm = "alt";
875 realalt = i; 840 realalt = i;
876 break; 841 break;
842
877 case XK_Super_L: 843 case XK_Super_L:
878 case XK_Super_R: 844 case XK_Super_R:
879 cm = "super"; 845 cm = "super";
880 break; 846 break;
847
881 case XK_Hyper_L: 848 case XK_Hyper_L:
882 case XK_Hyper_R: 849 case XK_Hyper_R:
883 cm = "hyper"; 850 cm = "hyper";
884 break; 851 break;
852
853 default:
854 continue;
885 } 855 }
856
886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 857 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
887 requestedmeta = i; 858 requestedmeta = i;
888 } 859 }
889 } 860 }
861
890 XFreeModifiermap (map); 862 XFreeModifiermap (map);
863
891 i = (requestedmeta ? requestedmeta 864 i = requestedmeta ? requestedmeta
892 : (realmeta ? realmeta 865 : realmeta ? realmeta
893 : (realalt ? realalt : 0))); 866 : realalt ? realalt
867 : 0;
868
894 if (i) 869 if (i)
895 ModMetaMask = modmasks[i - 1]; 870 ModMetaMask = modmasks[i - 1];
896} 871}
897 872
898/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
… …
901rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
902{ 877{
903 XClassHint classHint; 878 XClassHint classHint;
904 XWMHints wmHint; 879 XWMHints wmHint;
905#if ENABLE_FRILLS 880#if ENABLE_FRILLS
906 Atom prop = None;
907 MWMHints mwmhints; 881 MWMHints mwmhints;
908#endif 882#endif
909 XGCValues gcvalue; 883 XGCValues gcvalue;
910 long vt_emask;
911 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
912 XWindowAttributes gattr; 885 Window top, parent;
913 886
914#ifdef USING_W11LIB 887 dLocal (Display *, xdisp);
915 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
917#endif
918 888
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 889 /* grab colors before netscape does */
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 890 Get_Colours ();
921 891
922 if (options & Opt_transparent) 892 if (!set_fonts ())
923 { 893 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); 894
925 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 895 parent = display->root;
926 } 896
897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
927 898
928#if ENABLE_FRILLS 899#if ENABLE_FRILLS
929 if (options & Opt_borderLess) 900 if (OPTION (Opt_borderLess))
930 { 901 {
931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
932
933 if (prop == None)
934 { 903 {
935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* 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; 905 attributes.override_redirect = TRUE;
938#endif
939 mwmhints.flags = 0; 906 mwmhints.flags = 0;
940 } 907 }
941 else 908 else
942 { 909 {
943 mwmhints.flags = MWM_HINTS_DECORATIONS; 910 mwmhints.flags = MWM_HINTS_DECORATIONS;
944 mwmhints.decorations = 0; 911 mwmhints.decorations = 0;
945 } 912 }
946 } 913 }
947 else 914 else
948 {
949 mwmhints.flags = 0; 915 mwmhints.flags = 0;
916#endif
917
918#if ENABLE_XEMBED
919 if (rs[Rs_embed])
950 } 920 {
951#endif 921 XWindowAttributes wattr;
952 922
953 /* grab colors before netscape does */ 923 parent = strtol (rs[Rs_embed], 0, 0);
954 Get_Colours ();
955 924
956 if (!set_fonts ()) 925 if (!XGetWindowAttributes (xdisp, parent, &wattr))
957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
927
928 window_calc (wattr.width, wattr.height);
929 }
930#endif
958 931
959 window_calc (0, 0); 932 window_calc (0, 0);
933
934 /* sub-window placement & size in rxvt_resize_subwindows () */
935 attributes.background_pixel = pix_colors_focused [Color_border];
936 attributes.border_pixel = pix_colors_focused [Color_border];
937 attributes.colormap = cmap;
938
939 top = XCreateWindow (xdisp, parent,
940 szHint.x, szHint.y,
941 szHint.width, szHint.height,
942 ext_bwidth,
943 depth, InputOutput, visual,
944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
945 &attributes);
946
947 this->parent[0] = top;
948
960 old_width = szHint.width; 949 old_width = szHint.width;
961 old_height = szHint.height; 950 old_height = szHint.height;
962 951
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); 952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
986 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
987 954
988 classHint.res_name = (char *)rs[Rs_name]; 955 classHint.res_name = (char *)rs[Rs_name];
989 classHint.res_class = (char *)RESCLASS; 956 classHint.res_class = (char *)RESCLASS;
990 957
991 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
992 wmHint.input = True; 959 wmHint.input = True;
993 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
994 wmHint.window_group = TermWin.parent[0]; 961 wmHint.window_group = top;
995 962
996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
997 (char **)argv, argc, &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
998
999 /* Enable delete window protocol */
1000 XSetWMProtocols (display->display, TermWin.parent[0],
1001 &xa[XA_WMDELETEWINDOW], 1);
1002 965
1003#if ENABLE_FRILLS 966#if ENABLE_FRILLS
967 if (mwmhints.flags)
968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif
971
972 Atom protocols[] = {
973 xa[XA_WM_DELETE_WINDOW],
974#if ENABLE_EWMH
975 xa[XA_NET_WM_PING],
976#endif
977 };
978
979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
980
981#if ENABLE_FRILLS
982 if (rs[Rs_transient_for])
983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif
985
986#if ENABLE_EWMH
1004 long pid = getpid (); 987 long pid = getpid ();
1005 988
1006 XChangeProperty (display->display, TermWin.parent[0], 989 XChangeProperty (xdisp, top,
1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1008 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1009#endif
1010 992
1011 XSelectInput (display->display, TermWin.parent[0], 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
994#endif
995
996 XSelectInput (xdisp, top,
1012 KeyPressMask 997 KeyPressMask
1013#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1014 | KeyReleaseMask 999 | KeyReleaseMask
1015#endif 1000#endif
1016 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1017 | ExposureMask
1018 | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1003
1019 termwin_ev.start (display, TermWin.parent[0]); 1004 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 1005
1027 /* vt cursor: Black-on-White is standard, but this is more popular */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1029 1008
1030#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1009#ifdef HAVE_SCROLLBARS
1031 /* cursor (menuBar/scrollBar): Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1032 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1011 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 1012#endif
1047 1013
1048 /* the vt window */ 1014 /* the vt window */
1049 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1015 vt = XCreateSimpleWindow (xdisp, top,
1050 window_vt_x,
1051 window_vt_y, 1016 window_vt_x, window_vt_y,
1052 TermWin_TotalWidth (), 1017 width, height,
1053 TermWin_TotalHeight (),
1054 0, 1018 0,
1055 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1056 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1057#ifdef DEBUG_X
1058 XStoreName (display->display, TermWin.vt, "vt window");
1059#endif
1060 1021
1061 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1062 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1063 1024
1064 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1065 1026
1066 pointer_unblank (); 1027 if (OPTION (Opt_pointerBlank))
1067
1068#ifdef POINTER_BLANK
1069 if (options & Opt_pointerBlank)
1070 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
1071 else 1029 else
1072#endif
1073 vt_emask |= Button1MotionMask | Button3MotionMask; 1030 vt_emask |= Button1MotionMask | Button3MotionMask;
1074 1031
1075 XSelectInput (display->display, TermWin.vt, vt_emask); 1032 vt_select_input ();
1033
1076 vt_ev.start (display, TermWin.vt); 1034 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 1035
1105#ifdef XPM_BACKGROUND 1036#ifdef XPM_BACKGROUND
1106 if (rs[Rs_backgroundPixmap] != NULL 1037 if (rs[Rs_backgroundPixmap] != NULL
1107 && ! (options & Opt_transparent)) 1038 && !OPTION (Opt_transparent))
1108 { 1039 {
1109 const char *p = rs[Rs_backgroundPixmap]; 1040 const char *p = rs[Rs_backgroundPixmap];
1110 1041
1111 if ((p = strchr (p, ';')) != NULL) 1042 if ((p = strchr (p, ';')) != NULL)
1112 { 1043 {
… …
1118 scr_touch (true); 1049 scr_touch (true);
1119 } 1050 }
1120#endif 1051#endif
1121 1052
1122 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1123 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1124 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1125 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 1;
1126 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1057
1058 gc = XCreateGC (xdisp, vt,
1127 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1128 &gcvalue); 1060 &gcvalue);
1129 1061
1130 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1062 drawable = new rxvt_drawable (this, vt);
1131 1063
1132#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1064#ifdef RXVT_SCROLLBAR
1133 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1134 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1135 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1136 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1137 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1138 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1139#endif 1071#endif
1140 1072
1141#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1142 // initially we are in unfocused state 1074 // initially we are in unfocused state
1143 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])
1144 pix_colors = pix_colors_unfocused; 1076 pix_colors = pix_colors_unfocused;
1145#endif 1077#endif
1146 1078
1079 pointer_unblank ();
1147 scr_recolour (); 1080 scr_recolour ();
1148} 1081}
1149 1082
1150/* ------------------------------------------------------------------------- * 1083/* ------------------------------------------------------------------------- *
1151 * GET TTY CURRENT STATE * 1084 * GET TTY CURRENT STATE *
… …
1157 /* 1090 /*
1158 * standard System V termios interface 1091 * standard System V termios interface
1159 */ 1092 */
1160 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1161 { 1094 {
1162 /* return error - use system defaults */ 1095 // return error - use system defaults,
1096 // where possible, and zero elsewhere
1097 memset (tio, 0, sizeof (ttymode_t));
1098
1163 tio->c_cc[VINTR] = CINTR; 1099 tio->c_cc[VINTR] = CINTR;
1164 tio->c_cc[VQUIT] = CQUIT; 1100 tio->c_cc[VQUIT] = CQUIT;
1165 tio->c_cc[VERASE] = CERASE; 1101 tio->c_cc[VERASE] = CERASE;
1102#ifdef VERASE2
1103 tio->c_cc[VERASE2] = CERASE2;
1104#endif
1166 tio->c_cc[VKILL] = CKILL; 1105 tio->c_cc[VKILL] = CKILL;
1167 tio->c_cc[VSTART] = CSTART; 1106 tio->c_cc[VSTART] = CSTART;
1168 tio->c_cc[VSTOP] = CSTOP; 1107 tio->c_cc[VSTOP] = CSTOP;
1169 tio->c_cc[VSUSP] = CSUSP; 1108 tio->c_cc[VSUSP] = CSUSP;
1170# ifdef VDSUSP 1109# ifdef VDSUSP
1171
1172 tio->c_cc[VDSUSP] = CDSUSP; 1110 tio->c_cc[VDSUSP] = CDSUSP;
1173# endif 1111# endif
1174# ifdef VREPRINT 1112# ifdef VREPRINT
1175
1176 tio->c_cc[VREPRINT] = CRPRNT; 1113 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif 1114# endif
1178# ifdef VDISCRD 1115# ifdef VDISCRD
1179
1180 tio->c_cc[VDISCRD] = CFLUSH; 1116 tio->c_cc[VDISCRD] = CFLUSH;
1181# endif 1117# endif
1182# ifdef VWERSE 1118# ifdef VWERSE
1183
1184 tio->c_cc[VWERSE] = CWERASE; 1119 tio->c_cc[VWERSE] = CWERASE;
1185# endif 1120# endif
1186# ifdef VLNEXT 1121# ifdef VLNEXT
1187
1188 tio->c_cc[VLNEXT] = CLNEXT; 1122 tio->c_cc[VLNEXT] = CLNEXT;
1189# endif 1123# endif
1190
1191 } 1124 }
1125
1192 tio->c_cc[VEOF] = CEOF; 1126 tio->c_cc[VEOF] = CEOF;
1193 tio->c_cc[VEOL] = VDISABLE; 1127 tio->c_cc[VEOL] = VDISABLE;
1194# ifdef VEOL2 1128# ifdef VEOL2
1195
1196 tio->c_cc[VEOL2] = VDISABLE; 1129 tio->c_cc[VEOL2] = VDISABLE;
1197# endif 1130# endif
1198# ifdef VSWTC 1131# ifdef VSWTC
1199
1200 tio->c_cc[VSWTC] = VDISABLE; 1132 tio->c_cc[VSWTC] = VDISABLE;
1201# endif 1133# endif
1202# ifdef VSWTCH 1134# ifdef VSWTCH
1203
1204 tio->c_cc[VSWTCH] = VDISABLE; 1135 tio->c_cc[VSWTCH] = VDISABLE;
1205# endif 1136# endif
1206# if VMIN != VEOF 1137# if VMIN != VEOF
1207
1208 tio->c_cc[VMIN] = 1; 1138 tio->c_cc[VMIN] = 1;
1209# endif 1139# endif
1210# if VTIME != VEOL 1140# if VTIME != VEOL
1211
1212 tio->c_cc[VTIME] = 0; 1141 tio->c_cc[VTIME] = 0;
1213# endif 1142# endif
1214 1143
1215 if (erase != -1) 1144 if (erase != -1)
1216 tio->c_cc[VERASE] = (char)erase; 1145 tio->c_cc[VERASE] = (char)erase;
… …
1244 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1245 { 1174 {
1246 tio->sg.sg_erase = CERASE; /* ^H */ 1175 tio->sg.sg_erase = CERASE; /* ^H */
1247 tio->sg.sg_kill = CKILL; /* ^U */ 1176 tio->sg.sg_kill = CKILL; /* ^U */
1248 } 1177 }
1178
1249 if (erase != -1) 1179 if (erase != -1)
1250 tio->sg.sg_erase = (char)erase; 1180 tio->sg.sg_erase = (char)erase;
1251 1181
1252 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1253 1183
… …
1259 tio->tc.t_startc = CSTART; /* ^Q */ 1189 tio->tc.t_startc = CSTART; /* ^Q */
1260 tio->tc.t_stopc = CSTOP; /* ^S */ 1190 tio->tc.t_stopc = CSTOP; /* ^S */
1261 tio->tc.t_eofc = CEOF; /* ^D */ 1191 tio->tc.t_eofc = CEOF; /* ^D */
1262 tio->tc.t_brkc = -1; 1192 tio->tc.t_brkc = -1;
1263 } 1193 }
1194
1264 /* get local special chars */ 1195 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 { 1197 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */ 1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 } 1204 }
1274 /* get line discipline */ 1205 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC 1207# ifdef NTTYDISC
1277
1278 tio->line = NTTYDISC; 1208 tio->line = NTTYDISC;
1279# endif /* NTTYDISC */ 1209# endif /* NTTYDISC */
1280 1210
1281 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1282#endif /* HAVE_TERMIOS_H */ 1212#endif /* HAVE_TERMIOS_H */
… …
1305 FOO (IGNCR, "IGNCR"); 1235 FOO (IGNCR, "IGNCR");
1306 FOO (ICRNL, "ICRNL"); 1236 FOO (ICRNL, "ICRNL");
1307 FOO (IXON, "IXON"); 1237 FOO (IXON, "IXON");
1308 FOO (IXOFF, "IXOFF"); 1238 FOO (IXOFF, "IXOFF");
1309# ifdef IUCLC 1239# ifdef IUCLC
1310
1311 FOO (IUCLC, "IUCLC"); 1240 FOO (IUCLC, "IUCLC");
1312# endif 1241# endif
1313# ifdef IXANY 1242# ifdef IXANY
1314
1315 FOO (IXANY, "IXANY"); 1243 FOO (IXANY, "IXANY");
1316# endif 1244# endif
1317# ifdef IMAXBEL 1245# ifdef IMAXBEL
1318
1319 FOO (IMAXBEL, "IMAXBEL"); 1246 FOO (IMAXBEL, "IMAXBEL");
1320# endif 1247# endif
1321 1248
1322 fprintf (stderr, "\n"); 1249 fprintf (stderr, "\n");
1323 1250
… …
1330 FOO (VERASE, "VERASE"); 1257 FOO (VERASE, "VERASE");
1331 FOO (VKILL, "VKILL"); 1258 FOO (VKILL, "VKILL");
1332 FOO (VEOF, "VEOF"); 1259 FOO (VEOF, "VEOF");
1333 FOO (VEOL, "VEOL"); 1260 FOO (VEOL, "VEOL");
1334# ifdef VEOL2 1261# ifdef VEOL2
1335
1336 FOO (VEOL2, "VEOL2"); 1262 FOO (VEOL2, "VEOL2");
1337# endif 1263# endif
1338# ifdef VSWTC 1264# ifdef VSWTC
1339
1340 FOO (VSWTC, "VSWTC"); 1265 FOO (VSWTC, "VSWTC");
1341# endif 1266# endif
1342# ifdef VSWTCH 1267# ifdef VSWTCH
1343
1344 FOO (VSWTCH, "VSWTCH"); 1268 FOO (VSWTCH, "VSWTCH");
1345# endif 1269# endif
1346
1347 FOO (VSTART, "VSTART"); 1270 FOO (VSTART, "VSTART");
1348 FOO (VSTOP, "VSTOP"); 1271 FOO (VSTOP, "VSTOP");
1349 FOO (VSUSP, "VSUSP"); 1272 FOO (VSUSP, "VSUSP");
1350# ifdef VDSUSP 1273# ifdef VDSUSP
1351
1352 FOO (VDSUSP, "VDSUSP"); 1274 FOO (VDSUSP, "VDSUSP");
1353# endif 1275# endif
1354# ifdef VREPRINT 1276# ifdef VREPRINT
1355
1356 FOO (VREPRINT, "VREPRINT"); 1277 FOO (VREPRINT, "VREPRINT");
1357# endif 1278# endif
1358# ifdef VDISCRD 1279# ifdef VDISCRD
1359
1360 FOO (VDISCRD, "VDISCRD"); 1280 FOO (VDISCRD, "VDISCRD");
1361# endif 1281# endif
1362# ifdef VWERSE 1282# ifdef VWERSE
1363
1364 FOO (VWERSE, "VWERSE"); 1283 FOO (VWERSE, "VWERSE");
1365# endif 1284# endif
1366# ifdef VLNEXT 1285# ifdef VLNEXT
1367
1368 FOO (VLNEXT, "VLNEXT"); 1286 FOO (VLNEXT, "VLNEXT");
1369# endif 1287# endif
1370 1288
1371 fprintf (stderr, "\n"); 1289 fprintf (stderr, "\n");
1372# undef FOO 1290# undef FOO
… …
1381 * the slave. 1299 * the slave.
1382 */ 1300 */
1383void 1301void
1384rxvt_term::run_command (const char *const *argv) 1302rxvt_term::run_command (const char *const *argv)
1385{ 1303{
1304#if ENABLE_FRILLS
1305 if (rs[Rs_pty_fd])
1306 {
1307 pty->pty = atoi (rs[Rs_pty_fd]);
1308
1309 if (pty->pty >= 0)
1310 {
1311 if (getfd_hook)
1312 pty->pty = (*getfd_hook) (pty->pty);
1313
1314 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1315 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1316 }
1317 }
1318 else
1319#endif
1320 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322
1323 pty->set_utf8_mode (enc_utf8);
1324
1325 /* set initial window size */
1326 tt_winch ();
1327
1386 int er; 1328 int er;
1387
1388 if (!pty.get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1329
1391#ifndef NO_BACKSPACE_KEY 1330#ifndef NO_BACKSPACE_KEY
1392 if (key_backspace[0] && !key_backspace[1]) 1331 if (key_backspace[0] && !key_backspace[1])
1393 er = key_backspace[0]; 1332 er = key_backspace[0];
1394 else if (strcmp (key_backspace, "DEC") == 0) 1333 else if (strcmp (key_backspace, "DEC") == 0)
… …
1397#endif 1336#endif
1398 er = -1; 1337 er = -1;
1399 1338
1400 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1401 1340
1402 /* set initial window size */ 1341#if ENABLE_FRILLS
1403 tt_winch (); 1342 if (rs[Rs_pty_fd])
1343 return;
1344#endif
1404 1345
1405 sw_chld.start (SIGCHLD);
1406
1407#ifndef __QNX__
1408 /* spin off the command interpreter */ 1346 /* spin off the command interpreter */
1409 switch (cmd_pid = fork ()) 1347 switch (cmd_pid = fork ())
1410 { 1348 {
1411 case -1: 1349 case -1:
1350 {
1351 cmd_pid = 0;
1412 rxvt_fatal ("can't fork, aborting.\n"); 1352 rxvt_fatal ("can't fork, aborting.\n");
1353 }
1413 case 0: 1354 case 0:
1414 init_env (); 1355 init_env ();
1415 1356
1416 if (!pty.make_controlling_tty ()) 1357 if (!pty->make_controlling_tty ())
1417 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1358 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1418 else 1359 else
1419 { 1360 {
1420 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1361 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1421 dup2 (pty.tty, STDIN_FILENO); 1362 dup2 (pty->tty, STDIN_FILENO);
1422 dup2 (pty.tty, STDOUT_FILENO); 1363 dup2 (pty->tty, STDOUT_FILENO);
1423 dup2 (pty.tty, STDERR_FILENO); 1364 dup2 (pty->tty, STDERR_FILENO);
1424 1365
1425 // close all our file handles that we do no longer need 1366 // close all our file handles that we do no longer need
1426 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1367 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1427 { 1368 {
1428 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1369 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1429 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1370 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1430 } 1371 }
1431 1372
1432 run_child (argv); 1373 run_child (argv);
1433 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1374 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1434 } 1375 }
1435 1376
1436 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1437 1378
1438 default: 1379 default:
1439 { 1380 if (!OPTION (Opt_utmpInhibit))
1440#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1441 int fdstdin;
1442 1382
1443 fdstdin = dup (STDIN_FILENO); 1383 pty->close_tty ();
1444 dup2 (pty.tty, STDIN_FILENO);
1445#endif
1446 1384
1447#ifdef UTMP_SUPPORT 1385 child_ev.start (cmd_pid);
1448 privileged_utmp (SAVE);
1449#endif
1450 1386
1451#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 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; 1388 break;
1460 } 1389 }
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} 1390}
1470 1391
1471/* ------------------------------------------------------------------------- * 1392/* ------------------------------------------------------------------------- *
1472 * CHILD PROCESS OPERATIONS * 1393 * CHILD PROCESS OPERATIONS *
1473 * ------------------------------------------------------------------------- */ 1394 * ------------------------------------------------------------------------- */
… …
1480{ 1401{
1481 char *login; 1402 char *login;
1482 1403
1483 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1484 1405
1485 if (options & Opt_console) 1406 if (OPTION (Opt_console))
1486 { /* be virtual console, fail silently */ 1407 { /* be virtual console, fail silently */
1487#ifdef TIOCCONS 1408#ifdef TIOCCONS
1488 unsigned int on = 1; 1409 unsigned int on = 1;
1489 1410
1490 ioctl (STDIN_FILENO, TIOCCONS, &on); 1411 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1517 // unblock signals (signals are blocked by iom.C 1438 // unblock signals (signals are blocked by iom.C
1518 sigset_t ss; 1439 sigset_t ss;
1519 sigemptyset (&ss); 1440 sigemptyset (&ss);
1520 sigprocmask (SIG_SETMASK, &ss, 0); 1441 sigprocmask (SIG_SETMASK, &ss, 0);
1521 1442
1522#ifndef __QNX__
1523 /* command interpreter path */ 1443 /* command interpreter path */
1524 if (argv != NULL) 1444 if (argv != NULL)
1525 { 1445 {
1526# ifdef DEBUG_CMD 1446# ifdef DEBUG_CMD
1527 int i; 1447 int i;
… …
1533 execvp (argv[0], (char *const *)argv); 1453 execvp (argv[0], (char *const *)argv);
1534 /* no error message: STDERR is closed! */ 1454 /* no error message: STDERR is closed! */
1535 } 1455 }
1536 else 1456 else
1537 { 1457 {
1538 const char *argv0, *shell; 1458 const char *argv0, *shell;
1539 1459
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1461 shell = "/bin/sh";
1542 1462
1543 argv0 = (const char *)rxvt_r_basename (shell); 1463 argv0 = (const char *)rxvt_r_basename (shell);
1544 1464
1545 if (options & Opt_loginShell) 1465 if (OPTION (Opt_loginShell))
1546 { 1466 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1548 1468
1549 login[0] = '-'; 1469 login[0] = '-';
1550 strcpy (&login[1], argv0); 1470 strcpy (&login[1], argv0);
1551 argv0 = login; 1471 argv0 = login;
1552 } 1472 }
1473
1553 execlp (shell, argv0, NULL); 1474 execlp (shell, argv0, NULL);
1554 /* no error message: STDERR is closed! */ 1475 /* no error message: STDERR is closed! */
1555 } 1476 }
1556 1477
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; 1478 return -1;
1614} 1479}
1615 1480
1616/*----------------------- end-of-file (C source) -----------------------*/ 1481/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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