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

Diff Legend

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