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

Diff Legend

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