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.198 by sasha, Fri Aug 3 05:33:04 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)
… …
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#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
209#ifdef XPM_BACKGROUND 205#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
210 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
213#endif 211#endif
214 212
215 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
216 224
217 return true; 225 return true;
218} 226}
219 227
220void 228void
… …
258 int i, r_argc; 266 int i, r_argc;
259 char *val; 267 char *val;
260 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
261 269
262 /* 270 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 272 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
267 break; 275 break;
268 276
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 278
271 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
298 306
299 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 309
310 // using a local pointer decreases code size a lot
302 xa = display->xa; 311 xa = display->xa;
312
313 set (display);
314 extract_resources ();
303 315
304#if XFT 316#if XFT
305 if (rs[Rs_depth]) 317 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 318 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 319#endif
309 set (display);
310 320
311 extract_resources (); 321#ifdef HAVE_AFTERIMAGE
312 322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif
313 free (r_argv); 324 free (r_argv);
325
326 for (int i = NUM_RESOURCES; i--; )
327 if (rs [i] == resval_undef)
328 rs [i] = 0;
314 329
315#if ENABLE_PERL 330#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 331 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 332 rs[Rs_perl_ext_1] = "default";
318 333
… …
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 433#endif
419 434
420#ifdef XTERM_REVERSE_VIDEO 435#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 436 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 437 if (option (Opt_reverseVideo))
423 { 438 {
424 if (!rs[Rs_color + Color_fg]) 439 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 440 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
441
426 if (!rs[Rs_color + Color_bg]) 442 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 443 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 444 }
429#endif 445#endif
430 446
… …
432 if (!rs[Rs_color + i]) 448 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 449 rs[Rs_color + i] = def_colorName[i];
434 450
435#ifndef XTERM_REVERSE_VIDEO 451#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 452 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 453 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 454 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 455#endif
440 456
441 /* convenient aliases for setting fg/bg to colors */ 457 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 458 color_aliases (Color_fg);
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 498 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 499 rs[Rs_display_name] = (const char *)val;
484 500
485 if (val == NULL) 501 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 502#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 503 val = XDisplayString (dpy);
488 504
489 if (rs[Rs_display_name] == NULL) 505 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 506 rs[Rs_display_name] = val; /* use broken `:0' value */
491 507
492 i = strlen (val); 508 i = strlen (val);
… …
616 * Initialize the command connection. 632 * Initialize the command connection.
617 * This should be called after the X server connection is established. 633 * This should be called after the X server connection is established.
618 */ 634 */
619 635
620#ifdef META8_OPTION 636#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 637 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 638#endif
623 639
624 get_ourmods (); 640 get_ourmods ();
625 641
626 if (!OPTION (Opt_scrollTtyOutput)) 642 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 643 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 644 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 645 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 646 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 647 priv_modes |= PrivMode_smoothScroll;
632 648
633#ifndef NO_BACKSPACE_KEY 649#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 650 if (strcmp (key_backspace, "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 651 priv_modes |= PrivMode_HaveBackSpace;
… …
655 pix_colors = pix_colors_focused; 671 pix_colors = pix_colors_focused;
656#endif 672#endif
657 673
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 675 {
676 const char *name = rs[Rs_color + i];
677
678 if (!name)
679 continue;
680
660 rxvt_color xcol; 681 rxvt_color xcol;
661 682
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 683 if (!set_color (xcol, name))
666 { 684 {
667#ifndef XTERM_REVERSE_VIDEO 685#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 686 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 687 name = def_colorName [1 - i];
670 else 688 else
671#endif 689#endif
672 rs[Rs_color + i] = def_colorName[i]; 690 name = def_colorName [i];
673 691
674 if (!rs[Rs_color + i]) 692 if (!name)
675 continue; 693 continue;
676 694
677 if (!set_color (xcol, rs[Rs_color + i])) 695 if (!set_color (xcol, name))
678 { 696 {
679 switch (i) 697 switch (i)
680 { 698 {
681 case Color_fg: 699 case Color_fg:
682 case Color_bg: 700 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 701 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
702 name = "";
685 break; 703 break;
686#ifndef NO_CURSORCOLOR 704#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 705 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 706#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 707 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 708 name = rs[Rs_color + Color_fg];
709 xcol.set (this, name);
693 break; 710 break;
694 default: 711 default:
695 xcol = pix_colors[Color_bg]; /* None */ 712 name = rs[Rs_color + Color_bg];
713 xcol.set (this, name);
696 break; 714 break;
697 } 715 }
698 } 716 }
699 } 717 }
700 718
701 pix_colors[i] = xcol; 719 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 720 rs[Rs_color + i] = name;
703 } 721 }
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 722
711 if (depth <= 2) 723 if (depth <= 2)
712 { 724 {
713 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 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]; 726 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]; 727 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
716 } 728 }
717 729
718 /* 730 /*
719 * get scrollBar shadow colors 731 * get scrollBar shadow colors
720 * 732 *
721 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
722 * from the fvwm window manager. 734 * from the fvwm window manager.
723 */ 735 */
724#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
725
726 if (depth <= 2) 737 if (depth <= 2)
727 { 738 {
728 /* Monochrome */ 739 /* Monochrome */
729 pix_colors[Color_scroll] = pix_colors[Color_fg]; 740 alias_color (Color_scroll, Color_fg);
730 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 741 alias_color (Color_topShadow, Color_bg);
731 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 742 alias_color (Color_bottomShadow, Color_bg);
732 } 743 }
733 else 744 else
734 { 745 {
735 rxvt_color xcol[2]; 746 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 747
740 xcol[1] = pix_colors[Color_scroll]; 748 rgba cscroll;
741 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 749 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 750
750 /* topShadowColor */ 751 /* topShadowColor */
751 if (!xcol[1].set (this, 752 if (!pix_colors[Color_topShadow].set (this,
752 rxvt_rgba ( 753 rgba (
753 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 754 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), 755 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), 756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
756 c1.a) // pa1 vs. pa0: arbitrary 757 cscroll.a)
757 )); 758 ))
758 xcol[1] = pix_colors[Color_White]; 759 alias_color (Color_topShadow, Color_White);
759
760 pix_colors[Color_topShadow] = xcol[1];
761 } 760 }
762#endif /* KEEP_SCROLLCOLOR */ 761#endif /* KEEP_SCROLLCOLOR */
762
763#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i);
766#endif
763} 767}
764 768
765/*----------------------------------------------------------------------*/ 769/*----------------------------------------------------------------------*/
766/* color aliases, fg/bg bright-bold */ 770/* color aliases, fg/bg bright-bold */
767void 771void
… …
806 810
807 if (rsmod 811 if (rsmod
808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
809 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
810 814
811 map = XGetModifierMapping (xdisp); 815 map = XGetModifierMapping (dpy);
812 kc = map->modifiermap; 816 kc = map->modifiermap;
813 817
814 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
815 { 819 {
816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
818 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
819 { 823 {
820 if (kc[k] == 0) 824 if (kc[k] == 0)
821 break; 825 break;
822 826
823 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 827 switch (XKeycodeToKeysym (dpy, kc[k], 0))
824 { 828 {
825 case XK_Num_Lock: 829 case XK_Num_Lock:
826 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
827 continue; 831 continue;
828 832
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
879{ 883{
880 XClassHint classHint; 884 XClassHint classHint;
881 XWMHints wmHint; 885 XWMHints wmHint;
882#if ENABLE_FRILLS 886#if ENABLE_FRILLS
883 MWMHints mwmhints; 887 MWMHints mwmhints = { };
884#endif 888#endif
885 XGCValues gcvalue; 889 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
887 Window top, parent; 891 Window top, parent;
888 892
889 dLocal (Display *, xdisp); 893 dLocal (Display *, dpy);
890 894
891 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
892 Get_Colours (); 896 Get_Colours ();
893 897
894 if (!set_fonts ()) 898 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 900
897 parent = display->root; 901 parent = display->root;
898 902
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!option (Opt_override_redirect);
900 904
901#if ENABLE_FRILLS 905#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 906 if (option (Opt_borderLess))
903 { 907 {
904 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 909 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
907 attributes.override_redirect = true; 911 attributes.override_redirect = true;
908 mwmhints.flags = 0; 912 mwmhints.flags = 0;
909 } 913 }
… …
922 { 926 {
923 XWindowAttributes wattr; 927 XWindowAttributes wattr;
924 928
925 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
926 930
927 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 931 if (!XGetWindowAttributes (dpy, parent, &wattr))
928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
929 933
930 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
931 } 935 }
932#endif 936#endif
… …
936 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
937 attributes.background_pixel = pix_colors_focused [Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
938 attributes.border_pixel = pix_colors_focused [Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
939 attributes.colormap = cmap; 943 attributes.colormap = cmap;
940 944
941 top = XCreateWindow (xdisp, parent, 945 top = XCreateWindow (dpy, parent,
942 szHint.x, szHint.y, 946 szHint.x, szHint.y,
943 szHint.width, szHint.height, 947 szHint.width, szHint.height,
944 ext_bwidth, 948 ext_bwidth,
945 depth, InputOutput, visual, 949 depth, InputOutput, visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
957 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
959 963
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 965 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 967 wmHint.window_group = top;
964 968
965 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
967 971
968#if ENABLE_FRILLS 972#if ENABLE_FRILLS
969 if (mwmhints.flags) 973 if (mwmhints.flags)
970 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 974 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 976#endif
973 977
974 Atom protocols[] = { 978 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 980#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
978#endif 982#endif
979 }; 983 };
980 984
981 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 986
983#if ENABLE_FRILLS 987#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
985 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 990#endif
987 991
988#if ENABLE_EWMH 992#if ENABLE_EWMH
989 long pid = getpid (); 993 long pid = getpid ();
990 994
991 XChangeProperty (xdisp, top, 995 XChangeProperty (dpy, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
994 998
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 1000#endif
997 1001
998 XSelectInput (xdisp, top, 1002 XSelectInput (dpy, top,
999 KeyPressMask 1003 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1005 | KeyReleaseMask
1002#endif 1006#endif
1003 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1005 1009
1006 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1007 1011
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010 1014
1011#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif 1018#endif
1015 1019
1016 /* the vt window */ 1020 /* the vt window */
1017 vt = XCreateSimpleWindow (xdisp, top, 1021 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1022 window_vt_x, window_vt_y,
1019 width, height, 1023 width, height,
1020 0, 1024 0,
1021 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1023 1027
1024 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1030
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1032
1029 if (OPTION (Opt_pointerBlank)) 1033 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1031 else 1035 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1037
1034 vt_select_input (); 1038 vt_select_input ();
1035 1039
1036 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1037 1041
1038#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL)
1040 && !OPTION (Opt_transparent))
1041 { 1044 {
1042 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1043 1046
1044 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1045 { 1048 {
… …
1053#endif 1056#endif
1054 1057
1055 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1059 1062
1060 gc = XCreateGC (xdisp, vt, 1063 gc = XCreateGC (dpy, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1065 &gcvalue);
1063 1066
1064 drawable = new rxvt_drawable (this, vt); 1067 drawable = new rxvt_drawable (this, vt);
1065 1068
1066#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif 1076#endif
1074 1077
1075#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1079 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
… …
1086 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1088void 1091void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1090{ 1093{
1091#ifdef HAVE_TERMIOS_H
1092 /* 1094 /*
1093 * standard System V termios interface 1095 * standard System V termios interface
1094 */ 1096 */
1095 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1096 { 1098 {
… …
1163 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1164# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1165 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1166# endif 1168# endif
1167 | ECHOE | ECHOK); 1169 | 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 1170
1216 /* 1171 /*
1217 * Debugging 1172 * Debugging
1218 */ 1173 */
1219#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1320 else 1275 else
1321#endif 1276#endif
1322 if (!pty->get ()) 1277 if (!pty->get ())
1323 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324 1279
1325 pty->set_utf8_mode (enc_utf8);
1326
1327 /* set initial window size */
1328 tt_winch ();
1329
1330 int er; 1280 int er;
1331 1281
1332#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1333 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1334 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1337 else 1287 else
1338#endif 1288#endif
1339 er = -1; 1289 er = -1;
1340 1290
1341 rxvt_get_ttymode (&tio, er); 1291 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1293 pty->set_utf8_mode (enc_utf8);
1294
1295 /* set initial window size */
1296 tt_winch ();
1342 1297
1343#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1344 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1345 return; 1300 return;
1346#endif 1301#endif
… …
1377 } 1332 }
1378 1333
1379 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1380 1335
1381 default: 1336 default:
1382 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1384 1339
1385 pty->close_tty (); 1340 pty->close_tty ();
1386 1341
1387 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1388 1343
… …
1401int 1356int
1402rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1403{ 1358{
1404 char *login; 1359 char *login;
1405 1360
1406 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1409 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1410#ifdef TIOCCONS 1363#ifdef TIOCCONS
1411 unsigned int on = 1; 1364 unsigned int on = 1;
1412 1365
1413 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1462 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1463 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1464 1417
1465 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1466 1419
1467 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1468 { 1421 {
1469 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1470 1423
1471 login[0] = '-'; 1424 login[0] = '-';
1472 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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