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.108 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.109 by root, Mon Feb 14 18:47:54 2005 UTC

… …
926#endif 926#endif
927 XGCValues gcvalue; 927 XGCValues gcvalue;
928 long vt_emask; 928 long vt_emask;
929 XSetWindowAttributes attributes; 929 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 930 XWindowAttributes gattr;
931 Window top;
931 dDisp; 932 dDisp;
932 933
933#ifdef USING_W11LIB 934#ifdef USING_W11LIB
934 /* enable W11 callbacks */ 935 /* enable W11 callbacks */
935 W11AddEventHandler (disp, rxvt_W11_process_x_event); 936 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
973 Get_Colours (); 974 Get_Colours ();
974 975
975 if (!set_fonts ()) 976 if (!set_fonts ())
976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
977 978
979#if ENABLE_FRILLS
980 if (rs[Rs_embed])
981 {
982 top = strtol (rs[Rs_embed], 0, 0);
983
984 XWindowAttributes wattr;
985 XGetWindowAttributes (disp, top, &wattr);
986
987 window_calc (wattr.width, wattr.height);
988
989#if 0
990 if (wattr.map_state == IsViewable)
991 {
992 TermWin.mapped = 1;
993 refresh_type = FAST_REFRESH;
994 XClearWindow (disp, top);
995 // TODO: make XMapNotify-event-code a function and call it
996 // TODO: how can I detetc visibility without unmpa/map?
997 // TODO: focusin etc.
998 }
999#else
1000 // it'S easiets just to unmap/map to get all state correctly set-up
1001 XUnmapWindow (disp, top);
1002#endif
1003 }
1004 else
1005#endif
1006 {
978 window_calc (0, 0); 1007 window_calc (0, 0);
1008
1009 /* sub-window placement & size in rxvt_resize_subwindows () */
1010#ifdef PREFER_24BIT
1011 attributes.background_pixel = pix_colors_focused[Color_border];
1012 attributes.border_pixel = pix_colors_focused[Color_border];
1013 attributes.colormap = display->cmap;
1014 top = XCreateWindow (disp, DefaultRootWindow (disp),
1015 szHint.x, szHint.y,
1016 szHint.width, szHint.height,
1017 TermWin.ext_bwidth,
1018 display->depth, InputOutput,
1019 display->visual,
1020 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1021#else
1022 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1023 szHint.x, szHint.y,
1024 szHint.width, szHint.height,
1025 TermWin.ext_bwidth,
1026 pix_colors_focused[Color_border],
1027 pix_colors_focused[Color_border]);
1028#endif
1029 }
1030
1031 TermWin.parent[0] = top;
1032
979 old_width = szHint.width; 1033 old_width = szHint.width;
980 old_height = szHint.height; 1034 old_height = szHint.height;
981
982 /* sub-window placement & size in rxvt_resize_subwindows () */
983
984#ifdef PREFER_24BIT
985 attributes.background_pixel = pix_colors_focused[Color_border];
986 attributes.border_pixel = pix_colors_focused[Color_border];
987 attributes.colormap = display->cmap;
988 TermWin.parent[0] = XCreateWindow (disp, DefaultRootWindow (disp),
989 szHint.x, szHint.y,
990 szHint.width, szHint.height,
991 TermWin.ext_bwidth,
992 display->depth, InputOutput,
993 display->visual,
994 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
995#else
996 TermWin.parent[0] = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
997 szHint.x, szHint.y,
998 szHint.width, szHint.height,
999 TermWin.ext_bwidth,
1000 pix_colors_focused[Color_border],
1001 pix_colors_focused[Color_border]);
1002#endif
1003 1035
1004 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1036 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1005 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1037 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1006 1038
1007 classHint.res_name = (char *)rs[Rs_name]; 1039 classHint.res_name = (char *)rs[Rs_name];
1008 classHint.res_class = (char *)RESCLASS; 1040 classHint.res_class = (char *)RESCLASS;
1009 1041
1010 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1042 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1011 wmHint.input = True; 1043 wmHint.input = True;
1012 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1044 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1013 wmHint.window_group = TermWin.parent[0]; 1045 wmHint.window_group = top;
1014 1046
1015 XSetWMProperties (disp, TermWin.parent[0], NULL, NULL, 1047 XSetWMProperties (disp, top, NULL, NULL,
1016 (char **)argv, argc, &szHint, &wmHint, &classHint); 1048 (char **)argv, argc, &szHint, &wmHint, &classHint);
1017 1049
1018 /* Enable delete window protocol */ 1050 /* Enable delete window protocol */
1019 XSetWMProtocols (disp, TermWin.parent[0], 1051 XSetWMProtocols (disp, top, &xa[XA_WMDELETEWINDOW], 1);
1020 &xa[XA_WMDELETEWINDOW], 1);
1021 1052
1022#if ENABLE_FRILLS 1053#if ENABLE_FRILLS
1023 long pid = getpid (); 1054 long pid = getpid ();
1024 1055
1025 XChangeProperty (disp, TermWin.parent[0], 1056 XChangeProperty (disp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1057 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1058 PropModeReplace, (unsigned char *)&pid, 1);
1028#endif 1059#endif
1029 1060
1030 XSelectInput (disp, TermWin.parent[0], 1061 XSelectInput (disp, top,
1031 KeyPressMask 1062 KeyPressMask
1032#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1033 | KeyReleaseMask 1064 | KeyReleaseMask
1034#endif 1065#endif
1035 | FocusChangeMask | VisibilityChangeMask 1066 | FocusChangeMask | VisibilityChangeMask
1036 | ExposureMask 1067 | ExposureMask
1037 | StructureNotifyMask); 1068 | StructureNotifyMask);
1038 termwin_ev.start (display, TermWin.parent[0]); 1069 termwin_ev.start (display, top);
1039 1070
1040#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1041 if (mwmhints.flags) 1072 if (mwmhints.flags)
1042 XChangeProperty (disp, TermWin.parent[0], 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,
1043 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1044#endif 1075#endif
1045 1076
1046 /* vt cursor: Black-on-White is standard, but this is more popular */ 1077 /* vt cursor: Black-on-White is standard, but this is more popular */
1047 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
… …
1050 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1051 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1052#endif 1083#endif
1053 1084
1054 /* the vt window */ 1085 /* the vt window */
1055 TermWin.vt = XCreateSimpleWindow (disp, TermWin.parent[0], 1086 TermWin.vt = XCreateSimpleWindow (disp, top,
1056 window_vt_x, 1087 window_vt_x,
1057 window_vt_y, 1088 window_vt_y,
1058 TermWin_TotalWidth (), 1089 TermWin_TotalWidth (),
1059 TermWin_TotalHeight (), 1090 TermWin_TotalHeight (),
1060 0, 1091 0,
… …
1082 vt_ev.start (display, TermWin.vt); 1113 vt_ev.start (display, TermWin.vt);
1083 1114
1084#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1085 if (menuBar_height ()) 1116 if (menuBar_height ())
1086 { 1117 {
1087 menuBar.win = XCreateSimpleWindow (disp, TermWin.parent[0], 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1088 window_vt_x, 0, 1119 window_vt_x, 0,
1089 TermWin_TotalWidth (), 1120 TermWin_TotalWidth (),
1090 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1091 0, 1122 0,
1092 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],

Diff Legend

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