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

Diff Legend

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