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

Diff Legend

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