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

Diff Legend

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