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

Diff Legend

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