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.112 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.184 by sasha, Fri Jun 8 20:04:12 2007 UTC

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

Diff Legend

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