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.163 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.206 by ayin, Mon Aug 13 07:17:48 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 }
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_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
712 } 724 }
713#endif
714 725
715 if (depth <= 2) 726 if (depth <= 2)
716 { 727 {
717 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);
718 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);
719 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);
720 } 731 }
721 732
722 /* 733 /*
723 * get scrollBar shadow colors 734 * get scrollBar shadow colors
724 * 735 *
725 * The calculations of topShadow/bottomShadow values are adapted 736 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 737 * from the fvwm window manager.
727 */ 738 */
728#ifdef KEEP_SCROLLCOLOR 739#ifdef KEEP_SCROLLCOLOR
729
730 if (depth <= 2) 740 if (depth <= 2)
731 { 741 {
732 /* Monochrome */ 742 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 743 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 744 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 745 alias_color (Color_bottomShadow, Color_bg);
736 } 746 }
737 else 747 else
738 { 748 {
739 rxvt_color xcol[2]; 749 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 750
744 xcol[1] = pix_colors[Color_scroll]; 751 rgba cscroll;
745 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);
746
747 rxvt_rgba c0, c1;
748
749 xcol[0].get (this, c0);
750 xcol[1].get (this, c1);
751
752 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
753 753
754 /* topShadowColor */ 754 /* topShadowColor */
755 if (!xcol[1].set (this, 755 if (!pix_colors[Color_topShadow].set (this,
756 rxvt_rgba ( 756 rgba (
757 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),
758 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),
759 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),
760 c1.a) // pa1 vs. pa0: arbitrary 760 cscroll.a)
761 )); 761 ))
762 xcol[1] = pix_colors[Color_White]; 762 alias_color (Color_topShadow, Color_White);
763
764 pix_colors[Color_topShadow] = xcol[1];
765 } 763 }
766#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
767} 770}
768 771
769/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
770/* color aliases, fg/bg bright-bold */ 773/* color aliases, fg/bg bright-bold */
771void 774void
… …
810 813
811 if (rsmod 814 if (rsmod
812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
814 817
815 map = XGetModifierMapping (xdisp); 818 map = XGetModifierMapping (dpy);
816 kc = map->modifiermap; 819 kc = map->modifiermap;
817 820
818 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
819 { 822 {
820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
822 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
823 { 826 {
824 if (kc[k] == 0) 827 if (kc[k] == 0)
825 break; 828 break;
826 829
827 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 830 switch (XKeycodeToKeysym (dpy, kc[k], 0))
828 { 831 {
829 case XK_Num_Lock: 832 case XK_Num_Lock:
830 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
831 continue; 834 continue;
832 835
… …
882rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
883{ 886{
884 XClassHint classHint; 887 XClassHint classHint;
885 XWMHints wmHint; 888 XWMHints wmHint;
886#if ENABLE_FRILLS 889#if ENABLE_FRILLS
887 MWMHints mwmhints; 890 MWMHints mwmhints = { };
888#endif 891#endif
889 XGCValues gcvalue; 892 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
891 Window top, parent; 894 Window top, parent;
892 895
893 dLocal (Display *, xdisp); 896 dLocal (Display *, dpy);
894 897
895 /* grab colors before netscape does */ 898 /* grab colors before netscape does */
896 Get_Colours (); 899 Get_Colours ();
897 900
898 if (!set_fonts ()) 901 if (!set_fonts ())
899 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");
900 903
901 parent = display->root; 904 parent = display->root;
902 905
903 attributes.override_redirect = !!OPTION (Opt_override_redirect); 906 attributes.override_redirect = !!option (Opt_override_redirect);
904 907
905#if ENABLE_FRILLS 908#if ENABLE_FRILLS
906 if (OPTION (Opt_borderLess)) 909 if (option (Opt_borderLess))
907 { 910 {
908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 911 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 912 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 913 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 914 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 915 }
914 else 916 else
915 { 917 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 918 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 919 }
919 } 920 }
920 else
921 mwmhints.flags = 0;
922#endif 921#endif
923 922
924#if ENABLE_XEMBED 923#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 924 if (rs[Rs_embed])
926 { 925 {
927 XWindowAttributes wattr; 926 XWindowAttributes wattr;
928 927
929 parent = strtol (rs[Rs_embed], 0, 0); 928 parent = strtol (rs[Rs_embed], 0, 0);
930 929
931 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 930 if (!XGetWindowAttributes (dpy, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 931 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933 932
934 window_calc (wattr.width, wattr.height); 933 window_calc (wattr.width, wattr.height);
935 } 934 }
936#endif 935#endif
… …
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 939 /* sub-window placement & size in rxvt_resize_subwindows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 940 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 941 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 942 attributes.colormap = cmap;
944 943
945 top = XCreateWindow (xdisp, parent, 944 top = XCreateWindow (dpy, parent,
946 szHint.x, szHint.y, 945 szHint.x, szHint.y,
947 szHint.width, szHint.height, 946 szHint.width, szHint.height,
948 ext_bwidth, 947 ext_bwidth,
949 depth, InputOutput, visual, 948 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
961 classHint.res_name = (char *)rs[Rs_name]; 960 classHint.res_name = (char *)rs[Rs_name];
962 classHint.res_class = (char *)RESCLASS; 961 classHint.res_class = (char *)RESCLASS;
963 962
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 963 wmHint.flags = InputHint | StateHint | WindowGroupHint;
965 wmHint.input = True; 964 wmHint.input = True;
966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 965 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 966 wmHint.window_group = top;
968 967
969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 968 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 969 &szHint, &wmHint, &classHint);
971 970
972#if ENABLE_FRILLS 971#if ENABLE_FRILLS
973 if (mwmhints.flags) 972 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 973 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif 975#endif
977 976
978 Atom protocols[] = { 977 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW], 978 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH 979#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 980 xa[XA_NET_WM_PING],
982#endif 981#endif
983 }; 982 };
984 983
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 984 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986 985
987#if ENABLE_FRILLS 986#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 987 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 988 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 989#endif
991 990
992#if ENABLE_EWMH 991#if ENABLE_EWMH
993 long pid = getpid (); 992 long pid = getpid ();
994 993
995 XChangeProperty (xdisp, top, 994 XChangeProperty (dpy, top,
996 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 995 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997 PropModeReplace, (unsigned char *)&pid, 1); 996 PropModeReplace, (unsigned char *)&pid, 1);
998 997
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif 999#endif
1001 1000
1002 XSelectInput (xdisp, top, 1001 XSelectInput (dpy, top,
1003 KeyPressMask 1002 KeyPressMask
1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1005 | KeyReleaseMask 1004 | KeyReleaseMask
1006#endif 1005#endif
1007 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1008 | ExposureMask | StructureNotifyMask); 1007 | ExposureMask | StructureNotifyMask);
1009 1008
1010 termwin_ev.start (display, top); 1009 termwin_ev.start (display, top);
1011 1010
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1011 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1012 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014 1013
1015#ifdef HAVE_SCROLLBARS 1014#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */ 1015 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1016 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif 1017#endif
1019 1018
1020 /* the vt window */ 1019 /* the vt window */
1021 vt = XCreateSimpleWindow (xdisp, top, 1020 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1021 window_vt_x, window_vt_y,
1023 width, height, 1022 width, height,
1024 0, 1023 0,
1025 pix_colors_focused[Color_fg], 1024 pix_colors_focused[Color_fg],
1026 pix_colors_focused[Color_bg]); 1025 pix_colors_focused[Color_bg]);
1027 1026
1028 attributes.bit_gravity = NorthWestGravity; 1027 attributes.bit_gravity = NorthWestGravity;
1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1028 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030 1029
1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1032 1031
1033 if (OPTION (Opt_pointerBlank)) 1032 if (option (Opt_pointerBlank))
1034 vt_emask |= PointerMotionMask; 1033 vt_emask |= PointerMotionMask;
1035 else 1034 else
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1035 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1036
1038 vt_select_input (); 1037 vt_select_input ();
1039 1038
1040 vt_ev.start (display, vt); 1039 vt_ev.start (display, vt);
1041 1040
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL
1044 && !OPTION (Opt_transparent))
1045 {
1046 const char *p = rs[Rs_backgroundPixmap];
1047
1048 if ((p = strchr (p, ';')) != NULL)
1049 {
1050 p++;
1051 scale_pixmap (p);
1052 }
1053
1054 set_bgPixmap (rs[Rs_backgroundPixmap]);
1055 scr_touch (true);
1056 }
1057#endif
1058
1059 /* graphics context for the vt window */ 1041 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1042 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1043 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 1; 1044 gcvalue.graphics_exposures = 0;
1063 1045
1064 gc = XCreateGC (xdisp, vt, 1046 gc = XCreateGC (dpy, vt,
1065 GCForeground | GCBackground | GCGraphicsExposures, 1047 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1048 &gcvalue);
1067 1049
1068 drawable = new rxvt_drawable (this, vt); 1050 drawable = new rxvt_drawable (this, vt);
1069 1051
1070#ifdef RXVT_SCROLLBAR 1052#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow]; 1053 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1054 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1055 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1056 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1057 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1058 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077#endif 1059#endif
1078 1060
1079#ifdef OFF_FOCUS_FADING 1061#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1062 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1063 if (rs[Rs_fade])
… …
1090 * GET TTY CURRENT STATE * 1072 * GET TTY CURRENT STATE *
1091 * ------------------------------------------------------------------------- */ 1073 * ------------------------------------------------------------------------- */
1092void 1074void
1093rxvt_get_ttymode (ttymode_t *tio, int erase) 1075rxvt_get_ttymode (ttymode_t *tio, int erase)
1094{ 1076{
1095#ifdef HAVE_TERMIOS_H
1096 /* 1077 /*
1097 * standard System V termios interface 1078 * standard System V termios interface
1098 */ 1079 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1080 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100 { 1081 {
… …
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1148 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE) 1149# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE 1150 | ECHOCTL | ECHOKE
1170# endif 1151# endif
1171 | ECHOE | ECHOK); 1152 | 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 1153
1220 /* 1154 /*
1221 * Debugging 1155 * Debugging
1222 */ 1156 */
1223#ifdef DEBUG_TTYMODE 1157#ifdef DEBUG_TTYMODE
… …
1324 else 1258 else
1325#endif 1259#endif
1326 if (!pty->get ()) 1260 if (!pty->get ())
1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1261 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1328 1262
1329 pty->set_utf8_mode (enc_utf8);
1330
1331 /* set initial window size */
1332 tt_winch ();
1333
1334 int er; 1263 int er;
1335 1264
1336#ifndef NO_BACKSPACE_KEY 1265#ifndef NO_BACKSPACE_KEY
1337 if (key_backspace[0] && !key_backspace[1]) 1266 if (key_backspace[0] && !key_backspace[1])
1338 er = key_backspace[0]; 1267 er = key_backspace[0];
… …
1341 else 1270 else
1342#endif 1271#endif
1343 er = -1; 1272 er = -1;
1344 1273
1345 rxvt_get_ttymode (&tio, er); 1274 rxvt_get_ttymode (&tio, er);
1275 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1276 pty->set_utf8_mode (enc_utf8);
1277
1278 /* set initial window size */
1279 tt_winch ();
1346 1280
1347#if ENABLE_FRILLS 1281#if ENABLE_FRILLS
1348 if (rs[Rs_pty_fd]) 1282 if (rs[Rs_pty_fd])
1349 return; 1283 return;
1350#endif 1284#endif
… …
1381 } 1315 }
1382 1316
1383 _exit (EXIT_FAILURE); 1317 _exit (EXIT_FAILURE);
1384 1318
1385 default: 1319 default:
1386 if (!OPTION (Opt_utmpInhibit)) 1320 if (!option (Opt_utmpInhibit))
1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1321 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1388 1322
1389 pty->close_tty (); 1323 pty->close_tty ();
1390 1324
1391 child_ev.start (cmd_pid); 1325 child_ev.start (cmd_pid);
1392 1326
… …
1405int 1339int
1406rxvt_term::run_child (const char *const *argv) 1340rxvt_term::run_child (const char *const *argv)
1407{ 1341{
1408 char *login; 1342 char *login;
1409 1343
1410 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1411
1412 if (OPTION (Opt_console)) 1344 if (option (Opt_console))
1413 { /* be virtual console, fail silently */ 1345 { /* be virtual console, fail silently */
1414#ifdef TIOCCONS 1346#ifdef TIOCCONS
1415 unsigned int on = 1; 1347 unsigned int on = 1;
1416 1348
1417 ioctl (STDIN_FILENO, TIOCCONS, &on); 1349 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1398 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1399 shell = "/bin/sh";
1468 1400
1469 argv0 = (const char *)rxvt_r_basename (shell); 1401 argv0 = (const char *)rxvt_r_basename (shell);
1470 1402
1471 if (OPTION (Opt_loginShell)) 1403 if (option (Opt_loginShell))
1472 { 1404 {
1473 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1405 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1474 1406
1475 login[0] = '-'; 1407 login[0] = '-';
1476 strcpy (&login[1], argv0); 1408 strcpy (&login[1], argv0);

Diff Legend

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