Mercurial > hg > xemacs-beta
comparison src/glyphs-x.c @ 448:3078fd1074e8 r21-2-39
Import from CVS: tag r21-2-39
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:38:25 +0200 |
parents | 1ccc32a20af4 |
children | 98528da0b7fc |
comparison
equal
deleted
inserted
replaced
447:4fc5f13f3bd3 | 448:3078fd1074e8 |
---|---|
2138 redisplay_output_subwindow */ | 2138 redisplay_output_subwindow */ |
2139 static void | 2139 static void |
2140 x_map_subwindow (Lisp_Image_Instance *p, int x, int y, | 2140 x_map_subwindow (Lisp_Image_Instance *p, int x, int y, |
2141 struct display_glyph_area* dga) | 2141 struct display_glyph_area* dga) |
2142 { | 2142 { |
2143 assert (dga->width > 0 && dga->height > 0); | |
2143 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) | 2144 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) |
2144 { | 2145 { |
2145 Window subwindow = IMAGE_INSTANCE_X_SUBWINDOW_ID (p); | 2146 Window subwindow = IMAGE_INSTANCE_X_SUBWINDOW_ID (p); |
2146 XMoveResizeWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p), | 2147 XMoveResizeWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p), |
2147 IMAGE_INSTANCE_X_CLIPWINDOW (p), | 2148 IMAGE_INSTANCE_X_CLIPWINDOW (p), |
2255 | 2256 |
2256 lw_add_widget_value_arg (wv, XtNwidth, | 2257 lw_add_widget_value_arg (wv, XtNwidth, |
2257 (Dimension)IMAGE_INSTANCE_WIDTH (p)); | 2258 (Dimension)IMAGE_INSTANCE_WIDTH (p)); |
2258 lw_add_widget_value_arg (wv, XtNheight, | 2259 lw_add_widget_value_arg (wv, XtNheight, |
2259 (Dimension)IMAGE_INSTANCE_HEIGHT (p)); | 2260 (Dimension)IMAGE_INSTANCE_HEIGHT (p)); |
2261 } | |
2262 | |
2263 /* Adjust offsets within the frame. */ | |
2264 if (XFRAME (IMAGE_INSTANCE_FRAME (p))->frame_changed) | |
2265 { | |
2266 Arg al[2]; | |
2267 XtSetArg (al [0], XtNx, &IMAGE_INSTANCE_X_WIDGET_XOFFSET (p)); | |
2268 XtSetArg (al [1], XtNy, &IMAGE_INSTANCE_X_WIDGET_YOFFSET (p)); | |
2269 XtGetValues (FRAME_X_TEXT_WIDGET | |
2270 (XFRAME (IMAGE_INSTANCE_FRAME (p))), al, 2); | |
2260 } | 2271 } |
2261 | 2272 |
2262 /* now modify the widget */ | 2273 /* now modify the widget */ |
2263 lw_modify_all_widgets (IMAGE_INSTANCE_X_WIDGET_LWID (p), | 2274 lw_modify_all_widgets (IMAGE_INSTANCE_X_WIDGET_LWID (p), |
2264 wv, True); | 2275 wv, True); |