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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines