[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget aae452a 09/13: whitespace cleanup
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget aae452a 09/13: whitespace cleanup |
Date: |
Fri, 02 Jan 2015 12:22:40 +0000 |
branch: xwidget
commit aae452aab234e9d81243b3a9d69725e3ec601aff
Author: jave <address@hidden>
Commit: jave <address@hidden>
whitespace cleanup
---
src/xterm.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/xterm.c b/src/xterm.c
index 58fb886..5354b06 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2686,6 +2686,7 @@ x_draw_glyph_string (struct glyph_string *s)
case IMAGE_GLYPH:
x_draw_image_glyph_string (s);
break;
+
#ifdef HAVE_XWIDGETS
case XWIDGET_GLYPH:
//erase xwidget background
@@ -8032,12 +8033,12 @@ x_draw_bar_cursor (struct window *w, struct glyph_row
*row, int width, enum text
cursor_glyph = get_phys_cursor_glyph (w);
if (cursor_glyph == NULL)
return;
-#ifdef HAVE_XWIDGETS
+#ifdef HAVE_XWIDGETS
if (cursor_glyph->type == XWIDGET_GLYPH){
printf("tried avoiding xwidget cursor\n");
return; //experimental avoidance of cursor on xwidget
}
-#endif
+#endif
/* If on an image, draw like a normal cursor. That's usually better
visible than drawing a bar, esp. if the image is large so that
the bar might not be in the window. */
@@ -10756,6 +10757,7 @@ x_term_init (Lisp_Object display_name, char
*xrm_option, char *resource_name)
https://bugzilla.gnome.org/show_bug.cgi?id=563627. */
id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
| G_LOG_FLAG_RECURSION, my_log_handler,
NULL);
+
/* NULL window -> events for all windows go to our function.
Call before gtk_init so Gtk+ event filters comes after our. */
gdk_window_add_filter (NULL, event_handler_gdk, NULL);
- [Emacs-diffs] xwidget 35c2e62 05/13: a missing merge, trailing whitespace, (continued)
- [Emacs-diffs] xwidget 35c2e62 05/13: a missing merge, trailing whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 2cef979 07/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 6d1cade 06/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 79030ea 08/13: whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget e93fd42 10/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 659a0a5 11/13: whitespace cleanup, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 1048722 03/13: Doc strings, and whitespace, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget c089503 13/13: moved xwidget test to the test dir, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget fe27c32 12/13: a missing merge, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget 8f0cf0a 01/13: removed msysconfig.sh, Joakim Verona, 2015/01/02
- [Emacs-diffs] xwidget aae452a 09/13: whitespace cleanup,
Joakim Verona <=
- [Emacs-diffs] xwidget 1d364da 02/13: Removed remains of Clutter experiment, Joakim Verona, 2015/01/02