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.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.191 by root, Tue Jul 24 14:32:47 2007 UTC

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

Diff Legend

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