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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.204 by sasha, Thu Aug 9 22:08:21 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",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
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 ()
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
258 int i, r_argc; 269 int i, r_argc;
259 char *val; 270 char *val;
260 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
261 272
262 /* 273 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 275 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
267 break; 278 break;
268 279
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 281
271 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
298 309
299 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
302 extract_resources (); 317 extract_resources ();
303 318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
304 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
330
331 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef)
333 rs [i] = 0;
305 334
306#if ENABLE_PERL 335#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 336 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 337 rs[Rs_perl_ext_1] = "default";
309 338
… …
408 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
409#endif 438#endif
410 439
411#ifdef XTERM_REVERSE_VIDEO 440#ifdef XTERM_REVERSE_VIDEO
412 /* this is how xterm implements reverseVideo */ 441 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 442 if (option (Opt_reverseVideo))
414 { 443 {
415 if (!rs[Rs_color + Color_fg]) 444 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 445 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
446
417 if (!rs[Rs_color + Color_bg]) 447 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 448 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 449 }
420#endif 450#endif
421 451
… …
423 if (!rs[Rs_color + i]) 453 if (!rs[Rs_color + i])
424 rs[Rs_color + i] = def_colorName[i]; 454 rs[Rs_color + i] = def_colorName[i];
425 455
426#ifndef XTERM_REVERSE_VIDEO 456#ifndef XTERM_REVERSE_VIDEO
427 /* this is how we implement reverseVideo */ 457 /* this is how we implement reverseVideo */
428 if (OPTION (Opt_reverseVideo)) 458 if (option (Opt_reverseVideo))
429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 459 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
430#endif 460#endif
431 461
432 /* convenient aliases for setting fg/bg to colors */ 462 /* convenient aliases for setting fg/bg to colors */
433 color_aliases (Color_fg); 463 color_aliases (Color_fg);
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 503 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 504 rs[Rs_display_name] = (const char *)val;
475 505
476 if (val == NULL) 506 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 507#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 508 val = XDisplayString (dpy);
479 509
480 if (rs[Rs_display_name] == NULL) 510 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 511 rs[Rs_display_name] = val; /* use broken `:0' value */
482 512
483 i = strlen (val); 513 i = strlen (val);
… …
503 533
504#ifdef RXVT_TERMINFO 534#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 535 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 536#endif
507 537
508 if (display->depth <= 2) 538 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 539 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 540 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 541 putenv ("COLORTERM=" COLORTERMENVFULL);
512 542
513 if (rs[Rs_term_name] != NULL) 543 if (rs[Rs_term_name] != NULL)
… …
607 * Initialize the command connection. 637 * Initialize the command connection.
608 * This should be called after the X server connection is established. 638 * This should be called after the X server connection is established.
609 */ 639 */
610 640
611#ifdef META8_OPTION 641#ifdef META8_OPTION
612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 642 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
613#endif 643#endif
614 644
615 get_ourmods (); 645 get_ourmods ();
616 646
617 if (!OPTION (Opt_scrollTtyOutput)) 647 if (!option (Opt_scrollTtyOutput))
618 priv_modes |= PrivMode_TtyOutputInh; 648 priv_modes |= PrivMode_TtyOutputInh;
619 if (OPTION (Opt_scrollTtyKeypress)) 649 if (option (Opt_scrollTtyKeypress))
620 priv_modes |= PrivMode_Keypress; 650 priv_modes |= PrivMode_Keypress;
621 if (!OPTION (Opt_jumpScroll)) 651 if (!option (Opt_jumpScroll))
622 priv_modes |= PrivMode_smoothScroll; 652 priv_modes |= PrivMode_smoothScroll;
623 653
624#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
625 if (strcmp (key_backspace, "DEC") == 0) 655 if (strcmp (key_backspace, "DEC") == 0)
626 priv_modes |= PrivMode_HaveBackSpace; 656 priv_modes |= PrivMode_HaveBackSpace;
… …
644 674
645#ifdef OFF_FOCUS_FADING 675#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 676 pix_colors = pix_colors_focused;
647#endif 677#endif
648 678
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 680 {
681 const char *name = rs[Rs_color + i];
682
683 if (!name)
684 continue;
685
651 rxvt_color xcol; 686 rxvt_color xcol;
652 687
653 if (!rs[Rs_color + i]) 688 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 689 {
658#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 691 if (i < 2 && option (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 692 name = def_colorName [1 - i];
661 else 693 else
662#endif 694#endif
663 rs[Rs_color + i] = def_colorName[i]; 695 name = def_colorName [i];
664 696
665 if (!rs[Rs_color + i]) 697 if (!name)
666 continue; 698 continue;
667 699
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 700 if (!set_color (xcol, name))
669 { 701 {
670 switch (i) 702 switch (i)
671 { 703 {
672 case Color_fg: 704 case Color_fg:
673 case Color_bg: 705 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 706 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 707 name = "";
677 break; 708 break;
678#ifndef NO_CURSORCOLOR 709#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 710 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 711#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 712 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 713 name = rs[Rs_color + Color_fg];
714 xcol.set (this, name);
685 break; 715 break;
686 default: 716 default:
687 xcol = pix_colors[Color_bg]; /* None */ 717 name = rs[Rs_color + Color_bg];
718 xcol.set (this, name);
688 break; 719 break;
689 } 720 }
690 } 721 }
691 } 722 }
692 723
693 pix_colors[i] = xcol; 724 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 725 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif
702
703 if (display->depth <= 2)
704 { 726 }
727
728 if (depth <= 2)
729 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 730 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 731 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 732 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
708 } 733 }
709 734
710 /* 735 /*
711 * get scrollBar shadow colors 736 * get scrollBar shadow colors
712 * 737 *
713 * The calculations of topShadow/bottomShadow values are adapted 738 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 739 * from the fvwm window manager.
715 */ 740 */
716#ifdef KEEP_SCROLLCOLOR 741#ifdef KEEP_SCROLLCOLOR
717
718 if (display->depth <= 2) 742 if (depth <= 2)
719 { 743 {
720 /* Monochrome */ 744 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 745 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 746 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 747 alias_color (Color_bottomShadow, Color_bg);
724 } 748 }
725 else 749 else
726 { 750 {
727 rxvt_color xcol[2]; 751 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 752
732 xcol[1] = pix_colors[Color_scroll]; 753 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 754 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 755
742 /* topShadowColor */ 756 /* topShadowColor */
743 if (!xcol[1].set (display, 757 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 758 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 759 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 760 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 761 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 762 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 763 ))
764 alias_color (Color_topShadow, Color_White);
750 } 765 }
751#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
767
768#ifdef OFF_FOCUS_FADING
769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770 update_fade_color (i);
771#endif
752} 772}
753 773
754/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 775/* color aliases, fg/bg bright-bold */
756void 776void
… …
795 815
796 if (rsmod 816 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 817 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 818 requestedmeta = rsmod[3] - '0';
799 819
800 map = XGetModifierMapping (display->display); 820 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 821 kc = map->modifiermap;
802 822
803 for (i = 1; i < 6; i++) 823 for (i = 1; i < 6; i++)
804 { 824 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 825 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 827 for (j = map->max_keypermod; j--; k++)
808 { 828 {
809 if (kc[k] == 0) 829 if (kc[k] == 0)
810 break; 830 break;
811 831
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 832 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 833 {
814 case XK_Num_Lock: 834 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 835 ModNumLockMask = modmasks[i - 1];
816 continue; 836 continue;
817 837
… …
867rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
868{ 888{
869 XClassHint classHint; 889 XClassHint classHint;
870 XWMHints wmHint; 890 XWMHints wmHint;
871#if ENABLE_FRILLS 891#if ENABLE_FRILLS
872 MWMHints mwmhints; 892 MWMHints mwmhints = { };
873#endif 893#endif
874 XGCValues gcvalue; 894 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
876 Window top, parent; 896 Window top, parent;
877 dDisp;
878 897
879 xa = display->xa; 898 dLocal (Display *, dpy);
880 899
881 /* grab colors before netscape does */ 900 /* grab colors before netscape does */
882 Get_Colours (); 901 Get_Colours ();
883 902
884 if (!set_fonts ()) 903 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 904 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886 905
887 parent = display->root; 906 parent = display->root;
888 907
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 908 attributes.override_redirect = !!option (Opt_override_redirect);
890 909
891#if ENABLE_FRILLS 910#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 911 if (option (Opt_borderLess))
893 { 912 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 914 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
897 attributes.override_redirect = TRUE; 916 attributes.override_redirect = true;
898 mwmhints.flags = 0; 917 mwmhints.flags = 0;
899 } 918 }
900 else 919 else
901 { 920 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 921 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 931 {
913 XWindowAttributes wattr; 932 XWindowAttributes wattr;
914 933
915 parent = strtol (rs[Rs_embed], 0, 0); 934 parent = strtol (rs[Rs_embed], 0, 0);
916 935
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 936 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 937 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 938
920 window_calc (wattr.width, wattr.height); 939 window_calc (wattr.width, wattr.height);
921 } 940 }
922#endif 941#endif
923 942
924 window_calc (0, 0); 943 window_calc (0, 0);
925 944
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 945 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 946 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 947 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 948 attributes.colormap = cmap;
930 949
931 top = XCreateWindow (disp, parent, 950 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 951 szHint.x, szHint.y,
933 szHint.width, szHint.height, 952 szHint.width, szHint.height,
934 ext_bwidth, 953 ext_bwidth,
935 display->depth, InputOutput, 954 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 955 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 956 &attributes);
939 957
940 this->parent[0] = top; 958 this->parent[0] = top;
941 959
… …
948 classHint.res_name = (char *)rs[Rs_name]; 966 classHint.res_name = (char *)rs[Rs_name];
949 classHint.res_class = (char *)RESCLASS; 967 classHint.res_class = (char *)RESCLASS;
950 968
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 969 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 970 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 972 wmHint.window_group = top;
955 973
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 975 &szHint, &wmHint, &classHint);
958 976
959#if ENABLE_FRILLS 977#if ENABLE_FRILLS
960 if (mwmhints.flags) 978 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 979 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 980 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 981#endif
964 982
965 Atom protocols[] = { 983 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 984 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 985#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 986 xa[XA_NET_WM_PING],
969#endif 987#endif
970 }; 988 };
971 989
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 990 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 991
974#if ENABLE_FRILLS 992#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 993 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 994 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 995#endif
978 996
979#if ENABLE_EWMH 997#if ENABLE_EWMH
980 long pid = getpid (); 998 long pid = getpid ();
981 999
982 XChangeProperty (disp, top, 1000 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1001 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 1002 PropModeReplace, (unsigned char *)&pid, 1);
985 1003
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1004 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 1005#endif
988 1006
989 XSelectInput (disp, top, 1007 XSelectInput (dpy, top,
990 KeyPressMask 1008 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1009#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1010 | KeyReleaseMask
993#endif 1011#endif
994 | FocusChangeMask | VisibilityChangeMask 1012 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1013 | ExposureMask | StructureNotifyMask);
996 1014
997 termwin_ev.start (display, top); 1015 termwin_ev.start (display, top);
998 1016
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1017 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1018 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1019
1002#ifdef HAVE_SCROLLBARS 1020#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1021 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1022 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1023#endif
1006 1024
1007 /* the vt window */ 1025 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1026 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1027 window_vt_x, window_vt_y,
1010 width, height, 1028 width, height,
1011 0, 1029 0,
1012 pix_colors_focused[Color_fg], 1030 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1031 pix_colors_focused[Color_bg]);
1014 1032
1015 attributes.bit_gravity = NorthWestGravity; 1033 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1034 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1035
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1036 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1037
1020 if (OPTION (Opt_pointerBlank)) 1038 if (option (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1039 vt_emask |= PointerMotionMask;
1022 else 1040 else
1023 vt_emask |= Button1MotionMask | Button3MotionMask; 1041 vt_emask |= Button1MotionMask | Button3MotionMask;
1024 1042
1025 vt_select_input (); 1043 vt_select_input ();
1026 1044
1027 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1028 1046
1029#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1030 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1031 && !OPTION (Opt_transparent))
1032 { 1049 {
1033 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1034 1051
1035 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1036 { 1053 {
1037 p++; 1054 p++;
1038 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1039 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1040 1059
1041 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1042 scr_touch (true); 1061 scr_touch (true);
1043 } 1062 }
1044#endif 1063#endif
1045 1064
1046 /* graphics context for the vt window */ 1065 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1066 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1067 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1068 gcvalue.graphics_exposures = 0;
1050 1069
1051 gc = XCreateGC (disp, vt, 1070 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1071 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1072 &gcvalue);
1054 1073
1055 drawable = new rxvt_drawable (display, vt); 1074 drawable = new rxvt_drawable (this, vt);
1056 1075
1057#ifdef RXVT_SCROLLBAR 1076#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1077 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1083#endif
1065 1084
1066#ifdef OFF_FOCUS_FADING 1085#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1086 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1087 if (rs[Rs_fade])
… …
1077 * GET TTY CURRENT STATE * 1096 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1097 * ------------------------------------------------------------------------- */
1079void 1098void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1099rxvt_get_ttymode (ttymode_t *tio, int erase)
1081{ 1100{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1101 /*
1084 * standard System V termios interface 1102 * standard System V termios interface
1085 */ 1103 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1087 { 1105 {
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1172 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1173# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1174 | ECHOCTL | ECHOKE
1157# endif 1175# endif
1158 | ECHOE | ECHOK); 1176 | ECHOE | ECHOK);
1159# else /* HAVE_TERMIOS_H */
1160
1161 /*
1162 * sgtty interface
1163 */
1164
1165 /* get parameters -- gtty */
1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1167 {
1168 tio->sg.sg_erase = CERASE; /* ^H */
1169 tio->sg.sg_kill = CKILL; /* ^U */
1170 }
1171
1172 if (erase != -1)
1173 tio->sg.sg_erase = (char)erase;
1174
1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1176
1177 /* get special characters */
1178 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1179 {
1180 tio->tc.t_intrc = CINTR; /* ^C */
1181 tio->tc.t_quitc = CQUIT; /* ^\ */
1182 tio->tc.t_startc = CSTART; /* ^Q */
1183 tio->tc.t_stopc = CSTOP; /* ^S */
1184 tio->tc.t_eofc = CEOF; /* ^D */
1185 tio->tc.t_brkc = -1;
1186 }
1187
1188 /* get local special chars */
1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1190 {
1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1193 tio->lc.t_rprntc = CRPRNT; /* ^R */
1194 tio->lc.t_flushc = CFLUSH; /* ^O */
1195 tio->lc.t_werasc = CWERASE; /* ^W */
1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1197 }
1198 /* get line discipline */
1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1200# ifdef NTTYDISC
1201 tio->line = NTTYDISC;
1202# endif /* NTTYDISC */
1203
1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1205#endif /* HAVE_TERMIOS_H */
1206 1177
1207 /* 1178 /*
1208 * Debugging 1179 * Debugging
1209 */ 1180 */
1210#ifdef DEBUG_TTYMODE 1181#ifdef DEBUG_TTYMODE
… …
1311 else 1282 else
1312#endif 1283#endif
1313 if (!pty->get ()) 1284 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1286
1316 pty->set_utf8_mode (enc_utf8);
1317
1318 /* set initial window size */
1319 tt_winch ();
1320
1321 int er; 1287 int er;
1322 1288
1323#ifndef NO_BACKSPACE_KEY 1289#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1]) 1290 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0]; 1291 er = key_backspace[0];
… …
1328 else 1294 else
1329#endif 1295#endif
1330 er = -1; 1296 er = -1;
1331 1297
1332 rxvt_get_ttymode (&tio, er); 1298 rxvt_get_ttymode (&tio, er);
1299 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1300 pty->set_utf8_mode (enc_utf8);
1301
1302 /* set initial window size */
1303 tt_winch ();
1333 1304
1334#if ENABLE_FRILLS 1305#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1306 if (rs[Rs_pty_fd])
1336 return; 1307 return;
1337#endif 1308#endif
… …
1368 } 1339 }
1369 1340
1370 _exit (EXIT_FAILURE); 1341 _exit (EXIT_FAILURE);
1371 1342
1372 default: 1343 default:
1373 if (!OPTION (Opt_utmpInhibit)) 1344 if (!option (Opt_utmpInhibit))
1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1375 1346
1376 pty->close_tty (); 1347 pty->close_tty ();
1377 1348
1378 child_ev.start (cmd_pid); 1349 child_ev.start (cmd_pid);
1379 1350
… …
1392int 1363int
1393rxvt_term::run_child (const char *const *argv) 1364rxvt_term::run_child (const char *const *argv)
1394{ 1365{
1395 char *login; 1366 char *login;
1396 1367
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398
1399 if (OPTION (Opt_console)) 1368 if (option (Opt_console))
1400 { /* be virtual console, fail silently */ 1369 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1370#ifdef TIOCCONS
1402 unsigned int on = 1; 1371 unsigned int on = 1;
1403 1372
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1373 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1423 shell = "/bin/sh";
1455 1424
1456 argv0 = (const char *)rxvt_r_basename (shell); 1425 argv0 = (const char *)rxvt_r_basename (shell);
1457 1426
1458 if (OPTION (Opt_loginShell)) 1427 if (option (Opt_loginShell))
1459 { 1428 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1461 1430
1462 login[0] = '-'; 1431 login[0] = '-';
1463 strcpy (&login[1], argv0); 1432 strcpy (&login[1], argv0);

Diff Legend

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