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

Diff Legend

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