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

Diff Legend

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