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

Diff Legend

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