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.114 by root, Sun Feb 20 00:09:25 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
189 "_NET_WM_PID", 190 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS", 191 "_MOTIF_WM_HINTS",
199 "ESETROOT_PMAP_ID", 200 "ESETROOT_PMAP_ID",
200#endif 201#endif
201#ifdef OFFIX_DND 202#ifdef OFFIX_DND
202 "DndProtocol", 203 "DndProtocol",
203 "DndSelection", 204 "DndSelection",
205#endif
206#if ENABLE_XEMBED
207 "_XEMBED",
208 "_XEMBED_INFO",
204#endif 209#endif
205 }; 210 };
206 211
207bool 212bool
208rxvt_term::init_vars () 213rxvt_term::init_vars ()
925#endif 930#endif
926 XGCValues gcvalue; 931 XGCValues gcvalue;
927 long vt_emask; 932 long vt_emask;
928 XSetWindowAttributes attributes; 933 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 934 XWindowAttributes gattr;
930 Window top; 935 Window top, parent;
931 dDisp; 936 dDisp;
932 937
933#ifdef USING_W11LIB 938#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 939 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 940 W11AddEventHandler (disp, rxvt_W11_process_x_event);
973 Get_Colours (); 978 Get_Colours ();
974 979
975 if (!set_fonts ()) 980 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 981 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 982
978#if ENABLE_FRILLS 983 parent = DefaultRootWindow (disp);
984
985#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 986 if (rs[Rs_embed])
980 { 987 {
981 XWindowAttributes wattr; 988 XWindowAttributes wattr;
982 989
983 top = strtol (rs[Rs_embed], 0, 0); 990 parent = strtol (rs[Rs_embed], 0, 0);
984 991
985 if (!XGetWindowAttributes (disp, top, &wattr)) 992 if (!XGetWindowAttributes (disp, parent, &wattr))
986 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 993 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
987 994
988 window_calc (wattr.width, wattr.height); 995 window_calc (wattr.width, wattr.height);
996 }
989 997
990#if 0 998#endif
991 if (wattr.map_state == IsViewable) 999 window_calc (0, 0);
992 { 1000
993 TermWin.mapped = 1; 1001 /* sub-window placement & size in rxvt_resize_subwindows () */
994 refresh_type = FAST_REFRESH; 1002#ifdef PREFER_24BIT
995 XClearWindow (disp, top); 1003 attributes.background_pixel = pix_colors_focused[Color_border];
996 // TODO: make XMapNotify-event-code a function and call it 1004 attributes.border_pixel = pix_colors_focused[Color_border];
997 // TODO: how can I detetc visibility without unmpa/map? 1005 attributes.colormap = display->cmap;
998 // TODO: focusin etc. 1006 top = XCreateWindow (disp, parent,
999 } 1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 TermWin.ext_bwidth,
1010 display->depth, InputOutput,
1011 display->visual,
1012 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1000#else 1013#else
1001 // it'S easiets just to unmap/map to get all state correctly set-up 1014 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, 1015 szHint.x, szHint.y,
1017 szHint.width, szHint.height, 1016 szHint.width, szHint.height,
1018 TermWin.ext_bwidth, 1017 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], 1018 pix_colors_focused[Color_border],
1028 pix_colors_focused[Color_border]); 1019 pix_colors_focused[Color_border]);
1029#endif 1020#endif
1030 }
1031 1021
1032 TermWin.parent[0] = top; 1022 TermWin.parent[0] = top;
1033 1023
1034 old_width = szHint.width; 1024 old_width = szHint.width;
1035 old_height = szHint.height; 1025 old_height = szHint.height;
1047 1037
1048 XSetWMProperties (disp, top, NULL, NULL, 1038 XSetWMProperties (disp, top, NULL, NULL,
1049 (char **)argv, argc, &szHint, &wmHint, &classHint); 1039 (char **)argv, argc, &szHint, &wmHint, &classHint);
1050 1040
1051 /* Enable delete window protocol */ 1041 /* Enable delete window protocol */
1052 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1042 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1053 1043
1054#if ENABLE_FRILLS 1044#if ENABLE_FRILLS
1055 long pid = getpid (); 1045 long pid = getpid ();
1056 1046
1057 XChangeProperty (disp, top, 1047 XChangeProperty (disp, top,
1063 KeyPressMask 1053 KeyPressMask
1064#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1065 | KeyReleaseMask 1055 | KeyReleaseMask
1066#endif 1056#endif
1067 | FocusChangeMask | VisibilityChangeMask 1057 | FocusChangeMask | VisibilityChangeMask
1068 | ExposureMask
1069 | StructureNotifyMask); 1058 | ExposureMask | StructureNotifyMask);
1059
1070 termwin_ev.start (display, top); 1060 termwin_ev.start (display, top);
1071 1061
1072#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
1073 if (mwmhints.flags) 1063 if (mwmhints.flags)
1074 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1099 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1100 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1101 1091
1102 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1103 1093
1104 pointer_unblank ();
1105
1106#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
1107 if (options & Opt_pointerBlank) 1095 if (options & Opt_pointerBlank)
1108 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1109 else 1097 else
1110#endif 1098#endif
1179 // initially we are in unfocused state 1167 // initially we are in unfocused state
1180 if (rs[Rs_fade]) 1168 if (rs[Rs_fade])
1181 pix_colors = pix_colors_unfocused; 1169 pix_colors = pix_colors_unfocused;
1182#endif 1170#endif
1183 1171
1172 pointer_unblank ();
1184 scr_recolour (); 1173 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1185} 1184}
1186 1185
1187/* ------------------------------------------------------------------------- * 1186/* ------------------------------------------------------------------------- *
1188 * GET TTY CURRENT STATE * 1187 * GET TTY CURRENT STATE *
1189 * ------------------------------------------------------------------------- */ 1188 * ------------------------------------------------------------------------- */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines