aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index c87862d1b6d..400cb1d1d7f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5324,7 +5324,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
5324 5324
5325 it->xwidget = lookup_xwidget(value); 5325 it->xwidget = lookup_xwidget(value);
5326 } 5326 }
5327#endif 5327#endif
5328#ifdef HAVE_WINDOW_SYSTEM 5328#ifdef HAVE_WINDOW_SYSTEM
5329 else 5329 else
5330 { 5330 {
@@ -6065,7 +6065,7 @@ push_it (struct it *it, struct text_pos *position)
6065 case GET_FROM_XWIDGET: 6065 case GET_FROM_XWIDGET:
6066 p->u.xwidget.object = it->object; 6066 p->u.xwidget.object = it->object;
6067 break; 6067 break;
6068#endif 6068#endif
6069 } 6069 }
6070 p->position = position ? *position : it->position; 6070 p->position = position ? *position : it->position;
6071 p->current = it->current; 6071 p->current = it->current;
@@ -6828,7 +6828,7 @@ static int (* get_next_element[NUM_IT_METHODS]) (struct it *it) =
6828 next_element_from_stretch 6828 next_element_from_stretch
6829#ifdef HAVE_XWIDGETS 6829#ifdef HAVE_XWIDGETS
6830 ,next_element_from_xwidget 6830 ,next_element_from_xwidget
6831#endif 6831#endif
6832}; 6832};
6833 6833
6834#define GET_NEXT_DISPLAY_ELEMENT(it) (*get_next_element[(it)->method]) (it) 6834#define GET_NEXT_DISPLAY_ELEMENT(it) (*get_next_element[(it)->method]) (it)
@@ -17061,8 +17061,6 @@ try_window (Lisp_Object window, struct text_pos pos, int flags)
17061 start_display (&it, w, pos); 17061 start_display (&it, w, pos);
17062 it.glyph_row->reversed_p = false; 17062 it.glyph_row->reversed_p = false;
17063 17063
17064
17065
17066 /* Display all lines of W. */ 17064 /* Display all lines of W. */
17067 while (it.current_y < it.last_visible_y) 17065 while (it.current_y < it.last_visible_y)
17068 { 17066 {
@@ -17942,7 +17940,7 @@ try_window_id (struct window *w)
17942 return -1; 17940 return -1;
17943#endif 17941#endif
17944 17942
17945 17943
17946 /* This is handy for debugging. */ 17944 /* This is handy for debugging. */
17947#if 0 17945#if 0
17948#define GIVE_UP(X) \ 17946#define GIVE_UP(X) \
@@ -18759,7 +18757,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
18759 glyph->left_box_line_p, 18757 glyph->left_box_line_p,
18760 glyph->right_box_line_p); 18758 glyph->right_box_line_p);
18761 } 18759 }
18762#ifdef HAVE_XWIDGETS 18760#ifdef HAVE_XWIDGETS
18763 else if (glyph->type == XWIDGET_GLYPH) 18761 else if (glyph->type == XWIDGET_GLYPH)
18764 { 18762 {
18765 fprintf (stderr, 18763 fprintf (stderr,
@@ -18781,7 +18779,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
18781 18779
18782 // printf("dump xwidget glyph\n"); 18780 // printf("dump xwidget glyph\n");
18783 } 18781 }
18784#endif 18782#endif
18785} 18783}
18786 18784
18787 18785
@@ -24206,7 +24204,7 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
24206 printf("calc_pixel_width_or_height: return dummy size FIXME\n"); 24204 printf("calc_pixel_width_or_height: return dummy size FIXME\n");
24207 return OK_PIXELS (width_p ? 100 : 100); 24205 return OK_PIXELS (width_p ? 100 : 100);
24208 } 24206 }
24209#endif 24207#endif
24210#endif 24208#endif
24211 if (EQ (car, Qplus) || EQ (car, Qminus)) 24209 if (EQ (car, Qplus) || EQ (car, Qminus))
24212 { 24210 {
@@ -24710,6 +24708,7 @@ fill_image_glyph_string (struct glyph_string *s)
24710 s->ybase += s->first_glyph->voffset; 24708 s->ybase += s->first_glyph->voffset;
24711} 24709}
24712 24710
24711
24713#ifdef HAVE_XWIDGETS 24712#ifdef HAVE_XWIDGETS
24714static void 24713static void
24715fill_xwidget_glyph_string (struct glyph_string *s) 24714fill_xwidget_glyph_string (struct glyph_string *s)
@@ -25227,7 +25226,7 @@ compute_overhangs_and_x (struct glyph_string *s, int x, int backward_p)
25227 BUILD_IMAGE_GLYPH_STRING (START, END, HEAD, TAIL, \ 25226 BUILD_IMAGE_GLYPH_STRING (START, END, HEAD, TAIL, \
25228 HL, X, LAST_X); \ 25227 HL, X, LAST_X); \
25229 break; 25228 break;
25230 25229
25231#define BUILD_GLYPH_STRINGS_XW(START, END, HEAD, TAIL, HL, X, LAST_X) \ 25230#define BUILD_GLYPH_STRINGS_XW(START, END, HEAD, TAIL, HL, X, LAST_X) \
25232 case XWIDGET_GLYPH: \ 25231 case XWIDGET_GLYPH: \
25233 BUILD_XWIDGET_GLYPH_STRING (START, END, HEAD, TAIL, \ 25232 BUILD_XWIDGET_GLYPH_STRING (START, END, HEAD, TAIL, \
@@ -25262,9 +25261,9 @@ BUILD_GLYPH_STRINGS_2(START, END, HEAD, TAIL, HL, X, LAST_X)
25262#define BUILD_GLYPH_STRINGS(START, END, HEAD, TAIL, HL, X, LAST_X) \ 25261#define BUILD_GLYPH_STRINGS(START, END, HEAD, TAIL, HL, X, LAST_X) \
25263BUILD_GLYPH_STRINGS_1(START, END, HEAD, TAIL, HL, X, LAST_X) \ 25262BUILD_GLYPH_STRINGS_1(START, END, HEAD, TAIL, HL, X, LAST_X) \
25264BUILD_GLYPH_STRINGS_2(START, END, HEAD, TAIL, HL, X, LAST_X) 25263BUILD_GLYPH_STRINGS_2(START, END, HEAD, TAIL, HL, X, LAST_X)
25265#endif 25264#endif
25265
25266 25266
25267
25268/* Draw glyphs between START and END in AREA of ROW on window W, 25267/* Draw glyphs between START and END in AREA of ROW on window W,
25269 starting at x-position X. X is relative to AREA in W. HL is a 25268 starting at x-position X. X is relative to AREA in W. HL is a
25270 face-override with the following meaning: 25269 face-override with the following meaning:
@@ -27321,6 +27320,7 @@ x_produce_glyphs (struct it *it)
27321 else if (it->what == IT_XWIDGET) 27320 else if (it->what == IT_XWIDGET)
27322 produce_xwidget_glyph (it); 27321 produce_xwidget_glyph (it);
27323#endif 27322#endif
27323
27324 done: 27324 done:
27325 /* Accumulate dimensions. Note: can't assume that it->descent > 0 27325 /* Accumulate dimensions. Note: can't assume that it->descent > 0
27326 because this isn't true for images with `:ascent 100'. */ 27326 because this isn't true for images with `:ascent 100'. */
@@ -27690,12 +27690,12 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width,
27690 if (!w->cursor_off_p) 27690 if (!w->cursor_off_p)
27691 { 27691 {
27692 27692
27693#ifdef HAVE_XWIDGETS 27693#ifdef HAVE_XWIDGETS
27694 if (glyph != NULL && glyph->type == XWIDGET_GLYPH){ 27694 if (glyph != NULL && glyph->type == XWIDGET_GLYPH){
27695 //printf("attempt xwidget cursor avoidance in get_window_cursor_type\n"); 27695 //printf("attempt xwidget cursor avoidance in get_window_cursor_type\n");
27696 return NO_CURSOR; 27696 return NO_CURSOR;
27697 } 27697 }
27698#endif 27698#endif
27699 if (glyph != NULL && glyph->type == IMAGE_GLYPH) 27699 if (glyph != NULL && glyph->type == IMAGE_GLYPH)
27700 { 27700 {
27701 if (cursor_type == FILLED_BOX_CURSOR) 27701 if (cursor_type == FILLED_BOX_CURSOR)