Commit 78f196e3 authored by jave's avatar jave

cleanups

parent a7e2c92d
...@@ -44,9 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -44,9 +44,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef MSDOS #ifdef MSDOS
#include "msdos.h" #include "msdos.h"
#endif #endif
#ifdef HAVE_NS
#include "nsterm.h"
#endif
#ifdef HAVE_XWIDGETS #ifdef HAVE_XWIDGETS
#include "xwidget.h" #include "xwidget.h"
#endif #endif
......
...@@ -318,7 +318,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -318,7 +318,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include TERM_HEADER #include TERM_HEADER
#endif /* HAVE_WINDOW_SYSTEM */ #endif /* HAVE_WINDOW_SYSTEM */
#include "font.h"
#ifdef HAVE_XWIDGETS #ifdef HAVE_XWIDGETS
#include "xwidget.h" #include "xwidget.h"
#endif #endif
...@@ -7701,6 +7700,7 @@ set_iterator_to_next (struct it *it, int reseat_p) ...@@ -7701,6 +7700,7 @@ set_iterator_to_next (struct it *it, int reseat_p)
goto consider_string_end; goto consider_string_end;
break; break;
#endif #endif
default: default:
/* There are no other methods defined, so this should be a bug. */ /* There are no other methods defined, so this should be a bug. */
emacs_abort (); emacs_abort ();
...@@ -13831,13 +13831,6 @@ redisplay_internal (void) ...@@ -13831,13 +13831,6 @@ redisplay_internal (void)
*w->desired_matrix->method = 0; *w->desired_matrix->method = 0;
debug_method_add (w, "optimization 1"); debug_method_add (w, "optimization 1");
#endif #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 #ifdef HAVE_WINDOW_SYSTEM
update_window_fringes (w, 0); update_window_fringes (w, 0);
#endif #endif
...@@ -17084,11 +17077,6 @@ try_window (Lisp_Object window, struct text_pos pos, int flags) ...@@ -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)) if (f->fonts_changed && !(flags & TRY_WINDOW_IGNORE_FONTS_CHANGE))
return 0; 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. */ /* Don't let the cursor end in the scroll margins. */
if ((flags & TRY_WINDOW_CHECK_MARGINS) if ((flags & TRY_WINDOW_CHECK_MARGINS)
...@@ -17949,13 +17937,6 @@ try_window_id (struct window *w) ...@@ -17949,13 +17937,6 @@ try_window_id (struct window *w)
return 0; return 0;
#endif #endif
#ifdef HAVE_XWIDGETS_xxx
//maybe needed for proper xwidget movement
printf("try_window_id\n");
return -1;
#endif
/* This is handy for debugging. */ /* This is handy for debugging. */
#if 0 #if 0
#define GIVE_UP(X) \ #define GIVE_UP(X) \
......
...@@ -8033,6 +8033,7 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text ...@@ -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); cursor_glyph = get_phys_cursor_glyph (w);
if (cursor_glyph == NULL) if (cursor_glyph == NULL)
return; return;
#ifdef HAVE_XWIDGETS #ifdef HAVE_XWIDGETS
if (cursor_glyph->type == XWIDGET_GLYPH){ if (cursor_glyph->type == XWIDGET_GLYPH){
printf("tried avoiding xwidget cursor\n"); printf("tried avoiding xwidget cursor\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment