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.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
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);
260 223
261 return true; 224 return true;
262} 225}
263 226
264void 227void
… …
302 int i, r_argc; 265 int i, r_argc;
303 char *val; 266 char *val;
304 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
305 268
306 /* 269 /*
307 * 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
308 */ 271 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
311 break; 274 break;
312 275
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 277
315 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
… …
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 295 rs[Rs_name] = rxvt_r_basename (argv[0]);
333 296
334 /* 297 /*
335 * Open display, get options/resources and create the window 298 * Open display, get options/resources and create the window
336 */ 299 */
300
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 301 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 302 rs[Rs_display_name] = ":0";
339 303
340 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
341 free (r_argv); 320 free (r_argv);
342 321
343#ifdef LOCAL_X_IS_UNIX 322 for (int i = NUM_RESOURCES; i--; )
344 if (rs[Rs_display_name][0] == ':') 323 if (rs [i] == resval_undef)
345 { 324 rs [i] = 0;
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 325
347 strcpy (val, "unix"); 326#if ENABLE_PERL
348 strcat (val, rs[Rs_display_name]); 327 if (!rs[Rs_perl_ext_1])
349 display = displays.get (val); 328 rs[Rs_perl_ext_1] = "default";
350 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]))
351 } 333 {
334 rxvt_perl.init (this);
335 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
336 }
352#endif 337#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 338
360 /* 339 /*
361 * set any defaults not already set 340 * set any defaults not already set
362 */ 341 */
363 if (cmd_argv && cmd_argv[0]) 342 if (cmd_argv && cmd_argv[0])
… …
374 if (!rs[Rs_iconName]) 353 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 354 rs[Rs_iconName] = rs[Rs_name];
376 } 355 }
377 356
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 357 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 358 saveLines = min (i, MAX_SAVELINES);
380 359
381#if ENABLE_FRILLS 360#if ENABLE_FRILLS
382 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)
383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 362 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
363
384 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)
385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 365 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
366
386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 367 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 368 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
388#endif 369#endif
389 370
390#ifdef POINTER_BLANK 371#ifdef POINTER_BLANK
391 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 372 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392 pointerBlankDelay = i; 373 pointerBlankDelay = i;
393 else 374 else
394 pointerBlankDelay = 2; 375 pointerBlankDelay = 2;
395#endif 376#endif
396 377
397 /* no point having a scrollbar without having any scrollback! */ 378 /* no point having a scrollbar without having any scrollback! */
398 if (!TermWin.saveLines) 379 if (!saveLines)
399 options &= ~Opt_scrollBar; 380 set_option (Opt_scrollBar, 0);
400 381
401#ifdef PRINTPIPE 382#ifdef PRINTPIPE
402 if (!rs[Rs_print_pipe]) 383 if (!rs[Rs_print_pipe])
403 rs[Rs_print_pipe] = PRINTPIPE; 384 rs[Rs_print_pipe] = PRINTPIPE;
404#endif 385#endif
… …
447 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]);
448#endif 429#endif
449 430
450#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
451 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
452 if (options & Opt_reverseVideo) 433 if (option (Opt_reverseVideo))
453 { 434 {
454 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
455 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437
456 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
457 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 439 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
458 } 440 }
459#endif 441#endif
460 442
… …
462 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
463 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
464 446
465#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 449 if (option (Opt_reverseVideo))
468 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]);
469#endif 451#endif
470 452
471 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 454 color_aliases (Color_fg);
473 color_aliases (Color_bg); 455 color_aliases (Color_bg);
… …
512 val = rxvt_network_display (rs[Rs_display_name]); 494 val = rxvt_network_display (rs[Rs_display_name]);
513 rs[Rs_display_name] = (const char *)val; 495 rs[Rs_display_name] = (const char *)val;
514 496
515 if (val == NULL) 497 if (val == NULL)
516#endif /* DISPLAY_IS_IP */ 498#endif /* DISPLAY_IS_IP */
517 val = XDisplayString (display->display); 499 val = XDisplayString (dpy);
518 500
519 if (rs[Rs_display_name] == NULL) 501 if (rs[Rs_display_name] == NULL)
520 rs[Rs_display_name] = val; /* use broken `:0' value */ 502 rs[Rs_display_name] = val; /* use broken `:0' value */
521 503
522 i = strlen (val); 504 i = strlen (val);
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
524 506
525 sprintf (env_display, "DISPLAY=%s", val); 507 sprintf (env_display, "DISPLAY=%s", val);
526 508
527 /* avoiding the math library: 509 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 510
537 /* add entries to the environment: 511 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 512 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 513 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 514 * @ COLORTERM: terminal sub-name and also indicates its color
… …
542 * @ TERMINFO: path to terminfo directory 516 * @ TERMINFO: path to terminfo directory
543 * @ COLORFGBG: fg;bg color codes 517 * @ COLORFGBG: fg;bg color codes
544 */ 518 */
545 putenv (env_display); 519 putenv (env_display);
546 putenv (env_windowid); 520 putenv (env_windowid);
521
547 if (env_colorfgbg) 522 if (env_colorfgbg)
548 putenv (env_colorfgbg); 523 putenv (env_colorfgbg);
549 524
550#ifdef RXVT_TERMINFO 525#ifdef RXVT_TERMINFO
551 putenv ("TERMINFO=" RXVT_TERMINFO); 526 putenv ("TERMINFO=" RXVT_TERMINFO);
552#endif 527#endif
553 528
554 if (display->depth <= 2) 529 if (depth <= 2)
555 putenv ("COLORTERM=" COLORTERMENV "-mono"); 530 putenv ("COLORTERM=" COLORTERMENV "-mono");
556 else 531 else
557 putenv ("COLORTERM=" COLORTERMENVFULL); 532 putenv ("COLORTERM=" COLORTERMENVFULL);
558 533
559 if (rs[Rs_term_name] != NULL) 534 if (rs[Rs_term_name] != NULL)
… …
579 * This should support all European type languages. 554 * This should support all European type languages.
580 */ 555 */
581void 556void
582rxvt_term::set_locale (const char *locale) 557rxvt_term::set_locale (const char *locale)
583{ 558{
559 set_environ (envv);
560
584#if HAVE_XSETLOCALE || HAVE_SETLOCALE 561#if HAVE_XSETLOCALE || HAVE_SETLOCALE
585 free (this->locale); 562 free (this->locale);
586 this->locale = setlocale (LC_CTYPE, locale); 563 this->locale = setlocale (LC_CTYPE, locale);
587 564
588 if (!this->locale) 565 if (!this->locale)
589 { 566 {
590 if (*locale) 567 if (*locale)
591 { 568 {
592 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);
593 setlocale (LC_CTYPE, ""); 570 setlocale (LC_CTYPE, "C");
594 } 571 }
595 else 572 else
596 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");
597 574
598 this->locale = ""; 575 this->locale = "C";
599 } 576 }
600 577
601 578
602 this->locale = rxvt_strdup (this->locale); 579 this->locale = rxvt_strdup (this->locale);
603 SET_LOCALE (this->locale); 580 SET_LOCALE (this->locale);
… …
618} 595}
619 596
620void 597void
621rxvt_term::init_xlocale () 598rxvt_term::init_xlocale ()
622{ 599{
600 set_environ (envv);
601
623#ifdef USE_XIM 602#ifdef USE_XIM
624 if (!locale) 603 if (!locale)
625 rxvt_warn ("setting locale failed, working without locale support.\n"); 604 rxvt_warn ("setting locale failed, working without locale support.\n");
626 else 605 else
627 { 606 {
… …
649 * Initialize the command connection. 628 * Initialize the command connection.
650 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
651 */ 630 */
652 631
653#ifdef META8_OPTION 632#ifdef META8_OPTION
654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
655#endif 634#endif
656 635
657 get_ourmods (); 636 get_ourmods ();
658 637
659 if (!(options & Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
660 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
661 if (options & Opt_scrollTtyKeypress) 640 if (option (Opt_scrollTtyKeypress))
662 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
663 if (!(options & Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
664 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
665 644
666#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
667 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
668 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
669#endif 648#endif
670 649
671 /* add value for scrollBar */ 650 /* add value for scrollBar */
672 if (scrollbar_visible ()) 651 if (scrollBar.state)
673 { 652 {
674 priv_modes |= PrivMode_scrollBar; 653 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 654 SavedModes |= PrivMode_scrollBar;
676 } 655 }
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 656
688 run_command (argv); 657 run_command (argv);
689} 658}
690 659
691/*----------------------------------------------------------------------*/ 660/*----------------------------------------------------------------------*/
… …
696 665
697#ifdef OFF_FOCUS_FADING 666#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 667 pix_colors = pix_colors_focused;
699#endif 668#endif
700 669
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 671 {
672 const char *name = rs[Rs_color + i];
673
674 if (!name)
675 continue;
676
703 rxvt_color xcol; 677 rxvt_color xcol;
704 678
705 if (!rs[Rs_color + i]) 679 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 680 {
710#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 683 name = def_colorName [1 - i];
713 else 684 else
714#endif 685#endif
715 rs[Rs_color + i] = def_colorName[i]; 686 name = def_colorName [i];
716 687
717 if (!rs[Rs_color + i]) 688 if (!name)
718 continue; 689 continue;
719 690
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 691 if (!set_color (xcol, name))
721 { 692 {
722 switch (i) 693 switch (i)
723 { 694 {
724 case Color_fg: 695 case Color_fg:
725 case Color_bg: 696 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 697 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 698 name = "";
729 break; 699 break;
730#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 701 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 702#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 703 case Color_pointer_fg:
736 xcol = pix_colors[Color_fg]; 704 name = rs[Rs_color + Color_fg];
705 xcol.set (this, name);
737 break; 706 break;
738 default: 707 default:
739 xcol = pix_colors[Color_bg]; /* None */ 708 name = rs[Rs_color + Color_bg];
709 xcol.set (this, name);
740 break; 710 break;
741 } 711 }
742 } 712 }
743 } 713 }
744 714
745 pix_colors[i] = xcol; 715 pix_colors[i] = xcol;
746#ifdef OFF_FOCUS_FADING 716 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 { 717 }
718
719 if (depth <= 2)
720 {
755 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);
756 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);
757 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);
758 } 724 }
759 725
760 /* 726 /*
761 * get scrollBar/menuBar shadow colors 727 * get scrollBar shadow colors
762 * 728 *
763 * The calculations of topShadow/bottomShadow values are adapted 729 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 730 * from the fvwm window manager.
765 */ 731 */
766#ifdef KEEP_SCROLLCOLOR 732#ifdef KEEP_SCROLLCOLOR
767
768 if (display->depth <= 2) 733 if (depth <= 2)
734 {
769 { /* Monochrome */ 735 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 alias_color (Color_scroll, Color_fg);
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 alias_color (Color_topShadow, Color_bg);
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 alias_color (Color_bottomShadow, Color_bg);
773 } 739 }
774 else 740 else
775 { 741 {
776 rxvt_color xcol[2]; 742 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 743
781 xcol[1] = pix_colors[Color_scroll]; 744 rgba cscroll;
782 xcol[0].set (display, 65535, 65535, 65535); 745 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 746
791 /* topShadowColor */ 747 /* topShadowColor */
792 if (!xcol[1].set (display, 748 if (!pix_colors[Color_topShadow].set (this,
793 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 749 rgba (
794 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 750 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
795 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 751 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
796 xcol[1] = pix_colors[Color_White]; 752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
797 753 cscroll.a)
798 pix_colors[Color_topShadow] = xcol[1]; 754 ))
755 alias_color (Color_topShadow, Color_White);
799 } 756 }
800#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
801} 763}
802 764
803/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
804/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
805void 767void
… …
810 int i = atoi (rs[Rs_color + idx]); 772 int i = atoi (rs[Rs_color + idx]);
811 773
812 if (i >= 8 && i <= 15) 774 if (i >= 8 && i <= 15)
813 { /* bright colors */ 775 { /* bright colors */
814 i -= 8; 776 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817 return; 778 return;
818#endif
819 } 779 }
820 780
821 if (i >= 0 && i <= 7) /* normal colors */ 781 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 783 }
… …
829 * Use resource ``modifier'' to override the Meta modifier 789 * Use resource ``modifier'' to override the Meta modifier
830 */ 790 */
831void 791void
832rxvt_term::get_ourmods () 792rxvt_term::get_ourmods ()
833{ 793{
834 int i, j, k; 794 int i, j, k;
835 int requestedmeta, realmeta, realalt; 795 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 796 const char *cm, *rsmod;
837 XModifierKeymap *map; 797 XModifierKeymap *map;
838 KeyCode *kc; 798 KeyCode *kc;
839 const unsigned int modmasks[] = 799 const unsigned int modmasks[] =
840 { 800 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 801 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 802 };
843 803
… …
846 806
847 if (rsmod 807 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
850 810
851 map = XGetModifierMapping (display->display); 811 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 812 kc = map->modifiermap;
853 813
854 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
855 { 815 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
859 { 819 {
860 if (kc[k] == 0) 820 if (kc[k] == 0)
861 break; 821 break;
862 822
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 823 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 824 {
865 case XK_Num_Lock: 825 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
867 continue; 827 continue;
868 828
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 878rxvt_term::create_windows (int argc, const char *const *argv)
919{ 879{
920 XClassHint classHint; 880 XClassHint classHint;
921 XWMHints wmHint; 881 XWMHints wmHint;
922#if ENABLE_FRILLS 882#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 883 MWMHints mwmhints;
925#endif 884#endif
926 XGCValues gcvalue; 885 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 887 Window top, parent;
930 888
931#ifdef USING_W11LIB 889 dLocal (Display *, dpy);
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935 890
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 891 /* grab colors before netscape does */
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 892 Get_Colours ();
938 893
939 if (options & Opt_transparent) 894 if (!set_fonts ())
940 { 895 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); 896
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 897 parent = display->root;
943 } 898
899 attributes.override_redirect = !!option (Opt_override_redirect);
944 900
945#if ENABLE_FRILLS 901#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 902 if (option (Opt_borderLess))
947 { 903 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 905 {
952 /* 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");*/
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 907 attributes.override_redirect = true;
955#endif
956 mwmhints.flags = 0; 908 mwmhints.flags = 0;
957 } 909 }
958 else 910 else
959 { 911 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 912 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0; 913 mwmhints.decorations = 0;
962 } 914 }
963 } 915 }
964 else 916 else
965 {
966 mwmhints.flags = 0; 917 mwmhints.flags = 0;
918#endif
919
920#if ENABLE_XEMBED
921 if (rs[Rs_embed])
967 } 922 {
968#endif 923 XWindowAttributes wattr;
969 924
970 /* grab colors before netscape does */ 925 parent = strtol (rs[Rs_embed], 0, 0);
971 Get_Colours ();
972 926
973 if (!set_fonts ()) 927 if (!XGetWindowAttributes (dpy, parent, &wattr))
974 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
975 933
976 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
977 old_width = szHint.width; 951 old_width = szHint.width;
978 old_height = szHint.height; 952 old_height = szHint.height;
979 953
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); 954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 956
1005 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
1007 959
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 961 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 963 wmHint.window_group = top;
1012 964
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
1015
1016 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0],
1018 &xa[XA_WMDELETEWINDOW], 1);
1019 967
1020#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
1021 long pid = getpid (); 989 long pid = getpid ();
1022 990
1023 XChangeProperty (display->display, TermWin.parent[0], 991 XChangeProperty (dpy, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 994
1028 XSelectInput (display->display, TermWin.parent[0], 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif
997
998 XSelectInput (dpy, top,
1029 KeyPressMask 999 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1001 | KeyReleaseMask
1032#endif 1002#endif
1033 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
1005
1036 termwin_ev.start (display, TermWin.parent[0]); 1006 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 1007
1044 /* 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 */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1046 1010
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1011#ifdef HAVE_SCROLLBARS
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1050#endif 1014#endif
1051 1015
1052 /* the vt window */ 1016 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1017 vt = XCreateSimpleWindow (dpy, top,
1054 window_vt_x,
1055 window_vt_y, 1018 window_vt_x, window_vt_y,
1056 TermWin_TotalWidth (), 1019 width, height,
1057 TermWin_TotalHeight (),
1058 0, 1020 0,
1059 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window");
1063#endif
1064 1023
1065 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1067 1026
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1028
1070 pointer_unblank ();
1071
1072#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1029 if (option (Opt_pointerBlank))
1074 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1075 else 1031 else
1076#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1033
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1034 vt_select_input ();
1035
1080 vt_ev.start (display, TermWin.vt); 1036 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 1037
1109#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1110 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1111 && ! (options & Opt_transparent)) 1041 && !OPTION (Opt_transparent)
1042#endif
1043 )
1112 { 1044 {
1113 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1114 1046
1115 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1116 { 1048 {
… …
1122 scr_touch (true); 1054 scr_touch (true);
1123 } 1055 }
1124#endif 1056#endif
1125 1057
1126 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1062
1063 gc = XCreateGC (dpy, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1065 &gcvalue);
1133 1066
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1067 drawable = new rxvt_drawable (this, vt);
1135 1068
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1143#endif 1076#endif
1144 1077
1145#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1079 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1149#endif 1082#endif
1150 1083
1084 pointer_unblank ();
1151 scr_recolour (); 1085 scr_recolour ();
1152} 1086}
1153 1087
1154/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1157void 1091void
1158rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1159{ 1093{
1160#ifdef HAVE_TERMIOS_H
1161 /* 1094 /*
1162 * standard System V termios interface 1095 * standard System V termios interface
1163 */ 1096 */
1164 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1165 { 1098 {
1166 /* 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
1167 tio->c_cc[VINTR] = CINTR; 1103 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1104 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1105 tio->c_cc[VERASE] = CERASE;
1106#ifdef VERASE2
1107 tio->c_cc[VERASE2] = CERASE2;
1108#endif
1170 tio->c_cc[VKILL] = CKILL; 1109 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1110 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1111 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1112 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1113# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1114 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1115# endif
1178# ifdef VREPRINT 1116# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1117 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1118# endif
1182# ifdef VDISCRD 1119# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1120 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1121# endif
1186# ifdef VWERSE 1122# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1123 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1124# endif
1190# ifdef VLNEXT 1125# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1126 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1127# endif
1194
1195 } 1128 }
1129
1196 tio->c_cc[VEOF] = CEOF; 1130 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE; 1131 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2 1132# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE; 1133 tio->c_cc[VEOL2] = VDISABLE;
1201# endif 1134# endif
1202# ifdef VSWTC 1135# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE; 1136 tio->c_cc[VSWTC] = VDISABLE;
1205# endif 1137# endif
1206# ifdef VSWTCH 1138# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE; 1139 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif 1140# endif
1210# if VMIN != VEOF 1141# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1142 tio->c_cc[VMIN] = 1;
1213# endif 1143# endif
1214# if VTIME != VEOL 1144# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1145 tio->c_cc[VTIME] = 0;
1217# endif 1146# endif
1218 1147
1219 if (erase != -1) 1148 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1149 tio->c_cc[VERASE] = (char)erase;
… …
1236 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1237# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1238 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1239# endif 1168# endif
1240 | ECHOE | ECHOK); 1169 | 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 1170
1288 /* 1171 /*
1289 * Debugging 1172 * Debugging
1290 */ 1173 */
1291#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1309 FOO (IGNCR, "IGNCR"); 1192 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1193 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1194 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1195 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1196# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1197 FOO (IUCLC, "IUCLC");
1316# endif 1198# endif
1317# ifdef IXANY 1199# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1200 FOO (IXANY, "IXANY");
1320# endif 1201# endif
1321# ifdef IMAXBEL 1202# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1203 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1204# endif
1325 1205
1326 fprintf (stderr, "\n"); 1206 fprintf (stderr, "\n");
1327 1207
… …
1334 FOO (VERASE, "VERASE"); 1214 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1215 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1216 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1217 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1218# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1219 FOO (VEOL2, "VEOL2");
1341# endif 1220# endif
1342# ifdef VSWTC 1221# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1222 FOO (VSWTC, "VSWTC");
1345# endif 1223# endif
1346# ifdef VSWTCH 1224# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1225 FOO (VSWTCH, "VSWTCH");
1349# endif 1226# endif
1350
1351 FOO (VSTART, "VSTART"); 1227 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1228 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1229 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1230# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1231 FOO (VDSUSP, "VDSUSP");
1357# endif 1232# endif
1358# ifdef VREPRINT 1233# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1234 FOO (VREPRINT, "VREPRINT");
1361# endif 1235# endif
1362# ifdef VDISCRD 1236# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1237 FOO (VDISCRD, "VDISCRD");
1365# endif 1238# endif
1366# ifdef VWERSE 1239# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1240 FOO (VWERSE, "VWERSE");
1369# endif 1241# endif
1370# ifdef VLNEXT 1242# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1243 FOO (VLNEXT, "VLNEXT");
1373# endif 1244# endif
1374 1245
1375 fprintf (stderr, "\n"); 1246 fprintf (stderr, "\n");
1376# undef FOO 1247# undef FOO
… …
1385 * the slave. 1256 * the slave.
1386 */ 1257 */
1387void 1258void
1388rxvt_term::run_command (const char *const *argv) 1259rxvt_term::run_command (const char *const *argv)
1389{ 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
1390 if (!pty.get ()) 1277 if (!pty->get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 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 1279
1398 int er; 1280 int er;
1399 1281
1400#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1401 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
… …
1405 else 1287 else
1406#endif 1288#endif
1407 er = -1; 1289 er = -1;
1408 1290
1409 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);
1410 1294
1411 sw_chld.start (SIGCHLD); 1295 /* set initial window size */
1296 tt_winch ();
1412 1297
1413#ifndef __QNX__ 1298#if ENABLE_FRILLS
1299 if (rs[Rs_pty_fd])
1300 return;
1301#endif
1302
1414 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1416 { 1305 {
1417 case -1: 1306 case -1:
1307 {
1308 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1309 rxvt_fatal ("can't fork, aborting.\n");
1310 }
1419 case 0: 1311 case 0:
1420 init_env (); 1312 init_env ();
1421 1313
1422 if (!pty.make_controlling_tty ()) 1314 if (!pty->make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1315 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else 1316 else
1425 { 1317 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1318 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO); 1319 dup2 (pty->tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO); 1320 dup2 (pty->tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO); 1321 dup2 (pty->tty, STDERR_FILENO);
1430 1322
1431 // close all our file handles that we do no longer need 1323 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1324 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 { 1325 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1326 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1327 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1436 } 1328 }
1437 1329
1438 run_child (argv); 1330 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1331 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 } 1332 }
1441 1333
1442 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1443 1335
1444 default: 1336 default:
1445 { 1337 if (!option (Opt_utmpInhibit))
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1447 int fdstdin;
1448 1339
1449 fdstdin = dup (STDIN_FILENO); 1340 pty->close_tty ();
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452 1341
1453#ifdef UTMP_SUPPORT 1342 child_ev.start (cmd_pid);
1454 privileged_utmp (SAVE);
1455#endif
1456 1343
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344 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; 1345 break;
1466 } 1346 }
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} 1347}
1476 1348
1477/* ------------------------------------------------------------------------- * 1349/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS * 1350 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */ 1351 * ------------------------------------------------------------------------- */
… …
1484int 1356int
1485rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1486{ 1358{
1487 char *login; 1359 char *login;
1488 1360
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490
1491 if (options & Opt_console) 1361 if (option (Opt_console))
1492 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1493#ifdef TIOCCONS 1363#ifdef TIOCCONS
1494 unsigned int on = 1; 1364 unsigned int on = 1;
1495 1365
1496 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1523 // unblock signals (signals are blocked by iom.C 1393 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss; 1394 sigset_t ss;
1525 sigemptyset (&ss); 1395 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0); 1396 sigprocmask (SIG_SETMASK, &ss, 0);
1527 1397
1528#ifndef __QNX__
1529 /* command interpreter path */ 1398 /* command interpreter path */
1530 if (argv != NULL) 1399 if (argv != NULL)
1531 { 1400 {
1532# ifdef DEBUG_CMD 1401# ifdef DEBUG_CMD
1533 int i; 1402 int i;
… …
1539 execvp (argv[0], (char *const *)argv); 1408 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1409 /* no error message: STDERR is closed! */
1541 } 1410 }
1542 else 1411 else
1543 { 1412 {
1544 const char *argv0, *shell; 1413 const char *argv0, *shell;
1545 1414
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1548 1417
1549 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1550 1419
1551 if (options & Opt_loginShell) 1420 if (option (Opt_loginShell))
1552 { 1421 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1554 1423
1555 login[0] = '-'; 1424 login[0] = '-';
1556 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);
1557 argv0 = login; 1426 argv0 = login;
1558 } 1427 }
1428
1559 execlp (shell, argv0, NULL); 1429 execlp (shell, argv0, NULL);
1560 /* no error message: STDERR is closed! */ 1430 /* no error message: STDERR is closed! */
1561 } 1431 }
1562 1432
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; 1433 return -1;
1620} 1434}
1621 1435
1622/*----------------------- end-of-file (C source) -----------------------*/ 1436/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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