funny diverged branches

3 files changed, 146 insertions, 68 deletions

diff --git a/README.xwidget b/README.xwidget
index 6ca6f1a62ca..1abc8f843e2 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -404,7 +404,9 @@ Missing separate debuginfos, use: debuginfo-install hunspell-1.2.15-2.fc15.x86_6
    CLOSED: [2011-07-19 Tue 14:26]
 now we just hard code sizes. but webkit widgets for instance can
 report sizes that suit the content. support that.
-** TODO BUG xwidget view ghosts
+** DONE BUG xwidget view ghosts
+   CLOSED: [2013-04-05 Fri 23:35]
+(havent seen this in quite a while)
 - xwidget-webkit-browse-url somewhere
 - split window.
 now theres 2 webkit views
@@ -929,7 +931,9 @@ http://developer.gnome.org/gdk/stable/gdk-Windows.html#GdkWindow-from-embedder
 turned out to be not so hard, captured events, copied them and
 forwarded them offscreen!
 
-** TODO investigate gdk_window_redirect_to_drawable
+** CANCELLED investigate gdk_window_redirect_to_drawable
+   CLOSED: [2013-04-05 Fri 23:37]
+(cancelled this, the current approach seems okay)
 http://developer.gnome.org/gdk/stable/gdk-Windows.html#gdk-offscreen-window-set-embedder
 maybe could be used in place of my own copy hacks? to work it must
 support a chain of redirects, which seems unlikely. the benefit would
@@ -1397,7 +1401,9 @@ isn't needed if emacs bg erase disabled
 might be some annoying local issues with my install because it is not
 reliably reproducible. (went away during merges)
 
-** TODO low impact xwidget based image viewer
+** CANCELLED low impact xwidget based image viewer
+   CLOSED: [2013-04-05 Fri 23:38]
+(cancelled this because it no longer seems like a good idea)
 for instance to render SVG using webkit, or some other canvas.
 that way it would be possible to merge to trunk in stages.
 
@@ -1558,7 +1564,6 @@ when an xwidget is removed from xwidget-alist, and there are no other
 references(mostly views) the xwidget should be garbage collected.
 
 special finalization would go into gc_sweep()
-<<<<<<< TREE
 ** TODO embedding evince
 http://developer.gnome.org/libevview/3.2/libevview-ev-view.html
 would be useful for reading PDF:s and other document types.
@@ -1622,4 +1627,91 @@ Current limitation:
 - next to no argument checking. If wrong type args are used with the
   xwgir methods, emacs crashes.
 
-
+*** TODO xwgir create components with more advanced constructor
+so this opens up an entire new can of beans.
+
+explain by example:
+lets say we want to create agtkhscale on screen. its a slider.
+https://developer.gnome.org/gtk3/stable/GtkHScale.html
+we can already create buttons, so sliders shouldnt be much more
+advanced right? wrong.
+
+the simplest slider constructor looks like:
+GtkWidget *         gtk_hscale_new
+(GtkAdjustment *adjustment);
+
+so in order to call it, we must be able to forward arguments to the
+constructor. this is almost already done, but we lack the ability to
+pass object instances, only simple types atm.
+
+we need to be able to create GtkAdjustment 
+https://developer.gnome.org/gtk3/stable/GtkAdjustment.html
+
+this we can already almost do, because an xwidget is a gir object
+with some decorations. we also store the decorated gir object in an
+array, retrievable from lisp.
+
+In order for this to be usable in practice, we need some changes:
+- lightweight objects should be stored un-decorated. they have no
+  need for the entire graphical machinery of xwidgets
+- lightweight objects should be garbage collectable, but this is the
+  same for all the xwidget objects, and isnt really resolved atm.
+
+
+** DONE investigate gdk_offscreen_window_set_embedder()
+   CLOSED: [2013-04-06 Sat 10:45]
+https://developer.gnome.org/gdk/unstable/gdk-Windows.html
+
+,----
+| Offscreen windows are more general than composited windows, since they
+| allow not only to modify the rendering of the child window onto its
+| parent, but also to apply coordinate transformations.
+| 
+| To integrate an offscreen window into a window hierarchy, one has to
+| call gdk_offscreen_window_set_embedder() and handle a number of
+| signals. The "pick-embedded-child" signal on the embedder window is
+| used to select an offscreen child at given coordinates, and the
+| "to-embedder" and "from-embedder" signals on the offscreen window are
+| used to translate coordinates between the embedder and the offscreen
+| window.
+| 
+| For rendering an offscreen window onto its embedder, the contents of
+| the offscreen window are available as a pixmap, via
+| gdk_offscreen_window_get_pixmap().
+`----
+
+okay, [2013-04-03 Wed] I finally suceeded in this approach!
+it was pretty  hard to make it work and currently works like this:
+- the on screen dravwing area is the embedder
+- you must implement "pick child"
+event forwarding is done automatically! 
+
+BUT its not really super, because it only works well with a single
+embedder.
+
+perhaps the strategy could be refined:
+- the window frame would be the embedder for all xwidgets. (but what
+  about several frames then?)
+- in the from-embedder signal handler, which maps container coords to
+  embedded widget coords, find out which xw-view i clicked on, and
+  compute the coords.
+
+[2013-04-04 Thu] I had a strategy working for a xwgir button but not
+a webkit. set_embedded in the motion event handler for the xv. it
+even works for 2 frames! but not webkit :(
+
+[2013-04-05 Fri] it works for xwgir osr components, but not for
+webkit. Webkit retains the previous event forwarding system.
+
+Now it works like this:
+- the offscreen widget is created as before
+- the on-screen views also as before, painting and copying as before.
+- gdk_offscreen_window_set_embedder() is now used to embedd the
+  offscreen widget in the onscreen one, upon view creation
+- only one widget can embedd one other. This means that the embedding
+  widget must be switched between the onscreen ones. This is now done
+  in the mouse motion event handler.
+
+The above approach has been tested for xwgir created buttons and seems
+to work. it doesnt work for webkit, so the old scheme is preserved
+for webkit.
diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
index ba434f3d79a..07b841bdc94 100644
--- a/lisp/xwidget-test.el
+++ b/lisp/xwidget-test.el
@@ -88,7 +88,7 @@
               (put 'xwgirButton :xwgir-class '("Gtk" "Button"))
 
               (xwidget-insert (point-min)  'xwgirButton "xwgir label didnt work..." 700  700)
-              (xwgir-call-method (xwidget-at 1) "set_label" '( "xwgir label worked!"))
+              (xwgir-xwidget-call-method (xwidget-at 1) "set_label" '( "xwgir label worked!"))
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
 (xwidget-demo "a-xwgir-check-button"
@@ -98,6 +98,13 @@
               (xwidget-insert (point-min)  'xwgirCheckButton "xwgir label didnt work..." 700  700)
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
+(xwidget-demo "a-xwgir-hscale"
+              (xwgir-require-namespace "Gtk" "3.0")
+              (put 'xwgirHScale :xwgir-class '("Gtk" "HScale"))
+
+              (xwidget-insert (point-min)  'xwgirHScale "xwgir label didnt work..." 700  700)
+              (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
+
 (xwidget-demo "a-xwgir-webkit"
               (xwgir-require-namespace "WebKit" "3.0")
               (put 'xwgirWebkit :xwgir-class '("WebKit" "WebView"))
diff --git a/src/xwidget.c b/src/xwidget.c
index c6714ad40a5..d169069c99d 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -238,11 +238,6 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
       xw->widget_osr = xwgir_create(    SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class)))),
                                         SDATA(Fcar(Fget(xw->type, Qcxwgir_class))));
 
-    ///debug xwgir
-    /* gdk_offscreen_window_set_embedder (      gtk_widget_get_window (xw->widget_osr), */
-    /*                                          gtk_widget_get_window (GTK_WIDGET (xw->widgetwindow_osr)) */
-    /*                                          ); */
-    ///
     gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height);
     gtk_container_add (xw->widgetwindow_osr, xw->widget_osr);
 
@@ -254,9 +249,6 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
     /* signals */
     g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event",    G_CALLBACK (xwidget_osr_damage_event_callback), NULL);
 
-    //TODO these were just a test hack
-    /* g_signal_connect (G_OBJECT ( xw->widget_osr), "key-press-event",    G_CALLBACK (webkit_osr_key_event_callback), NULL); */
-    /* g_signal_connect (G_OBJECT ( xw->widget_osr), "key-release-event",    G_CALLBACK (webkit_osr_key_event_callback), NULL);     */
 
     if (EQ(xw->type, Qwebkit_osr)){
       g_signal_connect (G_OBJECT ( xw->widget_osr),
@@ -303,56 +295,6 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
   }
 #endif
 
-  /* if (EQ(xw->type, Qsocket_osr)){ */
-  /*   printf("init socket osr\n"); */
-  /*   block_input(); */
-  /*   xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); */
-  /*   gtk_window_resize(    GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); */
-
-  /*   //////////////////// */
-  /*   //xw->widget_osr = webkit_web_view_new(); */
-  /*   xw->widget_osr = gtk_socket_new(); */
-  /*   //g_signal_connect_after(xv->widget, "plug-added", G_CALLBACK(xwidget_plug_added), "plug added"); */
-  /*   //g_signal_connect_after(xv->widget, "plug-removed", G_CALLBACK(xwidget_plug_removed), "plug removed"); */
-  /*   /////////////////// */
-    
-  /*   gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); */
-  /*   gtk_container_add (xw->widgetwindow_osr, xw->widget_osr); */
-
-  /*   gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr)); */
-
-  /*   /\* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. *\/ */
-  /*   g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw)); */
-  /*   g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw)); */
-  /*   g_signal_connect (G_OBJECT (    xw->widgetwindow_osr), "damage-event",    G_CALLBACK (xwidget_osr_damage_event_callback), NULL); */
-
-  /*   //webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org"); */
-  /*   unblock_input(); */
-
-  /* } */
-
-       
-  /*   ////////////////////////////// */
-  /*   gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); */
-  /*   gtk_container_add (xw->widgetwindow_osr, xw->widget_osr); */
-
-  /*   gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr)); */
-
-  /*   /\* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. *\/ */
-  /*   g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw)); */
-  /*   g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw)); */
-  /*   /\* signals *\/ */
-  /*   g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event",    G_CALLBACK (xwidget_osr_damage_event_callback), NULL); */
-  /*   g_signal_connect (G_OBJECT ( xw->widget_osr), "button-press-event",    G_CALLBACK (xwgir_event_callback), xw); */
-
-    
-  /*   unblock_input(); */
-  /* } */
-
-  ////////////////////////////////////////////////////////
-  
-
-  
   UNGCPRO;
   return val;
 }
@@ -522,7 +464,7 @@ webkit_osr_key_event_callback (GtkWidget *widget, GdkEventKey *event, gpointer d
 
 
 void
-store_xwidget_event_string(struct xwidget* xw, char* eventname,char* eventstr)
+store_xwidget_event_string(struct xwidget* xw, char* eventname, const char* eventstr)
 {
   //refactor attempt
   struct input_event event;
@@ -816,7 +758,43 @@ xwgir_convert_lisp_to_gir_arg(GIArgument* giarg,
   return 0;
 }
 
-DEFUN ("xwgir-call-method", Fxwgir_call_method,  Sxwgir_call_method,       3, 3, 0,
+#if 0
+void
+refactor_attempt(){
+  //this methhod should be called from xwgir-xwidget-call-method and from xwgir xwidget construction  
+  char* class = SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class))));
+
+  GIObjectInfo* obj_info = g_irepository_find_by_name(girepository, namespace, class);
+  GIFunctionInfo* f_info = g_object_info_find_method (obj_info, SDATA(method));
+
+  //loop over args, convert from lisp to primitive type, given arg introspection data
+  //TODO g_callable_info_get_n_args(f_info) should match
+  int argscount = XFASTINT(Flength(arguments));
+  if(argscount !=  g_callable_info_get_n_args(f_info)){
+    printf("xwgir call method arg count doesn match! \n");
+    return Qnil;
+  }
+  int i;
+  for (i = 1; i < argscount + 1; ++i)
+    {
+      xwgir_convert_lisp_to_gir_arg(&in_args[i], g_callable_info_get_arg(f_info, i - 1), Fnth(i - 1, arguments));
+    }
+
+  in_args[0].v_pointer = widget;
+  if(g_function_info_invoke(f_info,
+                            in_args, argscount + 1,
+                            NULL, 0,
+                            &return_value,
+                            &error)) { 
+    //g_error("ERROR: %s\n", error->message);
+    printf("invokation error\n");
+     return Qnil; 
+   }   
+  return Qt;
+}
+#endif
+
+DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method,  Sxwgir_xwidget_call_method,       3, 3, 0,
        doc:     /* call xwidget object method.*/)
   (Lisp_Object xwidget, Lisp_Object method, Lisp_Object arguments)
 {
@@ -1406,7 +1384,8 @@ DEFUN ("xwidget-resize", Fxwidget_resize, Sxwidget_resize, 3, 3, 0, doc:
     gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height); //minimum size
     //gtk_window_resize(    GTK_WINDOW(xw->widget_osr), xw->width, xw->height);
     gtk_window_resize(    GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height);
-    gtk_container_resize_children ( GTK_WINDOW(xw->widgetwindow_osr));
+    //gtk_container_resize_children ( GTK_WINDOW(xw->widgetwindow_osr));
+    gtk_container_resize_children ( GTK_CONTAINER(xw->widgetwindow_osr));
     
   }
 
@@ -1620,7 +1599,7 @@ syms_of_xwidget (void)
   DEFSYM (Qwebkit_osr ,"webkit-osr");
 #endif
 
-  defsubr (&Sxwgir_call_method  );
+  defsubr (&Sxwgir_xwidget_call_method  );
   defsubr (&Sxwgir_require_namespace);
   defsubr (&Sxwidget_size_request  );
   defsubr (&Sxwidget_delete_zombies);