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.99 by root, Mon Dec 20 16:44:31 2004 UTC vs.
Revision 1.148 by root, Wed Jan 18 19:43:51 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"
38
39#include <limits>
37 40
38#include <csignal> 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
174#if OFF_FOCUS_FADING
175 "black",
176#endif
173 }; 177 };
174 178
175const char *const xa_names[] = 179const char *const xa_names[] =
176 { 180 {
177 "TEXT", 181 "TEXT",
… …
180 "MULTIPLE", 184 "MULTIPLE",
181 "TARGETS", 185 "TARGETS",
182 "TIMESTAMP", 186 "TIMESTAMP",
183 "VT_SELECTION", 187 "VT_SELECTION",
184 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
185 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
186 "CLIPBOARD", 191 "CLIPBOARD",
187#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
188 "_NET_WM_PID", 196 "_NET_WM_PID",
189 "_MOTIF_WM_HINTS",
190 "_NET_WM_NAME", 197 "_NET_WM_NAME",
191 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
192#endif 200#endif
193#if USE_XIM 201#if USE_XIM
194 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
195#endif 203#endif
196#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
199#endif 207#endif
200#ifdef OFFIX_DND 208#ifdef OFFIX_DND
201 "DndProtocol", 209 "DndProtocol",
202 "DndSelection", 210 "DndSelection",
203#endif 211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
204 }; 216 };
205 217
206bool 218bool
207rxvt_term::init_vars () 219rxvt_term::init_vars ()
208{ 220{
209 sw_term.start (SIGTERM);
210
211 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
212#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
213 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
214#endif 224#endif
215 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
216 226
217 if (pix_colors == NULL) 227 if (pix_colors == NULL)
218 return false; 228 return false;
219 229
220#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
221 TermWin.pixmap = None; 231 pixmap = None;
222#endif 232#endif
223 233
224 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
225 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
226 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
227 want_refresh = 1; 237 want_refresh = 1;
228 cmd_pid = -1;
229 pty.pty = pty.tty = -1;
230 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
231 TermWin.focus = 0; 239 focus = 0;
232 TermWin.ncol = 80; 240 ncol = 80;
233 TermWin.nrow = 24; 241 nrow = 24;
234 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
236 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
237 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
238 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
239 247
240 refresh_limit = 1; 248 refresh_limit = 1;
241 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
242 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
247 bgPixmap.x = bgPixmap.y = 50; 255 bgPixmap.x = bgPixmap.y = 50;
248 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
249#endif 257#endif
250 258
251 last_bot = last_state = -1; 259 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 260
260 return true; 261 return true;
261} 262}
262 263
263void 264void
… …
331 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
332 333
333 /* 334 /*
334 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
335 */ 336 */
337
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
338 340
339 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
342
343 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345
346 extract_resources ();
347
340 free (r_argv); 348 free (r_argv);
341
342#ifdef LOCAL_X_IS_UNIX
343 if (rs[Rs_display_name][0] == ':')
344 {
345 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
346 strcpy (val, "unix");
347 strcat (val, rs[Rs_display_name]);
348 display = displays.get (val);
349 free (val);
350 }
351#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 349
359 /* 350 /*
360 * set any defaults not already set 351 * set any defaults not already set
361 */ 352 */
362 if (cmd_argv && cmd_argv[0]) 353 if (cmd_argv && cmd_argv[0])
… …
373 if (!rs[Rs_iconName]) 364 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 365 rs[Rs_iconName] = rs[Rs_name];
375 } 366 }
376 367
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 369 saveLines = min (i, MAX_SAVELINES);
379 370
380#if ENABLE_FRILLS 371#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 372 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 373 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
374
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 375 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
385#endif
386 377
387#ifndef NO_LINESPACE
388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
389 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 379 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
390#endif 380#endif
391 381
392#ifdef POINTER_BLANK 382#ifdef POINTER_BLANK
393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
394 pointerBlankDelay = i; 384 pointerBlankDelay = i;
395 else 385 else
396 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
397#endif 387#endif
398 388
399 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
400 if (!TermWin.saveLines) 390 if (!saveLines)
401 options &= ~Opt_scrollBar; 391 set_option (Opt_scrollBar, 0);
402 392
403#ifdef PRINTPIPE 393#ifdef PRINTPIPE
404 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
405 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
406#endif 396#endif
… …
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 440#endif
451 441
452#ifdef XTERM_REVERSE_VIDEO 442#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 443 /* this is how xterm implements reverseVideo */
454 if (options & Opt_reverseVideo) 444 if (OPTION (Opt_reverseVideo))
455 { 445 {
456 if (!rs[Rs_color + Color_fg]) 446 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 447 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
458 if (!rs[Rs_color + Color_bg]) 448 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 449 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
464 if (!rs[Rs_color + i]) 454 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 455 rs[Rs_color + i] = def_colorName[i];
466 456
467#ifndef XTERM_REVERSE_VIDEO 457#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 458 /* this is how we implement reverseVideo */
469 if (options & Opt_reverseVideo) 459 if (OPTION (Opt_reverseVideo))
470 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 461#endif
472 462
473 /* convenient aliases for setting fg/bg to colors */ 463 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 464 color_aliases (Color_fg);
475 color_aliases (Color_bg); 465 color_aliases (Color_bg);
… …
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 516
527 sprintf (env_display, "DISPLAY=%s", val); 517 sprintf (env_display, "DISPLAY=%s", val);
528 518
529 /* avoiding the math library: 519 /* avoiding the math library:
530 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ; 522 ;
533 MAX_IT (i, 1); 523 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535 525
536 sprintf (env_windowid, "WINDOWID=%u", 526 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)TermWin.parent[0]); 527 (unsigned int)parent[0]);
538 528
539 /* add entries to the environment: 529 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 530 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 531 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 532 * @ COLORTERM: terminal sub-name and also indicates its color
… …
581 * This should support all European type languages. 571 * This should support all European type languages.
582 */ 572 */
583void 573void
584rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
585{ 575{
576 set_environ (envv);
577
586#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
587 free (this->locale); 579 free (this->locale);
588 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
589 581
590 if (!this->locale) 582 if (!this->locale)
591 { 583 {
592 if (*locale) 584 if (*locale)
593 { 585 {
594 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
595 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
596 } 588 }
597 else 589 else
598 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
599 591
600 this->locale = ""; 592 this->locale = "C";
601 } 593 }
602 594
603 595
604 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
605 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
606 mbstate.reset (); 598 mbstate.reset ();
607#endif 599#endif
608 600
609#if 0
610#if HAVE_NL_LANGINFO 601#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET)); 602 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8") 603 // /^UTF.?8/i
613 || !strcasecmp (codeset, "UTF8"); 604 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
605 && (codeset[1] == 'T' || codeset[1] == 't')
606 && (codeset[2] == 'F' || codeset[2] == 'f')
607 && (codeset[3] == '8' || codeset[4] == '8');
614 free (codeset); 608 free (codeset);
615#else 609#else
616 enc_utf8 = 0; 610 enc_utf8 = 0;
617#endif 611#endif
618#endif
619} 612}
620 613
621void 614void
622rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
623{ 616{
617 set_environ (envv);
618
624#ifdef USE_XIM 619#ifdef USE_XIM
625 if (!locale) 620 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 622 else
628 { 623 {
… …
650 * Initialize the command connection. 645 * Initialize the command connection.
651 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
652 */ 647 */
653 648
654#ifdef META8_OPTION 649#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 651#endif
657 652
658 get_ourmods (); 653 get_ourmods ();
659 654
660 if (!(options & Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 656 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 657 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 658 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 659 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 660 priv_modes |= PrivMode_smoothScroll;
666 661
667#ifndef NO_BACKSPACE_KEY 662#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
670#endif 665#endif
671 666
672 /* add value for scrollBar */ 667 /* add value for scrollBar */
673 if (scrollbar_visible ()) 668 if (scrollBar.state)
674 { 669 {
675 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
677 } 672 }
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 673
689 run_command (argv); 674 run_command (argv);
690} 675}
691 676
692/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
707 continue; 692 continue;
708 693
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 695 {
711#ifndef XTERM_REVERSE_VIDEO 696#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 697 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 698 rs[Rs_color + i] = def_colorName[!i];
714 else 699 else
715#endif 700#endif
716 rs[Rs_color + i] = def_colorName[i]; 701 rs[Rs_color + i] = def_colorName[i];
717 702
… …
742 } 727 }
743 } 728 }
744 } 729 }
745 730
746 pix_colors[i] = xcol; 731 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i);
733 }
734
747#ifdef OFF_FOCUS_FADING 735#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
750#endif 739#endif
751 SET_PIXCOLOR (i);
752 }
753 740
754 if (display->depth <= 2) 741 if (display->depth <= 2)
755 { 742 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 743 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]; 744 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]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 } 746 }
760 747
761 /* 748 /*
762 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
763 * 750 *
764 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 752 * from the fvwm window manager.
766 */ 753 */
767#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
768 755
769 if (display->depth <= 2) 756 if (display->depth <= 2)
757 {
770 { /* Monochrome */ 758 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 759 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 760 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 762 }
775 else 763 else
… …
811 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
812 800
813 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
814 { /* bright colors */ 802 { /* bright colors */
815 i -= 8; 803 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 805 return;
819#endif
820 } 806 }
821 807
822 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 810 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 816 * Use resource ``modifier'' to override the Meta modifier
831 */ 817 */
832void 818void
833rxvt_term::get_ourmods () 819rxvt_term::get_ourmods ()
834{ 820{
835 int i, j, k; 821 int i, j, k;
836 int requestedmeta, realmeta, realalt; 822 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 823 const char *cm, *rsmod;
838 XModifierKeymap *map; 824 XModifierKeymap *map;
839 KeyCode *kc; 825 KeyCode *kc;
840 const unsigned int modmasks[] = 826 const unsigned int modmasks[] =
841 { 827 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 828 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 829 };
844 830
845 requestedmeta = realmeta = realalt = 0; 831 requestedmeta = realmeta = realalt = 0;
846 rsmod = rs[Rs_modifier]; 832 rsmod = rs[Rs_modifier];
833
847 if (rsmod 834 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 836 requestedmeta = rsmod[3] - '0';
850 837
851 map = XGetModifierMapping (display->display); 838 map = XGetModifierMapping (display->display);
852 kc = map->modifiermap; 839 kc = map->modifiermap;
840
853 for (i = 1; i < 6; i++) 841 for (i = 1; i < 6; i++)
854 { 842 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
844
856 for (j = map->max_keypermod; j--; k++) 845 for (j = map->max_keypermod; j--; k++)
857 { 846 {
858 if (kc[k] == 0) 847 if (kc[k] == 0)
859 break; 848 break;
849
860 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 850 switch (XKeycodeToKeysym (display->display, kc[k], 0))
861 { 851 {
862 case XK_Num_Lock: 852 case XK_Num_Lock:
863 ModNumLockMask = modmasks[i - 1]; 853 ModNumLockMask = modmasks[i - 1];
864 /* FALLTHROUGH */ 854 continue;
865 default: 855
866 continue; /* for (;;) */ 856 case XK_ISO_Level3_Shift:
857 ModLevel3Mask = modmasks[i - 1];
858 continue;
859
867 case XK_Meta_L: 860 case XK_Meta_L:
868 case XK_Meta_R: 861 case XK_Meta_R:
869 cm = "meta"; 862 cm = "meta";
870 realmeta = i; 863 realmeta = i;
871 break; 864 break;
865
872 case XK_Alt_L: 866 case XK_Alt_L:
873 case XK_Alt_R: 867 case XK_Alt_R:
874 cm = "alt"; 868 cm = "alt";
875 realalt = i; 869 realalt = i;
876 break; 870 break;
871
877 case XK_Super_L: 872 case XK_Super_L:
878 case XK_Super_R: 873 case XK_Super_R:
879 cm = "super"; 874 cm = "super";
880 break; 875 break;
876
881 case XK_Hyper_L: 877 case XK_Hyper_L:
882 case XK_Hyper_R: 878 case XK_Hyper_R:
883 cm = "hyper"; 879 cm = "hyper";
884 break; 880 break;
881
882 default:
883 continue;
885 } 884 }
885
886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
887 requestedmeta = i; 887 requestedmeta = i;
888 } 888 }
889 } 889 }
890
890 XFreeModifiermap (map); 891 XFreeModifiermap (map);
892
891 i = (requestedmeta ? requestedmeta 893 i = requestedmeta ? requestedmeta
892 : (realmeta ? realmeta 894 : realmeta ? realmeta
893 : (realalt ? realalt : 0))); 895 : realalt ? realalt
896 : 0;
897
894 if (i) 898 if (i)
895 ModMetaMask = modmasks[i - 1]; 899 ModMetaMask = modmasks[i - 1];
896} 900}
897 901
898/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
… …
905#if ENABLE_FRILLS 909#if ENABLE_FRILLS
906 Atom prop = None; 910 Atom prop = None;
907 MWMHints mwmhints; 911 MWMHints mwmhints;
908#endif 912#endif
909 XGCValues gcvalue; 913 XGCValues gcvalue;
910 long vt_emask;
911 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
912 XWindowAttributes gattr; 915 XWindowAttributes gattr;
916 Window top, parent;
917 dDisp;
913 918
914#ifdef USING_W11LIB 919#ifdef USING_W11LIB
915 /* enable W11 callbacks */ 920 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
917#endif 922#endif
918 923
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
921 926
922 if (options & Opt_transparent) 927 if (OPTION (Opt_transparent))
923 { 928 {
924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
925 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
926 } 931 }
927 932
933 /* grab colors before netscape does */
934 Get_Colours ();
935
936 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938
939 parent = DefaultRootWindow (disp);
940
941 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942
928#if ENABLE_FRILLS 943#if ENABLE_FRILLS
929 if (options & Opt_borderLess) 944 if (OPTION (Opt_borderLess))
930 { 945 {
931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
932 947
933 if (prop == None) 948 if (prop == None)
934 { 949 {
935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 950 /* 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; 951 attributes.override_redirect = TRUE;
938#endif
939 mwmhints.flags = 0; 952 mwmhints.flags = 0;
940 } 953 }
941 else 954 else
942 { 955 {
943 mwmhints.flags = MWM_HINTS_DECORATIONS; 956 mwmhints.flags = MWM_HINTS_DECORATIONS;
944 mwmhints.decorations = 0; 957 mwmhints.decorations = 0;
945 } 958 }
946 } 959 }
947 else 960 else
948 {
949 mwmhints.flags = 0; 961 mwmhints.flags = 0;
962#endif
963
964#if ENABLE_XEMBED
965 if (rs[Rs_embed])
950 } 966 {
951#endif 967 XWindowAttributes wattr;
952 968
953 /* grab colors before netscape does */ 969 parent = strtol (rs[Rs_embed], 0, 0);
954 Get_Colours ();
955 970
956 if (!set_fonts ()) 971 if (!XGetWindowAttributes (disp, parent, &wattr))
957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973
974 window_calc (wattr.width, wattr.height);
975 }
976#endif
958 977
959 window_calc (0, 0); 978 window_calc (0, 0);
960 old_width = szHint.width;
961 old_height = szHint.height;
962 979
963 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
964
965#ifdef PREFER_24BIT
966 attributes.background_pixel = pix_colors_focused[Color_border]; 981 attributes.background_pixel = pix_colors_focused[Color_border];
967 attributes.border_pixel = pix_colors_focused[Color_border]; 982 attributes.border_pixel = pix_colors_focused[Color_border];
968 attributes.colormap = display->cmap; 983 attributes.colormap = display->cmap;
969 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 984 top = XCreateWindow (disp, parent,
970 szHint.x, szHint.y, 985 szHint.x, szHint.y,
971 szHint.width, szHint.height, 986 szHint.width, szHint.height,
972 TermWin.ext_bwidth, 987 ext_bwidth,
973 display->depth, InputOutput, 988 display->depth, InputOutput,
974 display->visual, 989 display->visual,
975 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
976#else 991 &attributes);
977 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 992
978 szHint.x, szHint.y, 993 this->parent[0] = top;
979 szHint.width, szHint.height, 994
980 TermWin.ext_bwidth, 995 old_width = szHint.width;
981 pix_colors_focused[Color_border], 996 old_height = szHint.height;
982 pix_colors_focused[Color_border]);
983#endif
984 997
985 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
986 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
987 1000
988 classHint.res_name = (char *)rs[Rs_name]; 1001 classHint.res_name = (char *)rs[Rs_name];
989 classHint.res_class = (char *)RESCLASS; 1002 classHint.res_class = (char *)RESCLASS;
990 1003
991 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1004 wmHint.flags = InputHint | StateHint | WindowGroupHint;
992 wmHint.input = True; 1005 wmHint.input = True;
993 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
994 wmHint.window_group = TermWin.parent[0]; 1007 wmHint.window_group = top;
995 1008
996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
997 (char **)argv, argc, &szHint, &wmHint, &classHint); 1010 &szHint, &wmHint, &classHint);
998 1011
999 /* Enable delete window protocol */ 1012 Atom protocols[] = {
1000 XSetWMProtocols (display->display, TermWin.parent[0], 1013 xa[XA_WM_DELETE_WINDOW],
1001 &xa[XA_WMDELETEWINDOW], 1); 1014#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING],
1016#endif
1017 };
1018
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1002 1020
1003#if ENABLE_FRILLS 1021#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif
1025
1026#if ENABLE_EWMH
1004 long pid = getpid (); 1027 long pid = getpid ();
1005 1028
1006 XChangeProperty (display->display, TermWin.parent[0], 1029 XChangeProperty (disp, top,
1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1008 PropModeReplace, (unsigned char *)&pid, 1); 1031 PropModeReplace, (unsigned char *)&pid, 1);
1009#endif
1010 1032
1011 XSelectInput (display->display, TermWin.parent[0], 1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif
1035
1036 XSelectInput (disp, top,
1012 KeyPressMask 1037 KeyPressMask
1013#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1014 | KeyReleaseMask 1039 | KeyReleaseMask
1015#endif 1040#endif
1016 | FocusChangeMask | VisibilityChangeMask 1041 | FocusChangeMask | VisibilityChangeMask
1017 | ExposureMask
1018 | StructureNotifyMask); 1042 | ExposureMask | StructureNotifyMask);
1043
1019 termwin_ev.start (display, TermWin.parent[0]); 1044 termwin_ev.start (display, top);
1020 1045
1021#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
1022 if (mwmhints.flags) 1047 if (mwmhints.flags)
1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1025#endif 1050#endif
1026 1051
1027 /* vt cursor: Black-on-White is standard, but this is more popular */ 1052 /* vt cursor: Black-on-White is standard, but this is more popular */
1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1029 1054
1030#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1055#ifdef HAVE_SCROLLBARS
1031 /* cursor (menuBar/scrollBar): Black-on-White */ 1056 /* cursor scrollBar: Black-on-White */
1032 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1057 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 1058#endif
1047 1059
1048 /* the vt window */ 1060 /* the vt window */
1049 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1061 vt = XCreateSimpleWindow (disp, top,
1050 window_vt_x, 1062 window_vt_x,
1051 window_vt_y, 1063 window_vt_y,
1052 TermWin_TotalWidth (), 1064 width,
1053 TermWin_TotalHeight (), 1065 height,
1054 0, 1066 0,
1055 pix_colors_focused[Color_fg], 1067 pix_colors_focused[Color_fg],
1056 pix_colors_focused[Color_bg]); 1068 pix_colors_focused[Color_bg]);
1057#ifdef DEBUG_X 1069#ifdef DEBUG_X
1058 XStoreName (display->display, TermWin.vt, "vt window"); 1070 XStoreName (disp, vt, "vt window");
1059#endif 1071#endif
1060 1072
1061 attributes.bit_gravity = NorthWestGravity; 1073 attributes.bit_gravity = NorthWestGravity;
1062 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1063 1075
1064 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1065 1077
1066 pointer_unblank (); 1078 if (OPTION (Opt_pointerBlank))
1067
1068#ifdef POINTER_BLANK
1069 if (options & Opt_pointerBlank)
1070 vt_emask |= PointerMotionMask; 1079 vt_emask |= PointerMotionMask;
1071 else 1080 else
1072#endif
1073 vt_emask |= Button1MotionMask | Button3MotionMask; 1081 vt_emask |= Button1MotionMask | Button3MotionMask;
1074 1082
1075 XSelectInput (display->display, TermWin.vt, vt_emask); 1083 vt_select_input ();
1084
1076 vt_ev.start (display, TermWin.vt); 1085 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 1086
1105#ifdef XPM_BACKGROUND 1087#ifdef XPM_BACKGROUND
1106 if (rs[Rs_backgroundPixmap] != NULL 1088 if (rs[Rs_backgroundPixmap] != NULL
1107 && ! (options & Opt_transparent)) 1089 && ! OPTION (Opt_transparent))
1108 { 1090 {
1109 const char *p = rs[Rs_backgroundPixmap]; 1091 const char *p = rs[Rs_backgroundPixmap];
1110 1092
1111 if ((p = strchr (p, ';')) != NULL) 1093 if ((p = strchr (p, ';')) != NULL)
1112 { 1094 {
… …
1121 1103
1122 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1123 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1124 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1125 gcvalue.graphics_exposures = 1; 1107 gcvalue.graphics_exposures = 1;
1126 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1108 gc = XCreateGC (disp, vt,
1127 GCForeground | GCBackground | GCGraphicsExposures, 1109 GCForeground | GCBackground | GCGraphicsExposures,
1128 &gcvalue); 1110 &gcvalue);
1129 1111
1130 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1112 drawable = new rxvt_drawable (display, vt);
1131 1113
1132#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1114#ifdef RXVT_SCROLLBAR
1133 gcvalue.foreground = pix_colors[Color_topShadow]; 1115 gcvalue.foreground = pix_colors[Color_topShadow];
1134 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1135 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1117 gcvalue.foreground = pix_colors[Color_bottomShadow];
1136 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1137 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1138 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1139#endif 1121#endif
1140 1122
1141#ifdef OFF_FOCUS_FADING 1123#ifdef OFF_FOCUS_FADING
1142 // initially we are in unfocused state 1124 // initially we are in unfocused state
1143 if (rs[Rs_fade]) 1125 if (rs[Rs_fade])
1144 pix_colors = pix_colors_unfocused; 1126 pix_colors = pix_colors_unfocused;
1145#endif 1127#endif
1146 1128
1129 pointer_unblank ();
1147 scr_recolour (); 1130 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1148} 1141}
1149 1142
1150/* ------------------------------------------------------------------------- * 1143/* ------------------------------------------------------------------------- *
1151 * GET TTY CURRENT STATE * 1144 * GET TTY CURRENT STATE *
1152 * ------------------------------------------------------------------------- */ 1145 * ------------------------------------------------------------------------- */
… …
1157 /* 1150 /*
1158 * standard System V termios interface 1151 * standard System V termios interface
1159 */ 1152 */
1160 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1161 { 1154 {
1162 /* return error - use system defaults */ 1155 // return error - use system defaults,
1156 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t));
1158
1163 tio->c_cc[VINTR] = CINTR; 1159 tio->c_cc[VINTR] = CINTR;
1164 tio->c_cc[VQUIT] = CQUIT; 1160 tio->c_cc[VQUIT] = CQUIT;
1165 tio->c_cc[VERASE] = CERASE; 1161 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2
1163 tio->c_cc[VERASE2] = CERASE2;
1164#endif
1166 tio->c_cc[VKILL] = CKILL; 1165 tio->c_cc[VKILL] = CKILL;
1167 tio->c_cc[VSTART] = CSTART; 1166 tio->c_cc[VSTART] = CSTART;
1168 tio->c_cc[VSTOP] = CSTOP; 1167 tio->c_cc[VSTOP] = CSTOP;
1169 tio->c_cc[VSUSP] = CSUSP; 1168 tio->c_cc[VSUSP] = CSUSP;
1170# ifdef VDSUSP 1169# ifdef VDSUSP
1171
1172 tio->c_cc[VDSUSP] = CDSUSP; 1170 tio->c_cc[VDSUSP] = CDSUSP;
1173# endif 1171# endif
1174# ifdef VREPRINT 1172# ifdef VREPRINT
1175
1176 tio->c_cc[VREPRINT] = CRPRNT; 1173 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif 1174# endif
1178# ifdef VDISCRD 1175# ifdef VDISCRD
1179
1180 tio->c_cc[VDISCRD] = CFLUSH; 1176 tio->c_cc[VDISCRD] = CFLUSH;
1181# endif 1177# endif
1182# ifdef VWERSE 1178# ifdef VWERSE
1183
1184 tio->c_cc[VWERSE] = CWERASE; 1179 tio->c_cc[VWERSE] = CWERASE;
1185# endif 1180# endif
1186# ifdef VLNEXT 1181# ifdef VLNEXT
1187
1188 tio->c_cc[VLNEXT] = CLNEXT; 1182 tio->c_cc[VLNEXT] = CLNEXT;
1189# endif 1183# endif
1190
1191 } 1184 }
1185
1192 tio->c_cc[VEOF] = CEOF; 1186 tio->c_cc[VEOF] = CEOF;
1193 tio->c_cc[VEOL] = VDISABLE; 1187 tio->c_cc[VEOL] = VDISABLE;
1194# ifdef VEOL2 1188# ifdef VEOL2
1195
1196 tio->c_cc[VEOL2] = VDISABLE; 1189 tio->c_cc[VEOL2] = VDISABLE;
1197# endif 1190# endif
1198# ifdef VSWTC 1191# ifdef VSWTC
1199
1200 tio->c_cc[VSWTC] = VDISABLE; 1192 tio->c_cc[VSWTC] = VDISABLE;
1201# endif 1193# endif
1202# ifdef VSWTCH 1194# ifdef VSWTCH
1203
1204 tio->c_cc[VSWTCH] = VDISABLE; 1195 tio->c_cc[VSWTCH] = VDISABLE;
1205# endif 1196# endif
1206# if VMIN != VEOF 1197# if VMIN != VEOF
1207
1208 tio->c_cc[VMIN] = 1; 1198 tio->c_cc[VMIN] = 1;
1209# endif 1199# endif
1210# if VTIME != VEOL 1200# if VTIME != VEOL
1211
1212 tio->c_cc[VTIME] = 0; 1201 tio->c_cc[VTIME] = 0;
1213# endif 1202# endif
1214 1203
1215 if (erase != -1) 1204 if (erase != -1)
1216 tio->c_cc[VERASE] = (char)erase; 1205 tio->c_cc[VERASE] = (char)erase;
… …
1244 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1245 { 1234 {
1246 tio->sg.sg_erase = CERASE; /* ^H */ 1235 tio->sg.sg_erase = CERASE; /* ^H */
1247 tio->sg.sg_kill = CKILL; /* ^U */ 1236 tio->sg.sg_kill = CKILL; /* ^U */
1248 } 1237 }
1238
1249 if (erase != -1) 1239 if (erase != -1)
1250 tio->sg.sg_erase = (char)erase; 1240 tio->sg.sg_erase = (char)erase;
1251 1241
1252 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1253 1243
… …
1259 tio->tc.t_startc = CSTART; /* ^Q */ 1249 tio->tc.t_startc = CSTART; /* ^Q */
1260 tio->tc.t_stopc = CSTOP; /* ^S */ 1250 tio->tc.t_stopc = CSTOP; /* ^S */
1261 tio->tc.t_eofc = CEOF; /* ^D */ 1251 tio->tc.t_eofc = CEOF; /* ^D */
1262 tio->tc.t_brkc = -1; 1252 tio->tc.t_brkc = -1;
1263 } 1253 }
1254
1264 /* get local special chars */ 1255 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 { 1257 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */ 1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 } 1264 }
1274 /* get line discipline */ 1265 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC 1267# ifdef NTTYDISC
1277
1278 tio->line = NTTYDISC; 1268 tio->line = NTTYDISC;
1279# endif /* NTTYDISC */ 1269# endif /* NTTYDISC */
1280 1270
1281 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1282#endif /* HAVE_TERMIOS_H */ 1272#endif /* HAVE_TERMIOS_H */
… …
1305 FOO (IGNCR, "IGNCR"); 1295 FOO (IGNCR, "IGNCR");
1306 FOO (ICRNL, "ICRNL"); 1296 FOO (ICRNL, "ICRNL");
1307 FOO (IXON, "IXON"); 1297 FOO (IXON, "IXON");
1308 FOO (IXOFF, "IXOFF"); 1298 FOO (IXOFF, "IXOFF");
1309# ifdef IUCLC 1299# ifdef IUCLC
1310
1311 FOO (IUCLC, "IUCLC"); 1300 FOO (IUCLC, "IUCLC");
1312# endif 1301# endif
1313# ifdef IXANY 1302# ifdef IXANY
1314
1315 FOO (IXANY, "IXANY"); 1303 FOO (IXANY, "IXANY");
1316# endif 1304# endif
1317# ifdef IMAXBEL 1305# ifdef IMAXBEL
1318
1319 FOO (IMAXBEL, "IMAXBEL"); 1306 FOO (IMAXBEL, "IMAXBEL");
1320# endif 1307# endif
1321 1308
1322 fprintf (stderr, "\n"); 1309 fprintf (stderr, "\n");
1323 1310
… …
1330 FOO (VERASE, "VERASE"); 1317 FOO (VERASE, "VERASE");
1331 FOO (VKILL, "VKILL"); 1318 FOO (VKILL, "VKILL");
1332 FOO (VEOF, "VEOF"); 1319 FOO (VEOF, "VEOF");
1333 FOO (VEOL, "VEOL"); 1320 FOO (VEOL, "VEOL");
1334# ifdef VEOL2 1321# ifdef VEOL2
1335
1336 FOO (VEOL2, "VEOL2"); 1322 FOO (VEOL2, "VEOL2");
1337# endif 1323# endif
1338# ifdef VSWTC 1324# ifdef VSWTC
1339
1340 FOO (VSWTC, "VSWTC"); 1325 FOO (VSWTC, "VSWTC");
1341# endif 1326# endif
1342# ifdef VSWTCH 1327# ifdef VSWTCH
1343
1344 FOO (VSWTCH, "VSWTCH"); 1328 FOO (VSWTCH, "VSWTCH");
1345# endif 1329# endif
1346
1347 FOO (VSTART, "VSTART"); 1330 FOO (VSTART, "VSTART");
1348 FOO (VSTOP, "VSTOP"); 1331 FOO (VSTOP, "VSTOP");
1349 FOO (VSUSP, "VSUSP"); 1332 FOO (VSUSP, "VSUSP");
1350# ifdef VDSUSP 1333# ifdef VDSUSP
1351
1352 FOO (VDSUSP, "VDSUSP"); 1334 FOO (VDSUSP, "VDSUSP");
1353# endif 1335# endif
1354# ifdef VREPRINT 1336# ifdef VREPRINT
1355
1356 FOO (VREPRINT, "VREPRINT"); 1337 FOO (VREPRINT, "VREPRINT");
1357# endif 1338# endif
1358# ifdef VDISCRD 1339# ifdef VDISCRD
1359
1360 FOO (VDISCRD, "VDISCRD"); 1340 FOO (VDISCRD, "VDISCRD");
1361# endif 1341# endif
1362# ifdef VWERSE 1342# ifdef VWERSE
1363
1364 FOO (VWERSE, "VWERSE"); 1343 FOO (VWERSE, "VWERSE");
1365# endif 1344# endif
1366# ifdef VLNEXT 1345# ifdef VLNEXT
1367
1368 FOO (VLNEXT, "VLNEXT"); 1346 FOO (VLNEXT, "VLNEXT");
1369# endif 1347# endif
1370 1348
1371 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1372# undef FOO 1350# undef FOO
… …
1381 * the slave. 1359 * the slave.
1382 */ 1360 */
1383void 1361void
1384rxvt_term::run_command (const char *const *argv) 1362rxvt_term::run_command (const char *const *argv)
1385{ 1363{
1364#if ENABLE_FRILLS
1365 if (rs[Rs_pty_fd])
1366 {
1367 pty->pty = atoi (rs[Rs_pty_fd]);
1368
1369 if (pty->pty >= 0)
1370 {
1371 if (getfd_hook)
1372 pty->pty = (*getfd_hook) (pty->pty);
1373
1374 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1375 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1376 }
1377 }
1378 else
1379#endif
1380 if (!pty->get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382
1383 pty->set_utf8_mode (enc_utf8);
1384
1385 /* set initial window size */
1386 tt_winch ();
1387
1386 int er; 1388 int er;
1387
1388 if (!pty.get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1389
1391#ifndef NO_BACKSPACE_KEY 1390#ifndef NO_BACKSPACE_KEY
1392 if (key_backspace[0] && !key_backspace[1]) 1391 if (key_backspace[0] && !key_backspace[1])
1393 er = key_backspace[0]; 1392 er = key_backspace[0];
1394 else if (strcmp (key_backspace, "DEC") == 0) 1393 else if (strcmp (key_backspace, "DEC") == 0)
… …
1397#endif 1396#endif
1398 er = -1; 1397 er = -1;
1399 1398
1400 rxvt_get_ttymode (&tio, er); 1399 rxvt_get_ttymode (&tio, er);
1401 1400
1402 /* set initial window size */ 1401#if ENABLE_FRILLS
1403 tt_winch (); 1402 if (rs[Rs_pty_fd])
1403 return;
1404#endif
1404 1405
1405 sw_chld.start (SIGCHLD);
1406
1407#ifndef __QNX__
1408 /* spin off the command interpreter */ 1406 /* spin off the command interpreter */
1409 switch (cmd_pid = fork ()) 1407 switch (cmd_pid = fork ())
1410 { 1408 {
1411 case -1: 1409 case -1:
1410 {
1411 cmd_pid = 0;
1412 rxvt_fatal ("can't fork, aborting.\n"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1413 }
1413 case 0: 1414 case 0:
1414 init_env (); 1415 init_env ();
1415 1416
1416 if (!pty.make_controlling_tty ()) 1417 if (!pty->make_controlling_tty ())
1417 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1418 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1418 else 1419 else
1419 { 1420 {
1420 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1421 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1421 dup2 (pty.tty, STDIN_FILENO); 1422 dup2 (pty->tty, STDIN_FILENO);
1422 dup2 (pty.tty, STDOUT_FILENO); 1423 dup2 (pty->tty, STDOUT_FILENO);
1423 dup2 (pty.tty, STDERR_FILENO); 1424 dup2 (pty->tty, STDERR_FILENO);
1424 1425
1425 // close all our file handles that we do no longer need 1426 // close all our file handles that we do no longer need
1426 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1427 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1427 { 1428 {
1428 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1429 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1429 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1430 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1430 } 1431 }
1431 1432
1432 run_child (argv); 1433 run_child (argv);
1433 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1434 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1434 } 1435 }
1435 1436
1436 _exit (EXIT_FAILURE); 1437 _exit (EXIT_FAILURE);
1437 1438
1438 default: 1439 default:
1439 {
1440#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1441 int fdstdin;
1442
1443 fdstdin = dup (STDIN_FILENO);
1444 dup2 (pty.tty, STDIN_FILENO);
1445#endif
1446
1447#ifdef UTMP_SUPPORT 1440#if UTMP_SUPPORT
1448 privileged_utmp (SAVE); 1441 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1449#endif 1443#endif
1450 1444
1451#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1445 pty->close_tty ();
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; 1446 break;
1460 } 1447 }
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} 1448}
1470 1449
1471/* ------------------------------------------------------------------------- * 1450/* ------------------------------------------------------------------------- *
1472 * CHILD PROCESS OPERATIONS * 1451 * CHILD PROCESS OPERATIONS *
1473 * ------------------------------------------------------------------------- */ 1452 * ------------------------------------------------------------------------- */
… …
1480{ 1459{
1481 char *login; 1460 char *login;
1482 1461
1483 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1484 1463
1485 if (options & Opt_console) 1464 if (OPTION (Opt_console))
1486 { /* be virtual console, fail silently */ 1465 { /* be virtual console, fail silently */
1487#ifdef TIOCCONS 1466#ifdef TIOCCONS
1488 unsigned int on = 1; 1467 unsigned int on = 1;
1489 1468
1490 ioctl (STDIN_FILENO, TIOCCONS, &on); 1469 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1517 // unblock signals (signals are blocked by iom.C 1496 // unblock signals (signals are blocked by iom.C
1518 sigset_t ss; 1497 sigset_t ss;
1519 sigemptyset (&ss); 1498 sigemptyset (&ss);
1520 sigprocmask (SIG_SETMASK, &ss, 0); 1499 sigprocmask (SIG_SETMASK, &ss, 0);
1521 1500
1522#ifndef __QNX__
1523 /* command interpreter path */ 1501 /* command interpreter path */
1524 if (argv != NULL) 1502 if (argv != NULL)
1525 { 1503 {
1526# ifdef DEBUG_CMD 1504# ifdef DEBUG_CMD
1527 int i; 1505 int i;
… …
1533 execvp (argv[0], (char *const *)argv); 1511 execvp (argv[0], (char *const *)argv);
1534 /* no error message: STDERR is closed! */ 1512 /* no error message: STDERR is closed! */
1535 } 1513 }
1536 else 1514 else
1537 { 1515 {
1538 const char *argv0, *shell; 1516 const char *argv0, *shell;
1539 1517
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1519 shell = "/bin/sh";
1542 1520
1543 argv0 = (const char *)rxvt_r_basename (shell); 1521 argv0 = (const char *)rxvt_r_basename (shell);
1544 1522
1545 if (options & Opt_loginShell) 1523 if (OPTION (Opt_loginShell))
1546 { 1524 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1548 1526
1549 login[0] = '-'; 1527 login[0] = '-';
1550 strcpy (&login[1], argv0); 1528 strcpy (&login[1], argv0);
1551 argv0 = login; 1529 argv0 = login;
1552 } 1530 }
1531
1553 execlp (shell, argv0, NULL); 1532 execlp (shell, argv0, NULL);
1554 /* no error message: STDERR is closed! */ 1533 /* no error message: STDERR is closed! */
1555 } 1534 }
1556 1535
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; 1536 return -1;
1614} 1537}
1615 1538
1616/*----------------------- end-of-file (C source) -----------------------*/ 1539/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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