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

Diff Legend

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