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.162 by root, Tue Jan 31 16:19:16 2006 UTC vs.
Revision 1.187 by root, Mon Jun 18 12:53:26 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)
… …
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 196 ncol = 80;
198 nrow = 24; 197 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 201 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
204 203
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
207 205
208 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
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_secondaryScreen);
219 set_option (Opt_secondaryScroll);
220 set_option (Opt_pastableTabs);
221 set_option (Opt_intensityStyles);
222 set_option (Opt_iso14755_52);
216 223
217 return true; 224 return true;
218} 225}
219 226
220void 227void
… …
258 int i, r_argc; 265 int i, r_argc;
259 char *val; 266 char *val;
260 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
261 268
262 /* 269 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 270 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 271 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
267 break; 274 break;
268 275
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 277
271 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 304 get_options (r_argc, r_argv);
298 305
299 if (!(display = displays.get (rs[Rs_display_name]))) 306 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 308
309 // using a local pointer decreases code size a lot
302 xa = display->xa; 310 xa = display->xa;
311
312 set (display);
313 extract_resources ();
303 314
304#if XFT 315#if XFT
305 if (rs[Rs_depth]) 316 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 317 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 318#endif
309 set (display);
310
311 extract_resources ();
312 319
313 free (r_argv); 320 free (r_argv);
321
322 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef)
324 rs [i] = 0;
314 325
315#if ENABLE_PERL 326#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 327 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 328 rs[Rs_perl_ext_1] = "default";
318 329
… …
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 429#endif
419 430
420#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
423 { 434 {
424 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437
426 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 439 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 440 }
429#endif 441#endif
430 442
… …
432 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
434 446
435#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 451#endif
440 452
441 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 454 color_aliases (Color_fg);
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 494 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 495 rs[Rs_display_name] = (const char *)val;
484 496
485 if (val == NULL) 497 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 498#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 499 val = XDisplayString (dpy);
488 500
489 if (rs[Rs_display_name] == NULL) 501 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 502 rs[Rs_display_name] = val; /* use broken `:0' value */
491 503
492 i = strlen (val); 504 i = strlen (val);
… …
616 * Initialize the command connection. 628 * Initialize the command connection.
617 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
618 */ 630 */
619 631
620#ifdef META8_OPTION 632#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 634#endif
623 635
624 get_ourmods (); 636 get_ourmods ();
625 637
626 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
632 644
633#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
… …
655 pix_colors = pix_colors_focused; 667 pix_colors = pix_colors_focused;
656#endif 668#endif
657 669
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 671 {
672 const char *name = rs[Rs_color + i];
673
674 if (!name)
675 continue;
676
660 rxvt_color xcol; 677 rxvt_color xcol;
661 678
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 679 if (!set_color (xcol, name))
666 { 680 {
667#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 683 name = def_colorName [1 - i];
670 else 684 else
671#endif 685#endif
672 rs[Rs_color + i] = def_colorName[i]; 686 name = def_colorName [i];
673 687
674 if (!rs[Rs_color + i]) 688 if (!name)
675 continue; 689 continue;
676 690
677 if (!set_color (xcol, rs[Rs_color + i])) 691 if (!set_color (xcol, name))
678 { 692 {
679 switch (i) 693 switch (i)
680 { 694 {
681 case Color_fg: 695 case Color_fg:
682 case Color_bg: 696 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 697 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
698 name = "";
685 break; 699 break;
686#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 701 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 702#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 703 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 704 name = rs[Rs_color + Color_fg];
705 xcol.set (this, name);
693 break; 706 break;
694 default: 707 default:
695 xcol = pix_colors[Color_bg]; /* None */ 708 name = rs[Rs_color + Color_bg];
709 xcol.set (this, name);
696 break; 710 break;
697 } 711 }
698 } 712 }
699 } 713 }
700 714
701 pix_colors[i] = xcol; 715 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 716 rs[Rs_color + i] = name;
703 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
712 } 717 }
713#endif
714 718
715 if (depth <= 2) 719 if (depth <= 2)
716 { 720 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 721 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 722 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 723 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 724 }
721 725
722 /* 726 /*
723 * get scrollBar shadow colors 727 * get scrollBar shadow colors
724 * 728 *
725 * The calculations of topShadow/bottomShadow values are adapted 729 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 730 * from the fvwm window manager.
727 */ 731 */
728#ifdef KEEP_SCROLLCOLOR 732#ifdef KEEP_SCROLLCOLOR
729
730 if (depth <= 2) 733 if (depth <= 2)
731 { 734 {
732 /* Monochrome */ 735 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 alias_color (Color_bottomShadow, Color_bg);
736 } 739 }
737 else 740 else
738 { 741 {
739 rxvt_color xcol[2]; 742 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 743
744 xcol[1] = pix_colors[Color_scroll]; 744 rgba cscroll;
745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 745 pix_colors [Color_scroll].get (cscroll);
746
747 rxvt_rgba c0, c1;
748
749 xcol[0].get (this, c0);
750 xcol[1].get (this, c1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
753 746
754 /* topShadowColor */ 747 /* topShadowColor */
755 if (!xcol[1].set (this, 748 if (!pix_colors[Color_topShadow].set (this,
756 rxvt_rgba ( 749 rgba (
757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 750 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 751 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary 753 cscroll.a)
761 )); 754 ))
762 xcol[1] = pix_colors[Color_White]; 755 alias_color (Color_topShadow, Color_White);
763
764 pix_colors[Color_topShadow] = xcol[1];
765 } 756 }
766#endif /* KEEP_SCROLLCOLOR */ 757#endif /* KEEP_SCROLLCOLOR */
758
759#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i);
762#endif
767} 763}
768 764
769/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
770/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
771void 767void
… …
810 806
811 if (rsmod 807 if (rsmod
812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
814 810
815 map = XGetModifierMapping (xdisp); 811 map = XGetModifierMapping (dpy);
816 kc = map->modifiermap; 812 kc = map->modifiermap;
817 813
818 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
819 { 815 {
820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
822 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
823 { 819 {
824 if (kc[k] == 0) 820 if (kc[k] == 0)
825 break; 821 break;
826 822
827 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 823 switch (XKeycodeToKeysym (dpy, kc[k], 0))
828 { 824 {
829 case XK_Num_Lock: 825 case XK_Num_Lock:
830 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
831 continue; 827 continue;
832 828
… …
888#endif 884#endif
889 XGCValues gcvalue; 885 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
891 Window top, parent; 887 Window top, parent;
892 888
893 dLocal (Display *, xdisp); 889 dLocal (Display *, dpy);
894 890
895 /* grab colors before netscape does */ 891 /* grab colors before netscape does */
896 Get_Colours (); 892 Get_Colours ();
897 893
898 if (!set_fonts ()) 894 if (!set_fonts ())
899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
900 896
901 parent = display->root; 897 parent = display->root;
902 898
903 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
904 900
905#if ENABLE_FRILLS 901#if ENABLE_FRILLS
906 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
907 { 903 {
908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 905 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
911 attributes.override_redirect = true; 907 attributes.override_redirect = true;
912 mwmhints.flags = 0; 908 mwmhints.flags = 0;
913 } 909 }
… …
926 { 922 {
927 XWindowAttributes wattr; 923 XWindowAttributes wattr;
928 924
929 parent = strtol (rs[Rs_embed], 0, 0); 925 parent = strtol (rs[Rs_embed], 0, 0);
930 926
931 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 927 if (!XGetWindowAttributes (dpy, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933 929
934 window_calc (wattr.width, wattr.height); 930 window_calc (wattr.width, wattr.height);
935 } 931 }
936#endif 932#endif
… …
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 936 /* sub-window placement & size in rxvt_resize_subwindows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 937 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 938 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 939 attributes.colormap = cmap;
944 940
945 top = XCreateWindow (xdisp, parent, 941 top = XCreateWindow (dpy, parent,
946 szHint.x, szHint.y, 942 szHint.x, szHint.y,
947 szHint.width, szHint.height, 943 szHint.width, szHint.height,
948 ext_bwidth, 944 ext_bwidth,
949 depth, InputOutput, visual, 945 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
961 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
962 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
963 959
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
965 wmHint.input = True; 961 wmHint.input = True;
966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 963 wmHint.window_group = top;
968 964
969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
971 967
972#if ENABLE_FRILLS 968#if ENABLE_FRILLS
973 if (mwmhints.flags) 969 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif 972#endif
977 973
978 Atom protocols[] = { 974 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH 976#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
982#endif 978#endif
983 }; 979 };
984 980
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986 982
987#if ENABLE_FRILLS 983#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 984 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 986#endif
991 987
992#if ENABLE_EWMH 988#if ENABLE_EWMH
993 long pid = getpid (); 989 long pid = getpid ();
994 990
995 XChangeProperty (xdisp, top, 991 XChangeProperty (dpy, top,
996 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
998 994
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif 996#endif
1001 997
1002 XSelectInput (xdisp, top, 998 XSelectInput (dpy, top,
1003 KeyPressMask 999 KeyPressMask
1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1005 | KeyReleaseMask 1001 | KeyReleaseMask
1006#endif 1002#endif
1007 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
1008 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
1009 1005
1010 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
1011 1007
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1008 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014 1010
1015#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif 1014#endif
1019 1015
1020 /* the vt window */ 1016 /* the vt window */
1021 vt = XCreateSimpleWindow (xdisp, top, 1017 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1018 window_vt_x, window_vt_y,
1023 width, height, 1019 width, height,
1024 0, 1020 0,
1025 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1026 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1027 1023
1028 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030 1026
1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1032 1028
1033 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1034 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1035 else 1031 else
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1033
1038 vt_select_input (); 1034 vt_select_input ();
1039 1035
1040 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1041 1037
1042#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1044 && !OPTION (Opt_transparent)) 1041 && !option (Opt_transparent)
1042#endif
1043 )
1045 { 1044 {
1046 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1047 1046
1048 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1049 { 1048 {
… …
1057#endif 1056#endif
1058 1057
1059 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1063 1062
1064 gc = XCreateGC (xdisp, vt, 1063 gc = XCreateGC (dpy, vt,
1065 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1065 &gcvalue);
1067 1066
1068 drawable = new rxvt_drawable (this, vt); 1067 drawable = new rxvt_drawable (this, vt);
1069 1068
1070#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077#endif 1076#endif
1078 1077
1079#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1079 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
… …
1090 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1091 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1092void 1091void
1093rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1094{ 1093{
1095#ifdef HAVE_TERMIOS_H
1096 /* 1094 /*
1097 * standard System V termios interface 1095 * standard System V termios interface
1098 */ 1096 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100 { 1098 {
… …
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1170# endif 1168# endif
1171 | ECHOE | ECHOK); 1169 | ECHOE | ECHOK);
1172# else /* HAVE_TERMIOS_H */
1173
1174 /*
1175 * sgtty interface
1176 */
1177
1178 /* get parameters -- gtty */
1179 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1180 {
1181 tio->sg.sg_erase = CERASE; /* ^H */
1182 tio->sg.sg_kill = CKILL; /* ^U */
1183 }
1184
1185 if (erase != -1)
1186 tio->sg.sg_erase = (char)erase;
1187
1188 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1189
1190 /* get special characters */
1191 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1192 {
1193 tio->tc.t_intrc = CINTR; /* ^C */
1194 tio->tc.t_quitc = CQUIT; /* ^\ */
1195 tio->tc.t_startc = CSTART; /* ^Q */
1196 tio->tc.t_stopc = CSTOP; /* ^S */
1197 tio->tc.t_eofc = CEOF; /* ^D */
1198 tio->tc.t_brkc = -1;
1199 }
1200
1201 /* get local special chars */
1202 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1203 {
1204 tio->lc.t_suspc = CSUSP; /* ^Z */
1205 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1206 tio->lc.t_rprntc = CRPRNT; /* ^R */
1207 tio->lc.t_flushc = CFLUSH; /* ^O */
1208 tio->lc.t_werasc = CWERASE; /* ^W */
1209 tio->lc.t_lnextc = CLNEXT; /* ^V */
1210 }
1211 /* get line discipline */
1212 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1213# ifdef NTTYDISC
1214 tio->line = NTTYDISC;
1215# endif /* NTTYDISC */
1216
1217 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1218#endif /* HAVE_TERMIOS_H */
1219 1170
1220 /* 1171 /*
1221 * Debugging 1172 * Debugging
1222 */ 1173 */
1223#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1324 else 1275 else
1325#endif 1276#endif
1326 if (!pty->get ()) 1277 if (!pty->get ())
1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1328 1279
1329 pty->set_utf8_mode (enc_utf8);
1330
1331 /* set initial window size */
1332 tt_winch ();
1333
1334 int er; 1280 int er;
1335 1281
1336#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1337 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1338 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1341 else 1287 else
1342#endif 1288#endif
1343 er = -1; 1289 er = -1;
1344 1290
1345 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 ();
1346 1297
1347#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1348 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1349 return; 1300 return;
1350#endif 1301#endif
… …
1381 } 1332 }
1382 1333
1383 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1384 1335
1385 default: 1336 default:
1386 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1388 1339
1389 pty->close_tty (); 1340 pty->close_tty ();
1390 1341
1391 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1392 1343
… …
1405int 1356int
1406rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1407{ 1358{
1408 char *login; 1359 char *login;
1409 1360
1410 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1411
1412 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1413 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1414#ifdef TIOCCONS 1363#ifdef TIOCCONS
1415 unsigned int on = 1; 1364 unsigned int on = 1;
1416 1365
1417 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1468 1417
1469 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1470 1419
1471 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1472 { 1421 {
1473 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1474 1423
1475 login[0] = '-'; 1424 login[0] = '-';
1476 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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