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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.190 by sasha, Thu Jul 12 22:33:16 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>
… …
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 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
181{ 181{
182 pix_colors = //
182 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
183#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
185#endif 186#endif
186 pix_colors = pix_colors_focused;
187 187
188 if (pix_colors == NULL)
189 return false;
190
191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
192 pixmap = None; 189 pixmap = None;
193#endif 190#endif
194 191
195 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
196 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
197 options = DEFAULT_OPTIONS;
198 want_refresh = 1; 194 want_refresh = 1;
199 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
200 focus = 0;
201 ncol = 80; 196 ncol = 80;
202 nrow = 24; 197 nrow = 24;
203 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
204 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
205 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
206 saveLines = SAVELINES; 201 saveLines = SAVELINES;
207 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
208 203
209 refresh_limit = 1;
210 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
211 prev_nrow = prev_ncol = 0;
212 205
213 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
214#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
215 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
216 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
217 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
218#endif 211#endif
219 212
220 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
221 224
222 return true; 225 return true;
223} 226}
224 227
225void 228void
… …
263 int i, r_argc; 266 int i, r_argc;
264 char *val; 267 char *val;
265 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
266 269
267 /* 270 /*
268 * 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
269 */ 272 */
270 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
271 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
272 break; 275 break;
273 276
274 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
275 278
276 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
302 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
303 306
304 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
305 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]);
306 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
307 extract_resources (); 314 extract_resources ();
308 315
316#if XFT
317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif
320
321#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP(create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
324#endif
309 free (r_argv); 325 free (r_argv);
326
327 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef)
329 rs [i] = 0;
310 330
311#if ENABLE_PERL 331#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1]) 332 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default"; 333 rs[Rs_perl_ext_1] = "default";
314 334
… …
413 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 433 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
414#endif 434#endif
415 435
416#ifdef XTERM_REVERSE_VIDEO 436#ifdef XTERM_REVERSE_VIDEO
417 /* this is how xterm implements reverseVideo */ 437 /* this is how xterm implements reverseVideo */
418 if (OPTION (Opt_reverseVideo)) 438 if (option (Opt_reverseVideo))
419 { 439 {
420 if (!rs[Rs_color + Color_fg]) 440 if (!rs[Rs_color + Color_fg])
421 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 441 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
442
422 if (!rs[Rs_color + Color_bg]) 443 if (!rs[Rs_color + Color_bg])
423 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 444 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
424 } 445 }
425#endif 446#endif
426 447
… …
428 if (!rs[Rs_color + i]) 449 if (!rs[Rs_color + i])
429 rs[Rs_color + i] = def_colorName[i]; 450 rs[Rs_color + i] = def_colorName[i];
430 451
431#ifndef XTERM_REVERSE_VIDEO 452#ifndef XTERM_REVERSE_VIDEO
432 /* this is how we implement reverseVideo */ 453 /* this is how we implement reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 454 if (option (Opt_reverseVideo))
434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 455 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
435#endif 456#endif
436 457
437 /* convenient aliases for setting fg/bg to colors */ 458 /* convenient aliases for setting fg/bg to colors */
438 color_aliases (Color_fg); 459 color_aliases (Color_fg);
… …
478 val = rxvt_network_display (rs[Rs_display_name]); 499 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 500 rs[Rs_display_name] = (const char *)val;
480 501
481 if (val == NULL) 502 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 503#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 504 val = XDisplayString (dpy);
484 505
485 if (rs[Rs_display_name] == NULL) 506 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 507 rs[Rs_display_name] = val; /* use broken `:0' value */
487 508
488 i = strlen (val); 509 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
490 511
491 sprintf (env_display, "DISPLAY=%s", val); 512 sprintf (env_display, "DISPLAY=%s", val);
492 513
493 /* avoiding the math library: 514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
496 ;
497 max_it (i, 1);
498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
499
500 sprintf (env_windowid, "WINDOWID=%u",
501 (unsigned int)parent[0]);
502 515
503 /* add entries to the environment: 516 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 517 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 518 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 519 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 521 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 522 * @ COLORFGBG: fg;bg color codes
510 */ 523 */
511 putenv (env_display); 524 putenv (env_display);
512 putenv (env_windowid); 525 putenv (env_windowid);
526
513 if (env_colorfgbg) 527 if (env_colorfgbg)
514 putenv (env_colorfgbg); 528 putenv (env_colorfgbg);
515 529
516#ifdef RXVT_TERMINFO 530#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 531 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 532#endif
519 533
520 if (display->depth <= 2) 534 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 535 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 536 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 537 putenv ("COLORTERM=" COLORTERMENVFULL);
524 538
525 if (rs[Rs_term_name] != NULL) 539 if (rs[Rs_term_name] != NULL)
… …
619 * Initialize the command connection. 633 * Initialize the command connection.
620 * This should be called after the X server connection is established. 634 * This should be called after the X server connection is established.
621 */ 635 */
622 636
623#ifdef META8_OPTION 637#ifdef META8_OPTION
624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 638 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
625#endif 639#endif
626 640
627 get_ourmods (); 641 get_ourmods ();
628 642
629 if (!OPTION (Opt_scrollTtyOutput)) 643 if (!option (Opt_scrollTtyOutput))
630 priv_modes |= PrivMode_TtyOutputInh; 644 priv_modes |= PrivMode_TtyOutputInh;
631 if (OPTION (Opt_scrollTtyKeypress)) 645 if (option (Opt_scrollTtyKeypress))
632 priv_modes |= PrivMode_Keypress; 646 priv_modes |= PrivMode_Keypress;
633 if (!OPTION (Opt_jumpScroll)) 647 if (!option (Opt_jumpScroll))
634 priv_modes |= PrivMode_smoothScroll; 648 priv_modes |= PrivMode_smoothScroll;
635 649
636#ifndef NO_BACKSPACE_KEY 650#ifndef NO_BACKSPACE_KEY
637 if (strcmp (key_backspace, "DEC") == 0) 651 if (strcmp (key_backspace, "DEC") == 0)
638 priv_modes |= PrivMode_HaveBackSpace; 652 priv_modes |= PrivMode_HaveBackSpace;
… …
656 670
657#ifdef OFF_FOCUS_FADING 671#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 672 pix_colors = pix_colors_focused;
659#endif 673#endif
660 674
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 676 {
677 const char *name = rs[Rs_color + i];
678
679 if (!name)
680 continue;
681
663 rxvt_color xcol; 682 rxvt_color xcol;
664 683
665 if (!rs[Rs_color + i]) 684 if (!set_color (xcol, name))
666 continue;
667
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
669 { 685 {
670#ifndef XTERM_REVERSE_VIDEO 686#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 687 if (i < 2 && option (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 688 name = def_colorName [1 - i];
673 else 689 else
674#endif 690#endif
675 rs[Rs_color + i] = def_colorName[i]; 691 name = def_colorName [i];
676 692
677 if (!rs[Rs_color + i]) 693 if (!name)
678 continue; 694 continue;
679 695
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 696 if (!set_color (xcol, name))
681 { 697 {
682 switch (i) 698 switch (i)
683 { 699 {
684 case Color_fg: 700 case Color_fg:
685 case Color_bg: 701 case Color_bg:
686 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 702 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */ 703 name = "";
689 break; 704 break;
690#ifndef NO_CURSORCOLOR 705#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 706 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 707#endif
693 break;
694#endif /* ! NO_CURSORCOLOR */
695 case Color_pointer_fg: 708 case Color_pointer_fg:
696 xcol = pix_colors[Color_fg]; 709 name = rs[Rs_color + Color_fg];
710 xcol.set (this, name);
697 break; 711 break;
698 default: 712 default:
699 xcol = pix_colors[Color_bg]; /* None */ 713 name = rs[Rs_color + Color_bg];
714 xcol.set (this, name);
700 break; 715 break;
701 } 716 }
702 } 717 }
703 } 718 }
704 719
705 pix_colors[i] = xcol; 720 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i); 721 rs[Rs_color + i] = name;
707 }
708
709#ifdef OFF_FOCUS_FADING
710 if (rs[Rs_fade])
711 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
712 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
713#endif
714
715 if (display->depth <= 2)
716 { 722 }
723
724 if (depth <= 2)
725 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 726 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 727 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 728 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 729 }
721 730
722 /* 731 /*
723 * get scrollBar shadow colors 732 * get scrollBar shadow colors
724 * 733 *
725 * The calculations of topShadow/bottomShadow values are adapted 734 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 735 * from the fvwm window manager.
727 */ 736 */
728#ifdef KEEP_SCROLLCOLOR 737#ifdef KEEP_SCROLLCOLOR
729
730 if (display->depth <= 2) 738 if (depth <= 2)
731 { 739 {
732 /* Monochrome */ 740 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 alias_color (Color_bottomShadow, Color_bg);
736 } 744 }
737 else 745 else
738 { 746 {
739 rxvt_color xcol[2]; 747 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 748
744 xcol[1] = pix_colors[Color_scroll]; 749 rgba cscroll;
745 xcol[0].set (display, 65535, 65535, 65535); 750 pix_colors [Color_scroll].get (cscroll);
746
747 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
748
749 xcol[0].get (display, pr0, pg0, pb0);
750 xcol[1].get (display, pr1, pg1, pb1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
753 751
754 /* topShadowColor */ 752 /* topShadowColor */
755 if (!xcol[1].set (display, 753 if (!pix_colors[Color_topShadow].set (this,
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 754 rgba (
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 755 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 756 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 xcol[1] = pix_colors[Color_White]; 757 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 758 cscroll.a)
761 pix_colors[Color_topShadow] = xcol[1]; 759 ))
760 alias_color (Color_topShadow, Color_White);
762 } 761 }
763#endif /* KEEP_SCROLLCOLOR */ 762#endif /* KEEP_SCROLLCOLOR */
763
764#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i);
767#endif
764} 768}
765 769
766/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 771/* color aliases, fg/bg bright-bold */
768void 772void
… …
807 811
808 if (rsmod 812 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 813 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 814 requestedmeta = rsmod[3] - '0';
811 815
812 map = XGetModifierMapping (display->display); 816 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 817 kc = map->modifiermap;
814 818
815 for (i = 1; i < 6; i++) 819 for (i = 1; i < 6; i++)
816 { 820 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 821 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 823 for (j = map->max_keypermod; j--; k++)
820 { 824 {
821 if (kc[k] == 0) 825 if (kc[k] == 0)
822 break; 826 break;
823 827
824 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 828 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 829 {
826 case XK_Num_Lock: 830 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 831 ModNumLockMask = modmasks[i - 1];
828 continue; 832 continue;
829 833
… …
884 MWMHints mwmhints; 888 MWMHints mwmhints;
885#endif 889#endif
886 XGCValues gcvalue; 890 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 891 XSetWindowAttributes attributes;
888 Window top, parent; 892 Window top, parent;
889 dDisp;
890 893
891 xa = display->xa; 894 dLocal (Display *, dpy);
892 895
893 /* grab colors before netscape does */ 896 /* grab colors before netscape does */
894 Get_Colours (); 897 Get_Colours ();
895 898
896 if (!set_fonts ()) 899 if (!set_fonts ())
897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 900 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
898 901
899 parent = display->root; 902 parent = display->root;
900 903
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 904 attributes.override_redirect = !!option (Opt_override_redirect);
902 905
903#if ENABLE_FRILLS 906#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 907 if (option (Opt_borderLess))
905 { 908 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
907 { 910 {
908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 911 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
909 attributes.override_redirect = TRUE; 912 attributes.override_redirect = true;
910 mwmhints.flags = 0; 913 mwmhints.flags = 0;
911 } 914 }
912 else 915 else
913 { 916 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
924 { 927 {
925 XWindowAttributes wattr; 928 XWindowAttributes wattr;
926 929
927 parent = strtol (rs[Rs_embed], 0, 0); 930 parent = strtol (rs[Rs_embed], 0, 0);
928 931
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 932 if (!XGetWindowAttributes (dpy, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 933 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 934
932 window_calc (wattr.width, wattr.height); 935 window_calc (wattr.width, wattr.height);
933 } 936 }
934#endif 937#endif
935 938
936 window_calc (0, 0); 939 window_calc (0, 0);
937 940
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 941 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 942 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 943 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 944 attributes.colormap = cmap;
942 945
943 top = XCreateWindow (disp, parent, 946 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y, 947 szHint.x, szHint.y,
945 szHint.width, szHint.height, 948 szHint.width, szHint.height,
946 ext_bwidth, 949 ext_bwidth,
947 display->depth, InputOutput, 950 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 951 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 952 &attributes);
951 953
952 this->parent[0] = top; 954 this->parent[0] = top;
953 955
… …
960 classHint.res_name = (char *)rs[Rs_name]; 962 classHint.res_name = (char *)rs[Rs_name];
961 classHint.res_class = (char *)RESCLASS; 963 classHint.res_class = (char *)RESCLASS;
962 964
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 965 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 966 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 967 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 968 wmHint.window_group = top;
967 969
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 970 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 971 &szHint, &wmHint, &classHint);
970 972
971#if ENABLE_FRILLS 973#if ENABLE_FRILLS
972 if (mwmhints.flags) 974 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 975 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 976 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 977#endif
976 978
977 Atom protocols[] = { 979 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 980 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 981#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 982 xa[XA_NET_WM_PING],
981#endif 983#endif
982 }; 984 };
983 985
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 986 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 987
986#if ENABLE_FRILLS 988#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 989 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 990 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 991#endif
990 992
991#if ENABLE_EWMH 993#if ENABLE_EWMH
992 long pid = getpid (); 994 long pid = getpid ();
993 995
994 XChangeProperty (disp, top, 996 XChangeProperty (dpy, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 997 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 998 PropModeReplace, (unsigned char *)&pid, 1);
997 999
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1000 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 1001#endif
1000 1002
1001 XSelectInput (disp, top, 1003 XSelectInput (dpy, top,
1002 KeyPressMask 1004 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1006 | KeyReleaseMask
1005#endif 1007#endif
1006 | FocusChangeMask | VisibilityChangeMask 1008 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 1009 | ExposureMask | StructureNotifyMask);
1008 1010
1009 termwin_ev.start (display, top); 1011 termwin_ev.start (display, top);
1010 1012
1011 /* vt cursor: Black-on-White is standard, but this is more popular */ 1013 /* vt cursor: Black-on-White is standard, but this is more popular */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1014 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013 1015
1014#ifdef HAVE_SCROLLBARS 1016#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */ 1017 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1018 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1017#endif 1019#endif
1018 1020
1019 /* the vt window */ 1021 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1022 vt = XCreateSimpleWindow (dpy, top,
1021 window_vt_x, window_vt_y, 1023 window_vt_x, window_vt_y,
1022 width, height, 1024 width, height,
1023 0, 1025 0,
1024 pix_colors_focused[Color_fg], 1026 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1027 pix_colors_focused[Color_bg]);
1026 1028
1027 attributes.bit_gravity = NorthWestGravity; 1029 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1030 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1029 1031
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1032 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1033
1032 if (OPTION (Opt_pointerBlank)) 1034 if (option (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1035 vt_emask |= PointerMotionMask;
1034 else 1036 else
1035 vt_emask |= Button1MotionMask | Button3MotionMask; 1037 vt_emask |= Button1MotionMask | Button3MotionMask;
1036 1038
1037 vt_select_input (); 1039 vt_select_input ();
1038 1040
1039 vt_ev.start (display, vt); 1041 vt_ev.start (display, vt);
1040 1042
1041#ifdef XPM_BACKGROUND 1043#ifdef XPM_BACKGROUND
1042 if (rs[Rs_backgroundPixmap] != NULL 1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1043 && ! OPTION (Opt_transparent)) 1046 && !option (Opt_transparent)
1047#endif
1048 )
1044 { 1049 {
1045 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1046 1051
1047 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1048 { 1053 {
… …
1056#endif 1061#endif
1057 1062
1058 /* graphics context for the vt window */ 1063 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1064 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1065 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1066 gcvalue.graphics_exposures = 0;
1062 1067
1063 gc = XCreateGC (disp, vt, 1068 gc = XCreateGC (dpy, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1069 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1070 &gcvalue);
1066 1071
1067 drawable = new rxvt_drawable (display, vt); 1072 drawable = new rxvt_drawable (this, vt);
1068 1073
1069#ifdef RXVT_SCROLLBAR 1074#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow]; 1075 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1077 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1078 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1079 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif 1081#endif
1077 1082
1078#ifdef OFF_FOCUS_FADING 1083#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1084 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1085 if (rs[Rs_fade])
… …
1089 * GET TTY CURRENT STATE * 1094 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1095 * ------------------------------------------------------------------------- */
1091void 1096void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1097rxvt_get_ttymode (ttymode_t *tio, int erase)
1093{ 1098{
1094#ifdef HAVE_TERMIOS_H
1095 /* 1099 /*
1096 * standard System V termios interface 1100 * standard System V termios interface
1097 */ 1101 */
1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1099 { 1103 {
… …
1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1167# if defined (ECHOCTL) && defined (ECHOKE) 1171# if defined (ECHOCTL) && defined (ECHOKE)
1168 | ECHOCTL | ECHOKE 1172 | ECHOCTL | ECHOKE
1169# endif 1173# endif
1170 | ECHOE | ECHOK); 1174 | ECHOE | ECHOK);
1171# else /* HAVE_TERMIOS_H */
1172
1173 /*
1174 * sgtty interface
1175 */
1176
1177 /* get parameters -- gtty */
1178 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1179 {
1180 tio->sg.sg_erase = CERASE; /* ^H */
1181 tio->sg.sg_kill = CKILL; /* ^U */
1182 }
1183
1184 if (erase != -1)
1185 tio->sg.sg_erase = (char)erase;
1186
1187 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1188
1189 /* get special characters */
1190 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1191 {
1192 tio->tc.t_intrc = CINTR; /* ^C */
1193 tio->tc.t_quitc = CQUIT; /* ^\ */
1194 tio->tc.t_startc = CSTART; /* ^Q */
1195 tio->tc.t_stopc = CSTOP; /* ^S */
1196 tio->tc.t_eofc = CEOF; /* ^D */
1197 tio->tc.t_brkc = -1;
1198 }
1199
1200 /* get local special chars */
1201 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1202 {
1203 tio->lc.t_suspc = CSUSP; /* ^Z */
1204 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1205 tio->lc.t_rprntc = CRPRNT; /* ^R */
1206 tio->lc.t_flushc = CFLUSH; /* ^O */
1207 tio->lc.t_werasc = CWERASE; /* ^W */
1208 tio->lc.t_lnextc = CLNEXT; /* ^V */
1209 }
1210 /* get line discipline */
1211 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1212# ifdef NTTYDISC
1213 tio->line = NTTYDISC;
1214# endif /* NTTYDISC */
1215
1216 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1217#endif /* HAVE_TERMIOS_H */
1218 1175
1219 /* 1176 /*
1220 * Debugging 1177 * Debugging
1221 */ 1178 */
1222#ifdef DEBUG_TTYMODE 1179#ifdef DEBUG_TTYMODE
… …
1323 else 1280 else
1324#endif 1281#endif
1325 if (!pty->get ()) 1282 if (!pty->get ())
1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1327 1284
1328 pty->set_utf8_mode (enc_utf8);
1329
1330 /* set initial window size */
1331 tt_winch ();
1332
1333 int er; 1285 int er;
1334 1286
1335#ifndef NO_BACKSPACE_KEY 1287#ifndef NO_BACKSPACE_KEY
1336 if (key_backspace[0] && !key_backspace[1]) 1288 if (key_backspace[0] && !key_backspace[1])
1337 er = key_backspace[0]; 1289 er = key_backspace[0];
… …
1340 else 1292 else
1341#endif 1293#endif
1342 er = -1; 1294 er = -1;
1343 1295
1344 rxvt_get_ttymode (&tio, er); 1296 rxvt_get_ttymode (&tio, er);
1297 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1298 pty->set_utf8_mode (enc_utf8);
1299
1300 /* set initial window size */
1301 tt_winch ();
1345 1302
1346#if ENABLE_FRILLS 1303#if ENABLE_FRILLS
1347 if (rs[Rs_pty_fd]) 1304 if (rs[Rs_pty_fd])
1348 return; 1305 return;
1349#endif 1306#endif
… …
1380 } 1337 }
1381 1338
1382 _exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1383 1340
1384 default: 1341 default:
1385 if (!OPTION (Opt_utmpInhibit)) 1342 if (!option (Opt_utmpInhibit))
1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1343 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1387 1344
1388 pty->close_tty (); 1345 pty->close_tty ();
1389 1346
1390 child_ev.start (cmd_pid); 1347 child_ev.start (cmd_pid);
1391 1348
… …
1404int 1361int
1405rxvt_term::run_child (const char *const *argv) 1362rxvt_term::run_child (const char *const *argv)
1406{ 1363{
1407 char *login; 1364 char *login;
1408 1365
1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1410
1411 if (OPTION (Opt_console)) 1366 if (option (Opt_console))
1412 { /* be virtual console, fail silently */ 1367 { /* be virtual console, fail silently */
1413#ifdef TIOCCONS 1368#ifdef TIOCCONS
1414 unsigned int on = 1; 1369 unsigned int on = 1;
1415 1370
1416 ioctl (STDIN_FILENO, TIOCCONS, &on); 1371 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1466 shell = "/bin/sh"; 1421 shell = "/bin/sh";
1467 1422
1468 argv0 = (const char *)rxvt_r_basename (shell); 1423 argv0 = (const char *)rxvt_r_basename (shell);
1469 1424
1470 if (OPTION (Opt_loginShell)) 1425 if (option (Opt_loginShell))
1471 { 1426 {
1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1473 1428
1474 login[0] = '-'; 1429 login[0] = '-';
1475 strcpy (&login[1], argv0); 1430 strcpy (&login[1], argv0);

Diff Legend

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