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

Diff Legend

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