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

Diff Legend

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