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.152 by root, Sat Jan 21 22:38:05 2006 UTC vs.
Revision 1.167 by root, Tue Jan 31 19:54:39 2006 UTC

… …
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
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif 176#endif
212 }; 177 };
213 178
214bool 179bool
215rxvt_term::init_vars () 180rxvt_term::init_vars ()
216{ 181{
182 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 186#endif
221 pix_colors = pix_colors_focused;
222
223 if (pix_colors == NULL)
224 return false;
225 187
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None; 189 pixmap = None;
228#endif 190#endif
229 191
230 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 195 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 197 ncol = 80;
237 nrow = 24; 198 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 202 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
243 204
244 refresh_limit = 1; 205 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 207
248 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
249#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
337 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
338 298
339 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
340 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]);
341 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
342 extract_resources (); 312 extract_resources ();
343 313
344 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;
345 319
346#if ENABLE_PERL 320#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
349 323
… …
452 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 427 if (OPTION (Opt_reverseVideo))
454 { 428 {
455 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
457 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 434 }
460#endif 435#endif
461 436
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
515 490
516 if (val == NULL) 491 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 493 val = XDisplayString (xdisp);
519 494
520 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
522 497
523 i = strlen (val); 498 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 500
526 sprintf (env_display, "DISPLAY=%s", val); 501 sprintf (env_display, "DISPLAY=%s", val);
527 502
528 /* avoiding the math library: 503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 504
538 /* add entries to the environment: 505 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 506 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 507 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 508 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 510 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 511 * @ COLORFGBG: fg;bg color codes
545 */ 512 */
546 putenv (env_display); 513 putenv (env_display);
547 putenv (env_windowid); 514 putenv (env_windowid);
515
548 if (env_colorfgbg) 516 if (env_colorfgbg)
549 putenv (env_colorfgbg); 517 putenv (env_colorfgbg);
550 518
551#ifdef RXVT_TERMINFO 519#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 520 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 521#endif
554 522
555 if (display->depth <= 2) 523 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 524 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 525 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 526 putenv ("COLORTERM=" COLORTERMENVFULL);
559 527
560 if (rs[Rs_term_name] != NULL) 528 if (rs[Rs_term_name] != NULL)
… …
691 659
692#ifdef OFF_FOCUS_FADING 660#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
694#endif 662#endif
695 663
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
698 rxvt_color xcol; 671 rxvt_color xcol;
699 672
700 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 674 {
705#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
708 else 678 else
709#endif 679#endif
710 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
711 681
712 if (!rs[Rs_color + i]) 682 if (!name)
713 continue; 683 continue;
714 684
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
716 { 686 {
717 switch (i) 687 switch (i)
718 { 688 {
719 case Color_fg: 689 case Color_fg:
720 case Color_bg: 690 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 692 name = "";
724 break; 693 break;
725#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 695 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 696#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 697 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg];
731 xcol = pix_colors[Color_fg]; 699 xcol = pix_colors[Color_fg];
732 break; 700 break;
733 default: 701 default:
702 name = rs[Rs_color + Color_bg];
734 xcol = pix_colors[Color_bg]; /* None */ 703 xcol = pix_colors[Color_bg];
735 break; 704 break;
736 } 705 }
737 } 706 }
738 } 707 }
739 708
740 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 710 rs[Rs_color + i] = name;
742 } 711 }
743 712
744#ifdef OFF_FOCUS_FADING 713#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade]) 714 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
748#endif 721#endif
749 722
750 if (display->depth <= 2) 723 if (depth <= 2)
751 { 724 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
755 } 728 }
… …
760 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 734 * from the fvwm window manager.
762 */ 735 */
763#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
764 737
765 if (display->depth <= 2) 738 if (depth <= 2)
766 { 739 {
767 /* Monochrome */ 740 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 pix_colors[Color_scroll] = pix_colors[Color_fg];
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 pix_colors[Color_topShadow] = pix_colors[Color_bg];
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
775 /* xcol[0] == white 748 /* xcol[0] == white
776 * xcol[1] == top shadow 749 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */ 750 * xcol[2] == bot shadow */
778 751
779 xcol[1] = pix_colors[Color_scroll]; 752 xcol[1] = pix_colors[Color_scroll];
780 xcol[0].set (display, 65535, 65535, 65535); 753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
781 754
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 755 rgba c0, c1;
783 756
784 xcol[0].get (display, pr0, pg0, pb0); 757 xcol[0].get (c0);
785 xcol[1].get (display, pr1, pg1, pb1); 758 xcol[1].get (c1);
786 759
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
788 761
789 /* topShadowColor */ 762 /* topShadowColor */
790 if (!xcol[1].set (display, 763 if (!xcol[1].set (this,
764 rgba (
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary
769 ));
794 xcol[1] = pix_colors[Color_White]; 770 xcol[1] = pix_colors[Color_White];
795 771
796 pix_colors[Color_topShadow] = xcol[1]; 772 pix_colors[Color_topShadow] = xcol[1];
797 } 773 }
798#endif /* KEEP_SCROLLCOLOR */ 774#endif /* KEEP_SCROLLCOLOR */
… …
842 818
843 if (rsmod 819 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 821 requestedmeta = rsmod[3] - '0';
846 822
847 map = XGetModifierMapping (display->display); 823 map = XGetModifierMapping (xdisp);
848 kc = map->modifiermap; 824 kc = map->modifiermap;
849 825
850 for (i = 1; i < 6; i++) 826 for (i = 1; i < 6; i++)
851 { 827 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 830 for (j = map->max_keypermod; j--; k++)
855 { 831 {
856 if (kc[k] == 0) 832 if (kc[k] == 0)
857 break; 833 break;
858 834
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 835 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
860 { 836 {
861 case XK_Num_Lock: 837 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 838 ModNumLockMask = modmasks[i - 1];
863 continue; 839 continue;
864 840
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 890rxvt_term::create_windows (int argc, const char *const *argv)
915{ 891{
916 XClassHint classHint; 892 XClassHint classHint;
917 XWMHints wmHint; 893 XWMHints wmHint;
918#if ENABLE_FRILLS 894#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 895 MWMHints mwmhints;
921#endif 896#endif
922 XGCValues gcvalue; 897 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 898 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 899 Window top, parent;
926 dDisp;
927 900
928#ifdef USING_W11LIB 901 dLocal (Display *, xdisp);
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
937 {
938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940 }
941 902
942 /* grab colors before netscape does */ 903 /* grab colors before netscape does */
943 Get_Colours (); 904 Get_Colours ();
944 905
945 if (!set_fonts ()) 906 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 908
948 parent = DefaultRootWindow (disp); 909 parent = display->root;
949 910
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 911 attributes.override_redirect = !!OPTION (Opt_override_redirect);
951 912
952#if ENABLE_FRILLS 913#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 914 if (OPTION (Opt_borderLess))
954 { 915 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 917 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960 attributes.override_redirect = TRUE; 919 attributes.override_redirect = true;
961 mwmhints.flags = 0; 920 mwmhints.flags = 0;
962 } 921 }
963 else 922 else
964 { 923 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 924 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
975 { 934 {
976 XWindowAttributes wattr; 935 XWindowAttributes wattr;
977 936
978 parent = strtol (rs[Rs_embed], 0, 0); 937 parent = strtol (rs[Rs_embed], 0, 0);
979 938
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 939 if (!XGetWindowAttributes (xdisp, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 941
983 window_calc (wattr.width, wattr.height); 942 window_calc (wattr.width, wattr.height);
984 } 943 }
985#endif 944#endif
986 945
987 window_calc (0, 0); 946 window_calc (0, 0);
988 947
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 948 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 949 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 950 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 951 attributes.colormap = cmap;
952
993 top = XCreateWindow (disp, parent, 953 top = XCreateWindow (xdisp, parent,
994 szHint.x, szHint.y, 954 szHint.x, szHint.y,
995 szHint.width, szHint.height, 955 szHint.width, szHint.height,
996 ext_bwidth, 956 ext_bwidth,
997 display->depth, InputOutput, 957 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 959 &attributes);
1001 960
1002 this->parent[0] = top; 961 this->parent[0] = top;
1003 962
1004 old_width = szHint.width; 963 old_width = szHint.width;
1005 old_height = szHint.height; 964 old_height = szHint.height;
1006 965
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 966 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 967 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 968
1010 classHint.res_name = (char *)rs[Rs_name]; 969 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 970 classHint.res_class = (char *)RESCLASS;
1012 971
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 972 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 973 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 975 wmHint.window_group = top;
1017 976
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 978 &szHint, &wmHint, &classHint);
979
980#if ENABLE_FRILLS
981 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif
1020 985
1021 Atom protocols[] = { 986 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 987 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 988#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 989 xa[XA_NET_WM_PING],
1025#endif 990#endif
1026 }; 991 };
1027 992
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 994
1030#if ENABLE_FRILLS 995#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 996 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 998#endif
1034 999
1035#if ENABLE_EWMH 1000#if ENABLE_EWMH
1036 long pid = getpid (); 1001 long pid = getpid ();
1037 1002
1038 XChangeProperty (disp, top, 1003 XChangeProperty (xdisp, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 1005 PropModeReplace, (unsigned char *)&pid, 1);
1041 1006
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1008#endif
1044 1009
1045 XSelectInput (disp, top, 1010 XSelectInput (xdisp, top,
1046 KeyPressMask 1011 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1013 | KeyReleaseMask
1049#endif 1014#endif
1050 | FocusChangeMask | VisibilityChangeMask 1015 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1016 | ExposureMask | StructureNotifyMask);
1052 1017
1053 termwin_ev.start (display, top); 1018 termwin_ev.start (display, top);
1054 1019
1055#if ENABLE_FRILLS
1056 if (mwmhints.flags)
1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059#endif
1060
1061 /* vt cursor: Black-on-White is standard, but this is more popular */ 1020 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1063 1022
1064#ifdef HAVE_SCROLLBARS 1023#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1024 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1067#endif 1026#endif
1068 1027
1069 /* the vt window */ 1028 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1029 vt = XCreateSimpleWindow (xdisp, top,
1071 window_vt_x,
1072 window_vt_y, 1030 window_vt_x, window_vt_y,
1073 width,
1074 height, 1031 width, height,
1075 0, 1032 0,
1076 pix_colors_focused[Color_fg], 1033 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1034 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1035
1082 attributes.bit_gravity = NorthWestGravity; 1036 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1084 1038
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1040
1087 if (OPTION (Opt_pointerBlank)) 1041 if (OPTION (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1042 vt_emask |= PointerMotionMask;
… …
1093 1047
1094 vt_ev.start (display, vt); 1048 vt_ev.start (display, vt);
1095 1049
1096#ifdef XPM_BACKGROUND 1050#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL 1051 if (rs[Rs_backgroundPixmap] != NULL
1098 && ! OPTION (Opt_transparent)) 1052 && !OPTION (Opt_transparent))
1099 { 1053 {
1100 const char *p = rs[Rs_backgroundPixmap]; 1054 const char *p = rs[Rs_backgroundPixmap];
1101 1055
1102 if ((p = strchr (p, ';')) != NULL) 1056 if ((p = strchr (p, ';')) != NULL)
1103 { 1057 {
… …
1109 scr_touch (true); 1063 scr_touch (true);
1110 } 1064 }
1111#endif 1065#endif
1112 1066
1113 /* graphics context for the vt window */ 1067 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1068 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1069 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1070 gcvalue.graphics_exposures = 1;
1071
1117 gc = XCreateGC (disp, vt, 1072 gc = XCreateGC (xdisp, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1073 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1074 &gcvalue);
1120 1075
1121 drawable = new rxvt_drawable (display, vt); 1076 drawable = new rxvt_drawable (this, vt);
1122 1077
1123#ifdef RXVT_SCROLLBAR 1078#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1079 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1081 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1130#endif 1085#endif
1131 1086
1132#ifdef OFF_FOCUS_FADING 1087#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1088 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1089 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1090 pix_colors = pix_colors_unfocused;
1136#endif 1091#endif
1137 1092
1138 pointer_unblank (); 1093 pointer_unblank ();
1139 scr_recolour (); 1094 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1150} 1095}
1151 1096
1152/* ------------------------------------------------------------------------- * 1097/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1098 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1099 * ------------------------------------------------------------------------- */

Diff Legend

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