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

Diff Legend

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