upstream

[gnu-emacs] / src / dispnew.c

diff --git a/src/dispnew.c b/src/dispnew.c
index d8808de3caad91300df4fd4fe2b542628d823fb5..35ccd95e92aedf4c927a883500822cd992223fa4 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -16,7 +16,6 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
 #include <config.h>
 #include <signal.h>
 #include <stdio.h>
@@ -49,6 +48,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 #endif /* HAVE_X_WINDOWS */
 
+
+
 #ifdef HAVE_NTGUI
 #include "w32term.h"
 #endif /* HAVE_NTGUI */
@@ -57,6 +58,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "nsterm.h"
 #endif
 
+#ifdef HAVE_XWIDGETS
+#include "xwidget.h"
+#endif
+
 /* Include systime.h after xterm.h to avoid double inclusion of time.h.  */
 
 #include "systime.h"
@@ -290,8 +295,7 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
    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;
 
@@ -3730,6 +3734,9 @@ update_window (struct window *w, int force_p)
   add_window_display_history (w, w->current_matrix->method, paused_p);
 #endif
 
+#ifdef HAVE_XWIDGETS
+  xwidget_end_redisplay(w, w->current_matrix);
+#endif
   clear_glyph_matrix (desired_matrix);
 
   return paused_p;
@@ -4323,6 +4330,12 @@ scrolling_window (struct window *w, int header_line_p)
        break;
     }
 
+#ifdef HAVE_XWIDGETS
+ //currently this is needed to detect xwidget movement reliably. or probably not.
+  //printf("scrolling_window\n");
+    return 0;
+#endif
+  
   /* Give up if some rows in the desired matrix are not enabled.  */
   if (!MATRIX_ROW (desired_matrix, i)->enabled_p)
     return -1;