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

Diff Legend

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