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.149 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.157 by root, Wed Jan 25 21:09:21 2006 UTC

… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 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#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 195 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 197 ncol = 80;
241 nrow = 24; 198 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 202 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
247 204
248 refresh_limit = 1; 205 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 207
252 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
341 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
342 298
343 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
344 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]);
345 301
302 xa = display->xa;
303
304#if ENABLE_FRILLS
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
310
346 extract_resources (); 311 extract_resources ();
347 312
348 free (r_argv); 313 free (r_argv);
314
315#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default";
318
319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
326#endif
349 327
350 /* 328 /*
351 * set any defaults not already set 329 * set any defaults not already set
352 */ 330 */
353 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
506 484
507 if (val == NULL) 485 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
510 488
511 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
513 491
514 i = strlen (val); 492 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 494
517 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
518 496
519 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 498
529 /* add entries to the environment: 499 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
536 */ 506 */
537 putenv (env_display); 507 putenv (env_display);
538 putenv (env_windowid); 508 putenv (env_windowid);
509
539 if (env_colorfgbg) 510 if (env_colorfgbg)
540 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
541 512
542#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 515#endif
545 516
546 if (display->depth <= 2) 517 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 519 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
550 521
551 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
682 653
683#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
685#endif 656#endif
686 657
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 659 {
689 rxvt_color xcol; 660 rxvt_color xcol;
690 661
691 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
692 continue; 663 continue;
… …
732 SET_PIXCOLOR (i); 703 SET_PIXCOLOR (i);
733 } 704 }
734 705
735#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739#endif 710#endif
740 711
741 if (display->depth <= 2) 712 if (depth <= 2)
742 { 713 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
744 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
745 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
746 } 717 }
… …
751 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 723 * from the fvwm window manager.
753 */ 724 */
754#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
755 726
756 if (display->depth <= 2) 727 if (depth <= 2)
757 { 728 {
758 /* Monochrome */ 729 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
766 /* xcol[0] == white 737 /* xcol[0] == white
767 * xcol[1] == top shadow 738 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
769 740
770 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
771 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, 65535, 65535, 65535);
772 743
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774 745
775 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, pr0, pg0, pb0);
776 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, pr1, pg1, pb1);
777 748
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
779 750
780 /* topShadowColor */ 751 /* topShadowColor */
781 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
785 xcol[1] = pix_colors[Color_White]; 756 xcol[1] = pix_colors[Color_White];
786 757
… …
833 804
834 if (rsmod 805 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
837 808
838 map = XGetModifierMapping (display->display); 809 map = XGetModifierMapping (xdisp);
839 kc = map->modifiermap; 810 kc = map->modifiermap;
840 811
841 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
842 { 813 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
846 { 817 {
847 if (kc[k] == 0) 818 if (kc[k] == 0)
848 break; 819 break;
849 820
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 821 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
851 { 822 {
852 case XK_Num_Lock: 823 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
854 continue; 825 continue;
855 826
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
906{ 877{
907 XClassHint classHint; 878 XClassHint classHint;
908 XWMHints wmHint; 879 XWMHints wmHint;
909#if ENABLE_FRILLS 880#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 881 MWMHints mwmhints;
912#endif 882#endif
913 XGCValues gcvalue; 883 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 885 Window top, parent;
917 dDisp;
918 886
919#ifdef USING_W11LIB 887 dLocal (Display *, xdisp);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 888
933 /* grab colors before netscape does */ 889 /* grab colors before netscape does */
934 Get_Colours (); 890 Get_Colours ();
935 891
936 if (!set_fonts ()) 892 if (!set_fonts ())
937 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
938 894
939 parent = DefaultRootWindow (disp); 895 parent = display->root;
940 896
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
942 898
943#if ENABLE_FRILLS 899#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 900 if (OPTION (Opt_borderLess))
945 { 901 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 903 {
950 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
951 attributes.override_redirect = TRUE; 905 attributes.override_redirect = TRUE;
952 mwmhints.flags = 0; 906 mwmhints.flags = 0;
953 } 907 }
… …
966 { 920 {
967 XWindowAttributes wattr; 921 XWindowAttributes wattr;
968 922
969 parent = strtol (rs[Rs_embed], 0, 0); 923 parent = strtol (rs[Rs_embed], 0, 0);
970 924
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 925 if (!XGetWindowAttributes (xdisp, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 927
974 window_calc (wattr.width, wattr.height); 928 window_calc (wattr.width, wattr.height);
975 } 929 }
976#endif 930#endif
977 931
978 window_calc (0, 0); 932 window_calc (0, 0);
979 933
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 934 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 935 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 936 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 937 attributes.colormap = cmap;
938
984 top = XCreateWindow (disp, parent, 939 top = XCreateWindow (xdisp, parent,
985 szHint.x, szHint.y, 940 szHint.x, szHint.y,
986 szHint.width, szHint.height, 941 szHint.width, szHint.height,
987 ext_bwidth, 942 ext_bwidth,
988 display->depth, InputOutput, 943 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 945 &attributes);
992 946
993 this->parent[0] = top; 947 this->parent[0] = top;
994 948
995 old_width = szHint.width; 949 old_width = szHint.width;
996 old_height = szHint.height; 950 old_height = szHint.height;
997 951
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 954
1001 classHint.res_name = (char *)rs[Rs_name]; 955 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 956 classHint.res_class = (char *)RESCLASS;
1003 957
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 959 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 961 wmHint.window_group = top;
1008 962
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1010 &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
965
966#if ENABLE_FRILLS
967 if (mwmhints.flags)
968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif
1011 971
1012 Atom protocols[] = { 972 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 973 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 974#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 975 xa[XA_NET_WM_PING],
1016#endif 976#endif
1017 }; 977 };
1018 978
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 980
1021#if ENABLE_FRILLS 981#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 982 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 984#endif
1025 985
1026#if ENABLE_EWMH 986#if ENABLE_EWMH
1027 long pid = getpid (); 987 long pid = getpid ();
1028 988
1029 XChangeProperty (disp, top, 989 XChangeProperty (xdisp, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1032 992
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 994#endif
1035 995
1036 XSelectInput (disp, top, 996 XSelectInput (xdisp, top,
1037 KeyPressMask 997 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 999 | KeyReleaseMask
1040#endif 1000#endif
1041 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1043 1003
1044 termwin_ev.start (display, top); 1004 termwin_ev.start (display, top);
1045 1005
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* vt cursor: Black-on-White is standard, but this is more popular */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1054 1008
1055#ifdef HAVE_SCROLLBARS 1009#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1058#endif 1012#endif
1059 1013
1060 /* the vt window */ 1014 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1015 vt = XCreateSimpleWindow (xdisp, top,
1062 window_vt_x,
1063 window_vt_y, 1016 window_vt_x, window_vt_y,
1064 width,
1065 height, 1017 width, height,
1066 0, 1018 0,
1067 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1021
1073 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1075 1024
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1026
1078 if (OPTION (Opt_pointerBlank)) 1027 if (OPTION (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
… …
1084 1033
1085 vt_ev.start (display, vt); 1034 vt_ev.start (display, vt);
1086 1035
1087#ifdef XPM_BACKGROUND 1036#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL 1037 if (rs[Rs_backgroundPixmap] != NULL
1089 && ! OPTION (Opt_transparent)) 1038 && !OPTION (Opt_transparent))
1090 { 1039 {
1091 const char *p = rs[Rs_backgroundPixmap]; 1040 const char *p = rs[Rs_backgroundPixmap];
1092 1041
1093 if ((p = strchr (p, ';')) != NULL) 1042 if ((p = strchr (p, ';')) != NULL)
1094 { 1043 {
… …
1100 scr_touch (true); 1049 scr_touch (true);
1101 } 1050 }
1102#endif 1051#endif
1103 1052
1104 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 1;
1057
1108 gc = XCreateGC (disp, vt, 1058 gc = XCreateGC (xdisp, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1060 &gcvalue);
1111 1061
1112 drawable = new rxvt_drawable (display, vt); 1062 drawable = new rxvt_drawable (this, vt);
1113 1063
1114#ifdef RXVT_SCROLLBAR 1064#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1121#endif 1071#endif
1122 1072
1123#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1074 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1076 pix_colors = pix_colors_unfocused;
1127#endif 1077#endif
1128 1078
1129 pointer_unblank (); 1079 pointer_unblank ();
1130 scr_recolour (); 1080 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1081}
1142 1082
1143/* ------------------------------------------------------------------------- * 1083/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1084 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1085 * ------------------------------------------------------------------------- */
… …
1435 } 1375 }
1436 1376
1437 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1438 1378
1439 default: 1379 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1380 if (!OPTION (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1382
1445 pty->close_tty (); 1383 pty->close_tty ();
1446 1384
1447 child_ev.start (cmd_pid); 1385 child_ev.start (cmd_pid);
1448 1386

Diff Legend

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