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.111 by root, Thu Feb 17 20:52:48 2005 UTC vs.
Revision 1.116 by root, Sun Feb 20 19:45:30 2005 UTC

181 "MULTIPLE", 181 "MULTIPLE",
182 "TARGETS", 182 "TARGETS",
183 "TIMESTAMP", 183 "TIMESTAMP",
184 "VT_SELECTION", 184 "VT_SELECTION",
185 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 188 "CLIPBOARD",
188#if ENABLE_FRILLS 189#if ENABLE_FRILLS
190 "_MOTIF_WM_HINTS",
191#endif
192#if ENABLE_EWMH
189 "_NET_WM_PID", 193 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 194 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 195 "_NET_WM_ICON_NAME",
196 "_NET_WM_PING",
193#endif 197#endif
194#if USE_XIM 198#if USE_XIM
195 "WM_LOCALE_NAME", 199 "WM_LOCALE_NAME",
196#endif 200#endif
197#ifdef TRANSPARENT 201#ifdef TRANSPARENT
199 "ESETROOT_PMAP_ID", 203 "ESETROOT_PMAP_ID",
200#endif 204#endif
201#ifdef OFFIX_DND 205#ifdef OFFIX_DND
202 "DndProtocol", 206 "DndProtocol",
203 "DndSelection", 207 "DndSelection",
208#endif
209#if ENABLE_XEMBED
210 "_XEMBED",
211 "_XEMBED_INFO",
204#endif 212#endif
205 }; 213 };
206 214
207bool 215bool
208rxvt_term::init_vars () 216rxvt_term::init_vars ()
925#endif 933#endif
926 XGCValues gcvalue; 934 XGCValues gcvalue;
927 long vt_emask; 935 long vt_emask;
928 XSetWindowAttributes attributes; 936 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 937 XWindowAttributes gattr;
930 Window top; 938 Window top, parent;
931 dDisp; 939 dDisp;
932 940
933#ifdef USING_W11LIB 941#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 942 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 943 W11AddEventHandler (disp, rxvt_W11_process_x_event);
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 970 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 971 mwmhints.decorations = 0;
964 } 972 }
965 } 973 }
966 else 974 else
967 {
968 mwmhints.flags = 0; 975 mwmhints.flags = 0;
969 }
970#endif 976#endif
971 977
972 /* grab colors before netscape does */ 978 /* grab colors before netscape does */
973 Get_Colours (); 979 Get_Colours ();
974 980
975 if (!set_fonts ()) 981 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 982 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 983
978#if ENABLE_FRILLS 984 parent = DefaultRootWindow (disp);
985
986#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 987 if (rs[Rs_embed])
980 { 988 {
981 XWindowAttributes wattr; 989 XWindowAttributes wattr;
982 990
983 top = strtol (rs[Rs_embed], 0, 0); 991 parent = strtol (rs[Rs_embed], 0, 0);
984 992
985 if (!XGetWindowAttributes (disp, top, &wattr)) 993 if (!XGetWindowAttributes (disp, parent, &wattr))
986 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987 995
988 window_calc (wattr.width, wattr.height); 996 window_calc (wattr.width, wattr.height);
997 }
989 998
990#if 0 999#endif
991 if (wattr.map_state == IsViewable) 1000 window_calc (0, 0);
992 { 1001
993 TermWin.mapped = 1; 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
994 refresh_type = FAST_REFRESH; 1003#ifdef PREFER_24BIT
995 XClearWindow (disp, top); 1004 attributes.background_pixel = pix_colors_focused[Color_border];
996 // TODO: make XMapNotify-event-code a function and call it 1005 attributes.border_pixel = pix_colors_focused[Color_border];
997 // TODO: how can I detetc visibility without unmpa/map? 1006 attributes.colormap = display->cmap;
998 // TODO: focusin etc. 1007 top = XCreateWindow (disp, parent,
999 } 1008 szHint.x, szHint.y,
1009 szHint.width, szHint.height,
1010 TermWin.ext_bwidth,
1011 display->depth, InputOutput,
1012 display->visual,
1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1000#else 1014#else
1001 // it'S easiets just to unmap/map to get all state correctly set-up 1015 top = XCreateSimpleWindow (disp, parent,
1002 XUnmapWindow (disp, top);
1003#endif
1004 }
1005 else
1006#endif
1007 {
1008 window_calc (0, 0);
1009
1010 /* sub-window placement & size in rxvt_resize_subwindows () */
1011#ifdef PREFER_24BIT
1012 attributes.background_pixel = pix_colors_focused[Color_border];
1013 attributes.border_pixel = pix_colors_focused[Color_border];
1014 attributes.colormap = display->cmap;
1015 top = XCreateWindow (disp, DefaultRootWindow (disp),
1016 szHint.x, szHint.y, 1016 szHint.x, szHint.y,
1017 szHint.width, szHint.height, 1017 szHint.width, szHint.height,
1018 TermWin.ext_bwidth, 1018 TermWin.ext_bwidth,
1019 display->depth, InputOutput,
1020 display->visual,
1021 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1022#else
1023 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1024 szHint.x, szHint.y,
1025 szHint.width, szHint.height,
1026 TermWin.ext_bwidth,
1027 pix_colors_focused[Color_border], 1019 pix_colors_focused[Color_border],
1028 pix_colors_focused[Color_border]); 1020 pix_colors_focused[Color_border]);
1029#endif 1021#endif
1030 }
1031 1022
1032 TermWin.parent[0] = top; 1023 TermWin.parent[0] = top;
1033 1024
1034 old_width = szHint.width; 1025 old_width = szHint.width;
1035 old_height = szHint.height; 1026 old_height = szHint.height;
1043 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1034 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1044 wmHint.input = True; 1035 wmHint.input = True;
1045 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1036 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1046 wmHint.window_group = top; 1037 wmHint.window_group = top;
1047 1038
1048 XSetWMProperties (disp, top, NULL, NULL, 1039 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1049 (char **)argv, argc, &szHint, &wmHint, &classHint); 1040 &szHint, &wmHint, &classHint);
1050 1041
1051 /* Enable delete window protocol */ 1042 Atom protocols[] = {
1052 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1043 xa[XA_WM_DELETE_WINDOW],
1044#if ENABLE_EWMH
1045 xa[XA_NET_WM_PING],
1046#endif
1047 };
1053 1048
1054#if ENABLE_FRILLS 1049 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1050
1051#if ENABLE_EWMH
1055 long pid = getpid (); 1052 long pid = getpid ();
1056 1053
1057 XChangeProperty (disp, top, 1054 XChangeProperty (disp, top,
1058 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1059 PropModeReplace, (unsigned char *)&pid, 1); 1056 PropModeReplace, (unsigned char *)&pid, 1);
1057
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1060#endif 1059#endif
1061 1060
1062 XSelectInput (disp, top, 1061 XSelectInput (disp, top,
1063 KeyPressMask 1062 KeyPressMask
1064#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1065 | KeyReleaseMask 1064 | KeyReleaseMask
1066#endif 1065#endif
1067 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1068 | ExposureMask
1069 | StructureNotifyMask); 1067 | ExposureMask | StructureNotifyMask);
1068
1070 termwin_ev.start (display, top); 1069 termwin_ev.start (display, top);
1071 1070
1072#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1073 if (mwmhints.flags) 1072 if (mwmhints.flags)
1074 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1099 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1100 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1101 1100
1102 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1103 1102
1104 pointer_unblank ();
1105
1106#ifdef POINTER_BLANK 1103#ifdef POINTER_BLANK
1107 if (options & Opt_pointerBlank) 1104 if (options & Opt_pointerBlank)
1108 vt_emask |= PointerMotionMask; 1105 vt_emask |= PointerMotionMask;
1109 else 1106 else
1110#endif 1107#endif
1179 // initially we are in unfocused state 1176 // initially we are in unfocused state
1180 if (rs[Rs_fade]) 1177 if (rs[Rs_fade])
1181 pix_colors = pix_colors_unfocused; 1178 pix_colors = pix_colors_unfocused;
1182#endif 1179#endif
1183 1180
1181 pointer_unblank ();
1184 scr_recolour (); 1182 scr_recolour ();
1183
1184#if ENABLE_XEMBED
1185 if (rs[Rs_embed])
1186 {
1187 long info[2] = { 0, XEMBED_MAPPED };
1188
1189 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1190 32, PropModeReplace, (unsigned char *)&info, 2);
1191 }
1192#endif
1185} 1193}
1186 1194
1187/* ------------------------------------------------------------------------- * 1195/* ------------------------------------------------------------------------- *
1188 * GET TTY CURRENT STATE * 1196 * GET TTY CURRENT STATE *
1189 * ------------------------------------------------------------------------- */ 1197 * ------------------------------------------------------------------------- */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines