comparison src/glyphs-gtk.c @ 691:1df69dc58840

[xemacs-hg @ 2001-12-13 20:53:20 by wmperry] Fix strange 'floating gutter tab' bug.
author wmperry
date Thu, 13 Dec 2001 20:53:21 +0000
parents 4d7fdf497470
children 02339d4ebed4
comparison
equal deleted inserted replaced
690:46874522858b 691:1df69dc58840
1221 else 1221 else
1222 { 1222 {
1223 assert (COLOR_SPECIFIERP (value)); 1223 assert (COLOR_SPECIFIERP (value));
1224 value = Fspecifier_instance (value, domain, Qnil, Qnil); 1224 value = Fspecifier_instance (value, domain, Qnil, Qnil);
1225 } 1225 }
1226
1226 if (NILP (value)) 1227 if (NILP (value))
1227 continue; 1228 continue;
1228 results = noseeum_cons (noseeum_cons (name, value), results); 1229 results = noseeum_cons (noseeum_cons (name, value), results);
1229 i++; 1230 i++;
1230 } 1231 }
2017 2018
2018 /* map the subwindow. This is used by redisplay via 2019 /* map the subwindow. This is used by redisplay via
2019 redisplay_output_subwindow */ 2020 redisplay_output_subwindow */
2020 static void 2021 static void
2021 gtk_map_subwindow (Lisp_Image_Instance *p, int x, int y, 2022 gtk_map_subwindow (Lisp_Image_Instance *p, int x, int y,
2022 struct display_glyph_area* dga) 2023 struct display_glyph_area* dga)
2023 { 2024 {
2024 assert (dga->width > 0 && dga->height > 0); 2025 assert (dga->width > 0 && dga->height > 0);
2025 2026
2026 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) 2027 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
2027 { 2028 {
2071 wid, 2072 wid,
2072 -dga->xoffset, -dga->yoffset); 2073 -dga->xoffset, -dga->yoffset);
2073 } 2074 }
2074 GTK_WIDGET_FLAGS(FRAME_GTK_TEXT_WIDGET (f)) = old_flags; 2075 GTK_WIDGET_FLAGS(FRAME_GTK_TEXT_WIDGET (f)) = old_flags;
2075 } 2076 }
2077 else
2078 {
2079 if (IMAGE_INSTANCE_GTK_ALREADY_PUT(p))
2080 {
2081 /* Do nothing... */
2082 }
2083 else
2084 {
2085 /* Must make sure we have put the image at least once! */
2086 IMAGE_INSTANCE_GTK_ALREADY_PUT(p) = TRUE;
2087 gtk_fixed_put (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)),
2088 wid,
2089 -dga->xoffset, -dga->yoffset);
2090 }
2091 }
2076 2092
2077 if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p)) 2093 if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
2078 { 2094 {
2079 gtk_widget_map (wid); 2095 gtk_widget_map (wid);
2080 } 2096 }
2187 int dest_mask, Lisp_Object domain) 2203 int dest_mask, Lisp_Object domain)
2188 { 2204 {
2189 /* This function can GC */ 2205 /* This function can GC */
2190 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2206 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2191 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 2207 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
2192 Lisp_Object frame = DOMAIN_FRAME (domain);
2193 2208
2194 if (!DEVICE_GTK_P (XDEVICE (device))) 2209 if (!DEVICE_GTK_P (XDEVICE (device)))
2195 gui_error ("Not a GTK device", device); 2210 gui_error ("Not a GTK device", device);
2196 2211
2197 IMAGE_INSTANCE_TYPE (ii) = IMAGE_SUBWINDOW; 2212 IMAGE_INSTANCE_TYPE (ii) = IMAGE_SUBWINDOW;