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

Diff Legend

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