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.96 by root, Sat Dec 11 23:01:36 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"
37 38
39#include <limits>
40
38#include <signal.h> 41#include <csignal>
39 42
40const char *const def_colorName[] = 43const char *const def_colorName[] =
41 { 44 {
42 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
44 /* low-intensity colors */ 47 /* low-intensity colors */
45 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
46#ifndef NO_BRIGHTCOLOR
47 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
48 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
49 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
50 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
51 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
59# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
61# else 63# else
62 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
63# endif 65# endif
64#endif /* NO_BRIGHTCOLOR */
65 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
66 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
155 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 157 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
160#ifdef OPTION_HC 164#ifdef OPTION_HC
161 NULL, 165 NULL,
162#endif 166#endif
163#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
164 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
165 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
166#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
167#if TINTING 171#if TINTING
168 NULL, 172 NULL,
169#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
170 }; 177 };
171 178
172const char *const xa_names[NUM_XA] = 179const char *const xa_names[] =
173 { 180 {
174 "TEXT", 181 "TEXT",
175 "COMPOUND_TEXT", 182 "COMPOUND_TEXT",
176 "UTF8_STRING", 183 "UTF8_STRING",
177 "MULTIPLE", 184 "MULTIPLE",
178 "TARGETS", 185 "TARGETS",
179 "TIMESTAMP", 186 "TIMESTAMP",
180 "VT_SELECTION", 187 "VT_SELECTION",
181 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
182 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
183#ifdef TRANSPARENT 204#ifdef TRANSPARENT
184 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
185#endif 207#endif
186#ifdef OFFIX_DND 208#ifdef OFFIX_DND
187 "DndProtocol", 209 "DndProtocol",
188 "DndSelection", 210 "DndSelection",
189#endif 211#endif
190 "CLIPBOARD" 212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
191 }; 216 };
192 217
193bool 218bool
194rxvt_term::init_vars () 219rxvt_term::init_vars ()
195{ 220{
196 sw_term.start (SIGTERM);
197
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif 224#endif
202 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
203 226
204 if (pix_colors == NULL) 227 if (pix_colors == NULL)
205 return false; 228 return false;
206 229
207#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
208 TermWin.pixmap = None; 231 pixmap = None;
209#endif 232#endif
210 233
211 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
212 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
213 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
214 want_refresh = 1; 237 want_refresh = 1;
215 cmd_pid = -1;
216 pty.pty = pty.tty = -1;
217 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
218 TermWin.focus = 0; 239 focus = 0;
219 TermWin.ncol = 80; 240 ncol = 80;
220 TermWin.nrow = 24; 241 nrow = 24;
221 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
222 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
223 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
224 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
225 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
226 247
227 refresh_limit = 1; 248 refresh_limit = 1;
228 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
229 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
238 last_bot = last_state = -1; 259 last_bot = last_state = -1;
239 260
240#ifdef MENUBAR 261#ifdef MENUBAR
241 menu_readonly = 1; 262 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1) 263# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList); 264 CurrentBar = &BarList;
244# endif /* (MENUBAR_MAX > 1) */ 265# endif /* (MENUBAR_MAX > 1) */
245#endif 266#endif
246 267
247 return true; 268 return true;
248} 269}
… …
318 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
319 340
320 /* 341 /*
321 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
322 */ 343 */
344
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 345 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 346 rs[Rs_display_name] = ":0";
325 347
326 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
327 free (r_argv); 355 free (r_argv);
328
329#ifdef LOCAL_X_IS_UNIX
330 if (rs[Rs_display_name][0] == ':')
331 {
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
333 strcpy (val, "unix");
334 strcat (val, rs[Rs_display_name]);
335 display = displays.get (val);
336 free (val);
337 }
338#endif
339
340 if (!display
341 && ! (display = displays.get (rs[Rs_display_name])))
342 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
343
344 extract_resources (display->display, rs[Rs_name]);
345 356
346 /* 357 /*
347 * set any defaults not already set 358 * set any defaults not already set
348 */ 359 */
349 if (cmd_argv && cmd_argv[0]) 360 if (cmd_argv && cmd_argv[0])
… …
360 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
361 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
362 } 373 }
363 374
364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
365 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
366 377
367#if ENABLE_FRILLS 378#if ENABLE_FRILLS
368 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)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
370 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)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372#endif
373 384
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
377#endif 387#endif
378 388
379#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
380 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
381 pointerBlankDelay = i; 391 pointerBlankDelay = i;
382 else 392 else
383 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
384#endif 394#endif
385 395
386 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
387 if (!TermWin.saveLines) 397 if (!saveLines)
388 options &= ~Opt_scrollBar; 398 set_option (Opt_scrollBar, 0);
389 399
390#ifdef PRINTPIPE 400#ifdef PRINTPIPE
391 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
392 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
393#endif 403#endif
… …
436 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]);
437#endif 447#endif
438 448
439#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
440 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
441 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
442 { 452 {
443 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
444 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
445 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
446 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
451 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
452 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
453 463
454#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
455 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
456 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
457 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]);
458#endif 468#endif
459 469
460 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
461 color_aliases (Color_fg); 471 color_aliases (Color_fg);
462 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
513 523
514 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
515 525
516 /* avoiding the math library: 526 /* avoiding the math library:
517 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
518 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++)
519 ; 529 ;
520 MAX_IT (i, 1); 530 max_it (i, 1);
521 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
522 532
523 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
524 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
525 535
526 /* add entries to the environment: 536 /* add entries to the environment:
527 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
528 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
529 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
568 * This should support all European type languages. 578 * This should support all European type languages.
569 */ 579 */
570void 580void
571rxvt_term::set_locale (const char *locale) 581rxvt_term::set_locale (const char *locale)
572{ 582{
583 set_environ (envv);
584
573#if HAVE_XSETLOCALE || HAVE_SETLOCALE 585#if HAVE_XSETLOCALE || HAVE_SETLOCALE
574 free (this->locale); 586 free (this->locale);
575 this->locale = setlocale (LC_CTYPE, locale); 587 this->locale = setlocale (LC_CTYPE, locale);
576 588
577 if (!this->locale) 589 if (!this->locale)
578 { 590 {
579 if (*locale) 591 if (*locale)
580 { 592 {
581 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);
582 setlocale (LC_CTYPE, ""); 594 setlocale (LC_CTYPE, "C");
583 } 595 }
584 else 596 else
585 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");
586 598
587 this->locale = ""; 599 this->locale = "C";
588 } 600 }
589 601
590 602
591 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
593 mbstate.reset (); 605 mbstate.reset ();
594#endif 606#endif
595 607
596#if 0
597#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 609 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 610 // /^UTF.?8/i
600 || !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');
601 free (codeset); 615 free (codeset);
602#else 616#else
603 enc_utf8 = 0; 617 enc_utf8 = 0;
604#endif 618#endif
605#endif
606} 619}
607 620
608void 621void
609rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
610{ 623{
624 set_environ (envv);
625
611#ifdef USE_XIM 626#ifdef USE_XIM
612 if (!locale) 627 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 629 else
615 { 630 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 631 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 632
618 if (!XSupportsLocale ()) 633 if (!XSupportsLocale ())
619 { 634 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 635 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
621 return; 636 return;
… …
637 * Initialize the command connection. 652 * Initialize the command connection.
638 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
639 */ 654 */
640 655
641#ifdef META8_OPTION 656#ifdef META8_OPTION
642 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
643#endif 658#endif
644 659
645 get_ourmods (); 660 get_ourmods ();
646 661
647 if (!(options & Opt_scrollTtyOutput)) 662 if (!OPTION (Opt_scrollTtyOutput))
648 priv_modes |= PrivMode_TtyOutputInh; 663 priv_modes |= PrivMode_TtyOutputInh;
649 if (options & Opt_scrollTtyKeypress) 664 if (OPTION (Opt_scrollTtyKeypress))
650 priv_modes |= PrivMode_Keypress; 665 priv_modes |= PrivMode_Keypress;
651 if (!(options & Opt_jumpScroll)) 666 if (!OPTION (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 667 priv_modes |= PrivMode_smoothScroll;
653 668
654#ifndef NO_BACKSPACE_KEY 669#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 670 if (strcmp (key_backspace, "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 671 priv_modes |= PrivMode_HaveBackSpace;
… …
660 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
661 { 676 {
662 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
663 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
664 } 679 }
680
665 if (menubar_visible ()) 681 if (menubar_visible ())
666 { 682 {
667 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
668 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
669 } 685 }
670
671#ifdef CURSOR_BLINK
672 if (options & Opt_cursorBlink)
673 (void)gettimeofday (&lastcursorchange, NULL);
674#endif
675 686
676 run_command (argv); 687 run_command (argv);
677} 688}
678 689
679/*----------------------------------------------------------------------*/ 690/*----------------------------------------------------------------------*/
… …
694 continue; 705 continue;
695 706
696 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
697 { 708 {
698#ifndef XTERM_REVERSE_VIDEO 709#ifndef XTERM_REVERSE_VIDEO
699 if (i < 2 && (options & Opt_reverseVideo)) 710 if (i < 2 && OPTION (Opt_reverseVideo))
700 rs[Rs_color + i] = def_colorName[!i]; 711 rs[Rs_color + i] = def_colorName[!i];
701 else 712 else
702#endif 713#endif
703 rs[Rs_color + i] = def_colorName[i]; 714 rs[Rs_color + i] = def_colorName[i];
704 715
… …
729 } 740 }
730 } 741 }
731 } 742 }
732 743
733 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
734#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
735 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
736 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]);
737#endif 752#endif
738 SET_PIXCOLOR (i);
739 }
740 753
741 if (display->depth <= 2) 754 if (display->depth <= 2)
742 { 755 {
743 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];
744 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];
… …
752 * from the fvwm window manager. 765 * from the fvwm window manager.
753 */ 766 */
754#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
755 768
756 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
757 { /* Monochrome */ 771 /* Monochrome */
758 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
759 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
760 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
761 } 775 }
762 else 776 else
… …
798 int i = atoi (rs[Rs_color + idx]); 812 int i = atoi (rs[Rs_color + idx]);
799 813
800 if (i >= 8 && i <= 15) 814 if (i >= 8 && i <= 15)
801 { /* bright colors */ 815 { /* bright colors */
802 i -= 8; 816 i -= 8;
803#ifndef NO_BRIGHTCOLOR
804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
805 return; 818 return;
806#endif
807 } 819 }
808 820
809 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
810 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
811 } 823 }
… …
817 * Use resource ``modifier'' to override the Meta modifier 829 * Use resource ``modifier'' to override the Meta modifier
818 */ 830 */
819void 831void
820rxvt_term::get_ourmods () 832rxvt_term::get_ourmods ()
821{ 833{
822 int i, j, k; 834 int i, j, k;
823 int requestedmeta, realmeta, realalt; 835 int requestedmeta, realmeta, realalt;
824 const char *cm, *rsmod; 836 const char *cm, *rsmod;
825 XModifierKeymap *map; 837 XModifierKeymap *map;
826 KeyCode *kc; 838 KeyCode *kc;
827 const unsigned int modmasks[] = 839 const unsigned int modmasks[] =
828 { 840 {
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 842 };
831 843
832 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
834 if (rsmod 847 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
837 850
838 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 852 kc = map->modifiermap;
853
840 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
841 { 855 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
843 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
844 { 859 {
845 if (kc[k] == 0) 860 if (kc[k] == 0)
846 break; 861 break;
862
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 864 {
849 case XK_Num_Lock: 865 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 867 continue;
852 default: 868
853 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
854 case XK_Meta_L: 873 case XK_Meta_L:
855 case XK_Meta_R: 874 case XK_Meta_R:
856 cm = "meta"; 875 cm = "meta";
857 realmeta = i; 876 realmeta = i;
858 break; 877 break;
878
859 case XK_Alt_L: 879 case XK_Alt_L:
860 case XK_Alt_R: 880 case XK_Alt_R:
861 cm = "alt"; 881 cm = "alt";
862 realalt = i; 882 realalt = i;
863 break; 883 break;
884
864 case XK_Super_L: 885 case XK_Super_L:
865 case XK_Super_R: 886 case XK_Super_R:
866 cm = "super"; 887 cm = "super";
867 break; 888 break;
889
868 case XK_Hyper_L: 890 case XK_Hyper_L:
869 case XK_Hyper_R: 891 case XK_Hyper_R:
870 cm = "hyper"; 892 cm = "hyper";
871 break; 893 break;
894
895 default:
896 continue;
872 } 897 }
898
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 900 requestedmeta = i;
875 } 901 }
876 } 902 }
903
877 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
878 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 907 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
881 if (i) 911 if (i)
882 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
883} 913}
884 914
885/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
895#endif 925#endif
896 XGCValues gcvalue; 926 XGCValues gcvalue;
897 long vt_emask; 927 long vt_emask;
898 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 929 XWindowAttributes gattr;
900 930 Window top, parent;
901 for (int i = 0; i < NUM_XA; i++) 931 dDisp;
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903 932
904#ifdef USING_W11LIB 933#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 934 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 935 W11AddEventHandler (disp, rxvt_W11_process_x_event);
907#endif 936#endif
908 937
909 if (options & Opt_transparent) 938 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
939 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
940
941 if (OPTION (Opt_transparent))
910 { 942 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 943 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 944 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
913 } 945 }
914 946
915#if ENABLE_FRILLS 947#if ENABLE_FRILLS
916 if (options & Opt_borderLess) 948 if (OPTION (Opt_borderLess))
917 { 949 {
918 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 950 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
919 951
920 if (prop == None) 952 if (prop == None)
921 { 953 {
922 /* 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");*/
923#ifdef PREFER_24BIT 955#ifdef PREFER_24BIT
… …
930 mwmhints.flags = MWM_HINTS_DECORATIONS; 962 mwmhints.flags = MWM_HINTS_DECORATIONS;
931 mwmhints.decorations = 0; 963 mwmhints.decorations = 0;
932 } 964 }
933 } 965 }
934 else 966 else
935 {
936 mwmhints.flags = 0; 967 mwmhints.flags = 0;
937 }
938#endif 968#endif
939 969
940 /* grab colors before netscape does */ 970 /* grab colors before netscape does */
941 Get_Colours (); 971 Get_Colours ();
942 972
943 if (!set_fonts ()) 973 if (!set_fonts ())
944 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");
945 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
946 window_calc (0, 0); 992 window_calc (0, 0);
947 old_width = szHint.width;
948 old_height = szHint.height;
949 993
950 /* sub-window placement & size in rxvt_resize_subwindows () */ 994 /* sub-window placement & size in rxvt_resize_subwindows () */
951
952#ifdef PREFER_24BIT 995#ifdef PREFER_24BIT
953 attributes.background_pixel = pix_colors_focused[Color_border]; 996 attributes.background_pixel = pix_colors_focused[Color_border];
954 attributes.border_pixel = pix_colors_focused[Color_border]; 997 attributes.border_pixel = pix_colors_focused[Color_border];
955 attributes.colormap = display->cmap; 998 attributes.colormap = display->cmap;
956 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 999 top = XCreateWindow (disp, parent,
957 szHint.x, szHint.y, 1000 szHint.x, szHint.y,
958 szHint.width, szHint.height, 1001 szHint.width, szHint.height,
959 TermWin.ext_bwidth, 1002 ext_bwidth,
960 display->depth, InputOutput, 1003 display->depth, InputOutput,
961 display->visual, 1004 display->visual,
962 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1005 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
963#else 1006#else
964 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1007 top = XCreateSimpleWindow (disp, parent,
965 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1010 ext_bwidth,
968 pix_colors_focused[Color_border], 1011 pix_colors_focused[Color_border],
969 pix_colors_focused[Color_border]); 1012 pix_colors_focused[Color_border]);
970#endif 1013#endif
1014
1015 this->parent[0] = top;
1016
1017 old_width = szHint.width;
1018 old_height = szHint.height;
971 1019
972 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1020 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
973 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1021 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
974 1022
975 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
976 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
977 1025
978 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
979 wmHint.input = True; 1027 wmHint.input = True;
980 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1028 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
981 wmHint.window_group = TermWin.parent[0]; 1029 wmHint.window_group = top;
982 1030
983 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1031 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
984 (char **)argv, argc, &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
985 1033
986 /* Enable delete window protocol */ 1034 Atom protocols[] = {
987 XSetWMProtocols (display->display, TermWin.parent[0], 1035 xa[XA_WM_DELETE_WINDOW],
988 &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]));
989 1042
990#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
991 long pid = getpid (); 1049 long pid = getpid ();
992 1050
993 XChangeProperty (display->display, TermWin.parent[0], 1051 XChangeProperty (disp, top,
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1052 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1053 PropModeReplace, (unsigned char *)&pid, 1);
996#endif
997 1054
998 XSelectInput (display->display, TermWin.parent[0], 1055 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1056#endif
1057
1058 XSelectInput (disp, top,
999 KeyPressMask 1059 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1060#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1061 | KeyReleaseMask
1002#endif 1062#endif
1003 | FocusChangeMask | VisibilityChangeMask 1063 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask
1005 | StructureNotifyMask); 1064 | ExposureMask | StructureNotifyMask);
1065
1006 termwin_ev.start (display, TermWin.parent[0]); 1066 termwin_ev.start (display, top);
1007 1067
1008#if ENABLE_FRILLS 1068#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1069 if (mwmhints.flags)
1010 { 1070 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1011 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1012 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1013 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1071 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1072#endif
1016 1073
1017 /* 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 */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1075 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1076
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1077#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1078 /* cursor (menuBar/scrollBar): Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1079 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1023#endif
1024
1025#ifdef POINTER_BLANK
1026 {
1027 XColor blackcolour;
1028 blackcolour.red = 0;
1029 blackcolour.green = 0;
1030 blackcolour.blue = 0;
1031 Font f = XLoadFont (display->display, "fixed");
1032 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1033 &blackcolour, &blackcolour);
1034 XUnloadFont (display->display, f);
1035 }
1036#endif 1080#endif
1037 1081
1038 /* the vt window */ 1082 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1083 vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1084 window_vt_x,
1041 window_vt_y, 1085 window_vt_y,
1042 TermWin_TotalWidth (), 1086 width,
1043 TermWin_TotalHeight (), 1087 height,
1044 0, 1088 0,
1045 pix_colors_focused[Color_fg], 1089 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1090 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1091#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1092 XStoreName (disp, vt, "vt window");
1049#endif 1093#endif
1050 1094
1051 attributes.bit_gravity = NorthWestGravity; 1095 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1096 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1053 1097
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1098 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055 1099
1056 pointer_unblank (); 1100 if (OPTION (Opt_pointerBlank)
1057 1101#ifdef ENABLE_PERL
1058#ifdef POINTER_BLANK 1102 || perl.self
1059 if (options & Opt_pointerBlank) 1103#endif
1104 )
1060 vt_emask |= PointerMotionMask; 1105 vt_emask |= PointerMotionMask;
1061 else 1106 else
1062#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1107 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1108
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1109 XSelectInput (disp, vt, vt_emask);
1066 vt_ev.start (display, TermWin.vt); 1110 vt_ev.start (display, vt);
1067 1111
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1112#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ()) 1113 if (menuBar_height ())
1070 { 1114 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1115 menuBar.win = XCreateSimpleWindow (disp, top,
1072 window_vt_x, 0, 1116 window_vt_x, 0,
1073 TermWin_TotalWidth (), 1117 width,
1074 menuBar_TotalHeight (), 1118 menuBar_TotalHeight (),
1075 0, 1119 0,
1076 pix_colors_focused[Color_fg], 1120 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]); 1121 pix_colors_focused[Color_scroll]);
1078 1122
1079#ifdef DEBUG_X 1123#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar"); 1124 XStoreName (disp, menuBar.win, "menubar");
1081#endif 1125#endif
1082 1126
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1127 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084 1128
1085 XDefineCursor (display->display, menuBar.win, 1129 XDefineCursor (disp, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr)); 1130 XCreateFontCursor (disp, XC_left_ptr));
1087 1131
1088 XSelectInput (display->display, menuBar.win, 1132 XSelectInput (disp, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1133 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win); 1134 menubar_ev.start (display, menuBar.win);
1092 } 1135 }
1093#endif 1136#endif
1094 1137
1095#ifdef XPM_BACKGROUND 1138#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1139 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! (options & Opt_transparent)) 1140 && ! OPTION (Opt_transparent))
1098 { 1141 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1142 const char *p = rs[Rs_backgroundPixmap];
1100 1143
1101 if ((p = strchr (p, ';')) != NULL) 1144 if ((p = strchr (p, ';')) != NULL)
1102 { 1145 {
… …
1111 1154
1112 /* graphics context for the vt window */ 1155 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1156 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1157 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1158 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1159 gc = XCreateGC (disp, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1160 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1161 &gcvalue);
1119 1162
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1163 drawable = new rxvt_drawable (display, vt);
1121 1164
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1165#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1166 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1167 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1168 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1169 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1170 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1171 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129#endif 1172#endif
1130 1173
1131#ifdef OFF_FOCUS_FADING 1174#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1175 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1176 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1177 pix_colors = pix_colors_unfocused;
1135#endif 1178#endif
1136 1179
1180 pointer_unblank ();
1137 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
1138} 1192}
1139 1193
1140/* ------------------------------------------------------------------------- * 1194/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1195 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1196 * ------------------------------------------------------------------------- */
… …
1147 /* 1201 /*
1148 * standard System V termios interface 1202 * standard System V termios interface
1149 */ 1203 */
1150 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1204 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1151 { 1205 {
1152 /* 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
1153 tio->c_cc[VINTR] = CINTR; 1210 tio->c_cc[VINTR] = CINTR;
1154 tio->c_cc[VQUIT] = CQUIT; 1211 tio->c_cc[VQUIT] = CQUIT;
1155 tio->c_cc[VERASE] = CERASE; 1212 tio->c_cc[VERASE] = CERASE;
1213#ifdef VERASE2
1214 tio->c_cc[VERASE2] = CERASE2;
1215#endif
1156 tio->c_cc[VKILL] = CKILL; 1216 tio->c_cc[VKILL] = CKILL;
1157 tio->c_cc[VSTART] = CSTART; 1217 tio->c_cc[VSTART] = CSTART;
1158 tio->c_cc[VSTOP] = CSTOP; 1218 tio->c_cc[VSTOP] = CSTOP;
1159 tio->c_cc[VSUSP] = CSUSP; 1219 tio->c_cc[VSUSP] = CSUSP;
1160# ifdef VDSUSP 1220# ifdef VDSUSP
1161
1162 tio->c_cc[VDSUSP] = CDSUSP; 1221 tio->c_cc[VDSUSP] = CDSUSP;
1163# endif 1222# endif
1164# ifdef VREPRINT 1223# ifdef VREPRINT
1165
1166 tio->c_cc[VREPRINT] = CRPRNT; 1224 tio->c_cc[VREPRINT] = CRPRNT;
1167# endif 1225# endif
1168# ifdef VDISCRD 1226# ifdef VDISCRD
1169
1170 tio->c_cc[VDISCRD] = CFLUSH; 1227 tio->c_cc[VDISCRD] = CFLUSH;
1171# endif 1228# endif
1172# ifdef VWERSE 1229# ifdef VWERSE
1173
1174 tio->c_cc[VWERSE] = CWERASE; 1230 tio->c_cc[VWERSE] = CWERASE;
1175# endif 1231# endif
1176# ifdef VLNEXT 1232# ifdef VLNEXT
1177
1178 tio->c_cc[VLNEXT] = CLNEXT; 1233 tio->c_cc[VLNEXT] = CLNEXT;
1179# endif 1234# endif
1180
1181 } 1235 }
1236
1182 tio->c_cc[VEOF] = CEOF; 1237 tio->c_cc[VEOF] = CEOF;
1183 tio->c_cc[VEOL] = VDISABLE; 1238 tio->c_cc[VEOL] = VDISABLE;
1184# ifdef VEOL2 1239# ifdef VEOL2
1185
1186 tio->c_cc[VEOL2] = VDISABLE; 1240 tio->c_cc[VEOL2] = VDISABLE;
1187# endif 1241# endif
1188# ifdef VSWTC 1242# ifdef VSWTC
1189
1190 tio->c_cc[VSWTC] = VDISABLE; 1243 tio->c_cc[VSWTC] = VDISABLE;
1191# endif 1244# endif
1192# ifdef VSWTCH 1245# ifdef VSWTCH
1193
1194 tio->c_cc[VSWTCH] = VDISABLE; 1246 tio->c_cc[VSWTCH] = VDISABLE;
1195# endif 1247# endif
1196# if VMIN != VEOF 1248# if VMIN != VEOF
1197
1198 tio->c_cc[VMIN] = 1; 1249 tio->c_cc[VMIN] = 1;
1199# endif 1250# endif
1200# if VTIME != VEOL 1251# if VTIME != VEOL
1201
1202 tio->c_cc[VTIME] = 0; 1252 tio->c_cc[VTIME] = 0;
1203# endif 1253# endif
1204 1254
1205 if (erase != -1) 1255 if (erase != -1)
1206 tio->c_cc[VERASE] = (char)erase; 1256 tio->c_cc[VERASE] = (char)erase;
… …
1234 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1284 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1235 { 1285 {
1236 tio->sg.sg_erase = CERASE; /* ^H */ 1286 tio->sg.sg_erase = CERASE; /* ^H */
1237 tio->sg.sg_kill = CKILL; /* ^U */ 1287 tio->sg.sg_kill = CKILL; /* ^U */
1238 } 1288 }
1289
1239 if (erase != -1) 1290 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase; 1291 tio->sg.sg_erase = (char)erase;
1241 1292
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1293 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243 1294
… …
1249 tio->tc.t_startc = CSTART; /* ^Q */ 1300 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */ 1301 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */ 1302 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1; 1303 tio->tc.t_brkc = -1;
1253 } 1304 }
1305
1254 /* get local special chars */ 1306 /* get local special chars */
1255 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1307 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1256 { 1308 {
1257 tio->lc.t_suspc = CSUSP; /* ^Z */ 1309 tio->lc.t_suspc = CSUSP; /* ^Z */
1258 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1310 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1262 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1314 tio->lc.t_lnextc = CLNEXT; /* ^V */
1263 } 1315 }
1264 /* get line discipline */ 1316 /* get line discipline */
1265 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1317 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1266# ifdef NTTYDISC 1318# ifdef NTTYDISC
1267
1268 tio->line = NTTYDISC; 1319 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */ 1320# endif /* NTTYDISC */
1270 1321
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1322 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */ 1323#endif /* HAVE_TERMIOS_H */
… …
1295 FOO (IGNCR, "IGNCR"); 1346 FOO (IGNCR, "IGNCR");
1296 FOO (ICRNL, "ICRNL"); 1347 FOO (ICRNL, "ICRNL");
1297 FOO (IXON, "IXON"); 1348 FOO (IXON, "IXON");
1298 FOO (IXOFF, "IXOFF"); 1349 FOO (IXOFF, "IXOFF");
1299# ifdef IUCLC 1350# ifdef IUCLC
1300
1301 FOO (IUCLC, "IUCLC"); 1351 FOO (IUCLC, "IUCLC");
1302# endif 1352# endif
1303# ifdef IXANY 1353# ifdef IXANY
1304
1305 FOO (IXANY, "IXANY"); 1354 FOO (IXANY, "IXANY");
1306# endif 1355# endif
1307# ifdef IMAXBEL 1356# ifdef IMAXBEL
1308
1309 FOO (IMAXBEL, "IMAXBEL"); 1357 FOO (IMAXBEL, "IMAXBEL");
1310# endif 1358# endif
1311 1359
1312 fprintf (stderr, "\n"); 1360 fprintf (stderr, "\n");
1313 1361
… …
1320 FOO (VERASE, "VERASE"); 1368 FOO (VERASE, "VERASE");
1321 FOO (VKILL, "VKILL"); 1369 FOO (VKILL, "VKILL");
1322 FOO (VEOF, "VEOF"); 1370 FOO (VEOF, "VEOF");
1323 FOO (VEOL, "VEOL"); 1371 FOO (VEOL, "VEOL");
1324# ifdef VEOL2 1372# ifdef VEOL2
1325
1326 FOO (VEOL2, "VEOL2"); 1373 FOO (VEOL2, "VEOL2");
1327# endif 1374# endif
1328# ifdef VSWTC 1375# ifdef VSWTC
1329
1330 FOO (VSWTC, "VSWTC"); 1376 FOO (VSWTC, "VSWTC");
1331# endif 1377# endif
1332# ifdef VSWTCH 1378# ifdef VSWTCH
1333
1334 FOO (VSWTCH, "VSWTCH"); 1379 FOO (VSWTCH, "VSWTCH");
1335# endif 1380# endif
1336
1337 FOO (VSTART, "VSTART"); 1381 FOO (VSTART, "VSTART");
1338 FOO (VSTOP, "VSTOP"); 1382 FOO (VSTOP, "VSTOP");
1339 FOO (VSUSP, "VSUSP"); 1383 FOO (VSUSP, "VSUSP");
1340# ifdef VDSUSP 1384# ifdef VDSUSP
1341
1342 FOO (VDSUSP, "VDSUSP"); 1385 FOO (VDSUSP, "VDSUSP");
1343# endif 1386# endif
1344# ifdef VREPRINT 1387# ifdef VREPRINT
1345
1346 FOO (VREPRINT, "VREPRINT"); 1388 FOO (VREPRINT, "VREPRINT");
1347# endif 1389# endif
1348# ifdef VDISCRD 1390# ifdef VDISCRD
1349
1350 FOO (VDISCRD, "VDISCRD"); 1391 FOO (VDISCRD, "VDISCRD");
1351# endif 1392# endif
1352# ifdef VWERSE 1393# ifdef VWERSE
1353
1354 FOO (VWERSE, "VWERSE"); 1394 FOO (VWERSE, "VWERSE");
1355# endif 1395# endif
1356# ifdef VLNEXT 1396# ifdef VLNEXT
1357
1358 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1359# endif 1398# endif
1360 1399
1361 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1362# undef FOO 1401# undef FOO
… …
1371 * the slave. 1410 * the slave.
1372 */ 1411 */
1373void 1412void
1374rxvt_term::run_command (const char *const *argv) 1413rxvt_term::run_command (const char *const *argv)
1375{ 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
1376 int er; 1439 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1440
1381#ifndef NO_BACKSPACE_KEY 1441#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1442 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1443 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1444 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1447#endif
1388 er = -1; 1448 er = -1;
1389 1449
1390 rxvt_get_ttymode (&tio, er); 1450 rxvt_get_ttymode (&tio, er);
1391 1451
1392 /* set initial window size */ 1452#if ENABLE_FRILLS
1393 tt_winch (); 1453 if (rs[Rs_pty_fd])
1394 1454 return;
1395 sw_chld.start (SIGCHLD); 1455#endif
1396 1456
1397#ifndef __QNX__ 1457#ifndef __QNX__
1398 /* spin off the command interpreter */ 1458 /* spin off the command interpreter */
1399 switch (cmd_pid = fork ()) 1459 switch (cmd_pid = fork ())
1400 { 1460 {
1401 case -1: 1461 case -1:
1462 {
1463 cmd_pid = 0;
1402 rxvt_fatal ("can't fork, aborting.\n"); 1464 rxvt_fatal ("can't fork, aborting.\n");
1465 }
1403 case 0: 1466 case 0:
1404 init_env (); 1467 init_env ();
1405 1468
1406 if (!pty.make_controlling_tty ()) 1469 if (!pty.make_controlling_tty ())
1407 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1470 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1470{ 1533{
1471 char *login; 1534 char *login;
1472 1535
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1536 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474 1537
1475 if (options & Opt_console) 1538 if (OPTION (Opt_console))
1476 { /* be virtual console, fail silently */ 1539 { /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1540#ifdef TIOCCONS
1478 unsigned int on = 1; 1541 unsigned int on = 1;
1479 1542
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1543 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1523 execvp (argv[0], (char *const *)argv); 1586 execvp (argv[0], (char *const *)argv);
1524 /* no error message: STDERR is closed! */ 1587 /* no error message: STDERR is closed! */
1525 } 1588 }
1526 else 1589 else
1527 { 1590 {
1528 const char *argv0, *shell; 1591 const char *argv0, *shell;
1529 1592
1530 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1593 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1531 shell = "/bin/sh"; 1594 shell = "/bin/sh";
1532 1595
1533 argv0 = (const char *)rxvt_r_basename (shell); 1596 argv0 = (const char *)rxvt_r_basename (shell);
1534 1597
1535 if (options & Opt_loginShell) 1598 if (OPTION (Opt_loginShell))
1536 { 1599 {
1537 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1600 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1538 1601
1539 login[0] = '-'; 1602 login[0] = '-';
1540 strcpy (&login[1], argv0); 1603 strcpy (&login[1], argv0);
1541 argv0 = login; 1604 argv0 = login;
1542 } 1605 }
1606
1543 execlp (shell, argv0, NULL); 1607 execlp (shell, argv0, NULL);
1544 /* no error message: STDERR is closed! */ 1608 /* no error message: STDERR is closed! */
1545 } 1609 }
1546 1610
1547#else /* __QNX__ uses qnxspawn () */ 1611#else /* __QNX__ uses qnxspawn () */
… …
1575 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1639 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1576 command = "/bin/sh"; 1640 command = "/bin/sh";
1577 1641
1578 arg_a[0] = my_basename (command); 1642 arg_a[0] = my_basename (command);
1579 1643
1580 if (options & Opt_loginShell) 1644 if (OPTION (Opt_loginShell))
1581 { 1645 {
1582 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1646 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1583 1647
1584 login[0] = '-'; 1648 login[0] = '-';
1585 strcpy (&login[1], arg_a[0]); 1649 strcpy (&login[1], arg_a[0]);

Diff Legend

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