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.172 by root, Mon Feb 20 22:42:00 2006 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#if XFT
306 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0));
308 else
309#endif
310 set (display);
311
307 extract_resources (); 312 extract_resources ();
308 313
309 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
310 319
311#if ENABLE_PERL 320#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
314 323
… …
417 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
418 if (OPTION (Opt_reverseVideo)) 427 if (OPTION (Opt_reverseVideo))
419 { 428 {
420 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
421 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
422 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
423 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
424 } 434 }
425#endif 435#endif
426 436
… …
478 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
480 490
481 if (val == NULL) 491 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 493 val = XDisplayString (dpy);
484 494
485 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
487 497
488 i = strlen (val); 498 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
490 500
491 sprintf (env_display, "DISPLAY=%s", val); 501 sprintf (env_display, "DISPLAY=%s", val);
492 502
493 /* avoiding the math library: 503 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 504
503 /* add entries to the environment: 505 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 506 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 507 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 508 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 510 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 511 * @ COLORFGBG: fg;bg color codes
510 */ 512 */
511 putenv (env_display); 513 putenv (env_display);
512 putenv (env_windowid); 514 putenv (env_windowid);
515
513 if (env_colorfgbg) 516 if (env_colorfgbg)
514 putenv (env_colorfgbg); 517 putenv (env_colorfgbg);
515 518
516#ifdef RXVT_TERMINFO 519#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 520 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 521#endif
519 522
520 if (display->depth <= 2) 523 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 524 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 525 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 526 putenv ("COLORTERM=" COLORTERMENVFULL);
524 527
525 if (rs[Rs_term_name] != NULL) 528 if (rs[Rs_term_name] != NULL)
… …
656 659
657#ifdef OFF_FOCUS_FADING 660#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
659#endif 662#endif
660 663
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
663 rxvt_color xcol; 671 rxvt_color xcol;
664 672
665 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
666 continue;
667
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
669 { 674 {
670#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
673 else 678 else
674#endif 679#endif
675 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
676 681
677 if (!rs[Rs_color + i]) 682 if (!name)
678 continue; 683 continue;
679 684
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
681 { 686 {
682 switch (i) 687 switch (i)
683 { 688 {
684 case Color_fg: 689 case Color_fg:
685 case Color_bg: 690 case Color_bg:
686 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */ 692 name = "";
689 break; 693 break;
690#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 695 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 696#endif
693 break;
694#endif /* ! NO_CURSORCOLOR */
695 case Color_pointer_fg: 697 case Color_pointer_fg:
696 xcol = pix_colors[Color_fg]; 698 name = rs[Rs_color + Color_fg];
699 xcol.set (this, name);
697 break; 700 break;
698 default: 701 default:
699 xcol = pix_colors[Color_bg]; /* None */ 702 name = rs[Rs_color + Color_bg];
703 xcol.set (this, name);
700 break; 704 break;
701 } 705 }
702 } 706 }
703 } 707 }
704 708
705 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i); 710 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 { 711 }
712
713 if (depth <= 2)
714 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 715 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]; 716 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]; 717 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 718 }
721 719
722 /* 720 /*
723 * get scrollBar shadow colors 721 * get scrollBar shadow colors
724 * 722 *
725 * The calculations of topShadow/bottomShadow values are adapted 723 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 724 * from the fvwm window manager.
727 */ 725 */
728#ifdef KEEP_SCROLLCOLOR 726#ifdef KEEP_SCROLLCOLOR
729
730 if (display->depth <= 2) 727 if (depth <= 2)
731 { 728 {
732 /* Monochrome */ 729 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 alias_color (Color_bottomShadow, Color_bg);
736 } 733 }
737 else 734 else
738 { 735 {
739 rxvt_color xcol[2]; 736 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 737
744 xcol[1] = pix_colors[Color_scroll]; 738 rgba cscroll;
745 xcol[0].set (display, 65535, 65535, 65535); 739 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 740
754 /* topShadowColor */ 741 /* topShadowColor */
755 if (!xcol[1].set (display, 742 if (!pix_colors[Color_topShadow].set (this,
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 743 rgba (
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 745 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 xcol[1] = pix_colors[Color_White]; 746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 747 cscroll.a)
761 pix_colors[Color_topShadow] = xcol[1]; 748 ))
749 alias_color (Color_topShadow, Color_White);
762 } 750 }
763#endif /* KEEP_SCROLLCOLOR */ 751#endif /* KEEP_SCROLLCOLOR */
752
753#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 {
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif
764} 762}
765 763
766/*----------------------------------------------------------------------*/ 764/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 765/* color aliases, fg/bg bright-bold */
768void 766void
… …
807 805
808 if (rsmod 806 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 808 requestedmeta = rsmod[3] - '0';
811 809
812 map = XGetModifierMapping (display->display); 810 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 811 kc = map->modifiermap;
814 812
815 for (i = 1; i < 6; i++) 813 for (i = 1; i < 6; i++)
816 { 814 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 817 for (j = map->max_keypermod; j--; k++)
820 { 818 {
821 if (kc[k] == 0) 819 if (kc[k] == 0)
822 break; 820 break;
823 821
824 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 822 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 823 {
826 case XK_Num_Lock: 824 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 825 ModNumLockMask = modmasks[i - 1];
828 continue; 826 continue;
829 827
… …
884 MWMHints mwmhints; 882 MWMHints mwmhints;
885#endif 883#endif
886 XGCValues gcvalue; 884 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 885 XSetWindowAttributes attributes;
888 Window top, parent; 886 Window top, parent;
889 dDisp;
890 887
891 xa = display->xa; 888 dLocal (Display *, dpy);
892 889
893 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
894 Get_Colours (); 891 Get_Colours ();
895 892
896 if (!set_fonts ()) 893 if (!set_fonts ())
… …
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
902 899
903#if ENABLE_FRILLS 900#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
905 { 902 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
907 { 904 {
908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
909 attributes.override_redirect = TRUE; 906 attributes.override_redirect = true;
910 mwmhints.flags = 0; 907 mwmhints.flags = 0;
911 } 908 }
912 else 909 else
913 { 910 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 911 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
924 { 921 {
925 XWindowAttributes wattr; 922 XWindowAttributes wattr;
926 923
927 parent = strtol (rs[Rs_embed], 0, 0); 924 parent = strtol (rs[Rs_embed], 0, 0);
928 925
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 926 if (!XGetWindowAttributes (dpy, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 928
932 window_calc (wattr.width, wattr.height); 929 window_calc (wattr.width, wattr.height);
933 } 930 }
934#endif 931#endif
935 932
936 window_calc (0, 0); 933 window_calc (0, 0);
937 934
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 936 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 937 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 938 attributes.colormap = cmap;
942 939
943 top = XCreateWindow (disp, parent, 940 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y, 941 szHint.x, szHint.y,
945 szHint.width, szHint.height, 942 szHint.width, szHint.height,
946 ext_bwidth, 943 ext_bwidth,
947 display->depth, InputOutput, 944 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 946 &attributes);
951 947
952 this->parent[0] = top; 948 this->parent[0] = top;
953 949
… …
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 959 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 960 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 962 wmHint.window_group = top;
967 963
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 965 &szHint, &wmHint, &classHint);
970 966
971#if ENABLE_FRILLS 967#if ENABLE_FRILLS
972 if (mwmhints.flags) 968 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 971#endif
976 972
977 Atom protocols[] = { 973 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 974 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 975#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 976 xa[XA_NET_WM_PING],
981#endif 977#endif
982 }; 978 };
983 979
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 981
986#if ENABLE_FRILLS 982#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 983 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 985#endif
990 986
991#if ENABLE_EWMH 987#if ENABLE_EWMH
992 long pid = getpid (); 988 long pid = getpid ();
993 989
994 XChangeProperty (disp, top, 990 XChangeProperty (dpy, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 991 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 992 PropModeReplace, (unsigned char *)&pid, 1);
997 993
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 995#endif
1000 996
1001 XSelectInput (disp, top, 997 XSelectInput (dpy, top,
1002 KeyPressMask 998 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1000 | KeyReleaseMask
1005#endif 1001#endif
1006 | FocusChangeMask | VisibilityChangeMask 1002 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 1003 | ExposureMask | StructureNotifyMask);
1008 1004
1009 termwin_ev.start (display, top); 1005 termwin_ev.start (display, top);
1010 1006
1011 /* vt cursor: Black-on-White is standard, but this is more popular */ 1007 /* vt cursor: Black-on-White is standard, but this is more popular */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013 1009
1014#ifdef HAVE_SCROLLBARS 1010#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */ 1011 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1017#endif 1013#endif
1018 1014
1019 /* the vt window */ 1015 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1016 vt = XCreateSimpleWindow (dpy, top,
1021 window_vt_x, window_vt_y, 1017 window_vt_x, window_vt_y,
1022 width, height, 1018 width, height,
1023 0, 1019 0,
1024 pix_colors_focused[Color_fg], 1020 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1021 pix_colors_focused[Color_bg]);
1026 1022
1027 attributes.bit_gravity = NorthWestGravity; 1023 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1029 1025
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1027
1032 if (OPTION (Opt_pointerBlank)) 1028 if (OPTION (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1029 vt_emask |= PointerMotionMask;
… …
1038 1034
1039 vt_ev.start (display, vt); 1035 vt_ev.start (display, vt);
1040 1036
1041#ifdef XPM_BACKGROUND 1037#ifdef XPM_BACKGROUND
1042 if (rs[Rs_backgroundPixmap] != NULL 1038 if (rs[Rs_backgroundPixmap] != NULL
1043 && ! OPTION (Opt_transparent)) 1039 && !OPTION (Opt_transparent))
1044 { 1040 {
1045 const char *p = rs[Rs_backgroundPixmap]; 1041 const char *p = rs[Rs_backgroundPixmap];
1046 1042
1047 if ((p = strchr (p, ';')) != NULL) 1043 if ((p = strchr (p, ';')) != NULL)
1048 { 1044 {
… …
1056#endif 1052#endif
1057 1053
1058 /* graphics context for the vt window */ 1054 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1055 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1056 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1057 gcvalue.graphics_exposures = 0;
1062 1058
1063 gc = XCreateGC (disp, vt, 1059 gc = XCreateGC (dpy, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1060 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1061 &gcvalue);
1066 1062
1067 drawable = new rxvt_drawable (display, vt); 1063 drawable = new rxvt_drawable (this, vt);
1068 1064
1069#ifdef RXVT_SCROLLBAR 1065#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow]; 1066 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif 1072#endif
1077 1073
1078#ifdef OFF_FOCUS_FADING 1074#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1075 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])

Diff Legend

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