… | |
… | |
177 | }; |
177 | }; |
178 | |
178 | |
179 | bool |
179 | bool |
180 | rxvt_term::init_vars () |
180 | rxvt_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; |
… | |
… | |
318 | { |
313 | { |
319 | rxvt_perl.init (this); |
314 | rxvt_perl.init (this); |
320 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
315 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
321 | } |
316 | } |
322 | #endif |
317 | #endif |
|
|
318 | |
|
|
319 | xa = display->xa; |
|
|
320 | |
|
|
321 | #if ENABLE_FRILLS |
|
|
322 | if (rs[Rs_depth]) |
|
|
323 | set (display, strtol (rs[Rs_depth], 0, 0)); |
|
|
324 | else |
|
|
325 | #endif |
|
|
326 | set (display); |
323 | |
327 | |
324 | /* |
328 | /* |
325 | * set any defaults not already set |
329 | * set any defaults not already set |
326 | */ |
330 | */ |
327 | if (cmd_argv && cmd_argv[0]) |
331 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
488 | i = strlen (val); |
492 | i = strlen (val); |
489 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
493 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
490 | |
494 | |
491 | sprintf (env_display, "DISPLAY=%s", val); |
495 | sprintf (env_display, "DISPLAY=%s", val); |
492 | |
496 | |
493 | /* avoiding the math library: |
497 | 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 | |
498 | |
503 | /* add entries to the environment: |
499 | /* add entries to the environment: |
504 | * @ DISPLAY: in case we started with -display |
500 | * @ DISPLAY: in case we started with -display |
505 | * @ WINDOWID: X window id number of the window |
501 | * @ WINDOWID: X window id number of the window |
506 | * @ COLORTERM: terminal sub-name and also indicates its color |
502 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
508 | * @ TERMINFO: path to terminfo directory |
504 | * @ TERMINFO: path to terminfo directory |
509 | * @ COLORFGBG: fg;bg color codes |
505 | * @ COLORFGBG: fg;bg color codes |
510 | */ |
506 | */ |
511 | putenv (env_display); |
507 | putenv (env_display); |
512 | putenv (env_windowid); |
508 | putenv (env_windowid); |
|
|
509 | |
513 | if (env_colorfgbg) |
510 | if (env_colorfgbg) |
514 | putenv (env_colorfgbg); |
511 | putenv (env_colorfgbg); |
515 | |
512 | |
516 | #ifdef RXVT_TERMINFO |
513 | #ifdef RXVT_TERMINFO |
517 | putenv ("TERMINFO=" RXVT_TERMINFO); |
514 | putenv ("TERMINFO=" RXVT_TERMINFO); |
518 | #endif |
515 | #endif |
519 | |
516 | |
520 | if (display->depth <= 2) |
517 | if (depth <= 2) |
521 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
518 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
522 | else |
519 | else |
523 | putenv ("COLORTERM=" COLORTERMENVFULL); |
520 | putenv ("COLORTERM=" COLORTERMENVFULL); |
524 | |
521 | |
525 | if (rs[Rs_term_name] != NULL) |
522 | if (rs[Rs_term_name] != NULL) |
… | |
… | |
656 | |
653 | |
657 | #ifdef OFF_FOCUS_FADING |
654 | #ifdef OFF_FOCUS_FADING |
658 | pix_colors = pix_colors_focused; |
655 | pix_colors = pix_colors_focused; |
659 | #endif |
656 | #endif |
660 | |
657 | |
661 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
658 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
662 | { |
659 | { |
663 | rxvt_color xcol; |
660 | rxvt_color xcol; |
664 | |
661 | |
665 | if (!rs[Rs_color + i]) |
662 | if (!rs[Rs_color + i]) |
666 | continue; |
663 | continue; |
… | |
… | |
706 | SET_PIXCOLOR (i); |
703 | SET_PIXCOLOR (i); |
707 | } |
704 | } |
708 | |
705 | |
709 | #ifdef OFF_FOCUS_FADING |
706 | #ifdef OFF_FOCUS_FADING |
710 | if (rs[Rs_fade]) |
707 | if (rs[Rs_fade]) |
711 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
708 | for (i = 0; i < (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]); |
709 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
713 | #endif |
710 | #endif |
714 | |
711 | |
715 | if (display->depth <= 2) |
712 | if (depth <= 2) |
716 | { |
713 | { |
717 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
714 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
718 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
715 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
719 | 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]; |
720 | } |
717 | } |
… | |
… | |
725 | * The calculations of topShadow/bottomShadow values are adapted |
722 | * The calculations of topShadow/bottomShadow values are adapted |
726 | * from the fvwm window manager. |
723 | * from the fvwm window manager. |
727 | */ |
724 | */ |
728 | #ifdef KEEP_SCROLLCOLOR |
725 | #ifdef KEEP_SCROLLCOLOR |
729 | |
726 | |
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 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
734 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
731 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
735 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
732 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
… | |
… | |
740 | /* xcol[0] == white |
737 | /* xcol[0] == white |
741 | * xcol[1] == top shadow |
738 | * xcol[1] == top shadow |
742 | * xcol[2] == bot shadow */ |
739 | * xcol[2] == bot shadow */ |
743 | |
740 | |
744 | xcol[1] = pix_colors[Color_scroll]; |
741 | xcol[1] = pix_colors[Color_scroll]; |
745 | xcol[0].set (display, 65535, 65535, 65535); |
742 | xcol[0].set (this, 65535, 65535, 65535); |
746 | |
743 | |
747 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
744 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
748 | |
745 | |
749 | xcol[0].get (display, pr0, pg0, pb0); |
746 | xcol[0].get (this, pr0, pg0, pb0); |
750 | xcol[1].get (display, pr1, pg1, pb1); |
747 | xcol[1].get (this, pr1, pg1, pb1); |
751 | |
748 | |
752 | pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); |
749 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
753 | |
750 | |
754 | /* topShadowColor */ |
751 | /* topShadowColor */ |
755 | if (!xcol[1].set (display, |
752 | if (!xcol[1].set (this, |
756 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
753 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
757 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
754 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
758 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
755 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
759 | xcol[1] = pix_colors[Color_White]; |
756 | xcol[1] = pix_colors[Color_White]; |
760 | |
757 | |
… | |
… | |
884 | MWMHints mwmhints; |
881 | MWMHints mwmhints; |
885 | #endif |
882 | #endif |
886 | XGCValues gcvalue; |
883 | XGCValues gcvalue; |
887 | XSetWindowAttributes attributes; |
884 | XSetWindowAttributes attributes; |
888 | Window top, parent; |
885 | Window top, parent; |
889 | dDisp; |
|
|
890 | |
886 | |
891 | xa = display->xa; |
887 | dLocal (Display *, xdisp); |
892 | |
888 | |
893 | /* grab colors before netscape does */ |
889 | /* grab colors before netscape does */ |
894 | Get_Colours (); |
890 | Get_Colours (); |
895 | |
891 | |
896 | if (!set_fonts ()) |
892 | if (!set_fonts ()) |
… | |
… | |
901 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
897 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
902 | |
898 | |
903 | #if ENABLE_FRILLS |
899 | #if ENABLE_FRILLS |
904 | if (OPTION (Opt_borderLess)) |
900 | if (OPTION (Opt_borderLess)) |
905 | { |
901 | { |
906 | if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) |
902 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
907 | { |
903 | { |
908 | /* 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");*/ |
909 | attributes.override_redirect = TRUE; |
905 | attributes.override_redirect = TRUE; |
910 | mwmhints.flags = 0; |
906 | mwmhints.flags = 0; |
911 | } |
907 | } |
… | |
… | |
924 | { |
920 | { |
925 | XWindowAttributes wattr; |
921 | XWindowAttributes wattr; |
926 | |
922 | |
927 | parent = strtol (rs[Rs_embed], 0, 0); |
923 | parent = strtol (rs[Rs_embed], 0, 0); |
928 | |
924 | |
929 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
925 | if (!XGetWindowAttributes (xdisp, parent, &wattr)) |
930 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
926 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
931 | |
927 | |
932 | window_calc (wattr.width, wattr.height); |
928 | window_calc (wattr.width, wattr.height); |
933 | } |
929 | } |
934 | #endif |
930 | #endif |
935 | |
931 | |
936 | window_calc (0, 0); |
932 | window_calc (0, 0); |
937 | |
933 | |
938 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
934 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
939 | attributes.background_pixel = pix_colors_focused[Color_border]; |
935 | attributes.background_pixel = pix_colors_focused [Color_border]; |
940 | attributes.border_pixel = pix_colors_focused[Color_border]; |
936 | attributes.border_pixel = pix_colors_focused [Color_border]; |
941 | attributes.colormap = display->cmap; |
937 | attributes.colormap = cmap; |
942 | |
938 | |
943 | top = XCreateWindow (disp, parent, |
939 | top = XCreateWindow (xdisp, parent, |
944 | szHint.x, szHint.y, |
940 | szHint.x, szHint.y, |
945 | szHint.width, szHint.height, |
941 | szHint.width, szHint.height, |
946 | ext_bwidth, |
942 | ext_bwidth, |
947 | display->depth, InputOutput, |
943 | depth, InputOutput, visual, |
948 | display->visual, |
|
|
949 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
944 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
950 | &attributes); |
945 | &attributes); |
951 | |
946 | |
952 | this->parent[0] = top; |
947 | this->parent[0] = top; |
953 | |
948 | |
… | |
… | |
963 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
958 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
964 | wmHint.input = True; |
959 | wmHint.input = True; |
965 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
960 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
966 | wmHint.window_group = top; |
961 | wmHint.window_group = top; |
967 | |
962 | |
968 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
963 | XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, |
969 | &szHint, &wmHint, &classHint); |
964 | &szHint, &wmHint, &classHint); |
970 | |
965 | |
971 | #if ENABLE_FRILLS |
966 | #if ENABLE_FRILLS |
972 | if (mwmhints.flags) |
967 | if (mwmhints.flags) |
973 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
968 | XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
974 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
969 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
975 | #endif |
970 | #endif |
976 | |
971 | |
977 | Atom protocols[] = { |
972 | Atom protocols[] = { |
978 | xa[XA_WM_DELETE_WINDOW], |
973 | xa[XA_WM_DELETE_WINDOW], |
979 | #if ENABLE_EWMH |
974 | #if ENABLE_EWMH |
980 | xa[XA_NET_WM_PING], |
975 | xa[XA_NET_WM_PING], |
981 | #endif |
976 | #endif |
982 | }; |
977 | }; |
983 | |
978 | |
984 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
979 | XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
985 | |
980 | |
986 | #if ENABLE_FRILLS |
981 | #if ENABLE_FRILLS |
987 | if (rs[Rs_transient_for]) |
982 | if (rs[Rs_transient_for]) |
988 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
983 | XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
989 | #endif |
984 | #endif |
990 | |
985 | |
991 | #if ENABLE_EWMH |
986 | #if ENABLE_EWMH |
992 | long pid = getpid (); |
987 | long pid = getpid (); |
993 | |
988 | |
994 | XChangeProperty (disp, top, |
989 | XChangeProperty (xdisp, top, |
995 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
990 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
996 | PropModeReplace, (unsigned char *)&pid, 1); |
991 | PropModeReplace, (unsigned char *)&pid, 1); |
997 | |
992 | |
998 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
993 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
999 | #endif |
994 | #endif |
1000 | |
995 | |
1001 | XSelectInput (disp, top, |
996 | XSelectInput (xdisp, top, |
1002 | KeyPressMask |
997 | KeyPressMask |
1003 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
998 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1004 | | KeyReleaseMask |
999 | | KeyReleaseMask |
1005 | #endif |
1000 | #endif |
1006 | | FocusChangeMask | VisibilityChangeMask |
1001 | | FocusChangeMask | VisibilityChangeMask |
1007 | | ExposureMask | StructureNotifyMask); |
1002 | | ExposureMask | StructureNotifyMask); |
1008 | |
1003 | |
1009 | termwin_ev.start (display, top); |
1004 | termwin_ev.start (display, top); |
1010 | |
1005 | |
1011 | /* 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 */ |
1012 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1007 | TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); |
1013 | |
1008 | |
1014 | #ifdef HAVE_SCROLLBARS |
1009 | #ifdef HAVE_SCROLLBARS |
1015 | /* cursor scrollBar: Black-on-White */ |
1010 | /* cursor scrollBar: Black-on-White */ |
1016 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1011 | leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); |
1017 | #endif |
1012 | #endif |
1018 | |
1013 | |
1019 | /* the vt window */ |
1014 | /* the vt window */ |
1020 | vt = XCreateSimpleWindow (disp, top, |
1015 | vt = XCreateSimpleWindow (xdisp, top, |
1021 | window_vt_x, window_vt_y, |
1016 | window_vt_x, window_vt_y, |
1022 | width, height, |
1017 | width, height, |
1023 | 0, |
1018 | 0, |
1024 | pix_colors_focused[Color_fg], |
1019 | pix_colors_focused[Color_fg], |
1025 | pix_colors_focused[Color_bg]); |
1020 | pix_colors_focused[Color_bg]); |
1026 | |
1021 | |
1027 | attributes.bit_gravity = NorthWestGravity; |
1022 | attributes.bit_gravity = NorthWestGravity; |
1028 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1023 | XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); |
1029 | |
1024 | |
1030 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1025 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1031 | |
1026 | |
1032 | if (OPTION (Opt_pointerBlank)) |
1027 | if (OPTION (Opt_pointerBlank)) |
1033 | vt_emask |= PointerMotionMask; |
1028 | vt_emask |= PointerMotionMask; |
… | |
… | |
1038 | |
1033 | |
1039 | vt_ev.start (display, vt); |
1034 | vt_ev.start (display, vt); |
1040 | |
1035 | |
1041 | #ifdef XPM_BACKGROUND |
1036 | #ifdef XPM_BACKGROUND |
1042 | if (rs[Rs_backgroundPixmap] != NULL |
1037 | if (rs[Rs_backgroundPixmap] != NULL |
1043 | && ! OPTION (Opt_transparent)) |
1038 | && !OPTION (Opt_transparent)) |
1044 | { |
1039 | { |
1045 | const char *p = rs[Rs_backgroundPixmap]; |
1040 | const char *p = rs[Rs_backgroundPixmap]; |
1046 | |
1041 | |
1047 | if ((p = strchr (p, ';')) != NULL) |
1042 | if ((p = strchr (p, ';')) != NULL) |
1048 | { |
1043 | { |
… | |
… | |
1058 | /* graphics context for the vt window */ |
1053 | /* graphics context for the vt window */ |
1059 | gcvalue.foreground = pix_colors[Color_fg]; |
1054 | gcvalue.foreground = pix_colors[Color_fg]; |
1060 | gcvalue.background = pix_colors[Color_bg]; |
1055 | gcvalue.background = pix_colors[Color_bg]; |
1061 | gcvalue.graphics_exposures = 1; |
1056 | gcvalue.graphics_exposures = 1; |
1062 | |
1057 | |
1063 | gc = XCreateGC (disp, vt, |
1058 | gc = XCreateGC (xdisp, vt, |
1064 | GCForeground | GCBackground | GCGraphicsExposures, |
1059 | GCForeground | GCBackground | GCGraphicsExposures, |
1065 | &gcvalue); |
1060 | &gcvalue); |
1066 | |
1061 | |
1067 | drawable = new rxvt_drawable (display, vt); |
1062 | drawable = new rxvt_drawable (this, vt); |
1068 | |
1063 | |
1069 | #ifdef RXVT_SCROLLBAR |
1064 | #ifdef RXVT_SCROLLBAR |
1070 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1065 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1071 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1066 | topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1072 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1067 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1073 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1068 | botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1074 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1069 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1075 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1070 | scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1076 | #endif |
1071 | #endif |
1077 | |
1072 | |
1078 | #ifdef OFF_FOCUS_FADING |
1073 | #ifdef OFF_FOCUS_FADING |
1079 | // initially we are in unfocused state |
1074 | // initially we are in unfocused state |
1080 | if (rs[Rs_fade]) |
1075 | if (rs[Rs_fade]) |