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.159 by root, Mon Jan 30 02:21:20 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>
… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
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 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
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
302 xa = display->xa; 314 xa = display->xa;
303 315
304#if ENABLE_FRILLS 316 set (display);
317 extract_resources ();
318
319#if XFT
305 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 322#endif
309 set (display);
310 323
311 extract_resources (); 324#ifdef HAVE_AFTERIMAGE
312 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
313 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;
314 334
315#if ENABLE_PERL 335#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 336 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 337 rs[Rs_perl_ext_1] = "default";
318 338
… …
417 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]);
418#endif 438#endif
419 439
420#ifdef XTERM_REVERSE_VIDEO 440#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 441 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 442 if (option (Opt_reverseVideo))
423 { 443 {
424 if (!rs[Rs_color + Color_fg]) 444 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 445 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
446
426 if (!rs[Rs_color + Color_bg]) 447 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 448 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 449 }
429#endif 450#endif
430 451
… …
432 if (!rs[Rs_color + i]) 453 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 454 rs[Rs_color + i] = def_colorName[i];
434 455
435#ifndef XTERM_REVERSE_VIDEO 456#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 457 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 458 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 459 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 460#endif
440 461
441 /* convenient aliases for setting fg/bg to colors */ 462 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 463 color_aliases (Color_fg);
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 503 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 504 rs[Rs_display_name] = (const char *)val;
484 505
485 if (val == NULL) 506 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 507#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 508 val = XDisplayString (dpy);
488 509
489 if (rs[Rs_display_name] == NULL) 510 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 511 rs[Rs_display_name] = val; /* use broken `:0' value */
491 512
492 i = strlen (val); 513 i = strlen (val);
… …
616 * Initialize the command connection. 637 * Initialize the command connection.
617 * This should be called after the X server connection is established. 638 * This should be called after the X server connection is established.
618 */ 639 */
619 640
620#ifdef META8_OPTION 641#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 642 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 643#endif
623 644
624 get_ourmods (); 645 get_ourmods ();
625 646
626 if (!OPTION (Opt_scrollTtyOutput)) 647 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 648 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 649 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 650 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 651 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 652 priv_modes |= PrivMode_smoothScroll;
632 653
633#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 655 if (strcmp (key_backspace, "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 656 priv_modes |= PrivMode_HaveBackSpace;
… …
655 pix_colors = pix_colors_focused; 676 pix_colors = pix_colors_focused;
656#endif 677#endif
657 678
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 680 {
681 const char *name = rs[Rs_color + i];
682
683 if (!name)
684 continue;
685
660 rxvt_color xcol; 686 rxvt_color xcol;
661 687
662 if (!rs[Rs_color + i]) 688 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 689 {
667#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 691 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 692 name = def_colorName [1 - i];
670 else 693 else
671#endif 694#endif
672 rs[Rs_color + i] = def_colorName[i]; 695 name = def_colorName [i];
673 696
674 if (!rs[Rs_color + i]) 697 if (!name)
675 continue; 698 continue;
676 699
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 700 if (!set_color (xcol, name))
678 { 701 {
679 switch (i) 702 switch (i)
680 { 703 {
681 case Color_fg: 704 case Color_fg:
682 case Color_bg: 705 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 706 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 707 name = "";
686 break; 708 break;
687#ifndef NO_CURSORCOLOR 709#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 710 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 711#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 712 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 713 name = rs[Rs_color + Color_fg];
714 xcol.set (this, name);
694 break; 715 break;
695 default: 716 default:
696 xcol = pix_colors[Color_bg]; /* None */ 717 name = rs[Rs_color + Color_bg];
718 xcol.set (this, name);
697 break; 719 break;
698 } 720 }
699 } 721 }
700 } 722 }
701 723
702 pix_colors[i] = xcol; 724 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 725 rs[Rs_color + i] = name;
704 } 726 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 727
712 if (depth <= 2) 728 if (depth <= 2)
713 { 729 {
714 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);
715 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);
716 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);
717 } 733 }
718 734
719 /* 735 /*
720 * get scrollBar shadow colors 736 * get scrollBar shadow colors
721 * 737 *
722 * The calculations of topShadow/bottomShadow values are adapted 738 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 739 * from the fvwm window manager.
724 */ 740 */
725#ifdef KEEP_SCROLLCOLOR 741#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 742 if (depth <= 2)
728 { 743 {
729 /* Monochrome */ 744 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 745 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 746 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 747 alias_color (Color_bottomShadow, Color_bg);
733 } 748 }
734 else 749 else
735 { 750 {
736 rxvt_color xcol[2]; 751 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 752
741 xcol[1] = pix_colors[Color_scroll]; 753 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 754 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 755
751 /* topShadowColor */ 756 /* topShadowColor */
752 if (!xcol[1].set (this, 757 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 758 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 759 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 760 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 761 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 762 cscroll.a)
758 )); 763 ))
759 xcol[1] = pix_colors[Color_White]; 764 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 765 }
763#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
764} 772}
765 773
766/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 775/* color aliases, fg/bg bright-bold */
768void 776void
… …
807 815
808 if (rsmod 816 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 817 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 818 requestedmeta = rsmod[3] - '0';
811 819
812 map = XGetModifierMapping (xdisp); 820 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 821 kc = map->modifiermap;
814 822
815 for (i = 1; i < 6; i++) 823 for (i = 1; i < 6; i++)
816 { 824 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 825 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 827 for (j = map->max_keypermod; j--; k++)
820 { 828 {
821 if (kc[k] == 0) 829 if (kc[k] == 0)
822 break; 830 break;
823 831
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 832 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 833 {
826 case XK_Num_Lock: 834 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 835 ModNumLockMask = modmasks[i - 1];
828 continue; 836 continue;
829 837
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
880{ 888{
881 XClassHint classHint; 889 XClassHint classHint;
882 XWMHints wmHint; 890 XWMHints wmHint;
883#if ENABLE_FRILLS 891#if ENABLE_FRILLS
884 MWMHints mwmhints; 892 MWMHints mwmhints = { };
885#endif 893#endif
886 XGCValues gcvalue; 894 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
888 Window top, parent; 896 Window top, parent;
889 897
890 dLocal (Display *, xdisp); 898 dLocal (Display *, dpy);
891 899
892 /* grab colors before netscape does */ 900 /* grab colors before netscape does */
893 Get_Colours (); 901 Get_Colours ();
894 902
895 if (!set_fonts ()) 903 if (!set_fonts ())
896 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");
897 905
898 parent = display->root; 906 parent = display->root;
899 907
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 908 attributes.override_redirect = !!option (Opt_override_redirect);
901 909
902#if ENABLE_FRILLS 910#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 911 if (option (Opt_borderLess))
904 { 912 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 914 {
907 /* 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");*/
908 attributes.override_redirect = true; 916 attributes.override_redirect = true;
909 mwmhints.flags = 0; 917 mwmhints.flags = 0;
910 } 918 }
… …
923 { 931 {
924 XWindowAttributes wattr; 932 XWindowAttributes wattr;
925 933
926 parent = strtol (rs[Rs_embed], 0, 0); 934 parent = strtol (rs[Rs_embed], 0, 0);
927 935
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 936 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 937 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 938
931 window_calc (wattr.width, wattr.height); 939 window_calc (wattr.width, wattr.height);
932 } 940 }
933#endif 941#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 945 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 946 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 947 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 948 attributes.colormap = cmap;
941 949
942 top = XCreateWindow (xdisp, parent, 950 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 951 szHint.x, szHint.y,
944 szHint.width, szHint.height, 952 szHint.width, szHint.height,
945 ext_bwidth, 953 ext_bwidth,
946 depth, InputOutput, visual, 954 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 955 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
958 classHint.res_name = (char *)rs[Rs_name]; 966 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 967 classHint.res_class = (char *)RESCLASS;
960 968
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 969 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 970 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 972 wmHint.window_group = top;
965 973
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 975 &szHint, &wmHint, &classHint);
968 976
969#if ENABLE_FRILLS 977#if ENABLE_FRILLS
970 if (mwmhints.flags) 978 if (mwmhints.flags)
971 XChangeProperty (xdisp, 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,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 980 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 981#endif
974 982
975 Atom protocols[] = { 983 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 984 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 985#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 986 xa[XA_NET_WM_PING],
979#endif 987#endif
980 }; 988 };
981 989
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 990 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 991
984#if ENABLE_FRILLS 992#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 993 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 994 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 995#endif
988 996
989#if ENABLE_EWMH 997#if ENABLE_EWMH
990 long pid = getpid (); 998 long pid = getpid ();
991 999
992 XChangeProperty (xdisp, top, 1000 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1001 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 1002 PropModeReplace, (unsigned char *)&pid, 1);
995 1003
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1004 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1005#endif
998 1006
999 XSelectInput (xdisp, top, 1007 XSelectInput (dpy, top,
1000 KeyPressMask 1008 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1009#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1010 | KeyReleaseMask
1003#endif 1011#endif
1004 | FocusChangeMask | VisibilityChangeMask 1012 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1013 | ExposureMask | StructureNotifyMask);
1006 1014
1007 termwin_ev.start (display, top); 1015 termwin_ev.start (display, top);
1008 1016
1009 /* 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 */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1018 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011 1019
1012#ifdef HAVE_SCROLLBARS 1020#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */ 1021 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1022 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif 1023#endif
1016 1024
1017 /* the vt window */ 1025 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1026 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1027 window_vt_x, window_vt_y,
1020 width, height, 1028 width, height,
1021 0, 1029 0,
1022 pix_colors_focused[Color_fg], 1030 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1031 pix_colors_focused[Color_bg]);
1024 1032
1025 attributes.bit_gravity = NorthWestGravity; 1033 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1034 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1035
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1036 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1037
1030 if (OPTION (Opt_pointerBlank)) 1038 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1039 vt_emask |= PointerMotionMask;
1032 else 1040 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1041 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1042
1035 vt_select_input (); 1043 vt_select_input ();
1036 1044
1037 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1038 1046
1039#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1041 && !OPTION (Opt_transparent))
1042 { 1049 {
1043 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1044 1051
1045 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1046 { 1053 {
1047 p++; 1054 p++;
1048 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1049 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1050 1059
1051 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1052 scr_touch (true); 1061 scr_touch (true);
1053 } 1062 }
1054#endif 1063#endif
1055 1064
1056 /* graphics context for the vt window */ 1065 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1066 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1067 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1068 gcvalue.graphics_exposures = 0;
1060 1069
1061 gc = XCreateGC (xdisp, vt, 1070 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1071 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1072 &gcvalue);
1064 1073
1065 drawable = new rxvt_drawable (this, vt); 1074 drawable = new rxvt_drawable (this, vt);
1066 1075
1067#ifdef RXVT_SCROLLBAR 1076#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow]; 1077 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074#endif 1083#endif
1075 1084
1076#ifdef OFF_FOCUS_FADING 1085#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1086 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1087 if (rs[Rs_fade])
… …
1087 * GET TTY CURRENT STATE * 1096 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */ 1097 * ------------------------------------------------------------------------- */
1089void 1098void
1090rxvt_get_ttymode (ttymode_t *tio, int erase) 1099rxvt_get_ttymode (ttymode_t *tio, int erase)
1091{ 1100{
1092#ifdef HAVE_TERMIOS_H
1093 /* 1101 /*
1094 * standard System V termios interface 1102 * standard System V termios interface
1095 */ 1103 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1097 { 1105 {
… …
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1172 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE) 1173# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE 1174 | ECHOCTL | ECHOKE
1167# endif 1175# endif
1168 | ECHOE | ECHOK); 1176 | ECHOE | ECHOK);
1169# else /* HAVE_TERMIOS_H */
1170
1171 /*
1172 * sgtty interface
1173 */
1174
1175 /* get parameters -- gtty */
1176 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177 {
1178 tio->sg.sg_erase = CERASE; /* ^H */
1179 tio->sg.sg_kill = CKILL; /* ^U */
1180 }
1181
1182 if (erase != -1)
1183 tio->sg.sg_erase = (char)erase;
1184
1185 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1186
1187 /* get special characters */
1188 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189 {
1190 tio->tc.t_intrc = CINTR; /* ^C */
1191 tio->tc.t_quitc = CQUIT; /* ^\ */
1192 tio->tc.t_startc = CSTART; /* ^Q */
1193 tio->tc.t_stopc = CSTOP; /* ^S */
1194 tio->tc.t_eofc = CEOF; /* ^D */
1195 tio->tc.t_brkc = -1;
1196 }
1197
1198 /* get local special chars */
1199 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200 {
1201 tio->lc.t_suspc = CSUSP; /* ^Z */
1202 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203 tio->lc.t_rprntc = CRPRNT; /* ^R */
1204 tio->lc.t_flushc = CFLUSH; /* ^O */
1205 tio->lc.t_werasc = CWERASE; /* ^W */
1206 tio->lc.t_lnextc = CLNEXT; /* ^V */
1207 }
1208 /* get line discipline */
1209 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210# ifdef NTTYDISC
1211 tio->line = NTTYDISC;
1212# endif /* NTTYDISC */
1213
1214 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1215#endif /* HAVE_TERMIOS_H */
1216 1177
1217 /* 1178 /*
1218 * Debugging 1179 * Debugging
1219 */ 1180 */
1220#ifdef DEBUG_TTYMODE 1181#ifdef DEBUG_TTYMODE
… …
1321 else 1282 else
1322#endif 1283#endif
1323 if (!pty->get ()) 1284 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1286
1326 pty->set_utf8_mode (enc_utf8);
1327
1328 /* set initial window size */
1329 tt_winch ();
1330
1331 int er; 1287 int er;
1332 1288
1333#ifndef NO_BACKSPACE_KEY 1289#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1]) 1290 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0]; 1291 er = key_backspace[0];
… …
1338 else 1294 else
1339#endif 1295#endif
1340 er = -1; 1296 er = -1;
1341 1297
1342 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 ();
1343 1304
1344#if ENABLE_FRILLS 1305#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1306 if (rs[Rs_pty_fd])
1346 return; 1307 return;
1347#endif 1308#endif
… …
1378 } 1339 }
1379 1340
1380 _exit (EXIT_FAILURE); 1341 _exit (EXIT_FAILURE);
1381 1342
1382 default: 1343 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1344 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1346
1386 pty->close_tty (); 1347 pty->close_tty ();
1387 1348
1388 child_ev.start (cmd_pid); 1349 child_ev.start (cmd_pid);
1389 1350
… …
1402int 1363int
1403rxvt_term::run_child (const char *const *argv) 1364rxvt_term::run_child (const char *const *argv)
1404{ 1365{
1405 char *login; 1366 char *login;
1406 1367
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1368 if (option (Opt_console))
1410 { /* be virtual console, fail silently */ 1369 { /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1370#ifdef TIOCCONS
1412 unsigned int on = 1; 1371 unsigned int on = 1;
1413 1372
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1373 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1423 shell = "/bin/sh";
1465 1424
1466 argv0 = (const char *)rxvt_r_basename (shell); 1425 argv0 = (const char *)rxvt_r_basename (shell);
1467 1426
1468 if (OPTION (Opt_loginShell)) 1427 if (option (Opt_loginShell))
1469 { 1428 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1471 1430
1472 login[0] = '-'; 1431 login[0] = '-';
1473 strcpy (&login[1], argv0); 1432 strcpy (&login[1], argv0);

Diff Legend

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