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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.144 by root, Tue Jan 17 11:02:10 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;
… …
234 bgPixmap.x = bgPixmap.y = 50; 255 bgPixmap.x = bgPixmap.y = 50;
235 bgPixmap.pixmap = None; 256 bgPixmap.pixmap = None;
236#endif 257#endif
237 258
238 last_bot = last_state = -1; 259 last_bot = last_state = -1;
239
240#ifdef MENUBAR
241 menu_readonly = 1;
242# if ! (MENUBAR_MAX > 1)
243 CurrentBar = & (BarList);
244# endif /* (MENUBAR_MAX > 1) */
245#endif
246 260
247 return true; 261 return true;
248} 262}
249 263
250void 264void
… …
318 rs[Rs_name] = rxvt_r_basename (argv[0]); 332 rs[Rs_name] = rxvt_r_basename (argv[0]);
319 333
320 /* 334 /*
321 * Open display, get options/resources and create the window 335 * Open display, get options/resources and create the window
322 */ 336 */
337
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 339 rs[Rs_display_name] = ":0";
325 340
326 get_options (r_argc, r_argv); 341 get_options (r_argc, r_argv);
342
343 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345
346 extract_resources ();
347
327 free (r_argv); 348 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 349
346 /* 350 /*
347 * set any defaults not already set 351 * set any defaults not already set
348 */ 352 */
349 if (cmd_argv && cmd_argv[0]) 353 if (cmd_argv && cmd_argv[0])
… …
360 if (!rs[Rs_iconName]) 364 if (!rs[Rs_iconName])
361 rs[Rs_iconName] = rs[Rs_name]; 365 rs[Rs_iconName] = rs[Rs_name];
362 } 366 }
363 367
364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 368 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
365 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 369 saveLines = min (i, MAX_SAVELINES);
366 370
367#if ENABLE_FRILLS 371#if ENABLE_FRILLS
368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 372 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 373 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
374
370 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 375 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 376 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372#endif
373 377
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 378 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 379 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
377#endif 380#endif
378 381
379#ifdef POINTER_BLANK 382#ifdef POINTER_BLANK
380 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 383 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
381 pointerBlankDelay = i; 384 pointerBlankDelay = i;
382 else 385 else
383 pointerBlankDelay = 2; 386 pointerBlankDelay = 2;
384#endif 387#endif
385 388
386 /* no point having a scrollbar without having any scrollback! */ 389 /* no point having a scrollbar without having any scrollback! */
387 if (!TermWin.saveLines) 390 if (!saveLines)
388 options &= ~Opt_scrollBar; 391 set_option (Opt_scrollBar, 0);
389 392
390#ifdef PRINTPIPE 393#ifdef PRINTPIPE
391 if (!rs[Rs_print_pipe]) 394 if (!rs[Rs_print_pipe])
392 rs[Rs_print_pipe] = PRINTPIPE; 395 rs[Rs_print_pipe] = PRINTPIPE;
393#endif 396#endif
… …
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif 440#endif
438 441
439#ifdef XTERM_REVERSE_VIDEO 442#ifdef XTERM_REVERSE_VIDEO
440 /* this is how xterm implements reverseVideo */ 443 /* this is how xterm implements reverseVideo */
441 if (options & Opt_reverseVideo) 444 if (OPTION (Opt_reverseVideo))
442 { 445 {
443 if (!rs[Rs_color + Color_fg]) 446 if (!rs[Rs_color + Color_fg])
444 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 447 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
445 if (!rs[Rs_color + Color_bg]) 448 if (!rs[Rs_color + Color_bg])
446 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 449 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
451 if (!rs[Rs_color + i]) 454 if (!rs[Rs_color + i])
452 rs[Rs_color + i] = def_colorName[i]; 455 rs[Rs_color + i] = def_colorName[i];
453 456
454#ifndef XTERM_REVERSE_VIDEO 457#ifndef XTERM_REVERSE_VIDEO
455 /* this is how we implement reverseVideo */ 458 /* this is how we implement reverseVideo */
456 if (options & Opt_reverseVideo) 459 if (OPTION (Opt_reverseVideo))
457 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
458#endif 461#endif
459 462
460 /* convenient aliases for setting fg/bg to colors */ 463 /* convenient aliases for setting fg/bg to colors */
461 color_aliases (Color_fg); 464 color_aliases (Color_fg);
462 color_aliases (Color_bg); 465 color_aliases (Color_bg);
… …
512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
513 516
514 sprintf (env_display, "DISPLAY=%s", val); 517 sprintf (env_display, "DISPLAY=%s", val);
515 518
516 /* avoiding the math library: 519 /* avoiding the math library:
517 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
518 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
519 ; 522 ;
520 MAX_IT (i, 1); 523 max_it (i, 1);
521 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
522 525
523 sprintf (env_windowid, "WINDOWID=%u", 526 sprintf (env_windowid, "WINDOWID=%u",
524 (unsigned int)TermWin.parent[0]); 527 (unsigned int)parent[0]);
525 528
526 /* add entries to the environment: 529 /* add entries to the environment:
527 * @ DISPLAY: in case we started with -display 530 * @ DISPLAY: in case we started with -display
528 * @ WINDOWID: X window id number of the window 531 * @ WINDOWID: X window id number of the window
529 * @ COLORTERM: terminal sub-name and also indicates its color 532 * @ COLORTERM: terminal sub-name and also indicates its color
… …
568 * This should support all European type languages. 571 * This should support all European type languages.
569 */ 572 */
570void 573void
571rxvt_term::set_locale (const char *locale) 574rxvt_term::set_locale (const char *locale)
572{ 575{
576 set_environ (envv);
577
573#if HAVE_XSETLOCALE || HAVE_SETLOCALE 578#if HAVE_XSETLOCALE || HAVE_SETLOCALE
574 free (this->locale); 579 free (this->locale);
575 this->locale = setlocale (LC_CTYPE, locale); 580 this->locale = setlocale (LC_CTYPE, locale);
576 581
577 if (!this->locale) 582 if (!this->locale)
578 { 583 {
579 if (*locale) 584 if (*locale)
580 { 585 {
581 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 586 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
582 setlocale (LC_CTYPE, ""); 587 setlocale (LC_CTYPE, "C");
583 } 588 }
584 else 589 else
585 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 590 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
586 591
587 this->locale = ""; 592 this->locale = "C";
588 } 593 }
589 594
590 595
591 this->locale = rxvt_strdup (this->locale); 596 this->locale = rxvt_strdup (this->locale);
592 SET_LOCALE (this->locale); 597 SET_LOCALE (this->locale);
593 mbstate.reset (); 598 mbstate.reset ();
594#endif 599#endif
595 600
596#if 0
597#if HAVE_NL_LANGINFO 601#if HAVE_NL_LANGINFO
598 char *codeset = strdup (nl_langinfo (CODESET)); 602 char *codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8") 603 // /^UTF.?8/i
600 || !strcasecmp (codeset, "UTF8"); 604 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
605 && (codeset[1] == 'T' || codeset[1] == 't')
606 && (codeset[2] == 'F' || codeset[2] == 'f')
607 && (codeset[3] == '8' || codeset[4] == '8');
601 free (codeset); 608 free (codeset);
602#else 609#else
603 enc_utf8 = 0; 610 enc_utf8 = 0;
604#endif 611#endif
605#endif
606} 612}
607 613
608void 614void
609rxvt_term::init_xlocale () 615rxvt_term::init_xlocale ()
610{ 616{
617 set_environ (envv);
618
611#ifdef USE_XIM 619#ifdef USE_XIM
612 if (!locale) 620 if (!locale)
613 rxvt_warn ("setting locale failed, working without locale support.\n"); 621 rxvt_warn ("setting locale failed, working without locale support.\n");
614 else 622 else
615 { 623 {
616 set_string_property (display->atom ("WM_LOCALE_NAME"), locale); 624 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
617 625
618 if (!XSupportsLocale ()) 626 if (!XSupportsLocale ())
619 { 627 {
620 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 628 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
621 return; 629 return;
… …
637 * Initialize the command connection. 645 * Initialize the command connection.
638 * This should be called after the X server connection is established. 646 * This should be called after the X server connection is established.
639 */ 647 */
640 648
641#ifdef META8_OPTION 649#ifdef META8_OPTION
642 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
643#endif 651#endif
644 652
645 get_ourmods (); 653 get_ourmods ();
646 654
647 if (!(options & Opt_scrollTtyOutput)) 655 if (!OPTION (Opt_scrollTtyOutput))
648 priv_modes |= PrivMode_TtyOutputInh; 656 priv_modes |= PrivMode_TtyOutputInh;
649 if (options & Opt_scrollTtyKeypress) 657 if (OPTION (Opt_scrollTtyKeypress))
650 priv_modes |= PrivMode_Keypress; 658 priv_modes |= PrivMode_Keypress;
651 if (!(options & Opt_jumpScroll)) 659 if (!OPTION (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 660 priv_modes |= PrivMode_smoothScroll;
653 661
654#ifndef NO_BACKSPACE_KEY 662#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 663 if (strcmp (key_backspace, "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 664 priv_modes |= PrivMode_HaveBackSpace;
657#endif 665#endif
658 666
659 /* add value for scrollBar */ 667 /* add value for scrollBar */
660 if (scrollbar_visible ()) 668 if (scrollBar.state)
661 { 669 {
662 priv_modes |= PrivMode_scrollBar; 670 priv_modes |= PrivMode_scrollBar;
663 SavedModes |= PrivMode_scrollBar; 671 SavedModes |= PrivMode_scrollBar;
664 } 672 }
665 if (menubar_visible ())
666 {
667 priv_modes |= PrivMode_menuBar;
668 SavedModes |= PrivMode_menuBar;
669 }
670
671#ifdef CURSOR_BLINK
672 if (options & Opt_cursorBlink)
673 (void)gettimeofday (&lastcursorchange, NULL);
674#endif
675 673
676 run_command (argv); 674 run_command (argv);
677} 675}
678 676
679/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
… …
694 continue; 692 continue;
695 693
696 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
697 { 695 {
698#ifndef XTERM_REVERSE_VIDEO 696#ifndef XTERM_REVERSE_VIDEO
699 if (i < 2 && (options & Opt_reverseVideo)) 697 if (i < 2 && OPTION (Opt_reverseVideo))
700 rs[Rs_color + i] = def_colorName[!i]; 698 rs[Rs_color + i] = def_colorName[!i];
701 else 699 else
702#endif 700#endif
703 rs[Rs_color + i] = def_colorName[i]; 701 rs[Rs_color + i] = def_colorName[i];
704 702
… …
729 } 727 }
730 } 728 }
731 } 729 }
732 730
733 pix_colors[i] = xcol; 731 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i);
733 }
734
734#ifdef OFF_FOCUS_FADING 735#ifdef OFF_FOCUS_FADING
735 if (rs[Rs_fade]) 736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
736 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
737#endif 739#endif
738 SET_PIXCOLOR (i);
739 }
740 740
741 if (display->depth <= 2) 741 if (display->depth <= 2)
742 { 742 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
746 } 746 }
747 747
748 /* 748 /*
749 * get scrollBar/menuBar shadow colors 749 * get scrollBar shadow colors
750 * 750 *
751 * The calculations of topShadow/bottomShadow values are adapted 751 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 752 * from the fvwm window manager.
753 */ 753 */
754#ifdef KEEP_SCROLLCOLOR 754#ifdef KEEP_SCROLLCOLOR
755 755
756 if (display->depth <= 2) 756 if (display->depth <= 2)
757 {
757 { /* Monochrome */ 758 /* Monochrome */
758 pix_colors[Color_scroll] = pix_colors[Color_fg]; 759 pix_colors[Color_scroll] = pix_colors[Color_fg];
759 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 760 pix_colors[Color_topShadow] = pix_colors[Color_bg];
760 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
761 } 762 }
762 else 763 else
… …
798 int i = atoi (rs[Rs_color + idx]); 799 int i = atoi (rs[Rs_color + idx]);
799 800
800 if (i >= 8 && i <= 15) 801 if (i >= 8 && i <= 15)
801 { /* bright colors */ 802 { /* bright colors */
802 i -= 8; 803 i -= 8;
803#ifndef NO_BRIGHTCOLOR
804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 804 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
805 return; 805 return;
806#endif
807 } 806 }
808 807
809 if (i >= 0 && i <= 7) /* normal colors */ 808 if (i >= 0 && i <= 7) /* normal colors */
810 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 809 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
811 } 810 }
… …
817 * Use resource ``modifier'' to override the Meta modifier 816 * Use resource ``modifier'' to override the Meta modifier
818 */ 817 */
819void 818void
820rxvt_term::get_ourmods () 819rxvt_term::get_ourmods ()
821{ 820{
822 int i, j, k; 821 int i, j, k;
823 int requestedmeta, realmeta, realalt; 822 int requestedmeta, realmeta, realalt;
824 const char *cm, *rsmod; 823 const char *cm, *rsmod;
825 XModifierKeymap *map; 824 XModifierKeymap *map;
826 KeyCode *kc; 825 KeyCode *kc;
827 const unsigned int modmasks[] = 826 const unsigned int modmasks[] =
828 { 827 {
829 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 828 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
830 }; 829 };
831 830
832 requestedmeta = realmeta = realalt = 0; 831 requestedmeta = realmeta = realalt = 0;
833 rsmod = rs[Rs_modifier]; 832 rsmod = rs[Rs_modifier];
833
834 if (rsmod 834 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 836 requestedmeta = rsmod[3] - '0';
837 837
838 map = XGetModifierMapping (display->display); 838 map = XGetModifierMapping (display->display);
839 kc = map->modifiermap; 839 kc = map->modifiermap;
840
840 for (i = 1; i < 6; i++) 841 for (i = 1; i < 6; i++)
841 { 842 {
842 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
844
843 for (j = map->max_keypermod; j--; k++) 845 for (j = map->max_keypermod; j--; k++)
844 { 846 {
845 if (kc[k] == 0) 847 if (kc[k] == 0)
846 break; 848 break;
849
847 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 850 switch (XKeycodeToKeysym (display->display, kc[k], 0))
848 { 851 {
849 case XK_Num_Lock: 852 case XK_Num_Lock:
850 ModNumLockMask = modmasks[i - 1]; 853 ModNumLockMask = modmasks[i - 1];
851 /* FALLTHROUGH */ 854 continue;
852 default: 855
853 continue; /* for (;;) */ 856 case XK_ISO_Level3_Shift:
857 ModLevel3Mask = modmasks[i - 1];
858 continue;
859
854 case XK_Meta_L: 860 case XK_Meta_L:
855 case XK_Meta_R: 861 case XK_Meta_R:
856 cm = "meta"; 862 cm = "meta";
857 realmeta = i; 863 realmeta = i;
858 break; 864 break;
865
859 case XK_Alt_L: 866 case XK_Alt_L:
860 case XK_Alt_R: 867 case XK_Alt_R:
861 cm = "alt"; 868 cm = "alt";
862 realalt = i; 869 realalt = i;
863 break; 870 break;
871
864 case XK_Super_L: 872 case XK_Super_L:
865 case XK_Super_R: 873 case XK_Super_R:
866 cm = "super"; 874 cm = "super";
867 break; 875 break;
876
868 case XK_Hyper_L: 877 case XK_Hyper_L:
869 case XK_Hyper_R: 878 case XK_Hyper_R:
870 cm = "hyper"; 879 cm = "hyper";
871 break; 880 break;
881
882 default:
883 continue;
872 } 884 }
885
873 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
874 requestedmeta = i; 887 requestedmeta = i;
875 } 888 }
876 } 889 }
890
877 XFreeModifiermap (map); 891 XFreeModifiermap (map);
892
878 i = (requestedmeta ? requestedmeta 893 i = requestedmeta ? requestedmeta
879 : (realmeta ? realmeta 894 : realmeta ? realmeta
880 : (realalt ? realalt : 0))); 895 : realalt ? realalt
896 : 0;
897
881 if (i) 898 if (i)
882 ModMetaMask = modmasks[i - 1]; 899 ModMetaMask = modmasks[i - 1];
883} 900}
884 901
885/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
… …
892#if ENABLE_FRILLS 909#if ENABLE_FRILLS
893 Atom prop = None; 910 Atom prop = None;
894 MWMHints mwmhints; 911 MWMHints mwmhints;
895#endif 912#endif
896 XGCValues gcvalue; 913 XGCValues gcvalue;
897 long vt_emask;
898 XSetWindowAttributes attributes; 914 XSetWindowAttributes attributes;
899 XWindowAttributes gattr; 915 XWindowAttributes gattr;
900 916 Window top, parent;
901 for (int i = 0; i < NUM_XA; i++) 917 dDisp;
902 xa[i] = XInternAtom (display->display, xa_names[i], False);
903 918
904#ifdef USING_W11LIB 919#ifdef USING_W11LIB
905 /* enable W11 callbacks */ 920 /* enable W11 callbacks */
906 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
907#endif 922#endif
908 923
909 if (options & Opt_transparent) 924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
910 { 928 {
911 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
912 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
913 } 931 }
914 932
915#if ENABLE_FRILLS 933#if ENABLE_FRILLS
916 if (options & Opt_borderLess) 934 if (OPTION (Opt_borderLess))
917 { 935 {
918 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
919 937
920 if (prop == None) 938 if (prop == None)
921 { 939 {
922 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
923#ifdef PREFER_24BIT 941#ifdef PREFER_24BIT
… …
930 mwmhints.flags = MWM_HINTS_DECORATIONS; 948 mwmhints.flags = MWM_HINTS_DECORATIONS;
931 mwmhints.decorations = 0; 949 mwmhints.decorations = 0;
932 } 950 }
933 } 951 }
934 else 952 else
935 {
936 mwmhints.flags = 0; 953 mwmhints.flags = 0;
937 }
938#endif 954#endif
939 955
940 /* grab colors before netscape does */ 956 /* grab colors before netscape does */
941 Get_Colours (); 957 Get_Colours ();
942 958
943 if (!set_fonts ()) 959 if (!set_fonts ())
944 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
945 961
962 parent = DefaultRootWindow (disp);
963
964#if ENABLE_XEMBED
965 if (rs[Rs_embed])
966 {
967 XWindowAttributes wattr;
968
969 parent = strtol (rs[Rs_embed], 0, 0);
970
971 if (!XGetWindowAttributes (disp, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973
974 window_calc (wattr.width, wattr.height);
975 }
976#endif
977
946 window_calc (0, 0); 978 window_calc (0, 0);
947 old_width = szHint.width;
948 old_height = szHint.height;
949 979
950 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
951
952#ifdef PREFER_24BIT 981#ifdef PREFER_24BIT
953 attributes.background_pixel = pix_colors_focused[Color_border]; 982 attributes.background_pixel = pix_colors_focused[Color_border];
954 attributes.border_pixel = pix_colors_focused[Color_border]; 983 attributes.border_pixel = pix_colors_focused[Color_border];
955 attributes.colormap = display->cmap; 984 attributes.colormap = display->cmap;
956 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 985 top = XCreateWindow (disp, parent,
957 szHint.x, szHint.y, 986 szHint.x, szHint.y,
958 szHint.width, szHint.height, 987 szHint.width, szHint.height,
959 TermWin.ext_bwidth, 988 ext_bwidth,
960 display->depth, InputOutput, 989 display->depth, InputOutput,
961 display->visual, 990 display->visual,
962 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 991 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
963#else 992#else
964 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 993 top = XCreateSimpleWindow (disp, parent,
965 szHint.x, szHint.y, 994 szHint.x, szHint.y,
966 szHint.width, szHint.height, 995 szHint.width, szHint.height,
967 TermWin.ext_bwidth, 996 ext_bwidth,
968 pix_colors_focused[Color_border], 997 pix_colors_focused[Color_border],
969 pix_colors_focused[Color_border]); 998 pix_colors_focused[Color_border]);
970#endif 999#endif
1000
1001 this->parent[0] = top;
1002
1003 old_width = szHint.width;
1004 old_height = szHint.height;
971 1005
972 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
973 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
974 1008
975 classHint.res_name = (char *)rs[Rs_name]; 1009 classHint.res_name = (char *)rs[Rs_name];
976 classHint.res_class = (char *)RESCLASS; 1010 classHint.res_class = (char *)RESCLASS;
977 1011
978 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1012 wmHint.flags = InputHint | StateHint | WindowGroupHint;
979 wmHint.input = True; 1013 wmHint.input = True;
980 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
981 wmHint.window_group = TermWin.parent[0]; 1015 wmHint.window_group = top;
982 1016
983 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
984 (char **)argv, argc, &szHint, &wmHint, &classHint); 1018 &szHint, &wmHint, &classHint);
985 1019
986 /* Enable delete window protocol */ 1020 Atom protocols[] = {
987 XSetWMProtocols (display->display, TermWin.parent[0], 1021 xa[XA_WM_DELETE_WINDOW],
988 &xa[XA_WMDELETEWINDOW], 1); 1022#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING],
1024#endif
1025 };
1026
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
989 1028
990#if ENABLE_FRILLS 1029#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif
1033
1034#if ENABLE_EWMH
991 long pid = getpid (); 1035 long pid = getpid ();
992 1036
993 XChangeProperty (display->display, TermWin.parent[0], 1037 XChangeProperty (disp, top,
994 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
995 PropModeReplace, (unsigned char *)&pid, 1); 1039 PropModeReplace, (unsigned char *)&pid, 1);
996#endif
997 1040
998 XSelectInput (display->display, TermWin.parent[0], 1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif
1043
1044 XSelectInput (disp, top,
999 KeyPressMask 1045 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1047 | KeyReleaseMask
1002#endif 1048#endif
1003 | FocusChangeMask | VisibilityChangeMask 1049 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask
1005 | StructureNotifyMask); 1050 | ExposureMask | StructureNotifyMask);
1051
1006 termwin_ev.start (display, TermWin.parent[0]); 1052 termwin_ev.start (display, top);
1007 1053
1008#if ENABLE_FRILLS 1054#if ENABLE_FRILLS
1009 if (mwmhints.flags) 1055 if (mwmhints.flags)
1010 { 1056 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1011 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1012 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1013 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1057 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1014 }
1015#endif 1058#endif
1016 1059
1017 /* vt cursor: Black-on-White is standard, but this is more popular */ 1060 /* vt cursor: Black-on-White is standard, but this is more popular */
1018 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1019 1062
1020#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1063#ifdef HAVE_SCROLLBARS
1021 /* cursor (menuBar/scrollBar): Black-on-White */ 1064 /* cursor scrollBar: Black-on-White */
1022 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1065 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 1066#endif
1037 1067
1038 /* the vt window */ 1068 /* the vt window */
1039 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1069 vt = XCreateSimpleWindow (disp, top,
1040 window_vt_x, 1070 window_vt_x,
1041 window_vt_y, 1071 window_vt_y,
1042 TermWin_TotalWidth (), 1072 width,
1043 TermWin_TotalHeight (), 1073 height,
1044 0, 1074 0,
1045 pix_colors_focused[Color_fg], 1075 pix_colors_focused[Color_fg],
1046 pix_colors_focused[Color_bg]); 1076 pix_colors_focused[Color_bg]);
1047#ifdef DEBUG_X 1077#ifdef DEBUG_X
1048 XStoreName (display->display, TermWin.vt, "vt window"); 1078 XStoreName (disp, vt, "vt window");
1049#endif 1079#endif
1050 1080
1051 attributes.bit_gravity = NorthWestGravity; 1081 attributes.bit_gravity = NorthWestGravity;
1052 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1053 1083
1054 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1055 1085
1056 pointer_unblank (); 1086 if (OPTION (Opt_pointerBlank))
1057
1058#ifdef POINTER_BLANK
1059 if (options & Opt_pointerBlank)
1060 vt_emask |= PointerMotionMask; 1087 vt_emask |= PointerMotionMask;
1061 else 1088 else
1062#endif
1063 vt_emask |= Button1MotionMask | Button3MotionMask; 1089 vt_emask |= Button1MotionMask | Button3MotionMask;
1064 1090
1065 XSelectInput (display->display, TermWin.vt, vt_emask); 1091 vt_select_input ();
1092
1066 vt_ev.start (display, TermWin.vt); 1093 vt_ev.start (display, vt);
1067
1068#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1069 if (menuBar_height ())
1070 {
1071 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1072 window_vt_x, 0,
1073 TermWin_TotalWidth (),
1074 menuBar_TotalHeight (),
1075 0,
1076 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_scroll]);
1078
1079#ifdef DEBUG_X
1080 XStoreName (display->display, menuBar.win, "menubar");
1081#endif
1082
1083 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1084
1085 XDefineCursor (display->display, menuBar.win,
1086 XCreateFontCursor (display->display, XC_left_ptr));
1087
1088 XSelectInput (display->display, menuBar.win,
1089 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1090 | Button1MotionMask));
1091 menubar_ev.start (display, menuBar.win);
1092 }
1093#endif
1094 1094
1095#ifdef XPM_BACKGROUND 1095#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1096 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! (options & Opt_transparent)) 1097 && ! OPTION (Opt_transparent))
1098 { 1098 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1099 const char *p = rs[Rs_backgroundPixmap];
1100 1100
1101 if ((p = strchr (p, ';')) != NULL) 1101 if ((p = strchr (p, ';')) != NULL)
1102 { 1102 {
… …
1111 1111
1112 /* graphics context for the vt window */ 1112 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1113 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1114 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1115 gcvalue.graphics_exposures = 1;
1116 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1116 gc = XCreateGC (disp, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1118 &gcvalue);
1119 1119
1120 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1120 drawable = new rxvt_drawable (display, vt);
1121 1121
1122#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1122#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129#endif 1129#endif
1130 1130
1131#ifdef OFF_FOCUS_FADING 1131#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1132 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1133 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1134 pix_colors = pix_colors_unfocused;
1135#endif 1135#endif
1136 1136
1137 pointer_unblank ();
1137 scr_recolour (); 1138 scr_recolour ();
1139
1140#if ENABLE_XEMBED
1141 if (rs[Rs_embed])
1142 {
1143 long info[2] = { 0, XEMBED_MAPPED };
1144
1145 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146 32, PropModeReplace, (unsigned char *)&info, 2);
1147 }
1148#endif
1138} 1149}
1139 1150
1140/* ------------------------------------------------------------------------- * 1151/* ------------------------------------------------------------------------- *
1141 * GET TTY CURRENT STATE * 1152 * GET TTY CURRENT STATE *
1142 * ------------------------------------------------------------------------- */ 1153 * ------------------------------------------------------------------------- */
… …
1147 /* 1158 /*
1148 * standard System V termios interface 1159 * standard System V termios interface
1149 */ 1160 */
1150 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1151 { 1162 {
1152 /* return error - use system defaults */ 1163 // return error - use system defaults,
1164 // where possible, and zero elsewhere
1165 memset (tio, 0, sizeof (ttymode_t));
1166
1153 tio->c_cc[VINTR] = CINTR; 1167 tio->c_cc[VINTR] = CINTR;
1154 tio->c_cc[VQUIT] = CQUIT; 1168 tio->c_cc[VQUIT] = CQUIT;
1155 tio->c_cc[VERASE] = CERASE; 1169 tio->c_cc[VERASE] = CERASE;
1170#ifdef VERASE2
1171 tio->c_cc[VERASE2] = CERASE2;
1172#endif
1156 tio->c_cc[VKILL] = CKILL; 1173 tio->c_cc[VKILL] = CKILL;
1157 tio->c_cc[VSTART] = CSTART; 1174 tio->c_cc[VSTART] = CSTART;
1158 tio->c_cc[VSTOP] = CSTOP; 1175 tio->c_cc[VSTOP] = CSTOP;
1159 tio->c_cc[VSUSP] = CSUSP; 1176 tio->c_cc[VSUSP] = CSUSP;
1160# ifdef VDSUSP 1177# ifdef VDSUSP
1161
1162 tio->c_cc[VDSUSP] = CDSUSP; 1178 tio->c_cc[VDSUSP] = CDSUSP;
1163# endif 1179# endif
1164# ifdef VREPRINT 1180# ifdef VREPRINT
1165
1166 tio->c_cc[VREPRINT] = CRPRNT; 1181 tio->c_cc[VREPRINT] = CRPRNT;
1167# endif 1182# endif
1168# ifdef VDISCRD 1183# ifdef VDISCRD
1169
1170 tio->c_cc[VDISCRD] = CFLUSH; 1184 tio->c_cc[VDISCRD] = CFLUSH;
1171# endif 1185# endif
1172# ifdef VWERSE 1186# ifdef VWERSE
1173
1174 tio->c_cc[VWERSE] = CWERASE; 1187 tio->c_cc[VWERSE] = CWERASE;
1175# endif 1188# endif
1176# ifdef VLNEXT 1189# ifdef VLNEXT
1177
1178 tio->c_cc[VLNEXT] = CLNEXT; 1190 tio->c_cc[VLNEXT] = CLNEXT;
1179# endif 1191# endif
1180
1181 } 1192 }
1193
1182 tio->c_cc[VEOF] = CEOF; 1194 tio->c_cc[VEOF] = CEOF;
1183 tio->c_cc[VEOL] = VDISABLE; 1195 tio->c_cc[VEOL] = VDISABLE;
1184# ifdef VEOL2 1196# ifdef VEOL2
1185
1186 tio->c_cc[VEOL2] = VDISABLE; 1197 tio->c_cc[VEOL2] = VDISABLE;
1187# endif 1198# endif
1188# ifdef VSWTC 1199# ifdef VSWTC
1189
1190 tio->c_cc[VSWTC] = VDISABLE; 1200 tio->c_cc[VSWTC] = VDISABLE;
1191# endif 1201# endif
1192# ifdef VSWTCH 1202# ifdef VSWTCH
1193
1194 tio->c_cc[VSWTCH] = VDISABLE; 1203 tio->c_cc[VSWTCH] = VDISABLE;
1195# endif 1204# endif
1196# if VMIN != VEOF 1205# if VMIN != VEOF
1197
1198 tio->c_cc[VMIN] = 1; 1206 tio->c_cc[VMIN] = 1;
1199# endif 1207# endif
1200# if VTIME != VEOL 1208# if VTIME != VEOL
1201
1202 tio->c_cc[VTIME] = 0; 1209 tio->c_cc[VTIME] = 0;
1203# endif 1210# endif
1204 1211
1205 if (erase != -1) 1212 if (erase != -1)
1206 tio->c_cc[VERASE] = (char)erase; 1213 tio->c_cc[VERASE] = (char)erase;
… …
1234 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1241 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1235 { 1242 {
1236 tio->sg.sg_erase = CERASE; /* ^H */ 1243 tio->sg.sg_erase = CERASE; /* ^H */
1237 tio->sg.sg_kill = CKILL; /* ^U */ 1244 tio->sg.sg_kill = CKILL; /* ^U */
1238 } 1245 }
1246
1239 if (erase != -1) 1247 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase; 1248 tio->sg.sg_erase = (char)erase;
1241 1249
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1250 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243 1251
… …
1249 tio->tc.t_startc = CSTART; /* ^Q */ 1257 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */ 1258 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */ 1259 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1; 1260 tio->tc.t_brkc = -1;
1253 } 1261 }
1262
1254 /* get local special chars */ 1263 /* get local special chars */
1255 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1264 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1256 { 1265 {
1257 tio->lc.t_suspc = CSUSP; /* ^Z */ 1266 tio->lc.t_suspc = CSUSP; /* ^Z */
1258 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1267 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1262 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1271 tio->lc.t_lnextc = CLNEXT; /* ^V */
1263 } 1272 }
1264 /* get line discipline */ 1273 /* get line discipline */
1265 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1274 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1266# ifdef NTTYDISC 1275# ifdef NTTYDISC
1267
1268 tio->line = NTTYDISC; 1276 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */ 1277# endif /* NTTYDISC */
1270 1278
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1279 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */ 1280#endif /* HAVE_TERMIOS_H */
… …
1295 FOO (IGNCR, "IGNCR"); 1303 FOO (IGNCR, "IGNCR");
1296 FOO (ICRNL, "ICRNL"); 1304 FOO (ICRNL, "ICRNL");
1297 FOO (IXON, "IXON"); 1305 FOO (IXON, "IXON");
1298 FOO (IXOFF, "IXOFF"); 1306 FOO (IXOFF, "IXOFF");
1299# ifdef IUCLC 1307# ifdef IUCLC
1300
1301 FOO (IUCLC, "IUCLC"); 1308 FOO (IUCLC, "IUCLC");
1302# endif 1309# endif
1303# ifdef IXANY 1310# ifdef IXANY
1304
1305 FOO (IXANY, "IXANY"); 1311 FOO (IXANY, "IXANY");
1306# endif 1312# endif
1307# ifdef IMAXBEL 1313# ifdef IMAXBEL
1308
1309 FOO (IMAXBEL, "IMAXBEL"); 1314 FOO (IMAXBEL, "IMAXBEL");
1310# endif 1315# endif
1311 1316
1312 fprintf (stderr, "\n"); 1317 fprintf (stderr, "\n");
1313 1318
… …
1320 FOO (VERASE, "VERASE"); 1325 FOO (VERASE, "VERASE");
1321 FOO (VKILL, "VKILL"); 1326 FOO (VKILL, "VKILL");
1322 FOO (VEOF, "VEOF"); 1327 FOO (VEOF, "VEOF");
1323 FOO (VEOL, "VEOL"); 1328 FOO (VEOL, "VEOL");
1324# ifdef VEOL2 1329# ifdef VEOL2
1325
1326 FOO (VEOL2, "VEOL2"); 1330 FOO (VEOL2, "VEOL2");
1327# endif 1331# endif
1328# ifdef VSWTC 1332# ifdef VSWTC
1329
1330 FOO (VSWTC, "VSWTC"); 1333 FOO (VSWTC, "VSWTC");
1331# endif 1334# endif
1332# ifdef VSWTCH 1335# ifdef VSWTCH
1333
1334 FOO (VSWTCH, "VSWTCH"); 1336 FOO (VSWTCH, "VSWTCH");
1335# endif 1337# endif
1336
1337 FOO (VSTART, "VSTART"); 1338 FOO (VSTART, "VSTART");
1338 FOO (VSTOP, "VSTOP"); 1339 FOO (VSTOP, "VSTOP");
1339 FOO (VSUSP, "VSUSP"); 1340 FOO (VSUSP, "VSUSP");
1340# ifdef VDSUSP 1341# ifdef VDSUSP
1341
1342 FOO (VDSUSP, "VDSUSP"); 1342 FOO (VDSUSP, "VDSUSP");
1343# endif 1343# endif
1344# ifdef VREPRINT 1344# ifdef VREPRINT
1345
1346 FOO (VREPRINT, "VREPRINT"); 1345 FOO (VREPRINT, "VREPRINT");
1347# endif 1346# endif
1348# ifdef VDISCRD 1347# ifdef VDISCRD
1349
1350 FOO (VDISCRD, "VDISCRD"); 1348 FOO (VDISCRD, "VDISCRD");
1351# endif 1349# endif
1352# ifdef VWERSE 1350# ifdef VWERSE
1353
1354 FOO (VWERSE, "VWERSE"); 1351 FOO (VWERSE, "VWERSE");
1355# endif 1352# endif
1356# ifdef VLNEXT 1353# ifdef VLNEXT
1357
1358 FOO (VLNEXT, "VLNEXT"); 1354 FOO (VLNEXT, "VLNEXT");
1359# endif 1355# endif
1360 1356
1361 fprintf (stderr, "\n"); 1357 fprintf (stderr, "\n");
1362# undef FOO 1358# undef FOO
… …
1371 * the slave. 1367 * the slave.
1372 */ 1368 */
1373void 1369void
1374rxvt_term::run_command (const char *const *argv) 1370rxvt_term::run_command (const char *const *argv)
1375{ 1371{
1372#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd])
1374 {
1375 pty.pty = atoi (rs[Rs_pty_fd]);
1376
1377 if (pty.pty >= 0)
1378 {
1379 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty);
1381
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 }
1385 }
1386 else
1387#endif
1388 if (!pty.get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390
1391 pty.set_utf8_mode (enc_utf8);
1392
1393 /* set initial window size */
1394 tt_winch ();
1395
1376 int er; 1396 int er;
1377
1378 if (!pty.get ())
1379 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1380 1397
1381#ifndef NO_BACKSPACE_KEY 1398#ifndef NO_BACKSPACE_KEY
1382 if (key_backspace[0] && !key_backspace[1]) 1399 if (key_backspace[0] && !key_backspace[1])
1383 er = key_backspace[0]; 1400 er = key_backspace[0];
1384 else if (strcmp (key_backspace, "DEC") == 0) 1401 else if (strcmp (key_backspace, "DEC") == 0)
… …
1387#endif 1404#endif
1388 er = -1; 1405 er = -1;
1389 1406
1390 rxvt_get_ttymode (&tio, er); 1407 rxvt_get_ttymode (&tio, er);
1391 1408
1392 /* set initial window size */ 1409#if ENABLE_FRILLS
1393 tt_winch (); 1410 if (rs[Rs_pty_fd])
1411 return;
1412#endif
1394 1413
1395 sw_chld.start (SIGCHLD);
1396
1397#ifndef __QNX__
1398 /* spin off the command interpreter */ 1414 /* spin off the command interpreter */
1399 switch (cmd_pid = fork ()) 1415 switch (cmd_pid = fork ())
1400 { 1416 {
1401 case -1: 1417 case -1:
1418 {
1419 cmd_pid = 0;
1402 rxvt_fatal ("can't fork, aborting.\n"); 1420 rxvt_fatal ("can't fork, aborting.\n");
1421 }
1403 case 0: 1422 case 0:
1404 init_env (); 1423 init_env ();
1405 1424
1406 if (!pty.make_controlling_tty ()) 1425 if (!pty.make_controlling_tty ())
1407 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
… …
1446 } 1465 }
1447 1466
1448 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ 1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1449 break; 1468 break;
1450 } 1469 }
1451#else /* __QNX__ uses qnxspawn () */
1452 fchmod (pty.tty, 0622);
1453 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1454 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1455
1456 if (run_child (argv) == -1)
1457 exit (EXIT_FAILURE);
1458#endif
1459} 1470}
1460 1471
1461/* ------------------------------------------------------------------------- * 1472/* ------------------------------------------------------------------------- *
1462 * CHILD PROCESS OPERATIONS * 1473 * CHILD PROCESS OPERATIONS *
1463 * ------------------------------------------------------------------------- */ 1474 * ------------------------------------------------------------------------- */
… …
1470{ 1481{
1471 char *login; 1482 char *login;
1472 1483
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1484 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474 1485
1475 if (options & Opt_console) 1486 if (OPTION (Opt_console))
1476 { /* be virtual console, fail silently */ 1487 { /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1488#ifdef TIOCCONS
1478 unsigned int on = 1; 1489 unsigned int on = 1;
1479 1490
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1491 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1507 // unblock signals (signals are blocked by iom.C 1518 // unblock signals (signals are blocked by iom.C
1508 sigset_t ss; 1519 sigset_t ss;
1509 sigemptyset (&ss); 1520 sigemptyset (&ss);
1510 sigprocmask (SIG_SETMASK, &ss, 0); 1521 sigprocmask (SIG_SETMASK, &ss, 0);
1511 1522
1512#ifndef __QNX__
1513 /* command interpreter path */ 1523 /* command interpreter path */
1514 if (argv != NULL) 1524 if (argv != NULL)
1515 { 1525 {
1516# ifdef DEBUG_CMD 1526# ifdef DEBUG_CMD
1517 int i; 1527 int i;
… …
1523 execvp (argv[0], (char *const *)argv); 1533 execvp (argv[0], (char *const *)argv);
1524 /* no error message: STDERR is closed! */ 1534 /* no error message: STDERR is closed! */
1525 } 1535 }
1526 else 1536 else
1527 { 1537 {
1528 const char *argv0, *shell; 1538 const char *argv0, *shell;
1529 1539
1530 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1531 shell = "/bin/sh"; 1541 shell = "/bin/sh";
1532 1542
1533 argv0 = (const char *)rxvt_r_basename (shell); 1543 argv0 = (const char *)rxvt_r_basename (shell);
1534 1544
1535 if (options & Opt_loginShell) 1545 if (OPTION (Opt_loginShell))
1536 { 1546 {
1537 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1538 1548
1539 login[0] = '-'; 1549 login[0] = '-';
1540 strcpy (&login[1], argv0); 1550 strcpy (&login[1], argv0);
1541 argv0 = login; 1551 argv0 = login;
1542 } 1552 }
1553
1543 execlp (shell, argv0, NULL); 1554 execlp (shell, argv0, NULL);
1544 /* no error message: STDERR is closed! */ 1555 /* no error message: STDERR is closed! */
1545 } 1556 }
1546 1557
1547#else /* __QNX__ uses qnxspawn () */
1548
1549 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1550 char *command = NULL, fullcommand[_MAX_PATH];
1551 char **arg_v, *arg_a[2] = { NULL, NULL };
1552
1553 if (argv != NULL)
1554 {
1555 if (access (argv[0], X_OK) == -1)
1556 {
1557 if (strchr (argv[0], '/') == NULL)
1558 {
1559 searchenv (argv[0], "PATH", fullcommand);
1560
1561 if (fullcommand[0] != '\0')
1562 command = fullcommand;
1563 }
1564
1565 if (access (command, X_OK) == -1)
1566 return -1;
1567 }
1568 else
1569 command = argv[0];
1570
1571 arg_v = argv;
1572 }
1573 else
1574 {
1575 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1576 command = "/bin/sh";
1577
1578 arg_a[0] = my_basename (command);
1579
1580 if (options & Opt_loginShell)
1581 {
1582 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1583
1584 login[0] = '-';
1585 strcpy (&login[1], arg_a[0]);
1586 arg_a[0] = login;
1587 }
1588
1589 arg_v = arg_a;
1590 }
1591
1592 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1593 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1594 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1595 command, arg_v, environ, iov_a, 0);
1596 if (login)
1597 free (login);
1598
1599 pty.close_tty ();
1600 return pty.pty;
1601#endif
1602
1603 return -1; 1558 return -1;
1604} 1559}
1605 1560
1606/*----------------------- end-of-file (C source) -----------------------*/ 1561/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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