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.114 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.173 by root, Wed Jul 5 20:31:48 2006 UTC

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

Diff Legend

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