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.110 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC

169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
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
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
181 "MULTIPLE", 184 "MULTIPLE",
182 "TARGETS", 185 "TARGETS",
183 "TIMESTAMP", 186 "TIMESTAMP",
184 "VT_SELECTION", 187 "VT_SELECTION",
185 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 191 "CLIPBOARD",
188#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
189 "_NET_WM_PID", 196 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME", 197 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
193#endif 200#endif
194#if USE_XIM 201#if USE_XIM
195 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
196#endif 203#endif
197#ifdef TRANSPARENT 204#ifdef TRANSPARENT
199 "ESETROOT_PMAP_ID", 206 "ESETROOT_PMAP_ID",
200#endif 207#endif
201#ifdef OFFIX_DND 208#ifdef OFFIX_DND
202 "DndProtocol", 209 "DndProtocol",
203 "DndSelection", 210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
204#endif 215#endif
205 }; 216 };
206 217
207bool 218bool
208rxvt_term::init_vars () 219rxvt_term::init_vars ()
336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
337 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
338 349
339 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
340 351
341#ifdef LOCAL_X_IS_UNIX
342 if (rs[Rs_display_name][0] == ':')
343 {
344 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
345 strcpy (val, "unix");
346 strcat (val, rs[Rs_display_name]);
347 display = displays.get (val);
348 free (val);
349 }
350#endif
351
352 if (!display
353 && ! (display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
354 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
355 354
356 extract_resources (); 355 extract_resources ();
357 free (r_argv); 356 free (r_argv);
358 357
741 } 740 }
742 } 741 }
743 } 742 }
744 743
745 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
746#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 752#endif
750 SET_PIXCOLOR (i);
751 }
752 753
753 if (display->depth <= 2) 754 if (display->depth <= 2)
754 { 755 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
764 * from the fvwm window manager. 765 * from the fvwm window manager.
765 */ 766 */
766#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
767 768
768 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
769 { /* Monochrome */ 771 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 775 }
774 else 776 else
925#endif 927#endif
926 XGCValues gcvalue; 928 XGCValues gcvalue;
927 long vt_emask; 929 long vt_emask;
928 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 931 XWindowAttributes gattr;
930 Window top; 932 Window top, parent;
931 dDisp; 933 dDisp;
932 934
933#ifdef USING_W11LIB 935#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 936 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
962 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
963 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
964 } 966 }
965 } 967 }
966 else 968 else
967 {
968 mwmhints.flags = 0; 969 mwmhints.flags = 0;
969 }
970#endif 970#endif
971 971
972 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
973 Get_Colours (); 973 Get_Colours ();
974 974
975 if (!set_fonts ()) 975 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 977
978#if ENABLE_FRILLS 978 parent = DefaultRootWindow (disp);
979
980#if ENABLE_XEMBED
979 if (rs[Rs_embed]) 981 if (rs[Rs_embed])
980 { 982 {
981 top = strtol (rs[Rs_embed], 0, 0);
982
983 XWindowAttributes wattr; 983 XWindowAttributes wattr;
984
985 parent = strtol (rs[Rs_embed], 0, 0);
986
984 XGetWindowAttributes (disp, top, &wattr); 987 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985 989
986 window_calc (wattr.width, wattr.height); 990 window_calc (wattr.width, wattr.height);
991 }
987 992
988#if 0 993#endif
989 if (wattr.map_state == IsViewable) 994 window_calc (0, 0);
990 { 995
991 TermWin.mapped = 1; 996 /* sub-window placement & size in rxvt_resize_subwindows () */
992 refresh_type = FAST_REFRESH; 997#ifdef PREFER_24BIT
993 XClearWindow (disp, top); 998 attributes.background_pixel = pix_colors_focused[Color_border];
994 // TODO: make XMapNotify-event-code a function and call it 999 attributes.border_pixel = pix_colors_focused[Color_border];
995 // TODO: how can I detetc visibility without unmpa/map? 1000 attributes.colormap = display->cmap;
996 // TODO: focusin etc. 1001 top = XCreateWindow (disp, parent,
997 } 1002 szHint.x, szHint.y,
1003 szHint.width, szHint.height,
1004 TermWin.ext_bwidth,
1005 display->depth, InputOutput,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
998#else 1008#else
999 // it'S easiets just to unmap/map to get all state correctly set-up 1009 top = XCreateSimpleWindow (disp, parent,
1000 XUnmapWindow (disp, top);
1001#endif
1002 }
1003 else
1004#endif
1005 {
1006 window_calc (0, 0);
1007
1008 /* sub-window placement & size in rxvt_resize_subwindows () */
1009#ifdef PREFER_24BIT
1010 attributes.background_pixel = pix_colors_focused[Color_border];
1011 attributes.border_pixel = pix_colors_focused[Color_border];
1012 attributes.colormap = display->cmap;
1013 top = XCreateWindow (disp, DefaultRootWindow (disp),
1014 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
1015 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
1016 TermWin.ext_bwidth, 1012 TermWin.ext_bwidth,
1017 display->depth, InputOutput,
1018 display->visual,
1019 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1020#else
1021 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1022 szHint.x, szHint.y,
1023 szHint.width, szHint.height,
1024 TermWin.ext_bwidth,
1025 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
1026 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
1027#endif 1015#endif
1028 }
1029 1016
1030 TermWin.parent[0] = top; 1017 TermWin.parent[0] = top;
1031 1018
1032 old_width = szHint.width; 1019 old_width = szHint.width;
1033 old_height = szHint.height; 1020 old_height = szHint.height;
1041 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1042 wmHint.input = True; 1029 wmHint.input = True;
1043 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1044 wmHint.window_group = top; 1031 wmHint.window_group = top;
1045 1032
1046 XSetWMProperties (disp, top, NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1047 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1048 1035
1049 /* Enable delete window protocol */ 1036 Atom protocols[] = {
1050 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1); 1037 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
1051 1042
1052#if ENABLE_FRILLS 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
1053 long pid = getpid (); 1046 long pid = getpid ();
1054 1047
1055 XChangeProperty (disp, top, 1048 XChangeProperty (disp, top,
1056 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1057 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
1051
1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1058#endif 1053#endif
1059 1054
1060 XSelectInput (disp, top, 1055 XSelectInput (disp, top,
1061 KeyPressMask 1056 KeyPressMask
1062#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1063 | KeyReleaseMask 1058 | KeyReleaseMask
1064#endif 1059#endif
1065 | FocusChangeMask | VisibilityChangeMask 1060 | FocusChangeMask | VisibilityChangeMask
1066 | ExposureMask
1067 | StructureNotifyMask); 1061 | ExposureMask | StructureNotifyMask);
1062
1068 termwin_ev.start (display, top); 1063 termwin_ev.start (display, top);
1069 1064
1070#if ENABLE_FRILLS 1065#if ENABLE_FRILLS
1071 if (mwmhints.flags) 1066 if (mwmhints.flags)
1072 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1067 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1097 attributes.bit_gravity = NorthWestGravity; 1092 attributes.bit_gravity = NorthWestGravity;
1098 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1099 1094
1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1101 1096
1102 pointer_unblank ();
1103
1104#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1105 if (options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
1106 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1107 else 1100 else
1108#endif 1101#endif
1177 // initially we are in unfocused state 1170 // initially we are in unfocused state
1178 if (rs[Rs_fade]) 1171 if (rs[Rs_fade])
1179 pix_colors = pix_colors_unfocused; 1172 pix_colors = pix_colors_unfocused;
1180#endif 1173#endif
1181 1174
1175 pointer_unblank ();
1182 scr_recolour (); 1176 scr_recolour ();
1177
1178#if ENABLE_XEMBED
1179 if (rs[Rs_embed])
1180 {
1181 long info[2] = { 0, XEMBED_MAPPED };
1182
1183 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1184 32, PropModeReplace, (unsigned char *)&info, 2);
1185 }
1186#endif
1183} 1187}
1184 1188
1185/* ------------------------------------------------------------------------- * 1189/* ------------------------------------------------------------------------- *
1186 * GET TTY CURRENT STATE * 1190 * GET TTY CURRENT STATE *
1187 * ------------------------------------------------------------------------- */ 1191 * ------------------------------------------------------------------------- */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines