GLYPH_DEBUG fix

5 files changed, 33 insertions, 10 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index d4da4297529..b4d2dc2334a 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -280,15 +280,14 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
             : "???"),
            paused_p ? " ***paused***" : "");
   strcat (buf, msg);
-
+}
 
 
 /* Add to the redisplay history that frame F has been displayed.
    PAUSED_P non-zero means that the update has been interrupted for
    pending input.  */
 
-static void
-add_frame_display_history (struct frame *f, int paused_p)
+static void add_frame_display_history (struct frame *f, int paused_p)
 {
   char *buf;
 
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 34daab7285f..7f8d8939d42 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -80,7 +80,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget,
   GtkWidgetClass *parent_class;
   struct GtkFixedPrivateL* priv;
 
-  printf(" emacs_fixed_gtk_widget_size_allocate\n");
+  //  printf(" emacs_fixed_gtk_widget_size_allocate\n");
   klass = EMACS_FIXED_GET_CLASS (widget);
   parent_class = g_type_class_peek_parent (klass);
   parent_class->size_allocate (widget, allocation);
@@ -148,7 +148,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget,
         child_allocation.height = xv->clip_bottom - xv->clip_top;
         //gtk_widget_size_allocate (child, &child_allocation);
         //TODO find a way to remove this feeble workaround
-        printf(" allocation internal modification for xw %d  %d,%d\n",xv,        child_allocation.width,        child_allocation.height);
+        //        printf(" allocation internal modification for xw %d  %d,%d\n",xv,        child_allocation.width,        child_allocation.height);
 
       }
       gtk_widget_size_allocate (child->widget, &child_allocation);
diff --git a/src/xdisp.c b/src/xdisp.c
index f01b277d35c..de9c624ba04 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6842,7 +6842,7 @@ set_iterator_to_next (struct it *it, int reseat_p)
     case GET_FROM_STRETCH:
 #ifdef HAVE_XWIDGETS
     case GET_FROM_XWIDGET:
-#endif
+
       /* The position etc with which we have to proceed are on
          the stack.  The position may be at the end of a string,
          if the `display' property takes up the whole string.  */
@@ -6851,7 +6851,7 @@ set_iterator_to_next (struct it *it, int reseat_p)
       if (it->method == GET_FROM_STRING)
         goto consider_string_end;
       break;
-
+#endif
     default:
       /* There are no other methods defined, so this should be a bug.  */
       abort ();
@@ -12733,6 +12733,13 @@ 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
@@ -15661,6 +15668,12 @@ try_window_reusing_current_matrix (struct window *w)
     return 0;
 #endif
 
+#if HAVE_XWIDGETS
+ //currently this is needed to detect xwidget movement reliably. or probably not.
+    return 0;
+#endif
+
+
   if (/* This function doesn't handle terminal frames.  */
       !FRAME_WINDOW_P (f)
       /* Don't try to reuse the display if windows have been split
@@ -24626,7 +24639,7 @@ get_window_cursor_type (struct window *w, struct glyph *glyph, int *width,
 
 #ifdef HAVE_XWIDGETS      
       if (glyph != NULL && glyph->type == XWIDGET_GLYPH){
-        printf("attempt xwidget cursor avoidance in get_window_cursor_type\n");
+        //printf("attempt xwidget cursor avoidance in get_window_cursor_type\n");
         return NO_CURSOR;
       }
 #endif      
diff --git a/src/xwidget.c b/src/xwidget.c
index a25dd170731..1c68e919efa 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -631,15 +631,20 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
   clip_top = max(0, WINDOW_TOP_EDGE_Y(s->w) -y );
 
   //we are conserned with movement of the onscreen area. the area might sit still when the widget actually moves
-  //this happens when an emacs window border moves across a widget winow
+  //this happens when an emacs window border moves across a widget window
+  //so, if any corner of the outer widget clippng window moves, that counts as movement here, even
+  //if it looks like no movement happens because the widget sits still inside the clipping area.
+  //the widget can also move inside the clipping area, which happens later
   moved = (xv->x  + xv->clip_left != x+clip_left)
     || ((xv->y + xv->clip_top)!= (y+clip_top));
   if(moved)    printf ("lxwidget moved: id:%d (%d,%d)->(%d,%d) y+clip_top:%d\n", xww, xv->x, xv->y, x, y, y + clip_top);
+  else
+    printf ("lxwidget DIDNT move: id:%d (%d,%d)->(%d,%d) y+clip_top:%d\n", xww, xv->x, xv->y, x, y, y + clip_top);
   xv->x = x;
   xv->y = y;
   if (moved)    //has it moved?
     {
-      if (!xwidget_hidden(xv))  //hidden equals not being seen during redisplay
+      if (1)//!xwidget_hidden(xv))      //hidden equals not being seen during redisplay
         {
           //TODO should be possible to use xwidget_show_view here
           gtk_fixed_move (GTK_FIXED (FRAME_GTK_WIDGET (s->f)),
@@ -662,6 +667,8 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
     xv->clip_right = clip_right; xv->clip_bottom = clip_bottom; xv->clip_top = clip_top;xv->clip_left = clip_left;
   }
   //if emacs wants to repaint the area where the widget lives, queue a redraw
+  //TODO it seems its possible to get out of sync with emacs redraws so emacs bg sometimes shows up instead of xwidget
+  //its just a visual glitch though
   if (!xwidget_hidden(xv)){
     gtk_widget_queue_draw (GTK_WIDGET(xv->widgetwindow));
     gtk_widget_queue_draw (xv->widget);
diff --git a/src/xwidget.h b/src/xwidget.h
index c515980ef12..e5cfe6de902 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -1,3 +1,6 @@
+#ifndef XWIDGET_H_INCLUDED
+#define XWIDGET_H_INCLUDED
+
 void x_draw_xwidget_glyph_string (struct glyph_string *s);
 void syms_of_xwidget ();
 
@@ -104,3 +107,4 @@ struct xwidget* lookup_xwidget (Lisp_Object  spec);
 #define XG_XWIDGET "emacs_xwidget"
 #define XG_XWIDGET_VIEW "emacs_xwidget_view"
 void      xwidget_view_delete_all_in_window(  struct window *w );
+#endif