[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget 78f196e 1/2: cleanups
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget 78f196e 1/2: cleanups |
Date: |
Sun, 04 Jan 2015 14:10:52 +0000 |
branch: xwidget
commit 78f196e333c9f77c6a6b5ed69b0d77857cd633a1
Author: jave <address@hidden>
Commit: jave <address@hidden>
cleanups
---
src/window.c | 3 ---
src/xdisp.c | 21 +--------------------
src/xterm.c | 1 +
3 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/src/window.c b/src/window.c
index da4e66c..65a837d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -44,9 +44,6 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#ifdef MSDOS
#include "msdos.h"
#endif
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif
#ifdef HAVE_XWIDGETS
#include "xwidget.h"
#endif
diff --git a/src/xdisp.c b/src/xdisp.c
index 1fa19f7..dd474cf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -318,7 +318,6 @@ along with GNU Emacs. If not, see
<http://www.gnu.org/licenses/>. */
#include TERM_HEADER
#endif /* HAVE_WINDOW_SYSTEM */
-#include "font.h"
#ifdef HAVE_XWIDGETS
#include "xwidget.h"
#endif
@@ -7701,6 +7700,7 @@ set_iterator_to_next (struct it *it, int reseat_p)
goto consider_string_end;
break;
#endif
+
default:
/* There are no other methods defined, so this should be a bug. */
emacs_abort ();
@@ -13831,13 +13831,6 @@ redisplay_internal (void)
*w->desired_matrix->method = 0;
debug_method_add (w, "optimization 1");
#endif
-#if HAVE_XWIDGETS
- //debug optimization movement issue
- //w->desired_matrix->no_scrolling_p = 1;
- //*w->desired_matrix->method = 0;
- //debug_method_add (w, "optimization 1");
-#endif
-
#ifdef HAVE_WINDOW_SYSTEM
update_window_fringes (w, 0);
#endif
@@ -17084,11 +17077,6 @@ try_window (Lisp_Object window, struct text_pos pos,
int flags)
if (f->fonts_changed && !(flags & TRY_WINDOW_IGNORE_FONTS_CHANGE))
return 0;
}
-#ifdef HAVE_XWIDGETS_xxx
- //currently this is needed to detect xwidget movement reliably. or probably
not.
- printf("try_window\n");
- return 0;
-#endif
/* Don't let the cursor end in the scroll margins. */
if ((flags & TRY_WINDOW_CHECK_MARGINS)
@@ -17949,13 +17937,6 @@ try_window_id (struct window *w)
return 0;
#endif
-#ifdef HAVE_XWIDGETS_xxx
- //maybe needed for proper xwidget movement
- printf("try_window_id\n");
- return -1;
-#endif
-
-
/* This is handy for debugging. */
#if 0
#define GIVE_UP(X) \
diff --git a/src/xterm.c b/src/xterm.c
index 14d04b8..e3f4739 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8033,6 +8033,7 @@ 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
if (cursor_glyph->type == XWIDGET_GLYPH){
printf("tried avoiding xwidget cursor\n");