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.129 by root, Mon Jan 2 22:23:26 2006 UTC vs.
Revision 1.188 by root, Mon Jun 18 13:38:12 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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.
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
56# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57 "Grey90", /* 7: white (#E5E5E5) */ 57# else
58# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59 "AntiqueWhite", /* 7: white (#FAEBD7) */
60# endif 59# endif
61 /* high-intensity colors */ 60 /* high-intensity colors */
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
68 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
69 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
71 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
73 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
74 "White", /* 7/15: bright white (#FFFFFF) */
75 73
76 // 88 xterm colours 74 // 88 xterm colours
77 "rgb:00/00/00", 75 "rgb:00/00/00",
78 "rgb:00/00/8b", 76 "rgb:00/00/8b",
79 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
172#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
173#if TINTING 171#if TINTING
174 NULL, 172 NULL,
175#endif 173#endif
176#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
177 "black", 175 "rgb:00/00/00",
178#endif
179 };
180
181const char *const xa_names[] =
182 {
183 "TEXT",
184 "COMPOUND_TEXT",
185 "UTF8_STRING",
186 "MULTIPLE",
187 "TARGETS",
188 "TIMESTAMP",
189 "VT_SELECTION",
190 "INCR",
191 "WM_PROTOCOLS",
192 "WM_DELETE_WINDOW",
193 "CLIPBOARD",
194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
198 "_NET_WM_PID",
199 "_NET_WM_NAME",
200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
202#endif
203#if USE_XIM
204 "WM_LOCALE_NAME",
205#endif
206#ifdef TRANSPARENT
207 "_XROOTPMAP_ID",
208 "ESETROOT_PMAP_ID",
209#endif
210#ifdef OFFIX_DND
211 "DndProtocol",
212 "DndSelection",
213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif 176#endif
218 }; 177 };
219 178
220bool 179bool
221rxvt_term::init_vars () 180rxvt_term::init_vars ()
222{ 181{
182 pix_colors = //
223 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
224#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
226#endif 186#endif
227 pix_colors = pix_colors_focused;
228
229 if (pix_colors == NULL)
230 return false;
231 187
232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
233 pixmap = None; 189 pixmap = None;
234#endif 190#endif
235 191
236 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
237 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
238 options = DEFAULT_OPTIONS;
239 want_refresh = 1; 194 want_refresh = 1;
240 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
241 focus = 0;
242 ncol = 80; 196 ncol = 80;
243 nrow = 24; 197 nrow = 24;
244 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
245 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
246 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
247 saveLines = SAVELINES; 201 saveLines = SAVELINES;
248 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
249 203
250 refresh_limit = 1;
251 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
252 prev_nrow = prev_ncol = 0;
253 205
254 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
255#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
256 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
257 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
258 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
259#endif 211#endif
260 212
261 last_bot = last_state = -1; 213 last_bot = last_state = -1;
262 214
263#ifdef MENUBAR 215 set_option (Opt_scrollBar);
264 menu_readonly = 1; 216 set_option (Opt_scrollTtyOutput);
265# if ! (MENUBAR_MAX > 1) 217 set_option (Opt_jumpScroll);
266 CurrentBar = &BarList; 218 set_option (Opt_skipScroll);
267# endif /* (MENUBAR_MAX > 1) */ 219 set_option (Opt_secondaryScreen);
268#endif 220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
269 224
270 return true; 225 return true;
271} 226}
272 227
273void 228void
… …
311 int i, r_argc; 266 int i, r_argc;
312 char *val; 267 char *val;
313 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
314 269
315 /* 270 /*
316 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
317 */ 272 */
318 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
319 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
320 break; 275 break;
321 276
322 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
323 278
324 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 296 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 297
343 /* 298 /*
344 * Open display, get options/resources and create the window 299 * Open display, get options/resources and create the window
345 */ 300 */
301
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 302 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 303 rs[Rs_display_name] = ":0";
348 304
349 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
350 306
351 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
354 extract_resources (); 314 extract_resources ();
315
316#if XFT
317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif
320
355 free (r_argv); 321 free (r_argv);
322
323 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef)
325 rs [i] = 0;
326
327#if ENABLE_PERL
328 if (!rs[Rs_perl_ext_1])
329 rs[Rs_perl_ext_1] = "default";
330
331 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
332 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
333 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
334 {
335 rxvt_perl.init (this);
336 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
337 }
338#endif
356 339
357 /* 340 /*
358 * set any defaults not already set 341 * set any defaults not already set
359 */ 342 */
360 if (cmd_argv && cmd_argv[0]) 343 if (cmd_argv && cmd_argv[0])
… …
393 pointerBlankDelay = 2; 376 pointerBlankDelay = 2;
394#endif 377#endif
395 378
396 /* no point having a scrollbar without having any scrollback! */ 379 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 380 if (!saveLines)
398 CLR_OPTION (Opt_scrollBar); 381 set_option (Opt_scrollBar, 0);
399 382
400#ifdef PRINTPIPE 383#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 384 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 385 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 386#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 429 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 430#endif
448 431
449#ifdef XTERM_REVERSE_VIDEO 432#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 433 /* this is how xterm implements reverseVideo */
451 if (OPTION (Opt_reverseVideo)) 434 if (option (Opt_reverseVideo))
452 { 435 {
453 if (!rs[Rs_color + Color_fg]) 436 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 437 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
438
455 if (!rs[Rs_color + Color_bg]) 439 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 440 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 441 }
458#endif 442#endif
459 443
… …
461 if (!rs[Rs_color + i]) 445 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 446 rs[Rs_color + i] = def_colorName[i];
463 447
464#ifndef XTERM_REVERSE_VIDEO 448#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 449 /* this is how we implement reverseVideo */
466 if (OPTION (Opt_reverseVideo)) 450 if (option (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 451 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 452#endif
469 453
470 /* convenient aliases for setting fg/bg to colors */ 454 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 455 color_aliases (Color_fg);
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 495 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 496 rs[Rs_display_name] = (const char *)val;
513 497
514 if (val == NULL) 498 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 499#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 500 val = XDisplayString (dpy);
517 501
518 if (rs[Rs_display_name] == NULL) 502 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 503 rs[Rs_display_name] = val; /* use broken `:0' value */
520 504
521 i = strlen (val); 505 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 507
524 sprintf (env_display, "DISPLAY=%s", val); 508 sprintf (env_display, "DISPLAY=%s", val);
525 509
526 /* avoiding the math library: 510 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ;
530 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532
533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)parent[0]);
535 511
536 /* add entries to the environment: 512 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 513 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 514 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 515 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 517 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 518 * @ COLORFGBG: fg;bg color codes
543 */ 519 */
544 putenv (env_display); 520 putenv (env_display);
545 putenv (env_windowid); 521 putenv (env_windowid);
522
546 if (env_colorfgbg) 523 if (env_colorfgbg)
547 putenv (env_colorfgbg); 524 putenv (env_colorfgbg);
548 525
549#ifdef RXVT_TERMINFO 526#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 527 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 528#endif
552 529
553 if (display->depth <= 2) 530 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 531 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 532 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 533 putenv ("COLORTERM=" COLORTERMENVFULL);
557 534
558 if (rs[Rs_term_name] != NULL) 535 if (rs[Rs_term_name] != NULL)
… …
578 * This should support all European type languages. 555 * This should support all European type languages.
579 */ 556 */
580void 557void
581rxvt_term::set_locale (const char *locale) 558rxvt_term::set_locale (const char *locale)
582{ 559{
560 set_environ (envv);
561
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 562#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 563 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 564 this->locale = setlocale (LC_CTYPE, locale);
586 565
587 if (!this->locale) 566 if (!this->locale)
588 { 567 {
589 if (*locale) 568 if (*locale)
590 { 569 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 570 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 571 setlocale (LC_CTYPE, "C");
593 } 572 }
594 else 573 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 574 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 575
597 this->locale = ""; 576 this->locale = "C";
598 } 577 }
599 578
600 579
601 this->locale = rxvt_strdup (this->locale); 580 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 581 SET_LOCALE (this->locale);
… …
617} 596}
618 597
619void 598void
620rxvt_term::init_xlocale () 599rxvt_term::init_xlocale ()
621{ 600{
601 set_environ (envv);
602
622#ifdef USE_XIM 603#ifdef USE_XIM
623 if (!locale) 604 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 605 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 606 else
626 { 607 {
… …
648 * Initialize the command connection. 629 * Initialize the command connection.
649 * This should be called after the X server connection is established. 630 * This should be called after the X server connection is established.
650 */ 631 */
651 632
652#ifdef META8_OPTION 633#ifdef META8_OPTION
653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 634 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 635#endif
655 636
656 get_ourmods (); 637 get_ourmods ();
657 638
658 if (!OPTION (Opt_scrollTtyOutput)) 639 if (!option (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 640 priv_modes |= PrivMode_TtyOutputInh;
660 if (OPTION (Opt_scrollTtyKeypress)) 641 if (option (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 642 priv_modes |= PrivMode_Keypress;
662 if (!OPTION (Opt_jumpScroll)) 643 if (!option (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 644 priv_modes |= PrivMode_smoothScroll;
664 645
665#ifndef NO_BACKSPACE_KEY 646#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 647 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 648 priv_modes |= PrivMode_HaveBackSpace;
668#endif 649#endif
669 650
670 /* add value for scrollBar */ 651 /* add value for scrollBar */
671 if (scrollbar_visible ()) 652 if (scrollBar.state)
672 { 653 {
673 priv_modes |= PrivMode_scrollBar; 654 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 655 SavedModes |= PrivMode_scrollBar;
675 } 656 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (OPTION (Opt_cursorBlink))
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 657
688 run_command (argv); 658 run_command (argv);
689} 659}
690 660
691/*----------------------------------------------------------------------*/ 661/*----------------------------------------------------------------------*/
… …
696 666
697#ifdef OFF_FOCUS_FADING 667#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 668 pix_colors = pix_colors_focused;
699#endif 669#endif
700 670
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 671 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 672 {
673 const char *name = rs[Rs_color + i];
674
675 if (!name)
676 continue;
677
703 rxvt_color xcol; 678 rxvt_color xcol;
704 679
705 if (!rs[Rs_color + i]) 680 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 681 {
710#ifndef XTERM_REVERSE_VIDEO 682#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && OPTION (Opt_reverseVideo)) 683 if (i < 2 && option (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 684 name = def_colorName [1 - i];
713 else 685 else
714#endif 686#endif
715 rs[Rs_color + i] = def_colorName[i]; 687 name = def_colorName [i];
716 688
717 if (!rs[Rs_color + i]) 689 if (!name)
718 continue; 690 continue;
719 691
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 692 if (!set_color (xcol, name))
721 { 693 {
722 switch (i) 694 switch (i)
723 { 695 {
724 case Color_fg: 696 case Color_fg:
725 case Color_bg: 697 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 698 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 699 name = "";
729 break; 700 break;
730#ifndef NO_CURSORCOLOR 701#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 702 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 703#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 704 case Color_pointer_fg:
736 xcol = pix_colors[Color_fg]; 705 name = rs[Rs_color + Color_fg];
706 xcol.set (this, name);
737 break; 707 break;
738 default: 708 default:
739 xcol = pix_colors[Color_bg]; /* None */ 709 name = rs[Rs_color + Color_bg];
710 xcol.set (this, name);
740 break; 711 break;
741 } 712 }
742 } 713 }
743 } 714 }
744 715
745 pix_colors[i] = xcol; 716 pix_colors[i] = xcol;
746 SET_PIXCOLOR (i); 717 rs[Rs_color + i] = name;
747 }
748
749#ifdef OFF_FOCUS_FADING
750 if (rs[Rs_fade])
751 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
752 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
753#endif
754
755 if (display->depth <= 2)
756 { 718 }
719
720 if (depth <= 2)
721 {
757 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 722 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
758 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 723 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
759 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 724 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
760 } 725 }
761 726
762 /* 727 /*
763 * get scrollBar/menuBar shadow colors 728 * get scrollBar shadow colors
764 * 729 *
765 * The calculations of topShadow/bottomShadow values are adapted 730 * The calculations of topShadow/bottomShadow values are adapted
766 * from the fvwm window manager. 731 * from the fvwm window manager.
767 */ 732 */
768#ifdef KEEP_SCROLLCOLOR 733#ifdef KEEP_SCROLLCOLOR
769
770 if (display->depth <= 2) 734 if (depth <= 2)
771 { 735 {
772 /* Monochrome */ 736 /* Monochrome */
773 pix_colors[Color_scroll] = pix_colors[Color_fg]; 737 alias_color (Color_scroll, Color_fg);
774 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 738 alias_color (Color_topShadow, Color_bg);
775 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 739 alias_color (Color_bottomShadow, Color_bg);
776 } 740 }
777 else 741 else
778 { 742 {
779 rxvt_color xcol[2]; 743 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
780 /* xcol[0] == white
781 * xcol[1] == top shadow
782 * xcol[2] == bot shadow */
783 744
784 xcol[1] = pix_colors[Color_scroll]; 745 rgba cscroll;
785 xcol[0].set (display, 65535, 65535, 65535); 746 pix_colors [Color_scroll].get (cscroll);
786
787 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
788
789 xcol[0].get (display, pr0, pg0, pb0);
790 xcol[1].get (display, pr1, pg1, pb1);
791
792 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
793 747
794 /* topShadowColor */ 748 /* topShadowColor */
795 if (!xcol[1].set (display, 749 if (!pix_colors[Color_topShadow].set (this,
796 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 750 rgba (
797 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 751 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
798 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 752 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
799 xcol[1] = pix_colors[Color_White]; 753 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
800 754 cscroll.a)
801 pix_colors[Color_topShadow] = xcol[1]; 755 ))
756 alias_color (Color_topShadow, Color_White);
802 } 757 }
803#endif /* KEEP_SCROLLCOLOR */ 758#endif /* KEEP_SCROLLCOLOR */
759
760#ifdef OFF_FOCUS_FADING
761 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
762 update_fade_color (i);
763#endif
804} 764}
805 765
806/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
807/* color aliases, fg/bg bright-bold */ 767/* color aliases, fg/bg bright-bold */
808void 768void
… …
813 int i = atoi (rs[Rs_color + idx]); 773 int i = atoi (rs[Rs_color + idx]);
814 774
815 if (i >= 8 && i <= 15) 775 if (i >= 8 && i <= 15)
816 { /* bright colors */ 776 { /* bright colors */
817 i -= 8; 777 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 779 return;
821#endif
822 } 780 }
823 781
824 if (i >= 0 && i <= 7) /* normal colors */ 782 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 784 }
… …
849 807
850 if (rsmod 808 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 810 requestedmeta = rsmod[3] - '0';
853 811
854 map = XGetModifierMapping (display->display); 812 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 813 kc = map->modifiermap;
856 814
857 for (i = 1; i < 6; i++) 815 for (i = 1; i < 6; i++)
858 { 816 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 819 for (j = map->max_keypermod; j--; k++)
862 { 820 {
863 if (kc[k] == 0) 821 if (kc[k] == 0)
864 break; 822 break;
865 823
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 824 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 825 {
868 case XK_Num_Lock: 826 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 827 ModNumLockMask = modmasks[i - 1];
870 continue; 828 continue;
871 829
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
922{ 880{
923 XClassHint classHint; 881 XClassHint classHint;
924 XWMHints wmHint; 882 XWMHints wmHint;
925#if ENABLE_FRILLS 883#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 884 MWMHints mwmhints;
928#endif 885#endif
929 XGCValues gcvalue; 886 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 888 Window top, parent;
934 dDisp;
935 889
936#ifdef USING_W11LIB 890 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 891
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 892 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 893 Get_Colours ();
943 894
944 if (OPTION (Opt_transparent)) 895 if (!set_fonts ())
945 { 896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 897
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 898 parent = display->root;
948 } 899
900 attributes.override_redirect = !!option (Opt_override_redirect);
949 901
950#if ENABLE_FRILLS 902#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 903 if (option (Opt_borderLess))
952 { 904 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 906 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 908 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0; 909 mwmhints.flags = 0;
962 } 910 }
963 else 911 else
964 { 912 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 913 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
968 } 916 }
969 else 917 else
970 mwmhints.flags = 0; 918 mwmhints.flags = 0;
971#endif 919#endif
972 920
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED 921#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 922 if (rs[Rs_embed])
983 { 923 {
984 XWindowAttributes wattr; 924 XWindowAttributes wattr;
985 925
986 parent = strtol (rs[Rs_embed], 0, 0); 926 parent = strtol (rs[Rs_embed], 0, 0);
987 927
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 928 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 930
991 window_calc (wattr.width, wattr.height); 931 window_calc (wattr.width, wattr.height);
992 } 932 }
993#endif 933#endif
994 934
995 window_calc (0, 0); 935 window_calc (0, 0);
996 936
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 937 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 938 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 939 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 940 attributes.colormap = cmap;
941
1002 top = XCreateWindow (disp, parent, 942 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 943 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 944 szHint.width, szHint.height,
1005 ext_bwidth, 945 ext_bwidth,
1006 display->depth, InputOutput, 946 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 948 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 949
1018 this->parent[0] = top; 950 this->parent[0] = top;
1019 951
1020 old_width = szHint.width; 952 old_width = szHint.width;
1021 old_height = szHint.height; 953 old_height = szHint.height;
1022 954
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 955 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 956 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 957
1026 classHint.res_name = (char *)rs[Rs_name]; 958 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 959 classHint.res_class = (char *)RESCLASS;
1028 960
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 961 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 962 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 963 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 964 wmHint.window_group = top;
1033 965
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 966 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 967 &szHint, &wmHint, &classHint);
968
969#if ENABLE_FRILLS
970 if (mwmhints.flags)
971 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif
1036 974
1037 Atom protocols[] = { 975 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 976 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 977#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 978 xa[XA_NET_WM_PING],
1041#endif 979#endif
1042 }; 980 };
1043 981
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 982 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983
984#if ENABLE_FRILLS
985 if (rs[Rs_transient_for])
986 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif
1045 988
1046#if ENABLE_EWMH 989#if ENABLE_EWMH
1047 long pid = getpid (); 990 long pid = getpid ();
1048 991
1049 XChangeProperty (disp, top, 992 XChangeProperty (dpy, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 993 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1051 PropModeReplace, (unsigned char *)&pid, 1); 994 PropModeReplace, (unsigned char *)&pid, 1);
1052 995
1053 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1054#endif 997#endif
1055 998
1056 XSelectInput (disp, top, 999 XSelectInput (dpy, top,
1057 KeyPressMask 1000 KeyPressMask
1058#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1059 | KeyReleaseMask 1002 | KeyReleaseMask
1060#endif 1003#endif
1061 | FocusChangeMask | VisibilityChangeMask 1004 | FocusChangeMask | VisibilityChangeMask
1062 | ExposureMask | StructureNotifyMask); 1005 | ExposureMask | StructureNotifyMask);
1063 1006
1064 termwin_ev.start (display, top); 1007 termwin_ev.start (display, top);
1065 1008
1066#if ENABLE_FRILLS
1067 if (mwmhints.flags)
1068 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1069 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1070#endif
1071
1072 /* vt cursor: Black-on-White is standard, but this is more popular */ 1009 /* vt cursor: Black-on-White is standard, but this is more popular */
1073 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1010 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1074 1011
1075#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1012#ifdef HAVE_SCROLLBARS
1076 /* cursor (menuBar/scrollBar): Black-on-White */ 1013 /* cursor scrollBar: Black-on-White */
1077 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1014 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1078#endif 1015#endif
1079 1016
1080 /* the vt window */ 1017 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1018 vt = XCreateSimpleWindow (dpy, top,
1082 window_vt_x,
1083 window_vt_y, 1019 window_vt_x, window_vt_y,
1084 TermWin_TotalWidth (), 1020 width, height,
1085 TermWin_TotalHeight (),
1086 0, 1021 0,
1087 pix_colors_focused[Color_fg], 1022 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1023 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window");
1091#endif
1092 1024
1093 attributes.bit_gravity = NorthWestGravity; 1025 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1026 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1095 1027
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1029
1098#ifdef POINTER_BLANK
1099 if (OPTION (Opt_pointerBlank)) 1030 if (option (Opt_pointerBlank))
1100 vt_emask |= PointerMotionMask; 1031 vt_emask |= PointerMotionMask;
1101 else 1032 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1033 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1034
1105 XSelectInput (disp, vt, vt_emask); 1035 vt_select_input ();
1036
1106 vt_ev.start (display, vt); 1037 vt_ev.start (display, vt);
1107
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ())
1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0,
1113 TermWin_TotalWidth (),
1114 menuBar_TotalHeight (),
1115 0,
1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]);
1118
1119#ifdef DEBUG_X
1120 XStoreName (disp, menuBar.win, "menubar");
1121#endif
1122
1123 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1124
1125 XDefineCursor (disp, menuBar.win,
1126 XCreateFontCursor (disp, XC_left_ptr));
1127
1128 XSelectInput (disp, menuBar.win,
1129 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1130 menubar_ev.start (display, menuBar.win);
1131 }
1132#endif
1133 1038
1134#ifdef XPM_BACKGROUND 1039#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1040 if (rs[Rs_backgroundPixmap] != NULL
1041#ifndef HAVE_AFTERIMAGE
1136 && ! OPTION (Opt_transparent)) 1042 && !option (Opt_transparent)
1043#endif
1044 )
1137 { 1045 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1139 1047
1140 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1141 { 1049 {
… …
1147 scr_touch (true); 1055 scr_touch (true);
1148 } 1056 }
1149#endif 1057#endif
1150 1058
1151 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1152 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1153 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1154 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 0;
1063
1155 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (dpy, vt,
1156 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1157 &gcvalue); 1066 &gcvalue);
1158 1067
1159 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1160 1069
1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1070#ifdef RXVT_SCROLLBAR
1162 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1164 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1168#endif 1077#endif
1169 1078
1170#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1171 // initially we are in unfocused state 1080 // initially we are in unfocused state
1172 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])
1173 pix_colors = pix_colors_unfocused; 1082 pix_colors = pix_colors_unfocused;
1174#endif 1083#endif
1175 1084
1176 pointer_unblank (); 1085 pointer_unblank ();
1177 scr_recolour (); 1086 scr_recolour ();
1178
1179#if ENABLE_XEMBED
1180 if (rs[Rs_embed])
1181 {
1182 long info[2] = { 0, XEMBED_MAPPED };
1183
1184 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1185 32, PropModeReplace, (unsigned char *)&info, 2);
1186 }
1187#endif
1188} 1087}
1189 1088
1190/* ------------------------------------------------------------------------- * 1089/* ------------------------------------------------------------------------- *
1191 * GET TTY CURRENT STATE * 1090 * GET TTY CURRENT STATE *
1192 * ------------------------------------------------------------------------- */ 1091 * ------------------------------------------------------------------------- */
1193void 1092void
1194rxvt_get_ttymode (ttymode_t *tio, int erase) 1093rxvt_get_ttymode (ttymode_t *tio, int erase)
1195{ 1094{
1196#ifdef HAVE_TERMIOS_H
1197 /* 1095 /*
1198 * standard System V termios interface 1096 * standard System V termios interface
1199 */ 1097 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1099 {
… …
1268 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1269# if defined (ECHOCTL) && defined (ECHOKE) 1167# if defined (ECHOCTL) && defined (ECHOKE)
1270 | ECHOCTL | ECHOKE 1168 | ECHOCTL | ECHOKE
1271# endif 1169# endif
1272 | ECHOE | ECHOK); 1170 | ECHOE | ECHOK);
1273# else /* HAVE_TERMIOS_H */
1274
1275 /*
1276 * sgtty interface
1277 */
1278
1279 /* get parameters -- gtty */
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 {
1282 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */
1284 }
1285
1286 if (erase != -1)
1287 tio->sg.sg_erase = (char)erase;
1288
1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1290
1291 /* get special characters */
1292 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1293 {
1294 tio->tc.t_intrc = CINTR; /* ^C */
1295 tio->tc.t_quitc = CQUIT; /* ^\ */
1296 tio->tc.t_startc = CSTART; /* ^Q */
1297 tio->tc.t_stopc = CSTOP; /* ^S */
1298 tio->tc.t_eofc = CEOF; /* ^D */
1299 tio->tc.t_brkc = -1;
1300 }
1301
1302 /* get local special chars */
1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1304 {
1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1307 tio->lc.t_rprntc = CRPRNT; /* ^R */
1308 tio->lc.t_flushc = CFLUSH; /* ^O */
1309 tio->lc.t_werasc = CWERASE; /* ^W */
1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1311 }
1312 /* get line discipline */
1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1314# ifdef NTTYDISC
1315 tio->line = NTTYDISC;
1316# endif /* NTTYDISC */
1317
1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1319#endif /* HAVE_TERMIOS_H */
1320 1171
1321 /* 1172 /*
1322 * Debugging 1173 * Debugging
1323 */ 1174 */
1324#ifdef DEBUG_TTYMODE 1175#ifdef DEBUG_TTYMODE
… …
1409rxvt_term::run_command (const char *const *argv) 1260rxvt_term::run_command (const char *const *argv)
1410{ 1261{
1411#if ENABLE_FRILLS 1262#if ENABLE_FRILLS
1412 if (rs[Rs_pty_fd]) 1263 if (rs[Rs_pty_fd])
1413 { 1264 {
1414 pty.pty = atoi (rs[Rs_pty_fd]); 1265 pty->pty = atoi (rs[Rs_pty_fd]);
1415 1266
1267 if (pty->pty >= 0)
1268 {
1416 if (getfd_hook) 1269 if (getfd_hook)
1417 pty.pty = (*getfd_hook) (pty.pty); 1270 pty->pty = (*getfd_hook) (pty->pty);
1418 1271
1419 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1272 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1420 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1273 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1274 }
1421 } 1275 }
1422 else 1276 else
1423#endif 1277#endif
1424 if (!pty.get ()) 1278 if (!pty->get ())
1425 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1279 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1426
1427 pty.set_utf8_mode (enc_utf8);
1428
1429 /* set initial window size */
1430 tt_winch ();
1431 1280
1432 int er; 1281 int er;
1433 1282
1434#ifndef NO_BACKSPACE_KEY 1283#ifndef NO_BACKSPACE_KEY
1435 if (key_backspace[0] && !key_backspace[1]) 1284 if (key_backspace[0] && !key_backspace[1])
… …
1439 else 1288 else
1440#endif 1289#endif
1441 er = -1; 1290 er = -1;
1442 1291
1443 rxvt_get_ttymode (&tio, er); 1292 rxvt_get_ttymode (&tio, er);
1293 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1294 pty->set_utf8_mode (enc_utf8);
1295
1296 /* set initial window size */
1297 tt_winch ();
1444 1298
1445#if ENABLE_FRILLS 1299#if ENABLE_FRILLS
1446 if (rs[Rs_pty_fd]) 1300 if (rs[Rs_pty_fd])
1447 return; 1301 return;
1448#endif 1302#endif
1449 1303
1450#ifndef __QNX__
1451 /* spin off the command interpreter */ 1304 /* spin off the command interpreter */
1452 switch (cmd_pid = fork ()) 1305 switch (cmd_pid = fork ())
1453 { 1306 {
1454 case -1: 1307 case -1:
1455 { 1308 {
… …
1457 rxvt_fatal ("can't fork, aborting.\n"); 1310 rxvt_fatal ("can't fork, aborting.\n");
1458 } 1311 }
1459 case 0: 1312 case 0:
1460 init_env (); 1313 init_env ();
1461 1314
1462 if (!pty.make_controlling_tty ()) 1315 if (!pty->make_controlling_tty ())
1463 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1316 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1464 else 1317 else
1465 { 1318 {
1466 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1319 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1467 dup2 (pty.tty, STDIN_FILENO); 1320 dup2 (pty->tty, STDIN_FILENO);
1468 dup2 (pty.tty, STDOUT_FILENO); 1321 dup2 (pty->tty, STDOUT_FILENO);
1469 dup2 (pty.tty, STDERR_FILENO); 1322 dup2 (pty->tty, STDERR_FILENO);
1470 1323
1471 // close all our file handles that we do no longer need 1324 // close all our file handles that we do no longer need
1472 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1325 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1473 { 1326 {
1474 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1327 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1475 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1328 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1476 } 1329 }
1477 1330
1478 run_child (argv); 1331 run_child (argv);
1479 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1332 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1480 } 1333 }
1481 1334
1482 _exit (EXIT_FAILURE); 1335 _exit (EXIT_FAILURE);
1483 1336
1484 default: 1337 default:
1485 { 1338 if (!option (Opt_utmpInhibit))
1486#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1339 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1487 int fdstdin;
1488 1340
1489 fdstdin = dup (STDIN_FILENO); 1341 pty->close_tty ();
1490 dup2 (pty.tty, STDIN_FILENO);
1491#endif
1492 1342
1493#ifdef UTMP_SUPPORT 1343 child_ev.start (cmd_pid);
1494 privileged_utmp (SAVE);
1495#endif
1496 1344
1497#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1345 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1498
1499 dup2 (fdstdin, STDIN_FILENO);
1500 close (fdstdin);
1501#endif
1502 }
1503
1504 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1505 break; 1346 break;
1506 } 1347 }
1507#else /* __QNX__ uses qnxspawn () */
1508 fchmod (pty.tty, 0622);
1509 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1510 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1511
1512 if (run_child (argv) == -1)
1513 exit (EXIT_FAILURE);
1514#endif
1515} 1348}
1516 1349
1517/* ------------------------------------------------------------------------- * 1350/* ------------------------------------------------------------------------- *
1518 * CHILD PROCESS OPERATIONS * 1351 * CHILD PROCESS OPERATIONS *
1519 * ------------------------------------------------------------------------- */ 1352 * ------------------------------------------------------------------------- */
… …
1524int 1357int
1525rxvt_term::run_child (const char *const *argv) 1358rxvt_term::run_child (const char *const *argv)
1526{ 1359{
1527 char *login; 1360 char *login;
1528 1361
1529 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1530
1531 if (OPTION (Opt_console)) 1362 if (option (Opt_console))
1532 { /* be virtual console, fail silently */ 1363 { /* be virtual console, fail silently */
1533#ifdef TIOCCONS 1364#ifdef TIOCCONS
1534 unsigned int on = 1; 1365 unsigned int on = 1;
1535 1366
1536 ioctl (STDIN_FILENO, TIOCCONS, &on); 1367 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1563 // unblock signals (signals are blocked by iom.C 1394 // unblock signals (signals are blocked by iom.C
1564 sigset_t ss; 1395 sigset_t ss;
1565 sigemptyset (&ss); 1396 sigemptyset (&ss);
1566 sigprocmask (SIG_SETMASK, &ss, 0); 1397 sigprocmask (SIG_SETMASK, &ss, 0);
1567 1398
1568#ifndef __QNX__
1569 /* command interpreter path */ 1399 /* command interpreter path */
1570 if (argv != NULL) 1400 if (argv != NULL)
1571 { 1401 {
1572# ifdef DEBUG_CMD 1402# ifdef DEBUG_CMD
1573 int i; 1403 int i;
… …
1579 execvp (argv[0], (char *const *)argv); 1409 execvp (argv[0], (char *const *)argv);
1580 /* no error message: STDERR is closed! */ 1410 /* no error message: STDERR is closed! */
1581 } 1411 }
1582 else 1412 else
1583 { 1413 {
1584 const char *argv0, *shell; 1414 const char *argv0, *shell;
1585 1415
1586 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1416 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1587 shell = "/bin/sh"; 1417 shell = "/bin/sh";
1588 1418
1589 argv0 = (const char *)rxvt_r_basename (shell); 1419 argv0 = (const char *)rxvt_r_basename (shell);
1590 1420
1591 if (OPTION (Opt_loginShell)) 1421 if (option (Opt_loginShell))
1592 { 1422 {
1593 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1594 1424
1595 login[0] = '-'; 1425 login[0] = '-';
1596 strcpy (&login[1], argv0); 1426 strcpy (&login[1], argv0);
1597 argv0 = login; 1427 argv0 = login;
1598 } 1428 }
1429
1599 execlp (shell, argv0, NULL); 1430 execlp (shell, argv0, NULL);
1600 /* no error message: STDERR is closed! */ 1431 /* no error message: STDERR is closed! */
1601 } 1432 }
1602 1433
1603#else /* __QNX__ uses qnxspawn () */
1604
1605 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1606 char *command = NULL, fullcommand[_MAX_PATH];
1607 char **arg_v, *arg_a[2] = { NULL, NULL };
1608
1609 if (argv != NULL)
1610 {
1611 if (access (argv[0], X_OK) == -1)
1612 {
1613 if (strchr (argv[0], '/') == NULL)
1614 {
1615 searchenv (argv[0], "PATH", fullcommand);
1616
1617 if (fullcommand[0] != '\0')
1618 command = fullcommand;
1619 }
1620
1621 if (access (command, X_OK) == -1)
1622 return -1;
1623 }
1624 else
1625 command = argv[0];
1626
1627 arg_v = argv;
1628 }
1629 else
1630 {
1631 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1632 command = "/bin/sh";
1633
1634 arg_a[0] = my_basename (command);
1635
1636 if (OPTION (Opt_loginShell))
1637 {
1638 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1639
1640 login[0] = '-';
1641 strcpy (&login[1], arg_a[0]);
1642 arg_a[0] = login;
1643 }
1644
1645 arg_v = arg_a;
1646 }
1647
1648 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1649 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1650 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1651 command, arg_v, environ, iov_a, 0);
1652 if (login)
1653 free (login);
1654
1655 pty.close_tty ();
1656 return pty.pty;
1657#endif
1658
1659 return -1; 1434 return -1;
1660} 1435}
1661 1436
1662/*----------------------- end-of-file (C source) -----------------------*/ 1437/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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