Rewrite some preview callbacks in Scheme

liblepton/scheme/lepton/ffi.scm

@@ -358,6 +358,7 @@
             lepton_page_get_page_control
             lepton_page_set_page_control
             lepton_page_get_pid
+            lepton_page_get_toplevel
             lepton_page_get_undo_bottom
             lepton_page_set_undo_bottom
             lepton_page_get_undo_current
@@ -712,6 +713,7 @@
 (define-lff lepton_page_get_page_control int '(*))
 (define-lff lepton_page_set_page_control void (list '* int))
 (define-lff lepton_page_get_pid int '(*))
+(define-lff lepton_page_get_toplevel '* '(*))
 (define-lff lepton_page_get_undo_bottom '* '(*))
 (define-lff lepton_page_set_undo_bottom void '(* *))
 (define-lff lepton_page_get_undo_current '* '(*))

libleptongui/include/preview_widget.h

@@ -32,31 +32,14 @@
 typedef struct _SchematicPreviewClass SchematicPreviewClass;
 typedef struct _SchematicPreview      SchematicPreview;
 
-struct _SchematicPreviewClass
-{
-  GschemPageViewClass parent_class;
-};
-
-struct _SchematicPreview
-{
-  GschemPageView parent_instance;
-
-  GschemToplevel *window;
-
-  gchar *filename;
-  gchar *buffer;
-
-  gboolean active;
-};
-
 GType
 schematic_preview_get_type (void);
 
+G_BEGIN_DECLS
+
 GtkWidget*
 schematic_preview_new ();
 
-G_BEGIN_DECLS
-
 gboolean
 schematic_preview_callback_button_press (GtkWidget *widget,
                                          GdkEventButton *event,
@@ -65,9 +48,14 @@ void
 schematic_preview_callback_realize (GtkWidget *widget,
                                     gpointer user_data);
 gboolean
-schematic_preview_callback_scroll_event (GtkWidget *widget,
-                                         GdkEventScroll *event,
-                                         GschemToplevel *w_current);
+schematic_preview_get_active (GtkWidget *preview);
+
+gchar*
+schematic_preview_get_buffer (GtkWidget *preview);
+
+gchar*
+schematic_preview_get_filename (GtkWidget *preview);
+
 GschemToplevel*
 schematic_preview_get_window (GtkWidget *preview);
 

libleptongui/include/prototype.h

@@ -496,8 +496,15 @@ schematic_compselect_new (GschemToplevel *w_current);
 
 
 /* x_fileselect.c */
+GtkWidget*
+schematic_file_select_dialog_new (GschemToplevel *w_current);
+
+void
+x_fileselect_add_preview (GtkWidget *dialog,
+                          GtkWidget *preview);
 GSList*
-x_fileselect_open (GschemToplevel *w_current);
+x_fileselect_open (GschemToplevel *w_current,
+                   GtkWidget *dialog);
 
 gboolean
 x_fileselect_save (GschemToplevel *w_current,
@@ -508,6 +515,9 @@ schematic_file_open (GschemToplevel *w_current,
                      LeptonPage *page,
                      const gchar *filename,
                      GError **err);
+void
+x_fileselect_callback_update_preview (GtkFileChooser *chooser,
+                                      gpointer user_data);
 
 /* x_fstylecb.c */
 GtkWidget* x_fstylecb_new ();

libleptongui/scheme/Makefile.am

@@ -25,6 +25,7 @@ nobase_dist_scmdata_DATA = \
 	schematic/gettext.scm \
 	schematic/dialog.scm \
 	schematic/dialog/file-select.scm \
+	schematic/preview-widget.scm \
 	schematic/dialog/slot-edit.scm \
 	schematic/ffi.scm \
 	schematic/ffi/gobject.scm \

libleptongui/scheme/schematic/callback.scm

@@ -33,6 +33,7 @@
   #:use-module (schematic dialog file-select)
   #:use-module (schematic ffi)
   #:use-module (schematic gettext)
+  #:use-module (schematic preview-widget)
   #:use-module (schematic window foreign)
   #:use-module (schematic window)
 
@@ -135,15 +136,6 @@
 
 (define (callback-add-component *widget *window)
   (define window (pointer->window *window))
-  (define signal-callback-list
-    (list
-     (if %m4-use-gtk3
-         `("draw" . ,*x_event_draw)
-         `("expose-event" . ,*x_event_expose))
-     `("realize" . ,*schematic_preview_callback_realize)
-     `("button-press-event" . ,*schematic_preview_callback_button_press)
-     `("configure-event" . ,*x_event_configure)
-     `("scroll-event" . ,*schematic_preview_callback_scroll_event)))
 
   (o_redraw_cleanstates *window)
 
@@ -154,14 +146,8 @@
                                 (string->pointer "response")
                                 *x_compselect_callback_response
                                 *window)
-      (let ((*preview (schematic_compselect_get_preview *compselect-widget)))
-        (for-each
-         (lambda (element)
-           (schematic_signal_connect *preview
-                                     (string->pointer (car element))
-                                     (cdr element)
-                                     (schematic_preview_get_window *preview)))
-         signal-callback-list))
+      (init-preview-widget-signals
+       (schematic_compselect_get_preview *compselect-widget))
       (schematic_window_set_compselect *window *compselect-widget)))
   (x_compselect_open (schematic_window_get_compselect *window))
 

libleptongui/scheme/schematic/dialog/file-select.scm

@@ -1,6 +1,6 @@
 ;;; Lepton EDA Schematic Capture
 ;;; Scheme API
-;;; Copyright (C) 2022 Lepton EDA Contributors
+;;; Copyright (C) 2022-2024 Lepton EDA Contributors
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -21,9 +21,11 @@
   #:use-module (srfi srfi-1)
   #:use-module (system foreign)
 
+  #:use-module (lepton ffi boolean)
   #:use-module (lepton ffi glib)
 
   #:use-module (schematic ffi)
+  #:use-module (schematic preview-widget)
   #:use-module (schematic window)
   #:use-module (schematic window foreign)
 
@@ -36,8 +38,25 @@ pages.  The current page of the window is set to the page of the
 last loaded page."
   (define *window (check-window window 1))
 
+  (define (*make-dialog)
+    (let ((*dialog
+           (schematic_file_select_dialog_new *window)))
+      (when (true? (schematic_window_get_file_preview *window))
+        (let ((*preview (schematic_preview_new)))
+          (x_fileselect_add_preview
+           *dialog
+           (init-preview-widget-signals *preview))
+          ;; Connect callback to update preview.
+          (schematic_signal_connect *dialog
+                                    (string->pointer "update-preview")
+                                    *x_fileselect_callback_update_preview
+                                    *preview)))
+      *dialog))
+
   (define filenames
-    (gslist->list (x_fileselect_open *window) pointer->string 'free))
+    (gslist->list (x_fileselect_open *window (*make-dialog))
+                  pointer->string
+                  'free))
 
   ;; Open each file.
   (define pages

libleptongui/scheme/schematic/ffi.scm

@@ -331,9 +331,12 @@
             gschem_page_view_zoom_extents
             schematic_page_view_grab_focus
 
+            schematic_preview_new
             *schematic_preview_callback_realize
             *schematic_preview_callback_button_press
-            *schematic_preview_callback_scroll_event
+            schematic_preview_get_active
+            schematic_preview_get_buffer
+            schematic_preview_get_filename
             schematic_preview_get_window
 
             schematic_signal_connect
@@ -360,6 +363,8 @@
             schematic_window_get_draw_grips
             schematic_window_set_draw_grips
             schematic_window_get_enforce_hierarchy
+            schematic_window_get_file_preview
+            schematic_window_set_file_preview
             schematic_window_set_first_wx
             schematic_window_set_first_wy
             schematic_window_get_second_wx
@@ -424,6 +429,10 @@
             gschem_options_widget_new
 
             gschem_page_geometry_set_viewport
+            gschem_page_geometry_set_world_bottom
+            gschem_page_geometry_set_world_left
+            gschem_page_geometry_set_world_right
+            gschem_page_geometry_set_world_top
 
             gschem_text_properties_widget_new
             text_edit_dialog
@@ -458,7 +467,7 @@
             *x_event_configure
             *x_event_draw
             *x_event_expose
-            *x_event_scroll
+            x_event_scroll
             schematic_event_get_button
             schematic_event_is_double_button_press
             schematic_event_get_doing_stroke
@@ -468,9 +477,11 @@
             schematic_event_control_mask
             schematic_event_shift_mask
 
-
+            schematic_file_select_dialog_new
+            x_fileselect_add_preview
             x_fileselect_open
             x_fileselect_save
+            *x_fileselect_callback_update_preview
             schematic_file_open
 
             x_image_setup
@@ -632,9 +643,12 @@
 (define-lff schematic_page_view_grab_focus void '(*))
 
 ;;; preview_widget.c
+(define-lff schematic_preview_new '* '())
 (define-lfc *schematic_preview_callback_realize)
 (define-lfc *schematic_preview_callback_button_press)
-(define-lfc *schematic_preview_callback_scroll_event)
+(define-lff schematic_preview_get_active int '(*))
+(define-lff schematic_preview_get_buffer '* '(*))
+(define-lff schematic_preview_get_filename '* '(*))
 (define-lff schematic_preview_get_window '* '(*))
 
 ;;; schematic_hierarchy.c
@@ -679,6 +693,8 @@
 (define-lff schematic_window_get_draw_grips int '(*))
 (define-lff schematic_window_set_draw_grips void (list '* int))
 (define-lff schematic_window_get_enforce_hierarchy int '(*))
+(define-lff schematic_window_get_file_preview int '(*))
+(define-lff schematic_window_set_file_preview void (list int '*))
 (define-lff schematic_window_set_first_wx void (list '* int))
 (define-lff schematic_window_set_first_wy void (list '* int))
 (define-lff schematic_window_get_second_wx int '(*))
@@ -749,6 +765,10 @@
 
 ;;; gschem_page_geometry.c
 (define-lff gschem_page_geometry_set_viewport void (list '* int int double))
+(define-lff gschem_page_geometry_set_world_bottom void (list '* int))
+(define-lff gschem_page_geometry_set_world_left void (list '* int))
+(define-lff gschem_page_geometry_set_world_right void (list '* int))
+(define-lff gschem_page_geometry_set_world_top void (list '* int))
 
 ;;; gschem_text_properties_widget.c
 (define-lff gschem_text_properties_widget_new '* '(*))
@@ -997,7 +1017,7 @@
 (define-lfc *x_event_configure)
 (define-lfc *x_event_draw)
 (define-lfc *x_event_expose)
-(define-lfc *x_event_scroll)
+(define-lff x_event_scroll int '(* * *))
 (define-lff schematic_event_get_button int '(*))
 (define-lff schematic_event_is_double_button_press int '(*))
 (define-lff schematic_event_get_doing_stroke int '())
@@ -1008,8 +1028,11 @@
 (define-lff schematic_event_shift_mask int '())
 
 ;;; x_fileselect.c
-(define-lff x_fileselect_open '* '(*))
+(define-lff schematic_file_select_dialog_new '* '(*))
+(define-lff x_fileselect_add_preview void '(* *))
+(define-lff x_fileselect_open '* '(* *))
 (define-lff x_fileselect_save int '(* * *))
+(define-lfc *x_fileselect_callback_update_preview)
 (define-lff schematic_file_open int '(* * * *))
 
 ;;; x_image.c