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

Diff Legend

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