Merge pull request #6 from daimrod/struct_to_Lisp_Object

Struct to lisp object

2 files changed, 95 insertions, 109 deletions

diff --git a/src/xwidget.c b/src/xwidget.c
index 57d27a2b3c7..21cf47b8a7a 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -96,13 +96,6 @@
 
 #include "xwidget.h"
 
-//TODO should of course not be a hardcoded array but I can't be bothered atm
-//just a fixed array of xwidgets for now
-//would need to be hashtables or something
-
-#define MAX_XWIDGETS 100
-struct xwidget_view xwidget_views[MAX_XWIDGETS];
-
 //TODO embryo of lisp allocators for xwidgets
 //TODO xwidget* should be Lisp_xwidget*
 struct xwidget*
@@ -215,7 +208,7 @@ TYPE is a symbol which can take one of the following values:
   
   xw->height = XFASTINT(height);
   xw->width = XFASTINT(width);
-  XSETPSEUDOVECTOR (val, xw, PVEC_XWIDGET); // set the vectorlike_header of VAL with the correct value
+  XSETXWIDGET (val, xw); // set the vectorlike_header of VAL with the correct value
   Vxwidget_list = Fcons (val, Vxwidget_list);
   xw->widgetwindow_osr = NULL;
   xw->widget_osr = NULL;
@@ -439,25 +432,20 @@ xwidget_slider_changed (GtkRange *range,
 
   printf("slider changed val:%f\n", v);
 
-
-  //block sibling views signal handlers
-  for (int i = 0; i < MAX_XWIDGETS; i++)
-    {
-      xv = &xwidget_views[i];
-      if(xv->initialized && xvp->model == xv->model){
-        g_signal_handler_block( xv->widget,xv->handler_id);
-      }
-    }
-  //set values of sibling views and unblock
-  for (int i = 0; i < MAX_XWIDGETS; i++)
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
     {
-      xv = &xwidget_views[i];
-      if(xv->initialized && xvp->model == xv->model){
-        gtk_range_set_value(GTK_RANGE(xv->widget), v);
-        g_signal_handler_unblock( xv->widget,xv->handler_id);
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        xv = XXWIDGET_VIEW (XCAR (tail));
+        if (EQ (xvp->model, xv->model)) {
+          //block sibling views signal handlers
+          g_signal_handler_block(xv->widget, xv->handler_id);
+
+          //set values of sibling views and unblock
+          gtk_range_set_value(GTK_RANGE(xv->widget), v);
+          g_signal_handler_unblock(xv->widget,xv->handler_id);
+        }
       }
     }
-
 }
 
 
@@ -471,11 +459,13 @@ xwidget_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *event, gpo
   struct xwidget_view* xv;
   //webkit_osr_redraw_child(xw, widget);
   printf ("damage\n");
-  for (int i = 0; i < MAX_XWIDGETS; i++)//todo mvc refactor
+
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
     {
-      xv = &xwidget_views[i];
-      if(xv->initialized && xv->model == xw){
-        gtk_widget_queue_draw (xv->widget); //redraw all views, the master has changed
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        xv = XXWIDGET_VIEW (XCAR (tail));
+        if (XXWIDGET (xv->model) == xw)
+          gtk_widget_queue_draw (xv->widget); //redraw all views, the master has changed
       }
     }
 
@@ -958,13 +948,11 @@ xwidget_osr_event_set_embedder (GtkWidget *widget,
                            GdkEvent  *event,
                            gpointer   xv)
 {
-  xwidget_set_embedder_view(((struct xwidget_view*) xv)->model,
+  xwidget_set_embedder_view(XXWIDGET (((struct xwidget_view*) xv)->model),
                             (struct xwidget_view*) xv);
 }
 
  
-int xwidget_view_index=0;
-
 /* initializes and does initial placement of an xwidget view on screen */
 struct xwidget_view*
 xwidget_init_view (struct xwidget *xww,
@@ -972,21 +960,15 @@ xwidget_init_view (struct xwidget *xww,
                    int x, int y)
 {
   //TODO temp code replace with lisp list
-  struct xwidget_view *xv;
+  struct xwidget_view *xv = allocate_xwidget_view();
+  Lisp_Object val;
   GdkColor color;
 
-  do{
-    if(xwidget_view_index < MAX_XWIDGETS)
-      xwidget_view_index++;
-    else
-      xwidget_view_index=0;
-
-    xv = &xwidget_views[xwidget_view_index];
-  }while(  xv->initialized == 1); //TODO yeah this can infloop if there are MAX_WIDGETS on-screen
-
-  xv->initialized = 1;
-  xv->w = s->w;
-  xv->model = xww;
+  XSETXWIDGET_VIEW (val, xv)  ;
+  Vxwidget_view_list = Fcons (val, Vxwidget_view_list);
+  
+  XSETWINDOW(xv->w, s->w);
+  XSETXWIDGET(xv->model, xww);
 
   //widget creation
   if(EQ(xww->type, Qbutton))
@@ -1136,21 +1118,18 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
   int box_line_vwidth = max (s->face->box_line_width, 0);
   int height = s->height;
   struct xwidget *xww = s->xwidget;
-  struct xwidget_view *xv = xwidget_view_lookup(xww, (s->w));
+  struct xwidget_view *xv = xwidget_view_lookup(xww, s->w);
   int clip_right; int clip_bottom; int clip_top; int clip_left;
 
   int x = s->x;
   int y = s->y + (s->height / 2) - (xww->height / 2);
   int moved=0;
 
-  if (xv == NULL || xv->initialized == 0){
-    /* Views must be initialized once(only once).
-       We do it here in the display loop because there is no other time to know things like
-       window placement etc.
-    */
-    printf ("xv init for xw %d\n", xww);
-    xv = xwidget_init_view (xww, s, x, y);
-  }
+  /* We do it here in the display loop because there is no other
+     time to know things like window placement etc.
+  */
+  printf ("xv init for xw %d\n", xww);
+  xv = xwidget_init_view (xww, s, x, y);
 
   //calculate clipping, which is used for all manner of onscreen xwidget views
   //each widget border can get clipped by other emacs objects so there are four clipping variables
@@ -1377,12 +1356,14 @@ DEFUN ("xwidget-resize", Fxwidget_resize, Sxwidget_resize, 3, 3, 0, doc:
     
   }
 
-  for (int i = 0; i < MAX_XWIDGETS; i++) //TODO MVC refactor lazy linear search
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail)) //TODO MVC refactor lazy linear search
     {
-      xv = &xwidget_views[i];
-      if(xv->initialized && xv->model == xw){
-        gtk_layout_set_size (GTK_LAYOUT (xv->widgetwindow), xw->width, xw->height);
-        gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xw->width, xw->height);
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        xv = XXWIDGET_VIEW (XCAR (tail));
+        if(XXWIDGET (xv->model) == xw) {
+          gtk_layout_set_size (GTK_LAYOUT (xv->widgetwindow), xw->width, xw->height);
+          gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xw->width, xw->height);
+        }
       }
     }
 
@@ -1525,17 +1506,16 @@ DEFUN("xwidget-delete-zombies", Fxwidget_delete_zombies , Sxwidget_delete_zombie
 
    */
   struct xwidget_view* xv = NULL;
-  Lisp_Object w;
-  for (int i = 0; i < MAX_XWIDGETS; i++){
-      xv =  &xwidget_views[i];
-      if (xv->w != NULL)
-          XSETWINDOW(w,  xv->w);
-      if(xv->initialized && (! (WINDOW_LIVE_P(w)))){
-
-        gtk_widget_destroy(GTK_WIDGET(xv->widgetwindow));
-        xv->initialized = 0;
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
+    {
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        xv = XXWIDGET_VIEW (XCAR (tail));
+        if(!WINDOW_LIVE_P (xv->w)) {
+          gtk_widget_destroy(GTK_WIDGET(xv->widgetwindow));
+          Vxwidget_view_list = Fdelq (XCAR (tail), Vxwidget_view_list);
+        }
       }
-  }
+    }
 }
 
 
@@ -1622,13 +1602,11 @@ syms_of_xwidget (void)
   DEFVAR_LISP ("xwidget-list", Vxwidget_list, doc: /*xwidgets list*/);
   Vxwidget_list = Qnil;
 
-  DEFVAR_LISP ("xwidget-view-alist", Vxwidget_view_alist, doc: /*xwidget views list*/);
-  Vxwidget_view_alist = Qnil;
+  DEFVAR_LISP ("xwidget-view-list", Vxwidget_view_list, doc: /*xwidget views list*/);
+  Vxwidget_view_list = Qnil;
 
   Fprovide (intern ("xwidget-internal"), Qnil);
 
-  //  for (i = 0; i < MAX_XWIDGETS; i++)
-  //xwidgets[i].initialized = 0;
 }
 
 
@@ -1701,13 +1679,16 @@ void
 xwidget_view_delete_all_in_window (struct window *w)
 {
   struct xwidget_view* xv = NULL;
-  for (int i = 0; i < MAX_XWIDGETS; i++){
-      xv =  &xwidget_views[i];
-      if(xv->initialized && xv->w == w){
-        gtk_widget_destroy(GTK_WIDGET(xv->widgetwindow));
-        xv->initialized = 0;
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
+    {
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        xv = XXWIDGET_VIEW (XCAR (tail));
+        if(XWINDOW (xv->w) == w) {
+          gtk_widget_destroy(GTK_WIDGET(xv->widgetwindow));
+          Vxwidget_view_list = Fdelq (XCAR (tail), Vxwidget_view_list);
+        }
       }
-  }
+    }
 }
 
 
@@ -1716,11 +1697,14 @@ struct xwidget_view*
 xwidget_view_lookup (struct xwidget* xw, struct window *w)
 {
   struct xwidget_view* xv = NULL;
-  for (int i = 0; i < MAX_XWIDGETS; i++){
-    xv = &xwidget_views[i];
-    if (xv->initialized && (xv->model == xw) && (xv->w == w))
-      return xv;
-  }
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
+    {
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        xv = XXWIDGET_VIEW (XCAR (tail));
+        if (XXWIDGET (xv->model) == xw && XWINDOW (xv->w) == w)
+          return xv;
+      }
+    }
   return NULL; /* we didnt find a matching view */
 }
 
@@ -1765,10 +1749,11 @@ lookup_xwidget (Lisp_Object  spec)
 void
 xwidget_start_redisplay (void)
 {
-  int i;
-  for (i = 0; i < MAX_XWIDGETS; i++)
-    xwidget_views[i].redisplayed = 0;
-
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
+    {
+      if (XXWIDGET_VIEW_P (XCAR (tail)))
+        XXWIDGET_VIEW (XCAR (tail))->redisplayed = 0;
+    }
 }
 
 /* the xwidget was touched during redisplay, so it isnt a candidate for hiding*/
@@ -1830,18 +1815,19 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
         }
     }
 
-  for (i = 0; i < MAX_XWIDGETS; i++)
+  for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail))
     {
-      struct xwidget_view* xv = &xwidget_views[i];
+      if (XXWIDGET_VIEW_P (XCAR (tail))) {
+        struct xwidget_view* xv = XXWIDGET_VIEW (XCAR (tail));
 
-      //"touched" is only meaningful for the current window, so disregard other views
-      if (xv->initialized && ( xv->w ==    w))
-        {
+        //"touched" is only meaningful for the current window, so disregard other views
+        if (XWINDOW (xv->w) == w) {
           if (xwidget_touched(xv))
             xwidget_show_view (xv);
           else
             xwidget_hide_view (xv);
         }
+      }
     }
 }
 
@@ -1849,14 +1835,13 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
 void
 kill_buffer_xwidgets (Lisp_Object buffer)
 {
-    Lisp_Object tail, xw;
-
-    for (tail = Fget_buffer_xwidgets (buffer); CONSP (tail); tail = XCDR (tail))
-        {
-            xw = XCAR (tail);
-            Vxwidget_list = Fdelq (xw, Vxwidget_list);
-            /* TODO free the GTK things in xw */
-        }
+  Lisp_Object tail, xw;
+  for (tail = Fget_buffer_xwidgets (buffer); CONSP (tail); tail = XCDR (tail))
+    {
+      xw = XCAR (tail);
+      Vxwidget_list = Fdelq (xw, Vxwidget_list);
+      /* TODO free the GTK things in xw */
+    }
 }
 
 #endif  /* HAVE_XWIDGETS */
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
 {