Implement native scrolling of the webkit xwidget

[gnu-emacs] / src / xwidget.h

diff --git a/src/xwidget.h b/src/xwidget.h
index 18a9a1da483d1b85368b30ae6432ad01a63dea0b..cbaddf6cec7142608315abfd4d5a473adf106e49 100644 (file)
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -4,7 +4,7 @@
 void x_draw_xwidget_glyph_string (struct glyph_string *s);
 void syms_of_xwidget ();
 
-extern Lisp_Object Qxwidget;
+//extern Lisp_Object Qxwidget;
 
 
 int valid_xwidget_spec_p (Lisp_Object object) ;
@@ -20,12 +20,12 @@ lisp pseudovector.
 
  */
 struct xwidget{
-  struct vectorlike_header header;  
+  struct vectorlike_header header;
   Lisp_Object plist;//auxilliary data
   Lisp_Object type;//the widget type
   Lisp_Object buffer; //buffer where xwidget lives
   Lisp_Object title;//a title that is used for button labels for instance
-  
+
   //here ends the lisp part.
   //"height" is the marker field
   int height;
@@ -34,6 +34,8 @@ struct xwidget{
   //for offscreen widgets, unused if not osr
   GtkWidget* widget_osr;
   GtkWidget* widgetwindow_osr;
+  //this is used if the widget (webkit) is to be wrapped in a scrolled window,
+  GtkWidget* widgetscrolledwindow_osr;
   /* Non-nil means kill silently if Emacs is exited. */
   unsigned int kill_without_query : 1;
 
@@ -45,10 +47,10 @@ struct xwidget_view {
   struct vectorlike_header header;
   Lisp_Object model;
   Lisp_Object w;
-  
+
   //here ends the lisp part.
   //"redisplayed" is the marker field
-  int redisplayed; //if touched by redisplay  
+  int redisplayed; //if touched by redisplay
 
   int hidden;//if the "live" instance isnt drawn
 
@@ -90,7 +92,7 @@ struct xwidget_type
   /* Next in list of all supported image types.  */
   struct xwidget_type *next;
 };
-                             
+
 static struct xwidget_type *lookup_xwidget_type (Lisp_Object symbol);
 
 struct xwidget* xwidget_from_id(int id);
@@ -104,7 +106,7 @@ void xwidget_touch (struct xwidget_view *xw);
 
 //void assert_valid_xwidget_id(int id,char *str);
 
-struct xwidget* lookup_xwidget (Lisp_Object  spec); 
+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 );