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

Diff Legend

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