diff options
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/xterm.c b/src/xterm.c index 58b326fc227..a7bdffa8bf3 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -2624,7 +2624,6 @@ x_draw_glyph_string (struct glyph_string *s) | |||
| 2624 | { | 2624 | { |
| 2625 | int relief_drawn_p = 0; | 2625 | int relief_drawn_p = 0; |
| 2626 | 2626 | ||
| 2627 | //printf("x_draw_glyph_string: %d\n",s->first_glyph->type); | ||
| 2628 | /* If S draws into the background of its successors, draw the | 2627 | /* If S draws into the background of its successors, draw the |
| 2629 | background of the successors first so that S can draw into it. | 2628 | background of the successors first so that S can draw into it. |
| 2630 | This makes S->next use XDrawString instead of XDrawImageString. */ | 2629 | This makes S->next use XDrawString instead of XDrawImageString. */ |
| @@ -2685,7 +2684,6 @@ x_draw_glyph_string (struct glyph_string *s) | |||
| 2685 | case XWIDGET_GLYPH: | 2684 | case XWIDGET_GLYPH: |
| 2686 | //erase xwidget background | 2685 | //erase xwidget background |
| 2687 | x_draw_glyph_string_background (s, 0); | 2686 | x_draw_glyph_string_background (s, 0); |
| 2688 | //x_draw_xwidget_glyph_string draws phantom xwidgets only, live xwidgets are drawn in an expose handler | ||
| 2689 | x_draw_xwidget_glyph_string (s); | 2687 | x_draw_xwidget_glyph_string (s); |
| 2690 | break; | 2688 | break; |
| 2691 | 2689 | ||
| @@ -5834,7 +5832,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, | |||
| 5834 | inev.ie.kind = NO_EVENT; | 5832 | inev.ie.kind = NO_EVENT; |
| 5835 | inev.ie.arg = Qnil; | 5833 | inev.ie.arg = Qnil; |
| 5836 | 5834 | ||
| 5837 | |||
| 5838 | if (pending_event_wait.eventtype == event.type) | 5835 | if (pending_event_wait.eventtype == event.type) |
| 5839 | pending_event_wait.eventtype = 0; /* Indicates we got it. */ | 5836 | pending_event_wait.eventtype = 0; /* Indicates we got it. */ |
| 5840 | 5837 | ||
| @@ -6321,15 +6318,11 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, | |||
| 6321 | Lisp_Object c; | 6318 | Lisp_Object c; |
| 6322 | 6319 | ||
| 6323 | #ifdef USE_GTK | 6320 | #ifdef USE_GTK |
| 6324 | |||
| 6325 | /* Don't pass keys to GTK. A Tab will shift focus to the | 6321 | /* Don't pass keys to GTK. A Tab will shift focus to the |
| 6326 | tool bar in GTK 2.4. Keys will still go to menus and | 6322 | tool bar in GTK 2.4. Keys will still go to menus and |
| 6327 | dialogs because in that case popup_activated is TRUE | 6323 | dialogs because in that case popup_activated is TRUE |
| 6328 | (see above). | 6324 | (see above). */ |
| 6329 | */ | ||
| 6330 | *finish = X_EVENT_DROP; | 6325 | *finish = X_EVENT_DROP; |
| 6331 | |||
| 6332 | |||
| 6333 | #endif | 6326 | #endif |
| 6334 | 6327 | ||
| 6335 | event.xkey.state | 6328 | event.xkey.state |
| @@ -7221,7 +7214,7 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row) | |||
| 7221 | cursor_glyph = get_phys_cursor_glyph (w); | 7214 | cursor_glyph = get_phys_cursor_glyph (w); |
| 7222 | if (cursor_glyph == NULL) | 7215 | if (cursor_glyph == NULL) |
| 7223 | return; | 7216 | return; |
| 7224 | 7217 | ||
| 7225 | /* Compute frame-relative coordinates for phys cursor. */ | 7218 | /* Compute frame-relative coordinates for phys cursor. */ |
| 7226 | get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h); | 7219 | get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h); |
| 7227 | wd = w->phys_cursor_width; | 7220 | wd = w->phys_cursor_width; |
| @@ -7266,7 +7259,6 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text | |||
| 7266 | printf("tried avoiding xwidget cursor\n"); | 7259 | printf("tried avoiding xwidget cursor\n"); |
| 7267 | return; //experimental avoidance of cursor on xwidget | 7260 | return; //experimental avoidance of cursor on xwidget |
| 7268 | } | 7261 | } |
| 7269 | |||
| 7270 | /* If on an image, draw like a normal cursor. That's usually better | 7262 | /* If on an image, draw like a normal cursor. That's usually better |
| 7271 | visible than drawing a bar, esp. if the image is large so that | 7263 | visible than drawing a bar, esp. if the image is large so that |
| 7272 | the bar might not be in the window. */ | 7264 | the bar might not be in the window. */ |
| @@ -9899,9 +9891,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 9899 | | G_LOG_FLAG_RECURSION, my_log_handler, NULL); | 9891 | | G_LOG_FLAG_RECURSION, my_log_handler, NULL); |
| 9900 | #ifdef HAVE_CLUTTER | 9892 | #ifdef HAVE_CLUTTER |
| 9901 | gtk_clutter_init (&argc, &argv2); | 9893 | gtk_clutter_init (&argc, &argv2); |
| 9902 | #else | 9894 | #else |
| 9903 | gtk_init (&argc, &argv2); | 9895 | gtk_init (&argc, &argv2); |
| 9904 | #endif | 9896 | #endif |
| 9905 | g_log_remove_handler ("GLib", id); | 9897 | g_log_remove_handler ("GLib", id); |
| 9906 | 9898 | ||
| 9907 | /* gtk_init does set_locale. We must fix locale after calling it. */ | 9899 | /* gtk_init does set_locale. We must fix locale after calling it. */ |
| @@ -10507,7 +10499,7 @@ static struct redisplay_interface x_redisplay_interface = | |||
| 10507 | x_write_glyphs, | 10499 | x_write_glyphs, |
| 10508 | x_insert_glyphs, | 10500 | x_insert_glyphs, |
| 10509 | x_clear_end_of_line, | 10501 | x_clear_end_of_line, |
| 10510 | x_scroll_run, //maybe xwidgets dont work too well with scrolling by blitting | 10502 | x_scroll_run, |
| 10511 | x_after_update_window_line, | 10503 | x_after_update_window_line, |
| 10512 | x_update_window_begin, | 10504 | x_update_window_begin, |
| 10513 | x_update_window_end, | 10505 | x_update_window_end, |