Merge pull request #6 from daimrod/struct_to_Lisp_Object

Struct to lisp object

1 files changed, 10 insertions, 9 deletions

diff --git a/src/xwidget.h b/src/xwidget.h
index 530b087796c..f8c804aac46 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -43,22 +43,17 @@ struct xwidget{
 
 
 //struct for each xwidget view
-struct xwidget_view{
+struct xwidget_view {
   struct vectorlike_header header;
-  struct xwidget* model; //TODO should be lisp
-
+  Lisp_Object model;
+  Lisp_Object w;
   
   //here ends the lisp part.
   //"redisplayed" is the marker field
   int redisplayed; //if touched by redisplay  
 
-
-  struct window *w; //TODO should be lisp
-  
   int hidden;//if the "live" instance isnt drawn
 
-  int initialized;  
-
   GtkWidget* widget;
   GtkContainer* widgetwindow;
   GtkContainer* emacswindow;
@@ -72,10 +67,16 @@ struct xwidget_view{
 
 /* Test for xwidget (xwidget . spec)  (car must be the symbol xwidget)*/
 #define XWIDGETP(x) (CONSP (x) && EQ (XCAR (x), Qxwidget))
+
 /* Test for xwidget pseudovector*/
 #define XXWIDGETP(x) PSEUDOVECTORP (x, PVEC_XWIDGET)
-#define XXWIDGET(a) (eassert (XXWIDGETP(a)),(struct xwidget *) XPNTR(a))
+#define XXWIDGET(a) (eassert (XXWIDGETP(a)), \
+                     (struct xwidget *) XUNTAG(a, Lisp_Vectorlike))
 
+/* Test for xwidget_view pseudovector */
+#define XXWIDGET_VIEW_P(x) PSEUDOVECTORP (x, PVEC_XWIDGET_VIEW)
+#define XXWIDGET_VIEW(a) (eassert (XXWIDGET_VIEW_P(a)), \
+                          (struct xwidget_view *) XUNTAG(a, Lisp_Vectorlike))
 
 struct xwidget_type
 {