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

Diff Legend

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