comparison src/glyphs-x.c @ 914:44e6e64b1cf2

[xemacs-hg @ 2002-07-10 03:54:43 by stephent] correct subwindow (un)mapping <170e9b58-0fab-45ca-af95-baf53a643dec@deisui.org>
author stephent
date Wed, 10 Jul 2002 03:54:45 +0000
parents 79c6ff3eef26
children 79fb6b9e9f76
comparison
equal deleted inserted replaced
913:89db3de0165d 914:44e6e64b1cf2
2026 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) 2026 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
2027 { 2027 {
2028 XUnmapWindow 2028 XUnmapWindow
2029 (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p), 2029 (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
2030 IMAGE_INSTANCE_X_CLIPWINDOW (p)); 2030 IMAGE_INSTANCE_X_CLIPWINDOW (p));
2031 XUnmapSubwindows
2032 (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
2033 IMAGE_INSTANCE_X_CLIPWINDOW (p));
2031 } 2034 }
2032 else /* must be a widget */ 2035 else /* must be a widget */
2033 { 2036 {
2034 /* Since we are being unmapped we want the enclosing frame to 2037 /* Since we are being unmapped we want the enclosing frame to
2035 get focus. The losing with simple scrolling but is the safest 2038 get focus. The losing with simple scrolling but is the safest
2055 IMAGE_INSTANCE_X_CLIPWINDOW (p), 2058 IMAGE_INSTANCE_X_CLIPWINDOW (p),
2056 x, y, dga->width, dga->height); 2059 x, y, dga->width, dga->height);
2057 XMoveWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p), 2060 XMoveWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
2058 subwindow, -dga->xoffset, -dga->yoffset); 2061 subwindow, -dga->xoffset, -dga->yoffset);
2059 if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p)) 2062 if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
2060 XMapWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p), 2063 {
2061 IMAGE_INSTANCE_X_CLIPWINDOW (p)); 2064 XMapWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
2065 IMAGE_INSTANCE_X_CLIPWINDOW (p));
2066 XMapSubwindows (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
2067 IMAGE_INSTANCE_X_CLIPWINDOW (p));
2068 }
2062 } 2069 }
2063 else /* must be a widget */ 2070 else /* must be a widget */
2064 { 2071 {
2065 XtConfigureWidget (IMAGE_INSTANCE_X_CLIPWIDGET (p), 2072 XtConfigureWidget (IMAGE_INSTANCE_X_CLIPWIDGET (p),
2066 x + IMAGE_INSTANCE_X_WIDGET_XOFFSET (p), 2073 x + IMAGE_INSTANCE_X_WIDGET_XOFFSET (p),