ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

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

Diff Legend

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