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.92 by root, Wed Sep 8 17:23:02 2004 UTC vs.
Revision 1.141 by root, Fri Jan 13 04:19:41 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#if 0 607
596#if HAVE_NL_LANGINFO 608#if HAVE_NL_LANGINFO
609 char *codeset = strdup (nl_langinfo (CODESET));
610 // /^UTF.?8/i
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');
597 free (codeset); 615 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 616#else
602 enc_utf8 = 1; 617 enc_utf8 = 0;
603#endif
604#endif 618#endif
605} 619}
606 620
607void 621void
608rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
609{ 623{
624 set_environ (envv);
625
610#ifdef USE_XIM 626#ifdef USE_XIM
611 if (!locale) 627 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 629 else
614 { 630 {
615 Atom wmlocale; 631 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 632
622 if (!XSupportsLocale ()) 633 if (!XSupportsLocale ())
623 { 634 {
624 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");
625 return; 636 return;
… …
639{ 650{
640 /* 651 /*
641 * Initialize the command connection. 652 * Initialize the command connection.
642 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
643 */ 654 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 655
658#ifdef META8_OPTION 656#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 658#endif
661 659
662 get_ourmods (); 660 get_ourmods ();
663 661
664 if (!(options & Opt_scrollTtyOutput)) 662 if (!OPTION (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 663 priv_modes |= PrivMode_TtyOutputInh;
666 if (options & Opt_scrollTtyKeypress) 664 if (OPTION (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 665 priv_modes |= PrivMode_Keypress;
668 if (!(options & Opt_jumpScroll)) 666 if (!OPTION (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 667 priv_modes |= PrivMode_smoothScroll;
670 668
671#ifndef NO_BACKSPACE_KEY 669#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 670 if (strcmp (key_backspace, "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 671 priv_modes |= PrivMode_HaveBackSpace;
… …
677 if (scrollbar_visible ()) 675 if (scrollbar_visible ())
678 { 676 {
679 priv_modes |= PrivMode_scrollBar; 677 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 678 SavedModes |= PrivMode_scrollBar;
681 } 679 }
680
682 if (menubar_visible ()) 681 if (menubar_visible ())
683 { 682 {
684 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
686 } 685 }
687
688#ifdef CURSOR_BLINK
689 if (options & Opt_cursorBlink)
690 (void)gettimeofday (&lastcursorchange, NULL);
691#endif
692 686
693 run_command (argv); 687 run_command (argv);
694} 688}
695 689
696/*----------------------------------------------------------------------*/ 690/*----------------------------------------------------------------------*/
… …
711 continue; 705 continue;
712 706
713 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
714 { 708 {
715#ifndef XTERM_REVERSE_VIDEO 709#ifndef XTERM_REVERSE_VIDEO
716 if (i < 2 && (options & Opt_reverseVideo)) 710 if (i < 2 && OPTION (Opt_reverseVideo))
717 rs[Rs_color + i] = def_colorName[!i]; 711 rs[Rs_color + i] = def_colorName[!i];
718 else 712 else
719#endif 713#endif
720 rs[Rs_color + i] = def_colorName[i]; 714 rs[Rs_color + i] = def_colorName[i];
721 715
… …
746 } 740 }
747 } 741 }
748 } 742 }
749 743
750 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
751#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 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]);
754#endif 752#endif
755 SET_PIXCOLOR (i);
756 }
757 753
758 if (display->depth <= 2) 754 if (display->depth <= 2)
759 { 755 {
760 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];
761 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];
… …
769 * from the fvwm window manager. 765 * from the fvwm window manager.
770 */ 766 */
771#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
772 768
773 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
774 { /* Monochrome */ 771 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
778 } 775 }
779 else 776 else
… …
815 int i = atoi (rs[Rs_color + idx]); 812 int i = atoi (rs[Rs_color + idx]);
816 813
817 if (i >= 8 && i <= 15) 814 if (i >= 8 && i <= 15)
818 { /* bright colors */ 815 { /* bright colors */
819 i -= 8; 816 i -= 8;
820#ifndef NO_BRIGHTCOLOR
821 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
822 return; 818 return;
823#endif
824 } 819 }
825 820
826 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
827 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
828 } 823 }
… …
834 * Use resource ``modifier'' to override the Meta modifier 829 * Use resource ``modifier'' to override the Meta modifier
835 */ 830 */
836void 831void
837rxvt_term::get_ourmods () 832rxvt_term::get_ourmods ()
838{ 833{
839 int i, j, k; 834 int i, j, k;
840 int requestedmeta, realmeta, realalt; 835 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 836 const char *cm, *rsmod;
842 XModifierKeymap *map; 837 XModifierKeymap *map;
843 KeyCode *kc; 838 KeyCode *kc;
844 const unsigned int modmasks[] = 839 const unsigned int modmasks[] =
845 { 840 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 842 };
848 843
849 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
851 if (rsmod 847 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
854 850
855 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 852 kc = map->modifiermap;
853
857 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
858 { 855 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
860 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
861 { 859 {
862 if (kc[k] == 0) 860 if (kc[k] == 0)
863 break; 861 break;
862
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 864 {
866 case XK_Num_Lock: 865 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 867 continue;
869 default: 868
870 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
871 case XK_Meta_L: 873 case XK_Meta_L:
872 case XK_Meta_R: 874 case XK_Meta_R:
873 cm = "meta"; 875 cm = "meta";
874 realmeta = i; 876 realmeta = i;
875 break; 877 break;
878
876 case XK_Alt_L: 879 case XK_Alt_L:
877 case XK_Alt_R: 880 case XK_Alt_R:
878 cm = "alt"; 881 cm = "alt";
879 realalt = i; 882 realalt = i;
880 break; 883 break;
884
881 case XK_Super_L: 885 case XK_Super_L:
882 case XK_Super_R: 886 case XK_Super_R:
883 cm = "super"; 887 cm = "super";
884 break; 888 break;
889
885 case XK_Hyper_L: 890 case XK_Hyper_L:
886 case XK_Hyper_R: 891 case XK_Hyper_R:
887 cm = "hyper"; 892 cm = "hyper";
888 break; 893 break;
894
895 default:
896 continue;
889 } 897 }
898
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 900 requestedmeta = i;
892 } 901 }
893 } 902 }
903
894 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
895 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 907 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
898 if (i) 911 if (i)
899 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
900} 913}
901 914
902/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
909#if ENABLE_FRILLS 922#if ENABLE_FRILLS
910 Atom prop = None; 923 Atom prop = None;
911 MWMHints mwmhints; 924 MWMHints mwmhints;
912#endif 925#endif
913 XGCValues gcvalue; 926 XGCValues gcvalue;
914 long vt_emask;
915 XSetWindowAttributes attributes; 927 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 928 XWindowAttributes gattr;
929 Window top, parent;
930 dDisp;
917 931
918 if (options & Opt_transparent) 932#ifdef USING_W11LIB
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939
940 if (OPTION (Opt_transparent))
919 { 941 {
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
922 } 944 }
923 945
924#if ENABLE_FRILLS 946#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 947 if (OPTION (Opt_borderLess))
926 { 948 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950
928 if (prop == None) 951 if (prop == None)
929 { 952 {
930 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
931#ifdef PREFER_24BIT 954#ifdef PREFER_24BIT
932 attributes.override_redirect = TRUE; 955 attributes.override_redirect = TRUE;
… …
938 mwmhints.flags = MWM_HINTS_DECORATIONS; 961 mwmhints.flags = MWM_HINTS_DECORATIONS;
939 mwmhints.decorations = 0; 962 mwmhints.decorations = 0;
940 } 963 }
941 } 964 }
942 else 965 else
943 {
944 mwmhints.flags = 0; 966 mwmhints.flags = 0;
945 }
946#endif 967#endif
947 968
948 /* grab colors before netscape does */ 969 /* grab colors before netscape does */
949 Get_Colours (); 970 Get_Colours ();
950 971
951 if (!set_fonts ()) 972 if (!set_fonts ())
952 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n"); 973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED
978 if (rs[Rs_embed])
979 {
980 XWindowAttributes wattr;
981
982 parent = strtol (rs[Rs_embed], 0, 0);
983
984 if (!XGetWindowAttributes (disp, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986
987 window_calc (wattr.width, wattr.height);
988 }
989#endif
953 990
954 window_calc (0, 0); 991 window_calc (0, 0);
955 old_width = szHint.width;
956 old_height = szHint.height;
957 992
958 /* sub-window placement & size in rxvt_resize_subwindows () */ 993 /* sub-window placement & size in rxvt_resize_subwindows () */
959
960#ifdef PREFER_24BIT 994#ifdef PREFER_24BIT
961 attributes.background_pixel = pix_colors_focused[Color_border]; 995 attributes.background_pixel = pix_colors_focused[Color_border];
962 attributes.border_pixel = pix_colors_focused[Color_border]; 996 attributes.border_pixel = pix_colors_focused[Color_border];
963 attributes.colormap = display->cmap; 997 attributes.colormap = display->cmap;
964 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 998 top = XCreateWindow (disp, parent,
965 szHint.x, szHint.y, 999 szHint.x, szHint.y,
966 szHint.width, szHint.height, 1000 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 1001 ext_bwidth,
968 display->depth, InputOutput, 1002 display->depth, InputOutput,
969 display->visual, 1003 display->visual,
970 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
971#else 1005#else
972 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1006 top = XCreateSimpleWindow (disp, parent,
973 szHint.x, szHint.y, 1007 szHint.x, szHint.y,
974 szHint.width, szHint.height, 1008 szHint.width, szHint.height,
975 TermWin.ext_bwidth, 1009 ext_bwidth,
976 pix_colors_focused[Color_border], 1010 pix_colors_focused[Color_border],
977 pix_colors_focused[Color_border]); 1011 pix_colors_focused[Color_border]);
978#endif 1012#endif
1013
1014 this->parent[0] = top;
1015
1016 old_width = szHint.width;
1017 old_height = szHint.height;
979 1018
980 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
981 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
982 1021
983 classHint.res_name = (char *)rs[Rs_name]; 1022 classHint.res_name = (char *)rs[Rs_name];
984 classHint.res_class = (char *)RESCLASS; 1023 classHint.res_class = (char *)RESCLASS;
985 1024
986 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1025 wmHint.flags = InputHint | StateHint | WindowGroupHint;
987 wmHint.input = True; 1026 wmHint.input = True;
988 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
989 wmHint.window_group = TermWin.parent[0]; 1028 wmHint.window_group = top;
990 1029
991 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
992 (char **)argv, argc, &szHint, &wmHint, &classHint); 1031 &szHint, &wmHint, &classHint);
1032
1033 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING],
1037#endif
1038 };
1039
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
993 1041
994#if ENABLE_FRILLS 1042#if ENABLE_FRILLS
1043 if (rs[Rs_transient_for])
1044 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045#endif
1046
1047#if ENABLE_EWMH
995 long pid = getpid (); 1048 long pid = getpid ();
996 XChangeProperty (display->display, TermWin.parent[0], 1049
1050 XChangeProperty (disp, top,
997 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
998 PropModeReplace, (unsigned char *)&pid, 1); 1052 PropModeReplace, (unsigned char *)&pid, 1);
999#endif
1000 1053
1001 XSelectInput (display->display, TermWin.parent[0], 1054 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1055#endif
1056
1057 XSelectInput (disp, top,
1002 KeyPressMask 1058 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1059#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1060 | KeyReleaseMask
1005#endif 1061#endif
1006 | FocusChangeMask | VisibilityChangeMask 1062 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask
1008 | StructureNotifyMask); 1063 | ExposureMask | StructureNotifyMask);
1064
1009 termwin_ev.start (display, TermWin.parent[0]); 1065 termwin_ev.start (display, top);
1010 1066
1011#if ENABLE_FRILLS 1067#if ENABLE_FRILLS
1012 if (mwmhints.flags) 1068 if (mwmhints.flags)
1013 { 1069 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1014 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False); 1070 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1015 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1016 }
1017#endif 1071#endif
1018 1072
1019 /* vt cursor: Black-on-White is standard, but this is more popular */ 1073 /* vt cursor: Black-on-White is standard, but this is more popular */
1020 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1021 1075
1022#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1023 /* cursor (menuBar/scrollBar): Black-on-White */ 1077 /* cursor (menuBar/scrollBar): Black-on-White */
1024 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1025#endif
1026
1027#ifdef POINTER_BLANK
1028 {
1029 XColor blackcolour;
1030 blackcolour.red = 0;
1031 blackcolour.green = 0;
1032 blackcolour.blue = 0;
1033 Font f = XLoadFont (display->display, "fixed");
1034 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1035 &blackcolour, &blackcolour);
1036 XUnloadFont (display->display, f);
1037 }
1038#endif 1079#endif
1039 1080
1040 /* the vt window */ 1081 /* the vt window */
1041 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1082 vt = XCreateSimpleWindow (disp, top,
1042 window_vt_x, 1083 window_vt_x,
1043 window_vt_y, 1084 window_vt_y,
1044 TermWin_TotalWidth (), 1085 width,
1045 TermWin_TotalHeight (), 1086 height,
1046 0, 1087 0,
1047 pix_colors_focused[Color_fg], 1088 pix_colors_focused[Color_fg],
1048 pix_colors_focused[Color_bg]); 1089 pix_colors_focused[Color_bg]);
1049#ifdef DEBUG_X 1090#ifdef DEBUG_X
1050 XStoreName (display->display, TermWin.vt, "vt window"); 1091 XStoreName (disp, vt, "vt window");
1051#endif 1092#endif
1052 1093
1053 attributes.bit_gravity = NorthWestGravity; 1094 attributes.bit_gravity = NorthWestGravity;
1054 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1055 1096
1056 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1057 1098
1058 pointer_unblank (); 1099 if (OPTION (Opt_pointerBlank)
1059 1100#ifdef ENABLE_PERL
1060#ifdef POINTER_BLANK 1101 || perl.self
1061 if (options & Opt_pointerBlank) 1102#endif
1103 )
1062 vt_emask |= PointerMotionMask; 1104 vt_emask |= PointerMotionMask;
1063 else 1105 else
1064#endif
1065 vt_emask |= Button1MotionMask | Button3MotionMask; 1106 vt_emask |= Button1MotionMask | Button3MotionMask;
1066 1107
1067 XSelectInput (display->display, TermWin.vt, vt_emask); 1108 XSelectInput (disp, vt, vt_emask);
1068 vt_ev.start (display, TermWin.vt); 1109 vt_ev.start (display, vt);
1069 1110
1070#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1111#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1071 if (menuBar_height ()) 1112 if (menuBar_height ())
1072 { 1113 {
1073 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1114 menuBar.win = XCreateSimpleWindow (disp, top,
1074 window_vt_x, 0, 1115 window_vt_x, 0,
1075 TermWin_TotalWidth (), 1116 width,
1076 menuBar_TotalHeight (), 1117 menuBar_TotalHeight (),
1077 0, 1118 0,
1078 pix_colors_focused[Color_fg], 1119 pix_colors_focused[Color_fg],
1079 pix_colors_focused[Color_scroll]); 1120 pix_colors_focused[Color_scroll]);
1080 1121
1081#ifdef DEBUG_X 1122#ifdef DEBUG_X
1082 XStoreName (display->display, menuBar.win, "menubar"); 1123 XStoreName (disp, menuBar.win, "menubar");
1083#endif 1124#endif
1084 1125
1085 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1126 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1086 1127
1087 XDefineCursor (display->display, menuBar.win, 1128 XDefineCursor (disp, menuBar.win,
1088 XCreateFontCursor (display->display, XC_left_ptr)); 1129 XCreateFontCursor (disp, XC_left_ptr));
1089 1130
1090 XSelectInput (display->display, menuBar.win, 1131 XSelectInput (disp, menuBar.win,
1091 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1132 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1092 | Button1MotionMask));
1093 menubar_ev.start (display, menuBar.win); 1133 menubar_ev.start (display, menuBar.win);
1094 } 1134 }
1095#endif 1135#endif
1096 1136
1097#ifdef XPM_BACKGROUND 1137#ifdef XPM_BACKGROUND
1098 if (rs[Rs_backgroundPixmap] != NULL 1138 if (rs[Rs_backgroundPixmap] != NULL
1099 && ! (options & Opt_transparent)) 1139 && ! OPTION (Opt_transparent))
1100 { 1140 {
1101 const char *p = rs[Rs_backgroundPixmap]; 1141 const char *p = rs[Rs_backgroundPixmap];
1102 1142
1103 if ((p = strchr (p, ';')) != NULL) 1143 if ((p = strchr (p, ';')) != NULL)
1104 { 1144 {
… …
1113 1153
1114 /* graphics context for the vt window */ 1154 /* graphics context for the vt window */
1115 gcvalue.foreground = pix_colors[Color_fg]; 1155 gcvalue.foreground = pix_colors[Color_fg];
1116 gcvalue.background = pix_colors[Color_bg]; 1156 gcvalue.background = pix_colors[Color_bg];
1117 gcvalue.graphics_exposures = 1; 1157 gcvalue.graphics_exposures = 1;
1118 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1158 gc = XCreateGC (disp, vt,
1119 GCForeground | GCBackground | GCGraphicsExposures, 1159 GCForeground | GCBackground | GCGraphicsExposures,
1120 &gcvalue); 1160 &gcvalue);
1121 1161
1122 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1162 drawable = new rxvt_drawable (display, vt);
1123 1163
1124#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1164#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1125 gcvalue.foreground = pix_colors[Color_topShadow]; 1165 gcvalue.foreground = pix_colors[Color_topShadow];
1126 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1166 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1167 gcvalue.foreground = pix_colors[Color_bottomShadow];
1128 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1168 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1169 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1130 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1170 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1131#endif 1171#endif
1132 1172
1133#ifdef OFF_FOCUS_FADING 1173#ifdef OFF_FOCUS_FADING
1134 // initially we are in unfocused state 1174 // initially we are in unfocused state
1135 if (rs[Rs_fade]) 1175 if (rs[Rs_fade])
1136 pix_colors = pix_colors_unfocused; 1176 pix_colors = pix_colors_unfocused;
1137#endif 1177#endif
1138 1178
1179 pointer_unblank ();
1139 scr_recolour (); 1180 scr_recolour ();
1181
1182#if ENABLE_XEMBED
1183 if (rs[Rs_embed])
1184 {
1185 long info[2] = { 0, XEMBED_MAPPED };
1186
1187 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1188 32, PropModeReplace, (unsigned char *)&info, 2);
1189 }
1190#endif
1140} 1191}
1141 1192
1142/* ------------------------------------------------------------------------- * 1193/* ------------------------------------------------------------------------- *
1143 * GET TTY CURRENT STATE * 1194 * GET TTY CURRENT STATE *
1144 * ------------------------------------------------------------------------- */ 1195 * ------------------------------------------------------------------------- */
… …
1149 /* 1200 /*
1150 * standard System V termios interface 1201 * standard System V termios interface
1151 */ 1202 */
1152 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1203 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1153 { 1204 {
1154 /* return error - use system defaults */ 1205 // return error - use system defaults,
1206 // where possible, and zero elsewhere
1207 memset (tio, 0, sizeof (ttymode_t));
1208
1155 tio->c_cc[VINTR] = CINTR; 1209 tio->c_cc[VINTR] = CINTR;
1156 tio->c_cc[VQUIT] = CQUIT; 1210 tio->c_cc[VQUIT] = CQUIT;
1157 tio->c_cc[VERASE] = CERASE; 1211 tio->c_cc[VERASE] = CERASE;
1212#ifdef VERASE2
1213 tio->c_cc[VERASE2] = CERASE2;
1214#endif
1158 tio->c_cc[VKILL] = CKILL; 1215 tio->c_cc[VKILL] = CKILL;
1159 tio->c_cc[VSTART] = CSTART; 1216 tio->c_cc[VSTART] = CSTART;
1160 tio->c_cc[VSTOP] = CSTOP; 1217 tio->c_cc[VSTOP] = CSTOP;
1161 tio->c_cc[VSUSP] = CSUSP; 1218 tio->c_cc[VSUSP] = CSUSP;
1162# ifdef VDSUSP 1219# ifdef VDSUSP
1163
1164 tio->c_cc[VDSUSP] = CDSUSP; 1220 tio->c_cc[VDSUSP] = CDSUSP;
1165# endif 1221# endif
1166# ifdef VREPRINT 1222# ifdef VREPRINT
1167
1168 tio->c_cc[VREPRINT] = CRPRNT; 1223 tio->c_cc[VREPRINT] = CRPRNT;
1169# endif 1224# endif
1170# ifdef VDISCRD 1225# ifdef VDISCRD
1171
1172 tio->c_cc[VDISCRD] = CFLUSH; 1226 tio->c_cc[VDISCRD] = CFLUSH;
1173# endif 1227# endif
1174# ifdef VWERSE 1228# ifdef VWERSE
1175
1176 tio->c_cc[VWERSE] = CWERASE; 1229 tio->c_cc[VWERSE] = CWERASE;
1177# endif 1230# endif
1178# ifdef VLNEXT 1231# ifdef VLNEXT
1179
1180 tio->c_cc[VLNEXT] = CLNEXT; 1232 tio->c_cc[VLNEXT] = CLNEXT;
1181# endif 1233# endif
1182
1183 } 1234 }
1235
1184 tio->c_cc[VEOF] = CEOF; 1236 tio->c_cc[VEOF] = CEOF;
1185 tio->c_cc[VEOL] = VDISABLE; 1237 tio->c_cc[VEOL] = VDISABLE;
1186# ifdef VEOL2 1238# ifdef VEOL2
1187
1188 tio->c_cc[VEOL2] = VDISABLE; 1239 tio->c_cc[VEOL2] = VDISABLE;
1189# endif 1240# endif
1190# ifdef VSWTC 1241# ifdef VSWTC
1191
1192 tio->c_cc[VSWTC] = VDISABLE; 1242 tio->c_cc[VSWTC] = VDISABLE;
1193# endif 1243# endif
1194# ifdef VSWTCH 1244# ifdef VSWTCH
1195
1196 tio->c_cc[VSWTCH] = VDISABLE; 1245 tio->c_cc[VSWTCH] = VDISABLE;
1197# endif 1246# endif
1198# if VMIN != VEOF 1247# if VMIN != VEOF
1199
1200 tio->c_cc[VMIN] = 1; 1248 tio->c_cc[VMIN] = 1;
1201# endif 1249# endif
1202# if VTIME != VEOL 1250# if VTIME != VEOL
1203
1204 tio->c_cc[VTIME] = 0; 1251 tio->c_cc[VTIME] = 0;
1205# endif 1252# endif
1206 1253
1207 if (erase != -1) 1254 if (erase != -1)
1208 tio->c_cc[VERASE] = (char)erase; 1255 tio->c_cc[VERASE] = (char)erase;
… …
1236 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1283 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1237 { 1284 {
1238 tio->sg.sg_erase = CERASE; /* ^H */ 1285 tio->sg.sg_erase = CERASE; /* ^H */
1239 tio->sg.sg_kill = CKILL; /* ^U */ 1286 tio->sg.sg_kill = CKILL; /* ^U */
1240 } 1287 }
1288
1241 if (erase != -1) 1289 if (erase != -1)
1242 tio->sg.sg_erase = (char)erase; 1290 tio->sg.sg_erase = (char)erase;
1243 1291
1244 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1292 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1245 1293
… …
1251 tio->tc.t_startc = CSTART; /* ^Q */ 1299 tio->tc.t_startc = CSTART; /* ^Q */
1252 tio->tc.t_stopc = CSTOP; /* ^S */ 1300 tio->tc.t_stopc = CSTOP; /* ^S */
1253 tio->tc.t_eofc = CEOF; /* ^D */ 1301 tio->tc.t_eofc = CEOF; /* ^D */
1254 tio->tc.t_brkc = -1; 1302 tio->tc.t_brkc = -1;
1255 } 1303 }
1304
1256 /* get local special chars */ 1305 /* get local special chars */
1257 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1306 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1258 { 1307 {
1259 tio->lc.t_suspc = CSUSP; /* ^Z */ 1308 tio->lc.t_suspc = CSUSP; /* ^Z */
1260 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1309 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1264 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1313 tio->lc.t_lnextc = CLNEXT; /* ^V */
1265 } 1314 }
1266 /* get line discipline */ 1315 /* get line discipline */
1267 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1316 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1268# ifdef NTTYDISC 1317# ifdef NTTYDISC
1269
1270 tio->line = NTTYDISC; 1318 tio->line = NTTYDISC;
1271# endif /* NTTYDISC */ 1319# endif /* NTTYDISC */
1272 1320
1273 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1321 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1274#endif /* HAVE_TERMIOS_H */ 1322#endif /* HAVE_TERMIOS_H */
… …
1297 FOO (IGNCR, "IGNCR"); 1345 FOO (IGNCR, "IGNCR");
1298 FOO (ICRNL, "ICRNL"); 1346 FOO (ICRNL, "ICRNL");
1299 FOO (IXON, "IXON"); 1347 FOO (IXON, "IXON");
1300 FOO (IXOFF, "IXOFF"); 1348 FOO (IXOFF, "IXOFF");
1301# ifdef IUCLC 1349# ifdef IUCLC
1302
1303 FOO (IUCLC, "IUCLC"); 1350 FOO (IUCLC, "IUCLC");
1304# endif 1351# endif
1305# ifdef IXANY 1352# ifdef IXANY
1306
1307 FOO (IXANY, "IXANY"); 1353 FOO (IXANY, "IXANY");
1308# endif 1354# endif
1309# ifdef IMAXBEL 1355# ifdef IMAXBEL
1310
1311 FOO (IMAXBEL, "IMAXBEL"); 1356 FOO (IMAXBEL, "IMAXBEL");
1312# endif 1357# endif
1313 1358
1314 fprintf (stderr, "\n"); 1359 fprintf (stderr, "\n");
1315 1360
… …
1322 FOO (VERASE, "VERASE"); 1367 FOO (VERASE, "VERASE");
1323 FOO (VKILL, "VKILL"); 1368 FOO (VKILL, "VKILL");
1324 FOO (VEOF, "VEOF"); 1369 FOO (VEOF, "VEOF");
1325 FOO (VEOL, "VEOL"); 1370 FOO (VEOL, "VEOL");
1326# ifdef VEOL2 1371# ifdef VEOL2
1327
1328 FOO (VEOL2, "VEOL2"); 1372 FOO (VEOL2, "VEOL2");
1329# endif 1373# endif
1330# ifdef VSWTC 1374# ifdef VSWTC
1331
1332 FOO (VSWTC, "VSWTC"); 1375 FOO (VSWTC, "VSWTC");
1333# endif 1376# endif
1334# ifdef VSWTCH 1377# ifdef VSWTCH
1335
1336 FOO (VSWTCH, "VSWTCH"); 1378 FOO (VSWTCH, "VSWTCH");
1337# endif 1379# endif
1338
1339 FOO (VSTART, "VSTART"); 1380 FOO (VSTART, "VSTART");
1340 FOO (VSTOP, "VSTOP"); 1381 FOO (VSTOP, "VSTOP");
1341 FOO (VSUSP, "VSUSP"); 1382 FOO (VSUSP, "VSUSP");
1342# ifdef VDSUSP 1383# ifdef VDSUSP
1343
1344 FOO (VDSUSP, "VDSUSP"); 1384 FOO (VDSUSP, "VDSUSP");
1345# endif 1385# endif
1346# ifdef VREPRINT 1386# ifdef VREPRINT
1347
1348 FOO (VREPRINT, "VREPRINT"); 1387 FOO (VREPRINT, "VREPRINT");
1349# endif 1388# endif
1350# ifdef VDISCRD 1389# ifdef VDISCRD
1351
1352 FOO (VDISCRD, "VDISCRD"); 1390 FOO (VDISCRD, "VDISCRD");
1353# endif 1391# endif
1354# ifdef VWERSE 1392# ifdef VWERSE
1355
1356 FOO (VWERSE, "VWERSE"); 1393 FOO (VWERSE, "VWERSE");
1357# endif 1394# endif
1358# ifdef VLNEXT 1395# ifdef VLNEXT
1359
1360 FOO (VLNEXT, "VLNEXT"); 1396 FOO (VLNEXT, "VLNEXT");
1361# endif 1397# endif
1362 1398
1363 fprintf (stderr, "\n"); 1399 fprintf (stderr, "\n");
1364# undef FOO 1400# undef FOO
… …
1373 * the slave. 1409 * the slave.
1374 */ 1410 */
1375void 1411void
1376rxvt_term::run_command (const char *const *argv) 1412rxvt_term::run_command (const char *const *argv)
1377{ 1413{
1414#if ENABLE_FRILLS
1415 if (rs[Rs_pty_fd])
1416 {
1417 pty.pty = atoi (rs[Rs_pty_fd]);
1418
1419 if (pty.pty >= 0)
1420 {
1421 if (getfd_hook)
1422 pty.pty = (*getfd_hook) (pty.pty);
1423
1424 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1425 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 }
1427 }
1428 else
1429#endif
1430 if (!pty.get ())
1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432
1433 pty.set_utf8_mode (enc_utf8);
1434
1435 /* set initial window size */
1436 tt_winch ();
1437
1378 int er; 1438 int er;
1379
1380 if (!pty.get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1439
1383#ifndef NO_BACKSPACE_KEY 1440#ifndef NO_BACKSPACE_KEY
1384 if (key_backspace[0] && !key_backspace[1]) 1441 if (key_backspace[0] && !key_backspace[1])
1385 er = key_backspace[0]; 1442 er = key_backspace[0];
1386 else if (strcmp (key_backspace, "DEC") == 0) 1443 else if (strcmp (key_backspace, "DEC") == 0)
… …
1389#endif 1446#endif
1390 er = -1; 1447 er = -1;
1391 1448
1392 rxvt_get_ttymode (&tio, er); 1449 rxvt_get_ttymode (&tio, er);
1393 1450
1394 /* set initial window size */ 1451#if ENABLE_FRILLS
1395 tt_winch (); 1452 if (rs[Rs_pty_fd])
1396 1453 return;
1397 sw_chld.start (SIGCHLD); 1454#endif
1398 1455
1399#ifndef __QNX__ 1456#ifndef __QNX__
1400 /* spin off the command interpreter */ 1457 /* spin off the command interpreter */
1401 switch (cmd_pid = fork ()) 1458 switch (cmd_pid = fork ())
1402 { 1459 {
1403 case -1: 1460 case -1:
1461 {
1462 cmd_pid = 0;
1404 rxvt_fatal ("can't fork, aborting.\n"); 1463 rxvt_fatal ("can't fork, aborting.\n");
1464 }
1405 case 0: 1465 case 0:
1406 init_env (); 1466 init_env ();
1407 1467
1408 if (!pty.make_controlling_tty ()) 1468 if (!pty.make_controlling_tty ())
1409 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1472{ 1532{
1473 char *login; 1533 char *login;
1474 1534
1475 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1535 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1476 1536
1477 if (options & Opt_console) 1537 if (OPTION (Opt_console))
1478 { /* be virtual console, fail silently */ 1538 { /* be virtual console, fail silently */
1479#ifdef TIOCCONS 1539#ifdef TIOCCONS
1480 unsigned int on = 1; 1540 unsigned int on = 1;
1481 1541
1482 ioctl (STDIN_FILENO, TIOCCONS, &on); 1542 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1525 execvp (argv[0], (char *const *)argv); 1585 execvp (argv[0], (char *const *)argv);
1526 /* no error message: STDERR is closed! */ 1586 /* no error message: STDERR is closed! */
1527 } 1587 }
1528 else 1588 else
1529 { 1589 {
1530 const char *argv0, *shell; 1590 const char *argv0, *shell;
1531 1591
1532 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1592 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1533 shell = "/bin/sh"; 1593 shell = "/bin/sh";
1534 1594
1535 argv0 = (const char *)rxvt_r_basename (shell); 1595 argv0 = (const char *)rxvt_r_basename (shell);
1536 1596
1537 if (options & Opt_loginShell) 1597 if (OPTION (Opt_loginShell))
1538 { 1598 {
1539 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1599 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1540 1600
1541 login[0] = '-'; 1601 login[0] = '-';
1542 strcpy (&login[1], argv0); 1602 strcpy (&login[1], argv0);
1543 argv0 = login; 1603 argv0 = login;
1544 } 1604 }
1605
1545 execlp (shell, argv0, NULL); 1606 execlp (shell, argv0, NULL);
1546 /* no error message: STDERR is closed! */ 1607 /* no error message: STDERR is closed! */
1547 } 1608 }
1548 1609
1549#else /* __QNX__ uses qnxspawn () */ 1610#else /* __QNX__ uses qnxspawn () */
… …
1577 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1638 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1578 command = "/bin/sh"; 1639 command = "/bin/sh";
1579 1640
1580 arg_a[0] = my_basename (command); 1641 arg_a[0] = my_basename (command);
1581 1642
1582 if (options & Opt_loginShell) 1643 if (OPTION (Opt_loginShell))
1583 { 1644 {
1584 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1645 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1585 1646
1586 login[0] = '-'; 1647 login[0] = '-';
1587 strcpy (&login[1], arg_a[0]); 1648 strcpy (&login[1], arg_a[0]);

Diff Legend

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