aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2010-09-06 23:20:57 +0200
committerJoakim Verona2010-09-06 23:20:57 +0200
commit8dfed77f7bdf7591d6daa705364db6ba0d872116 (patch)
tree6926bc93b78c702a036b17d091907bcdc20a90f9 /src
parent5f09724dbf7335f829e435ecf104071074e309e1 (diff)
downloademacs-8dfed77f7bdf7591d6daa705364db6ba0d872116.tar.gz
emacs-8dfed77f7bdf7591d6daa705364db6ba0d872116.zip
disabled cursor drawing on xwidgets
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c4
-rw-r--r--src/xterm.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index c363a3e7a62..b4225a9c972 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23314,6 +23314,10 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width,
23314 if (!w->cursor_off_p) 23314 if (!w->cursor_off_p)
23315 { 23315 {
23316#ifdef HAVE_WINDOW_SYSTEM 23316#ifdef HAVE_WINDOW_SYSTEM
23317 if (glyph != NULL && glyph->type == XWIDGET_GLYPH){
23318 printf("attempt xwidget cursor avoidance in get_window_cursor_type\n");
23319 return NO_CURSOR;
23320 }
23317 if (glyph != NULL && glyph->type == IMAGE_GLYPH) 23321 if (glyph != NULL && glyph->type == IMAGE_GLYPH)
23318 { 23322 {
23319 if (cursor_type == FILLED_BOX_CURSOR) 23323 if (cursor_type == FILLED_BOX_CURSOR)
diff --git a/src/xterm.c b/src/xterm.c
index 67cc250a1b2..357ffeedc87 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7095,7 +7095,7 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row)
7095 cursor_glyph = get_phys_cursor_glyph (w); 7095 cursor_glyph = get_phys_cursor_glyph (w);
7096 if (cursor_glyph == NULL) 7096 if (cursor_glyph == NULL)
7097 return; 7097 return;
7098 7098
7099 /* Compute frame-relative coordinates for phys cursor. */ 7099 /* Compute frame-relative coordinates for phys cursor. */
7100 get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h); 7100 get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h);
7101 wd = w->phys_cursor_width; 7101 wd = w->phys_cursor_width;
@@ -7136,7 +7136,11 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text
7136 cursor_glyph = get_phys_cursor_glyph (w); 7136 cursor_glyph = get_phys_cursor_glyph (w);
7137 if (cursor_glyph == NULL) 7137 if (cursor_glyph == NULL)
7138 return; 7138 return;
7139 7139 if (cursor_glyph->type == XWIDGET_GLYPH){
7140 printf("tried avoiding xwidget cursor\n");
7141 return; //experimental avoidance of cursor on xwidget
7142 }
7143
7140 /* If on an image, draw like a normal cursor. That's usually better 7144 /* If on an image, draw like a normal cursor. That's usually better
7141 visible than drawing a bar, esp. if the image is large so that 7145 visible than drawing a bar, esp. if the image is large so that
7142 the bar might not be in the window. */ 7146 the bar might not be in the window. */