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.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC

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

Diff Legend

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