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.140 by root, Thu Jan 12 01:30:53 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;
… …
251 last_bot = last_state = -1; 259 last_bot = last_state = -1;
252 260
253#ifdef MENUBAR 261#ifdef MENUBAR
254 menu_readonly = 1; 262 menu_readonly = 1;
255# if ! (MENUBAR_MAX > 1) 263# if ! (MENUBAR_MAX > 1)
256 CurrentBar = & (BarList); 264 CurrentBar = &BarList;
257# endif /* (MENUBAR_MAX > 1) */ 265# endif /* (MENUBAR_MAX > 1) */
258#endif 266#endif
259 267
260 return true; 268 return true;
261} 269}
… …
331 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
332 340
333 /* 341 /*
334 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
335 */ 343 */
344
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 345 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 346 rs[Rs_display_name] = ":0";
338 347
339 get_options (r_argc, r_argv); 348 get_options (r_argc, r_argv);
349
350 if (!(display = displays.get (rs[Rs_display_name])))
351 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
352
353 extract_resources ();
354
340 free (r_argv); 355 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 356
359 /* 357 /*
360 * set any defaults not already set 358 * set any defaults not already set
361 */ 359 */
362 if (cmd_argv && cmd_argv[0]) 360 if (cmd_argv && cmd_argv[0])
… …
373 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
374 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
375 } 373 }
376 374
377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
379 377
380#if ENABLE_FRILLS 378#if ENABLE_FRILLS
381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
385#endif
386 384
387#ifndef NO_LINESPACE
388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
389 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
390#endif 387#endif
391 388
392#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
394 pointerBlankDelay = i; 391 pointerBlankDelay = i;
395 else 392 else
396 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
397#endif 394#endif
398 395
399 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
400 if (!TermWin.saveLines) 397 if (!saveLines)
401 options &= ~Opt_scrollBar; 398 set_option (Opt_scrollBar, 0);
402 399
403#ifdef PRINTPIPE 400#ifdef PRINTPIPE
404 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
405 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
406#endif 403#endif
… …
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 447#endif
451 448
452#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
454 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
455 { 452 {
456 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
458 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
464 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
466 463
467#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
469 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
470 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 468#endif
472 469
473 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 471 color_aliases (Color_fg);
475 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 523
527 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
528 525
529 /* avoiding the math library: 526 /* avoiding the math library:
530 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ; 529 ;
533 MAX_IT (i, 1); 530 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535 532
536 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
538 535
539 /* add entries to the environment: 536 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
581 * This should support all European type languages. 578 * This should support all European type languages.
582 */ 579 */
583void 580void
584rxvt_term::set_locale (const char *locale) 581rxvt_term::set_locale (const char *locale)
585{ 582{
583 set_environ (envv);
584
586#if HAVE_XSETLOCALE || HAVE_SETLOCALE 585#if HAVE_XSETLOCALE || HAVE_SETLOCALE
587 free (this->locale); 586 free (this->locale);
588 this->locale = setlocale (LC_CTYPE, locale); 587 this->locale = setlocale (LC_CTYPE, locale);
589 588
590 if (!this->locale) 589 if (!this->locale)
591 { 590 {
592 if (*locale) 591 if (*locale)
593 { 592 {
594 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 593 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
595 setlocale (LC_CTYPE, ""); 594 setlocale (LC_CTYPE, "C");
596 } 595 }
597 else 596 else
598 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 597 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
599 598
600 this->locale = ""; 599 this->locale = "C";
601 } 600 }
602 601
603 602
604 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
605 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
606 mbstate.reset (); 605 mbstate.reset ();
607#endif 606#endif
608 607
609#if 0
610#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET)); 609 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8") 610 // /^UTF.?8/i
613 || !strcasecmp (codeset, "UTF8"); 611 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
612 && (codeset[1] == 'T' || codeset[1] == 't')
613 && (codeset[2] == 'F' || codeset[2] == 'f')
614 && (codeset[3] == '8' || codeset[4] == '8');
614 free (codeset); 615 free (codeset);
615#else 616#else
616 enc_utf8 = 0; 617 enc_utf8 = 0;
617#endif 618#endif
618#endif
619} 619}
620 620
621void 621void
622rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
623{ 623{
624 set_environ (envv);
625
624#ifdef USE_XIM 626#ifdef USE_XIM
625 if (!locale) 627 if (!locale)
626 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
627 else 629 else
628 { 630 {
… …
650 * Initialize the command connection. 652 * Initialize the command connection.
651 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
652 */ 654 */
653 655
654#ifdef META8_OPTION 656#ifdef META8_OPTION
655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
656#endif 658#endif
657 659
658 get_ourmods (); 660 get_ourmods ();
659 661
660 if (!(options & Opt_scrollTtyOutput)) 662 if (!OPTION (Opt_scrollTtyOutput))
661 priv_modes |= PrivMode_TtyOutputInh; 663 priv_modes |= PrivMode_TtyOutputInh;
662 if (options & Opt_scrollTtyKeypress) 664 if (OPTION (Opt_scrollTtyKeypress))
663 priv_modes |= PrivMode_Keypress; 665 priv_modes |= PrivMode_Keypress;
664 if (!(options & Opt_jumpScroll)) 666 if (!OPTION (Opt_jumpScroll))
665 priv_modes |= PrivMode_smoothScroll; 667 priv_modes |= PrivMode_smoothScroll;
666 668
667#ifndef NO_BACKSPACE_KEY 669#ifndef NO_BACKSPACE_KEY
668 if (strcmp (key_backspace, "DEC") == 0) 670 if (strcmp (key_backspace, "DEC") == 0)
669 priv_modes |= PrivMode_HaveBackSpace; 671 priv_modes |= PrivMode_HaveBackSpace;
… …
673 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
674 { 676 {
675 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
677 } 679 }
680
678 if (menubar_visible ()) 681 if (menubar_visible ())
679 { 682 {
680 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
682 } 685 }
683
684#ifdef CURSOR_BLINK
685 if (options & Opt_cursorBlink)
686 (void)gettimeofday (&lastcursorchange, NULL);
687#endif
688 686
689 run_command (argv); 687 run_command (argv);
690} 688}
691 689
692/*----------------------------------------------------------------------*/ 690/*----------------------------------------------------------------------*/
… …
707 continue; 705 continue;
708 706
709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
710 { 708 {
711#ifndef XTERM_REVERSE_VIDEO 709#ifndef XTERM_REVERSE_VIDEO
712 if (i < 2 && (options & Opt_reverseVideo)) 710 if (i < 2 && OPTION (Opt_reverseVideo))
713 rs[Rs_color + i] = def_colorName[!i]; 711 rs[Rs_color + i] = def_colorName[!i];
714 else 712 else
715#endif 713#endif
716 rs[Rs_color + i] = def_colorName[i]; 714 rs[Rs_color + i] = def_colorName[i];
717 715
… …
742 } 740 }
743 } 741 }
744 } 742 }
745 743
746 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
747#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
750#endif 752#endif
751 SET_PIXCOLOR (i);
752 }
753 753
754 if (display->depth <= 2) 754 if (display->depth <= 2)
755 { 755 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 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]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
765 * from the fvwm window manager. 765 * from the fvwm window manager.
766 */ 766 */
767#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
768 768
769 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
770 { /* Monochrome */ 771 /* Monochrome */
771 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
772 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
774 } 775 }
775 else 776 else
… …
811 int i = atoi (rs[Rs_color + idx]); 812 int i = atoi (rs[Rs_color + idx]);
812 813
813 if (i >= 8 && i <= 15) 814 if (i >= 8 && i <= 15)
814 { /* bright colors */ 815 { /* bright colors */
815 i -= 8; 816 i -= 8;
816#ifndef NO_BRIGHTCOLOR
817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
818 return; 818 return;
819#endif
820 } 819 }
821 820
822 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
824 } 823 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 829 * Use resource ``modifier'' to override the Meta modifier
831 */ 830 */
832void 831void
833rxvt_term::get_ourmods () 832rxvt_term::get_ourmods ()
834{ 833{
835 int i, j, k; 834 int i, j, k;
836 int requestedmeta, realmeta, realalt; 835 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 836 const char *cm, *rsmod;
838 XModifierKeymap *map; 837 XModifierKeymap *map;
839 KeyCode *kc; 838 KeyCode *kc;
840 const unsigned int modmasks[] = 839 const unsigned int modmasks[] =
841 { 840 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 842 };
844 843
845 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
846 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
847 if (rsmod 847 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
850 850
851 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
852 kc = map->modifiermap; 852 kc = map->modifiermap;
853
853 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
854 { 855 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
856 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
857 { 859 {
858 if (kc[k] == 0) 860 if (kc[k] == 0)
859 break; 861 break;
862
860 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
861 { 864 {
862 case XK_Num_Lock: 865 case XK_Num_Lock:
863 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
864 /* FALLTHROUGH */ 867 continue;
865 default: 868
866 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
867 case XK_Meta_L: 873 case XK_Meta_L:
868 case XK_Meta_R: 874 case XK_Meta_R:
869 cm = "meta"; 875 cm = "meta";
870 realmeta = i; 876 realmeta = i;
871 break; 877 break;
878
872 case XK_Alt_L: 879 case XK_Alt_L:
873 case XK_Alt_R: 880 case XK_Alt_R:
874 cm = "alt"; 881 cm = "alt";
875 realalt = i; 882 realalt = i;
876 break; 883 break;
884
877 case XK_Super_L: 885 case XK_Super_L:
878 case XK_Super_R: 886 case XK_Super_R:
879 cm = "super"; 887 cm = "super";
880 break; 888 break;
889
881 case XK_Hyper_L: 890 case XK_Hyper_L:
882 case XK_Hyper_R: 891 case XK_Hyper_R:
883 cm = "hyper"; 892 cm = "hyper";
884 break; 893 break;
894
895 default:
896 continue;
885 } 897 }
898
886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
887 requestedmeta = i; 900 requestedmeta = i;
888 } 901 }
889 } 902 }
903
890 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
891 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
892 : (realmeta ? realmeta 907 : realmeta ? realmeta
893 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
894 if (i) 911 if (i)
895 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
896} 913}
897 914
898/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
908#endif 925#endif
909 XGCValues gcvalue; 926 XGCValues gcvalue;
910 long vt_emask; 927 long vt_emask;
911 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
912 XWindowAttributes gattr; 929 XWindowAttributes gattr;
930 Window top, parent;
931 dDisp;
913 932
914#ifdef USING_W11LIB 933#ifdef USING_W11LIB
915 /* enable W11 callbacks */ 934 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 935 W11AddEventHandler (disp, rxvt_W11_process_x_event);
917#endif 936#endif
918 937
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 938 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 939 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
921 940
922 if (options & Opt_transparent) 941 if (OPTION (Opt_transparent))
923 { 942 {
924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
925 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 944 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
926 } 945 }
927 946
928#if ENABLE_FRILLS 947#if ENABLE_FRILLS
929 if (options & Opt_borderLess) 948 if (OPTION (Opt_borderLess))
930 { 949 {
931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
932 951
933 if (prop == None) 952 if (prop == None)
934 { 953 {
935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 954 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
936#ifdef PREFER_24BIT 955#ifdef PREFER_24BIT
… …
943 mwmhints.flags = MWM_HINTS_DECORATIONS; 962 mwmhints.flags = MWM_HINTS_DECORATIONS;
944 mwmhints.decorations = 0; 963 mwmhints.decorations = 0;
945 } 964 }
946 } 965 }
947 else 966 else
948 {
949 mwmhints.flags = 0; 967 mwmhints.flags = 0;
950 }
951#endif 968#endif
952 969
953 /* grab colors before netscape does */ 970 /* grab colors before netscape does */
954 Get_Colours (); 971 Get_Colours ();
955 972
956 if (!set_fonts ()) 973 if (!set_fonts ())
957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
958 975
976 parent = DefaultRootWindow (disp);
977
978#if ENABLE_XEMBED
979 if (rs[Rs_embed])
980 {
981 XWindowAttributes wattr;
982
983 parent = strtol (rs[Rs_embed], 0, 0);
984
985 if (!XGetWindowAttributes (disp, parent, &wattr))
986 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987
988 window_calc (wattr.width, wattr.height);
989 }
990#endif
991
959 window_calc (0, 0); 992 window_calc (0, 0);
960 old_width = szHint.width;
961 old_height = szHint.height;
962 993
963 /* sub-window placement & size in rxvt_resize_subwindows () */ 994 /* sub-window placement & size in rxvt_resize_subwindows () */
964
965#ifdef PREFER_24BIT 995#ifdef PREFER_24BIT
966 attributes.background_pixel = pix_colors_focused[Color_border]; 996 attributes.background_pixel = pix_colors_focused[Color_border];
967 attributes.border_pixel = pix_colors_focused[Color_border]; 997 attributes.border_pixel = pix_colors_focused[Color_border];
968 attributes.colormap = display->cmap; 998 attributes.colormap = display->cmap;
969 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 999 top = XCreateWindow (disp, parent,
970 szHint.x, szHint.y, 1000 szHint.x, szHint.y,
971 szHint.width, szHint.height, 1001 szHint.width, szHint.height,
972 TermWin.ext_bwidth, 1002 ext_bwidth,
973 display->depth, InputOutput, 1003 display->depth, InputOutput,
974 display->visual, 1004 display->visual,
975 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1005 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
976#else 1006#else
977 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1007 top = XCreateSimpleWindow (disp, parent,
978 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
979 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
980 TermWin.ext_bwidth, 1010 ext_bwidth,
981 pix_colors_focused[Color_border], 1011 pix_colors_focused[Color_border],
982 pix_colors_focused[Color_border]); 1012 pix_colors_focused[Color_border]);
983#endif 1013#endif
1014
1015 this->parent[0] = top;
1016
1017 old_width = szHint.width;
1018 old_height = szHint.height;
984 1019
985 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1020 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
986 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1021 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
987 1022
988 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
989 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
990 1025
991 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
992 wmHint.input = True; 1027 wmHint.input = True;
993 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1028 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
994 wmHint.window_group = TermWin.parent[0]; 1029 wmHint.window_group = top;
995 1030
996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1031 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
997 (char **)argv, argc, &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
998 1033
999 /* Enable delete window protocol */ 1034 Atom protocols[] = {
1000 XSetWMProtocols (display->display, TermWin.parent[0], 1035 xa[XA_WM_DELETE_WINDOW],
1001 &xa[XA_WMDELETEWINDOW], 1); 1036#if ENABLE_EWMH
1037 xa[XA_NET_WM_PING],
1038#endif
1039 };
1040
1041 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1002 1042
1003#if ENABLE_FRILLS 1043#if ENABLE_FRILLS
1044 if (rs[Rs_transient_for])
1045 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1046#endif
1047
1048#if ENABLE_EWMH
1004 long pid = getpid (); 1049 long pid = getpid ();
1005 1050
1006 XChangeProperty (display->display, TermWin.parent[0], 1051 XChangeProperty (disp, top,
1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1052 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1008 PropModeReplace, (unsigned char *)&pid, 1); 1053 PropModeReplace, (unsigned char *)&pid, 1);
1009#endif
1010 1054
1011 XSelectInput (display->display, TermWin.parent[0], 1055 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1056#endif
1057
1058 XSelectInput (disp, top,
1012 KeyPressMask 1059 KeyPressMask
1013#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1060#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1014 | KeyReleaseMask 1061 | KeyReleaseMask
1015#endif 1062#endif
1016 | FocusChangeMask | VisibilityChangeMask 1063 | FocusChangeMask | VisibilityChangeMask
1017 | ExposureMask
1018 | StructureNotifyMask); 1064 | ExposureMask | StructureNotifyMask);
1065
1019 termwin_ev.start (display, TermWin.parent[0]); 1066 termwin_ev.start (display, top);
1020 1067
1021#if ENABLE_FRILLS 1068#if ENABLE_FRILLS
1022 if (mwmhints.flags) 1069 if (mwmhints.flags)
1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1070 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1071 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1025#endif 1072#endif
1026 1073
1027 /* vt cursor: Black-on-White is standard, but this is more popular */ 1074 /* vt cursor: Black-on-White is standard, but this is more popular */
1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1075 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1029 1076
1030#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1077#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1031 /* cursor (menuBar/scrollBar): Black-on-White */ 1078 /* cursor (menuBar/scrollBar): Black-on-White */
1032 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1079 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 1080#endif
1047 1081
1048 /* the vt window */ 1082 /* the vt window */
1049 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1083 vt = XCreateSimpleWindow (disp, top,
1050 window_vt_x, 1084 window_vt_x,
1051 window_vt_y, 1085 window_vt_y,
1052 TermWin_TotalWidth (), 1086 width,
1053 TermWin_TotalHeight (), 1087 height,
1054 0, 1088 0,
1055 pix_colors_focused[Color_fg], 1089 pix_colors_focused[Color_fg],
1056 pix_colors_focused[Color_bg]); 1090 pix_colors_focused[Color_bg]);
1057#ifdef DEBUG_X 1091#ifdef DEBUG_X
1058 XStoreName (display->display, TermWin.vt, "vt window"); 1092 XStoreName (disp, vt, "vt window");
1059#endif 1093#endif
1060 1094
1061 attributes.bit_gravity = NorthWestGravity; 1095 attributes.bit_gravity = NorthWestGravity;
1062 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1096 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1063 1097
1064 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1098 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1065 1099
1066 pointer_unblank (); 1100 if (OPTION (Opt_pointerBlank)
1067 1101#ifdef ENABLE_PERL
1068#ifdef POINTER_BLANK 1102 || perl.self
1069 if (options & Opt_pointerBlank) 1103#endif
1104 )
1070 vt_emask |= PointerMotionMask; 1105 vt_emask |= PointerMotionMask;
1071 else 1106 else
1072#endif
1073 vt_emask |= Button1MotionMask | Button3MotionMask; 1107 vt_emask |= Button1MotionMask | Button3MotionMask;
1074 1108
1075 XSelectInput (display->display, TermWin.vt, vt_emask); 1109 XSelectInput (disp, vt, vt_emask);
1076 vt_ev.start (display, TermWin.vt); 1110 vt_ev.start (display, vt);
1077 1111
1078#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1112#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1079 if (menuBar_height ()) 1113 if (menuBar_height ())
1080 { 1114 {
1081 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1115 menuBar.win = XCreateSimpleWindow (disp, top,
1082 window_vt_x, 0, 1116 window_vt_x, 0,
1083 TermWin_TotalWidth (), 1117 width,
1084 menuBar_TotalHeight (), 1118 menuBar_TotalHeight (),
1085 0, 1119 0,
1086 pix_colors_focused[Color_fg], 1120 pix_colors_focused[Color_fg],
1087 pix_colors_focused[Color_scroll]); 1121 pix_colors_focused[Color_scroll]);
1088 1122
1089#ifdef DEBUG_X 1123#ifdef DEBUG_X
1090 XStoreName (display->display, menuBar.win, "menubar"); 1124 XStoreName (disp, menuBar.win, "menubar");
1091#endif 1125#endif
1092 1126
1093 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1127 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1094 1128
1095 XDefineCursor (display->display, menuBar.win, 1129 XDefineCursor (disp, menuBar.win,
1096 XCreateFontCursor (display->display, XC_left_ptr)); 1130 XCreateFontCursor (disp, XC_left_ptr));
1097 1131
1098 XSelectInput (display->display, menuBar.win, 1132 XSelectInput (disp, menuBar.win,
1099 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1133 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1100 | Button1MotionMask));
1101 menubar_ev.start (display, menuBar.win); 1134 menubar_ev.start (display, menuBar.win);
1102 } 1135 }
1103#endif 1136#endif
1104 1137
1105#ifdef XPM_BACKGROUND 1138#ifdef XPM_BACKGROUND
1106 if (rs[Rs_backgroundPixmap] != NULL 1139 if (rs[Rs_backgroundPixmap] != NULL
1107 && ! (options & Opt_transparent)) 1140 && ! OPTION (Opt_transparent))
1108 { 1141 {
1109 const char *p = rs[Rs_backgroundPixmap]; 1142 const char *p = rs[Rs_backgroundPixmap];
1110 1143
1111 if ((p = strchr (p, ';')) != NULL) 1144 if ((p = strchr (p, ';')) != NULL)
1112 { 1145 {
… …
1121 1154
1122 /* graphics context for the vt window */ 1155 /* graphics context for the vt window */
1123 gcvalue.foreground = pix_colors[Color_fg]; 1156 gcvalue.foreground = pix_colors[Color_fg];
1124 gcvalue.background = pix_colors[Color_bg]; 1157 gcvalue.background = pix_colors[Color_bg];
1125 gcvalue.graphics_exposures = 1; 1158 gcvalue.graphics_exposures = 1;
1126 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1159 gc = XCreateGC (disp, vt,
1127 GCForeground | GCBackground | GCGraphicsExposures, 1160 GCForeground | GCBackground | GCGraphicsExposures,
1128 &gcvalue); 1161 &gcvalue);
1129 1162
1130 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1163 drawable = new rxvt_drawable (display, vt);
1131 1164
1132#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1165#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1133 gcvalue.foreground = pix_colors[Color_topShadow]; 1166 gcvalue.foreground = pix_colors[Color_topShadow];
1134 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1167 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1135 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1168 gcvalue.foreground = pix_colors[Color_bottomShadow];
1136 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1169 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1137 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1170 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1138 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1171 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1139#endif 1172#endif
1140 1173
1141#ifdef OFF_FOCUS_FADING 1174#ifdef OFF_FOCUS_FADING
1142 // initially we are in unfocused state 1175 // initially we are in unfocused state
1143 if (rs[Rs_fade]) 1176 if (rs[Rs_fade])
1144 pix_colors = pix_colors_unfocused; 1177 pix_colors = pix_colors_unfocused;
1145#endif 1178#endif
1146 1179
1180 pointer_unblank ();
1147 scr_recolour (); 1181 scr_recolour ();
1182
1183#if ENABLE_XEMBED
1184 if (rs[Rs_embed])
1185 {
1186 long info[2] = { 0, XEMBED_MAPPED };
1187
1188 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1189 32, PropModeReplace, (unsigned char *)&info, 2);
1190 }
1191#endif
1148} 1192}
1149 1193
1150/* ------------------------------------------------------------------------- * 1194/* ------------------------------------------------------------------------- *
1151 * GET TTY CURRENT STATE * 1195 * GET TTY CURRENT STATE *
1152 * ------------------------------------------------------------------------- */ 1196 * ------------------------------------------------------------------------- */
… …
1157 /* 1201 /*
1158 * standard System V termios interface 1202 * standard System V termios interface
1159 */ 1203 */
1160 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1204 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1161 { 1205 {
1162 /* return error - use system defaults */ 1206 // return error - use system defaults,
1207 // where possible, and zero elsewhere
1208 memset (tio, 0, sizeof (ttymode_t));
1209
1163 tio->c_cc[VINTR] = CINTR; 1210 tio->c_cc[VINTR] = CINTR;
1164 tio->c_cc[VQUIT] = CQUIT; 1211 tio->c_cc[VQUIT] = CQUIT;
1165 tio->c_cc[VERASE] = CERASE; 1212 tio->c_cc[VERASE] = CERASE;
1213#ifdef VERASE2
1214 tio->c_cc[VERASE2] = CERASE2;
1215#endif
1166 tio->c_cc[VKILL] = CKILL; 1216 tio->c_cc[VKILL] = CKILL;
1167 tio->c_cc[VSTART] = CSTART; 1217 tio->c_cc[VSTART] = CSTART;
1168 tio->c_cc[VSTOP] = CSTOP; 1218 tio->c_cc[VSTOP] = CSTOP;
1169 tio->c_cc[VSUSP] = CSUSP; 1219 tio->c_cc[VSUSP] = CSUSP;
1170# ifdef VDSUSP 1220# ifdef VDSUSP
1171
1172 tio->c_cc[VDSUSP] = CDSUSP; 1221 tio->c_cc[VDSUSP] = CDSUSP;
1173# endif 1222# endif
1174# ifdef VREPRINT 1223# ifdef VREPRINT
1175
1176 tio->c_cc[VREPRINT] = CRPRNT; 1224 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif 1225# endif
1178# ifdef VDISCRD 1226# ifdef VDISCRD
1179
1180 tio->c_cc[VDISCRD] = CFLUSH; 1227 tio->c_cc[VDISCRD] = CFLUSH;
1181# endif 1228# endif
1182# ifdef VWERSE 1229# ifdef VWERSE
1183
1184 tio->c_cc[VWERSE] = CWERASE; 1230 tio->c_cc[VWERSE] = CWERASE;
1185# endif 1231# endif
1186# ifdef VLNEXT 1232# ifdef VLNEXT
1187
1188 tio->c_cc[VLNEXT] = CLNEXT; 1233 tio->c_cc[VLNEXT] = CLNEXT;
1189# endif 1234# endif
1190
1191 } 1235 }
1236
1192 tio->c_cc[VEOF] = CEOF; 1237 tio->c_cc[VEOF] = CEOF;
1193 tio->c_cc[VEOL] = VDISABLE; 1238 tio->c_cc[VEOL] = VDISABLE;
1194# ifdef VEOL2 1239# ifdef VEOL2
1195
1196 tio->c_cc[VEOL2] = VDISABLE; 1240 tio->c_cc[VEOL2] = VDISABLE;
1197# endif 1241# endif
1198# ifdef VSWTC 1242# ifdef VSWTC
1199
1200 tio->c_cc[VSWTC] = VDISABLE; 1243 tio->c_cc[VSWTC] = VDISABLE;
1201# endif 1244# endif
1202# ifdef VSWTCH 1245# ifdef VSWTCH
1203
1204 tio->c_cc[VSWTCH] = VDISABLE; 1246 tio->c_cc[VSWTCH] = VDISABLE;
1205# endif 1247# endif
1206# if VMIN != VEOF 1248# if VMIN != VEOF
1207
1208 tio->c_cc[VMIN] = 1; 1249 tio->c_cc[VMIN] = 1;
1209# endif 1250# endif
1210# if VTIME != VEOL 1251# if VTIME != VEOL
1211
1212 tio->c_cc[VTIME] = 0; 1252 tio->c_cc[VTIME] = 0;
1213# endif 1253# endif
1214 1254
1215 if (erase != -1) 1255 if (erase != -1)
1216 tio->c_cc[VERASE] = (char)erase; 1256 tio->c_cc[VERASE] = (char)erase;
… …
1244 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1284 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1245 { 1285 {
1246 tio->sg.sg_erase = CERASE; /* ^H */ 1286 tio->sg.sg_erase = CERASE; /* ^H */
1247 tio->sg.sg_kill = CKILL; /* ^U */ 1287 tio->sg.sg_kill = CKILL; /* ^U */
1248 } 1288 }
1289
1249 if (erase != -1) 1290 if (erase != -1)
1250 tio->sg.sg_erase = (char)erase; 1291 tio->sg.sg_erase = (char)erase;
1251 1292
1252 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1293 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1253 1294
… …
1259 tio->tc.t_startc = CSTART; /* ^Q */ 1300 tio->tc.t_startc = CSTART; /* ^Q */
1260 tio->tc.t_stopc = CSTOP; /* ^S */ 1301 tio->tc.t_stopc = CSTOP; /* ^S */
1261 tio->tc.t_eofc = CEOF; /* ^D */ 1302 tio->tc.t_eofc = CEOF; /* ^D */
1262 tio->tc.t_brkc = -1; 1303 tio->tc.t_brkc = -1;
1263 } 1304 }
1305
1264 /* get local special chars */ 1306 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1307 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 { 1308 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */ 1309 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1310 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1314 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 } 1315 }
1274 /* get line discipline */ 1316 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1317 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC 1318# ifdef NTTYDISC
1277
1278 tio->line = NTTYDISC; 1319 tio->line = NTTYDISC;
1279# endif /* NTTYDISC */ 1320# endif /* NTTYDISC */
1280 1321
1281 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1322 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1282#endif /* HAVE_TERMIOS_H */ 1323#endif /* HAVE_TERMIOS_H */
… …
1305 FOO (IGNCR, "IGNCR"); 1346 FOO (IGNCR, "IGNCR");
1306 FOO (ICRNL, "ICRNL"); 1347 FOO (ICRNL, "ICRNL");
1307 FOO (IXON, "IXON"); 1348 FOO (IXON, "IXON");
1308 FOO (IXOFF, "IXOFF"); 1349 FOO (IXOFF, "IXOFF");
1309# ifdef IUCLC 1350# ifdef IUCLC
1310
1311 FOO (IUCLC, "IUCLC"); 1351 FOO (IUCLC, "IUCLC");
1312# endif 1352# endif
1313# ifdef IXANY 1353# ifdef IXANY
1314
1315 FOO (IXANY, "IXANY"); 1354 FOO (IXANY, "IXANY");
1316# endif 1355# endif
1317# ifdef IMAXBEL 1356# ifdef IMAXBEL
1318
1319 FOO (IMAXBEL, "IMAXBEL"); 1357 FOO (IMAXBEL, "IMAXBEL");
1320# endif 1358# endif
1321 1359
1322 fprintf (stderr, "\n"); 1360 fprintf (stderr, "\n");
1323 1361
… …
1330 FOO (VERASE, "VERASE"); 1368 FOO (VERASE, "VERASE");
1331 FOO (VKILL, "VKILL"); 1369 FOO (VKILL, "VKILL");
1332 FOO (VEOF, "VEOF"); 1370 FOO (VEOF, "VEOF");
1333 FOO (VEOL, "VEOL"); 1371 FOO (VEOL, "VEOL");
1334# ifdef VEOL2 1372# ifdef VEOL2
1335
1336 FOO (VEOL2, "VEOL2"); 1373 FOO (VEOL2, "VEOL2");
1337# endif 1374# endif
1338# ifdef VSWTC 1375# ifdef VSWTC
1339
1340 FOO (VSWTC, "VSWTC"); 1376 FOO (VSWTC, "VSWTC");
1341# endif 1377# endif
1342# ifdef VSWTCH 1378# ifdef VSWTCH
1343
1344 FOO (VSWTCH, "VSWTCH"); 1379 FOO (VSWTCH, "VSWTCH");
1345# endif 1380# endif
1346
1347 FOO (VSTART, "VSTART"); 1381 FOO (VSTART, "VSTART");
1348 FOO (VSTOP, "VSTOP"); 1382 FOO (VSTOP, "VSTOP");
1349 FOO (VSUSP, "VSUSP"); 1383 FOO (VSUSP, "VSUSP");
1350# ifdef VDSUSP 1384# ifdef VDSUSP
1351
1352 FOO (VDSUSP, "VDSUSP"); 1385 FOO (VDSUSP, "VDSUSP");
1353# endif 1386# endif
1354# ifdef VREPRINT 1387# ifdef VREPRINT
1355
1356 FOO (VREPRINT, "VREPRINT"); 1388 FOO (VREPRINT, "VREPRINT");
1357# endif 1389# endif
1358# ifdef VDISCRD 1390# ifdef VDISCRD
1359
1360 FOO (VDISCRD, "VDISCRD"); 1391 FOO (VDISCRD, "VDISCRD");
1361# endif 1392# endif
1362# ifdef VWERSE 1393# ifdef VWERSE
1363
1364 FOO (VWERSE, "VWERSE"); 1394 FOO (VWERSE, "VWERSE");
1365# endif 1395# endif
1366# ifdef VLNEXT 1396# ifdef VLNEXT
1367
1368 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1369# endif 1398# endif
1370 1399
1371 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1372# undef FOO 1401# undef FOO
… …
1381 * the slave. 1410 * the slave.
1382 */ 1411 */
1383void 1412void
1384rxvt_term::run_command (const char *const *argv) 1413rxvt_term::run_command (const char *const *argv)
1385{ 1414{
1415#if ENABLE_FRILLS
1416 if (rs[Rs_pty_fd])
1417 {
1418 pty.pty = atoi (rs[Rs_pty_fd]);
1419
1420 if (pty.pty >= 0)
1421 {
1422 if (getfd_hook)
1423 pty.pty = (*getfd_hook) (pty.pty);
1424
1425 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1426 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1427 }
1428 }
1429 else
1430#endif
1431 if (!pty.get ())
1432 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1433
1434 pty.set_utf8_mode (enc_utf8);
1435
1436 /* set initial window size */
1437 tt_winch ();
1438
1386 int er; 1439 int er;
1387
1388 if (!pty.get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1440
1391#ifndef NO_BACKSPACE_KEY 1441#ifndef NO_BACKSPACE_KEY
1392 if (key_backspace[0] && !key_backspace[1]) 1442 if (key_backspace[0] && !key_backspace[1])
1393 er = key_backspace[0]; 1443 er = key_backspace[0];
1394 else if (strcmp (key_backspace, "DEC") == 0) 1444 else if (strcmp (key_backspace, "DEC") == 0)
… …
1397#endif 1447#endif
1398 er = -1; 1448 er = -1;
1399 1449
1400 rxvt_get_ttymode (&tio, er); 1450 rxvt_get_ttymode (&tio, er);
1401 1451
1402 /* set initial window size */ 1452#if ENABLE_FRILLS
1403 tt_winch (); 1453 if (rs[Rs_pty_fd])
1404 1454 return;
1405 sw_chld.start (SIGCHLD); 1455#endif
1406 1456
1407#ifndef __QNX__ 1457#ifndef __QNX__
1408 /* spin off the command interpreter */ 1458 /* spin off the command interpreter */
1409 switch (cmd_pid = fork ()) 1459 switch (cmd_pid = fork ())
1410 { 1460 {
1411 case -1: 1461 case -1:
1462 {
1463 cmd_pid = 0;
1412 rxvt_fatal ("can't fork, aborting.\n"); 1464 rxvt_fatal ("can't fork, aborting.\n");
1465 }
1413 case 0: 1466 case 0:
1414 init_env (); 1467 init_env ();
1415 1468
1416 if (!pty.make_controlling_tty ()) 1469 if (!pty.make_controlling_tty ())
1417 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1480{ 1533{
1481 char *login; 1534 char *login;
1482 1535
1483 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1536 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1484 1537
1485 if (options & Opt_console) 1538 if (OPTION (Opt_console))
1486 { /* be virtual console, fail silently */ 1539 { /* be virtual console, fail silently */
1487#ifdef TIOCCONS 1540#ifdef TIOCCONS
1488 unsigned int on = 1; 1541 unsigned int on = 1;
1489 1542
1490 ioctl (STDIN_FILENO, TIOCCONS, &on); 1543 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1533 execvp (argv[0], (char *const *)argv); 1586 execvp (argv[0], (char *const *)argv);
1534 /* no error message: STDERR is closed! */ 1587 /* no error message: STDERR is closed! */
1535 } 1588 }
1536 else 1589 else
1537 { 1590 {
1538 const char *argv0, *shell; 1591 const char *argv0, *shell;
1539 1592
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1593 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1594 shell = "/bin/sh";
1542 1595
1543 argv0 = (const char *)rxvt_r_basename (shell); 1596 argv0 = (const char *)rxvt_r_basename (shell);
1544 1597
1545 if (options & Opt_loginShell) 1598 if (OPTION (Opt_loginShell))
1546 { 1599 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1600 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1548 1601
1549 login[0] = '-'; 1602 login[0] = '-';
1550 strcpy (&login[1], argv0); 1603 strcpy (&login[1], argv0);
1551 argv0 = login; 1604 argv0 = login;
1552 } 1605 }
1606
1553 execlp (shell, argv0, NULL); 1607 execlp (shell, argv0, NULL);
1554 /* no error message: STDERR is closed! */ 1608 /* no error message: STDERR is closed! */
1555 } 1609 }
1556 1610
1557#else /* __QNX__ uses qnxspawn () */ 1611#else /* __QNX__ uses qnxspawn () */
… …
1585 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1639 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1586 command = "/bin/sh"; 1640 command = "/bin/sh";
1587 1641
1588 arg_a[0] = my_basename (command); 1642 arg_a[0] = my_basename (command);
1589 1643
1590 if (options & Opt_loginShell) 1644 if (OPTION (Opt_loginShell))
1591 { 1645 {
1592 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1646 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1593 1647
1594 login[0] = '-'; 1648 login[0] = '-';
1595 strcpy (&login[1], arg_a[0]); 1649 strcpy (&login[1], arg_a[0]);

Diff Legend

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