ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

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

Diff Legend

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