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

Diff Legend

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