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.151 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.163 by root, Tue Jan 31 16:57:35 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;
… …
336 296
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]);
301
302 xa = display->xa;
303
304#if XFT
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
341 310
342 extract_resources (); 311 extract_resources ();
343 312
344 free (r_argv); 313 free (r_argv);
345 314
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
515 484
516 if (val == NULL) 485 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
519 488
520 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
522 491
523 i = strlen (val); 492 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 494
526 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
527 496
528 /* avoiding the math library: 497 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 498
538 /* add entries to the environment: 499 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
545 */ 506 */
546 putenv (env_display); 507 putenv (env_display);
547 putenv (env_windowid); 508 putenv (env_windowid);
509
548 if (env_colorfgbg) 510 if (env_colorfgbg)
549 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
550 512
551#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 515#endif
554 516
555 if (display->depth <= 2) 517 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 519 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
559 521
560 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
691 653
692#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
694#endif 656#endif
695 657
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 659 {
698 rxvt_color xcol; 660 rxvt_color xcol;
699 661
700 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
701 continue; 663 continue;
702 664
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, rs[Rs_color + i]))
704 { 666 {
705#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
708 else 670 else
… …
710 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
711 673
712 if (!rs[Rs_color + i]) 674 if (!rs[Rs_color + i])
713 continue; 675 continue;
714 676
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 677 if (!set_color (xcol, rs[Rs_color + i]))
716 { 678 {
717 switch (i) 679 switch (i)
718 { 680 {
719 case Color_fg: 681 case Color_fg:
720 case Color_bg: 682 case Color_bg:
721 /* fatal: need bg/fg color */ 683 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 684 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */
724 break; 685 break;
725#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 687 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 688 xcol = pix_colors[Color_fg];
728 break; 689 break;
… …
741 SET_PIXCOLOR (i); 702 SET_PIXCOLOR (i);
742 } 703 }
743 704
744#ifdef OFF_FOCUS_FADING 705#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade]) 706 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 707 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]); 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 }
748#endif 713#endif
749 714
750 if (display->depth <= 2) 715 if (depth <= 2)
751 { 716 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 717 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]; 718 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]; 719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
755 } 720 }
… …
760 * The calculations of topShadow/bottomShadow values are adapted 725 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 726 * from the fvwm window manager.
762 */ 727 */
763#ifdef KEEP_SCROLLCOLOR 728#ifdef KEEP_SCROLLCOLOR
764 729
765 if (display->depth <= 2) 730 if (depth <= 2)
766 { 731 {
767 /* Monochrome */ 732 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 733 pix_colors[Color_scroll] = pix_colors[Color_fg];
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 734 pix_colors[Color_topShadow] = pix_colors[Color_bg];
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
775 /* xcol[0] == white 740 /* xcol[0] == white
776 * xcol[1] == top shadow 741 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */ 742 * xcol[2] == bot shadow */
778 743
779 xcol[1] = pix_colors[Color_scroll]; 744 xcol[1] = pix_colors[Color_scroll];
780 xcol[0].set (display, 65535, 65535, 65535); 745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
781 746
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 747 rxvt_rgba c0, c1;
783 748
784 xcol[0].get (display, pr0, pg0, pb0); 749 xcol[0].get (this, c0);
785 xcol[1].get (display, pr1, pg1, pb1); 750 xcol[1].get (this, c1);
786 751
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 752 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
788 753
789 /* topShadowColor */ 754 /* topShadowColor */
790 if (!xcol[1].set (display, 755 if (!xcol[1].set (this,
756 rxvt_rgba (
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary
761 ));
794 xcol[1] = pix_colors[Color_White]; 762 xcol[1] = pix_colors[Color_White];
795 763
796 pix_colors[Color_topShadow] = xcol[1]; 764 pix_colors[Color_topShadow] = xcol[1];
797 } 765 }
798#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
… …
842 810
843 if (rsmod 811 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
846 814
847 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (xdisp);
848 kc = map->modifiermap; 816 kc = map->modifiermap;
849 817
850 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
851 { 819 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
855 { 823 {
856 if (kc[k] == 0) 824 if (kc[k] == 0)
857 break; 825 break;
858 826
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
860 { 828 {
861 case XK_Num_Lock: 829 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
863 continue; 831 continue;
864 832
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
915{ 883{
916 XClassHint classHint; 884 XClassHint classHint;
917 XWMHints wmHint; 885 XWMHints wmHint;
918#if ENABLE_FRILLS 886#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 887 MWMHints mwmhints;
921#endif 888#endif
922 XGCValues gcvalue; 889 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 891 Window top, parent;
926 dDisp;
927 892
928#ifdef USING_W11LIB 893 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 894
942 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
943 Get_Colours (); 896 Get_Colours ();
944 897
945 if (!set_fonts ()) 898 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 900
948 parent = DefaultRootWindow (disp); 901 parent = display->root;
949 902
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!OPTION (Opt_override_redirect);
951 904
952#if ENABLE_FRILLS 905#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 906 if (OPTION (Opt_borderLess))
954 { 907 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 909 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
961 mwmhints.flags = 0; 912 mwmhints.flags = 0;
962 } 913 }
963 else 914 else
964 { 915 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
975 { 926 {
976 XWindowAttributes wattr; 927 XWindowAttributes wattr;
977 928
978 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
979 930
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (xdisp, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 933
983 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
984 } 935 }
985#endif 936#endif
986 937
987 window_calc (0, 0); 938 window_calc (0, 0);
988 939
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
993 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (xdisp, parent,
994 szHint.x, szHint.y, 946 szHint.x, szHint.y,
995 szHint.width, szHint.height, 947 szHint.width, szHint.height,
996 ext_bwidth, 948 ext_bwidth,
997 display->depth, InputOutput, 949 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 951 &attributes);
1001 952
1002 this->parent[0] = top; 953 this->parent[0] = top;
1003 954
1004 old_width = szHint.width; 955 old_width = szHint.width;
1005 old_height = szHint.height; 956 old_height = szHint.height;
1006 957
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 960
1010 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1012 963
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 965 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 967 wmHint.window_group = top;
1017 968
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
971
972#if ENABLE_FRILLS
973 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif
1020 977
1021 Atom protocols[] = { 978 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 980#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1025#endif 982#endif
1026 }; 983 };
1027 984
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 986
1030#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 990#endif
1034 991
1035#if ENABLE_EWMH 992#if ENABLE_EWMH
1036 long pid = getpid (); 993 long pid = getpid ();
1037 994
1038 XChangeProperty (disp, top, 995 XChangeProperty (xdisp, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1041 998
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1000#endif
1044 1001
1045 XSelectInput (disp, top, 1002 XSelectInput (xdisp, top,
1046 KeyPressMask 1003 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1005 | KeyReleaseMask
1049#endif 1006#endif
1050 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1052 1009
1053 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1054 1011
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 */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1063 1014
1064#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1067#endif 1018#endif
1068 1019
1069 /* the vt window */ 1020 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (xdisp, top,
1071 window_vt_x,
1072 window_vt_y, 1022 window_vt_x, window_vt_y,
1073 width,
1074 height, 1023 width, height,
1075 0, 1024 0,
1076 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1027
1082 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1084 1030
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1032
1087 if (OPTION (Opt_pointerBlank)) 1033 if (OPTION (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
… …
1093 1039
1094 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1095 1041
1096#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1098 && ! OPTION (Opt_transparent)) 1044 && !OPTION (Opt_transparent))
1099 { 1045 {
1100 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1101 1047
1102 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1103 { 1049 {
… …
1109 scr_touch (true); 1055 scr_touch (true);
1110 } 1056 }
1111#endif 1057#endif
1112 1058
1113 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 1;
1063
1117 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (xdisp, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1066 &gcvalue);
1120 1067
1121 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1122 1069
1123#ifdef RXVT_SCROLLBAR 1070#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1130#endif 1077#endif
1131 1078
1132#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1080 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1082 pix_colors = pix_colors_unfocused;
1136#endif 1083#endif
1137 1084
1138 pointer_unblank (); 1085 pointer_unblank ();
1139 scr_recolour (); 1086 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} 1087}
1151 1088
1152/* ------------------------------------------------------------------------- * 1089/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1090 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1091 * ------------------------------------------------------------------------- */
… …
1444 } 1381 }
1445 1382
1446 _exit (EXIT_FAILURE); 1383 _exit (EXIT_FAILURE);
1447 1384
1448 default: 1385 default:
1449#if UTMP_SUPPORT
1450 if (!OPTION (Opt_utmpInhibit)) 1386 if (!OPTION (Opt_utmpInhibit))
1451 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1452#endif
1453 1388
1454 pty->close_tty (); 1389 pty->close_tty ();
1455 1390
1456 child_ev.start (cmd_pid); 1391 child_ev.start (cmd_pid);
1457 1392

Diff Legend

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