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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.175 by root, Sat Jan 20 00:37:13 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>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
181{ 181{
182 pix_colors = //
182 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
183#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
185#endif 186#endif
186 pix_colors = pix_colors_focused;
187
188 if (pix_colors == NULL)
189 return false;
190 187
191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
192 pixmap = None; 189 pixmap = None;
193#endif 190#endif
194 191
195 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
196 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
197 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
198 want_refresh = 1; 195 want_refresh = 1;
199 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
200 focus = 0;
201 ncol = 80; 197 ncol = 80;
202 nrow = 24; 198 nrow = 24;
203 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
204 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
205 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
206 saveLines = SAVELINES; 202 saveLines = SAVELINES;
207 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
208 204
209 refresh_limit = 1; 205 refresh_limit = 1;
210 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
211 prev_nrow = prev_ncol = 0;
212 207
213 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
214#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
215 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
216 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
263 int i, r_argc; 258 int i, r_argc;
264 char *val; 259 char *val;
265 const char **cmd_argv, **r_argv; 260 const char **cmd_argv, **r_argv;
266 261
267 /* 262 /*
268 * Look for -exec option. Find => split and make cmd_argv[] of command args 263 * Look for -e option. Find => split and make cmd_argv[] of command args
269 */ 264 */
270 for (r_argc = 0; r_argc < argc; r_argc++) 265 for (r_argc = 0; r_argc < argc; r_argc++)
271 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 266 if (!strcmp (argv[r_argc], "-e"))
272 break; 267 break;
273 268
274 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
275 270
276 for (i = 0; i < r_argc; i++) 271 for (i = 0; i < r_argc; i++)
… …
302 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
303 298
304 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
306 301
302 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305 set (display);
307 extract_resources (); 306 extract_resources ();
308 307
308#if XFT
309 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif
312
309 free (r_argv); 313 free (r_argv);
314
315 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef)
317 rs [i] = 0;
310 318
311#if ENABLE_PERL 319#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1]) 320 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default"; 321 rs[Rs_perl_ext_1] = "default";
314 322
… …
417 /* this is how xterm implements reverseVideo */ 425 /* this is how xterm implements reverseVideo */
418 if (OPTION (Opt_reverseVideo)) 426 if (OPTION (Opt_reverseVideo))
419 { 427 {
420 if (!rs[Rs_color + Color_fg]) 428 if (!rs[Rs_color + Color_fg])
421 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 429 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430
422 if (!rs[Rs_color + Color_bg]) 431 if (!rs[Rs_color + Color_bg])
423 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 432 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
424 } 433 }
425#endif 434#endif
426 435
… …
478 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
480 489
481 if (val == NULL) 490 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 492 val = XDisplayString (dpy);
484 493
485 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
487 496
488 i = strlen (val); 497 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
490 499
491 sprintf (env_display, "DISPLAY=%s", val); 500 sprintf (env_display, "DISPLAY=%s", val);
492 501
493 /* avoiding the math library: 502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
496 ;
497 max_it (i, 1);
498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
499
500 sprintf (env_windowid, "WINDOWID=%u",
501 (unsigned int)parent[0]);
502 503
503 /* add entries to the environment: 504 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 505 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 506 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 507 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 509 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 510 * @ COLORFGBG: fg;bg color codes
510 */ 511 */
511 putenv (env_display); 512 putenv (env_display);
512 putenv (env_windowid); 513 putenv (env_windowid);
514
513 if (env_colorfgbg) 515 if (env_colorfgbg)
514 putenv (env_colorfgbg); 516 putenv (env_colorfgbg);
515 517
516#ifdef RXVT_TERMINFO 518#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 519 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 520#endif
519 521
520 if (display->depth <= 2) 522 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 523 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 524 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 525 putenv ("COLORTERM=" COLORTERMENVFULL);
524 526
525 if (rs[Rs_term_name] != NULL) 527 if (rs[Rs_term_name] != NULL)
… …
656 658
657#ifdef OFF_FOCUS_FADING 659#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 660 pix_colors = pix_colors_focused;
659#endif 661#endif
660 662
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 664 {
665 const char *name = rs[Rs_color + i];
666
667 if (!name)
668 continue;
669
663 rxvt_color xcol; 670 rxvt_color xcol;
664 671
665 if (!rs[Rs_color + i]) 672 if (!set_color (xcol, name))
666 continue;
667
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
669 { 673 {
670#ifndef XTERM_REVERSE_VIDEO 674#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 675 if (i < 2 && OPTION (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 676 name = def_colorName [1 - i];
673 else 677 else
674#endif 678#endif
675 rs[Rs_color + i] = def_colorName[i]; 679 name = def_colorName [i];
676 680
677 if (!rs[Rs_color + i]) 681 if (!name)
678 continue; 682 continue;
679 683
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 684 if (!set_color (xcol, name))
681 { 685 {
682 switch (i) 686 switch (i)
683 { 687 {
684 case Color_fg: 688 case Color_fg:
685 case Color_bg: 689 case Color_bg:
686 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */ 691 name = "";
689 break; 692 break;
690#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 694 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 695#endif
693 break;
694#endif /* ! NO_CURSORCOLOR */
695 case Color_pointer_fg: 696 case Color_pointer_fg:
696 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
697 break; 699 break;
698 default: 700 default:
699 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
700 break; 703 break;
701 } 704 }
702 } 705 }
703 } 706 }
704 707
705 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i); 709 rs[Rs_color + i] = name;
707 }
708
709#ifdef OFF_FOCUS_FADING
710 if (rs[Rs_fade])
711 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
712 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
713#endif
714
715 if (display->depth <= 2)
716 { 710 }
711
712 if (depth <= 2)
713 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 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]; 715 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]; 716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 717 }
721 718
722 /* 719 /*
723 * get scrollBar shadow colors 720 * get scrollBar shadow colors
724 * 721 *
725 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 723 * from the fvwm window manager.
727 */ 724 */
728#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
729
730 if (display->depth <= 2) 726 if (depth <= 2)
731 { 727 {
732 /* Monochrome */ 728 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
736 } 732 }
737 else 733 else
738 { 734 {
739 rxvt_color xcol[2]; 735 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 736
744 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
745 xcol[0].set (display, 65535, 65535, 65535); 738 pix_colors [Color_scroll].get (cscroll);
746
747 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
748
749 xcol[0].get (display, pr0, pg0, pb0);
750 xcol[1].get (display, pr1, pg1, pb1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
753 739
754 /* topShadowColor */ 740 /* topShadowColor */
755 if (!xcol[1].set (display, 741 if (!pix_colors[Color_topShadow].set (this,
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 742 rgba (
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 xcol[1] = pix_colors[Color_White]; 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 746 cscroll.a)
761 pix_colors[Color_topShadow] = xcol[1]; 747 ))
748 alias_color (Color_topShadow, Color_White);
762 } 749 }
763#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i);
755#endif
764} 756}
765 757
766/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
768void 760void
… …
807 799
808 if (rsmod 800 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
811 803
812 map = XGetModifierMapping (display->display); 804 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 805 kc = map->modifiermap;
814 806
815 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
816 { 808 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
820 { 812 {
821 if (kc[k] == 0) 813 if (kc[k] == 0)
822 break; 814 break;
823 815
824 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 817 {
826 case XK_Num_Lock: 818 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
828 continue; 820 continue;
829 821
… …
884 MWMHints mwmhints; 876 MWMHints mwmhints;
885#endif 877#endif
886 XGCValues gcvalue; 878 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
888 Window top, parent; 880 Window top, parent;
889 dDisp;
890 881
891 xa = display->xa; 882 dLocal (Display *, dpy);
892 883
893 /* grab colors before netscape does */ 884 /* grab colors before netscape does */
894 Get_Colours (); 885 Get_Colours ();
895 886
896 if (!set_fonts ()) 887 if (!set_fonts ())
… …
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
902 893
903#if ENABLE_FRILLS 894#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
905 { 896 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
907 { 898 {
908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
909 attributes.override_redirect = TRUE; 900 attributes.override_redirect = true;
910 mwmhints.flags = 0; 901 mwmhints.flags = 0;
911 } 902 }
912 else 903 else
913 { 904 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 905 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
924 { 915 {
925 XWindowAttributes wattr; 916 XWindowAttributes wattr;
926 917
927 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
928 919
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 922
932 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
933 } 924 }
934#endif 925#endif
935 926
936 window_calc (0, 0); 927 window_calc (0, 0);
937 928
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 932 attributes.colormap = cmap;
942 933
943 top = XCreateWindow (disp, parent, 934 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y, 935 szHint.x, szHint.y,
945 szHint.width, szHint.height, 936 szHint.width, szHint.height,
946 ext_bwidth, 937 ext_bwidth,
947 display->depth, InputOutput, 938 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 940 &attributes);
951 941
952 this->parent[0] = top; 942 this->parent[0] = top;
953 943
… …
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 954 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 956 wmHint.window_group = top;
967 957
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
970 960
971#if ENABLE_FRILLS 961#if ENABLE_FRILLS
972 if (mwmhints.flags) 962 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 965#endif
976 966
977 Atom protocols[] = { 967 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 969#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
981#endif 971#endif
982 }; 972 };
983 973
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 975
986#if ENABLE_FRILLS 976#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 979#endif
990 980
991#if ENABLE_EWMH 981#if ENABLE_EWMH
992 long pid = getpid (); 982 long pid = getpid ();
993 983
994 XChangeProperty (disp, top, 984 XChangeProperty (dpy, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
997 987
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 989#endif
1000 990
1001 XSelectInput (disp, top, 991 XSelectInput (dpy, top,
1002 KeyPressMask 992 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 994 | KeyReleaseMask
1005#endif 995#endif
1006 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1008 998
1009 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1010 1000
1011 /* vt cursor: Black-on-White is standard, but this is more popular */ 1001 /* vt cursor: Black-on-White is standard, but this is more popular */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013 1003
1014#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1017#endif 1007#endif
1018 1008
1019 /* the vt window */ 1009 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1021 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1022 width, height, 1012 width, height,
1023 0, 1013 0,
1024 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1026 1016
1027 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1029 1019
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1021
1032 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
… …
1038 1028
1039 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1040 1030
1041#ifdef XPM_BACKGROUND 1031#ifdef XPM_BACKGROUND
1042 if (rs[Rs_backgroundPixmap] != NULL 1032 if (rs[Rs_backgroundPixmap] != NULL
1043 && ! OPTION (Opt_transparent)) 1033 && !OPTION (Opt_transparent))
1044 { 1034 {
1045 const char *p = rs[Rs_backgroundPixmap]; 1035 const char *p = rs[Rs_backgroundPixmap];
1046 1036
1047 if ((p = strchr (p, ';')) != NULL) 1037 if ((p = strchr (p, ';')) != NULL)
1048 { 1038 {
… …
1056#endif 1046#endif
1057 1047
1058 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1062 1052
1063 gc = XCreateGC (disp, vt, 1053 gc = XCreateGC (dpy, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1055 &gcvalue);
1066 1056
1067 drawable = new rxvt_drawable (display, vt); 1057 drawable = new rxvt_drawable (this, vt);
1068 1058
1069#ifdef RXVT_SCROLLBAR 1059#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif 1066#endif
1077 1067
1078#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1069 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])
… …
1323 else 1313 else
1324#endif 1314#endif
1325 if (!pty->get ()) 1315 if (!pty->get ())
1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1327 1317
1328 pty->set_utf8_mode (enc_utf8);
1329
1330 /* set initial window size */
1331 tt_winch ();
1332
1333 int er; 1318 int er;
1334 1319
1335#ifndef NO_BACKSPACE_KEY 1320#ifndef NO_BACKSPACE_KEY
1336 if (key_backspace[0] && !key_backspace[1]) 1321 if (key_backspace[0] && !key_backspace[1])
1337 er = key_backspace[0]; 1322 er = key_backspace[0];
… …
1340 else 1325 else
1341#endif 1326#endif
1342 er = -1; 1327 er = -1;
1343 1328
1344 rxvt_get_ttymode (&tio, er); 1329 rxvt_get_ttymode (&tio, er);
1330 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1332
1333 /* set initial window size */
1334 tt_winch ();
1345 1335
1346#if ENABLE_FRILLS 1336#if ENABLE_FRILLS
1347 if (rs[Rs_pty_fd]) 1337 if (rs[Rs_pty_fd])
1348 return; 1338 return;
1349#endif 1339#endif
… …
1403 */ 1393 */
1404int 1394int
1405rxvt_term::run_child (const char *const *argv) 1395rxvt_term::run_child (const char *const *argv)
1406{ 1396{
1407 char *login; 1397 char *login;
1408
1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1410 1398
1411 if (OPTION (Opt_console)) 1399 if (OPTION (Opt_console))
1412 { /* be virtual console, fail silently */ 1400 { /* be virtual console, fail silently */
1413#ifdef TIOCCONS 1401#ifdef TIOCCONS
1414 unsigned int on = 1; 1402 unsigned int on = 1;

Diff Legend

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