Imported Upstream version 12.0

1 files changed, 11 insertions, 69 deletions

diff --git a/misc.scm b/misc.scm
index 3eb36f5..598b4ff 100644
--- a/misc.scm
+++ b/misc.scm
@@ -1,5 +1,7 @@
 (provide 'snd-misc.scm)
 
+(if (not (provided? 'snd-motif)) (snd-error "misc.scm only works in the Motif version of Snd."))
+
 (if (not (provided? 'snd-snd-motif.scm)) (load "snd-motif.scm"))
 (if (not (provided? 'snd-examp.scm)) (load "examp.scm"))
 (if (not (provided? 'snd-extensions.scm)) (load "extensions.scm"))
@@ -12,26 +14,20 @@
 (if (not (provided? 'snd-mix.scm)) (load "mix.scm"))
 (if (not (provided? 'snd-moog.scm)) (load "moog.scm"))
 (if (not (provided? 'snd-play.scm)) (load "play.scm"))
-(if (not (provided? 'snd-popup.scm)) (load "popup.scm"))
 (if (not (provided? 'snd-rubber.scm)) (load "rubber.scm"))
 (if (not (provided? 'snd-zip.scm)) (load "zip.scm"))
 (if (not (provided? 'snd-new-effects.scm)) (load "new-effects.scm"))
 (if (not (provided? 'snd-special-menu.scm)) (load "special-menu.scm"))
 (if (not (provided? 'snd-new-backgrounds.scm)) (load "new-backgrounds.scm"))
 (if (not (provided? 'snd-marks-menu.scm)) (load "marks-menu.scm"))
-(if (not (provided? 'snd-toolbar.scm)) (load "toolbar.scm"))
-(if (not (provided? 'snd-panic.scm)) (load "panic.scm"))
-(if (and (provided? 'snd-gtk) (not (provided? 'snd-ladspa.scm))) (load "ladspa.scm"))
-(if (and (provided? 'snd-gtk) (not (provided? 'snd-ladspa-help.scm))) (load "ladspa-help.scm"))
 (if (not (provided? 'snd-fft-menu.scm)) (load "fft-menu.scm"))
 (if (not (provided? 'snd-edit123.scm)) (load "edit123.scm"))
 (if (not (provided? 'snd-effects-utils.scm)) (load "effects-utils.scm"))
 
 (keep-file-dialog-open-upon-ok)
-(make-hidden-controls-dialog)
-(check-for-unsaved-edits #t)
+(set! (ask-about-unsaved-edits) #t)
 (if (not (hook-member show-disk-space after-open-hook))
-    (add-hook! after-open-hook show-disk-space))
+    (hook-push after-open-hook show-disk-space))
 
 ;(define wd (make-pixmap (cadr (main-widgets)) rough))
 ;(for-each-child (cadr (main-widgets)) (lambda (w) (XtSetValues w (list XmNbackgroundPixmap wd))))
@@ -67,7 +63,7 @@
  (dialog-widgets))
 
 (if (not (hook-member paint-all new-widget-hook))
-    (add-hook! new-widget-hook paint-all))
+    (hook-push new-widget-hook paint-all))
 
 (set! (mix-waveform-height) 32)
 
@@ -107,7 +103,7 @@
 ;;; disable original Play radio button
 ;;;
 
-;(add-hook! after-open-hook
+;(hook-push after-open-hook
 ;           (lambda (snd)
 ;             (XtUnmanageChild (find-child (list-ref (sound-widgets snd) 2) "play"))))
 
@@ -222,59 +218,7 @@
 (add-delete-option)
 (add-rename-option)
 
-;;;
-;;; poup menu stuff
-;;;
 
-(change-graph-popup-color "pink")
-
-;;;(add-selection-popup)
-
-
-(define (change-selection-popup-color new-color)
-  ;; new-color can be the color name, an xm Pixel, a snd color, or a list of rgb values (as in Snd's make-color)
-  (let ((color-pixel
-         (if (string? new-color) ; assuming X11 color names here
-             (let* ((shell (cadr (main-widgets)))
-                    (dpy (XtDisplay shell))
-                    (scr (DefaultScreen dpy))
-                    (cmap (DefaultColormap dpy scr))
-                    (col (XColor)))
-               (if (= (XAllocNamedColor dpy cmap new-color col col) 0)
-                   (snd-error (format #f "can't allocate ~S" new-color))
-                   (.pixel col)))
-             (if (color? new-color)
-                     new-color
-                     ;; assume a list of rgb vals?
-                     (apply make-color new-color)))))
-    (for-each-child
-     selection-popup-menu
-     (lambda (n)
-       (XmChangeColor n color-pixel)))))
-(change-selection-popup-color "coral")
-
-(define (change-fft-popup-color new-color)
-  (let ((color-pixel
-         (if (string? new-color) ; assuming X11 color names here
-             (let* ((shell (cadr (main-widgets)))
-                    (dpy (XtDisplay shell))
-                    (scr (DefaultScreen dpy))
-                    (cmap (DefaultColormap dpy scr))
-                    (col (XColor)))
-               (if (= (XAllocNamedColor dpy cmap new-color col col) 0)
-                   (snd-error (format #f "can't allocate ~S" new-color))
-                   (.pixel col)))
-             (if (color? new-color)
-                     new-color
-                     ;; assume a list of rgb vals?
-                     (apply make-color new-color)))))
-    (for-each-child
-     fft-popup-menu
-     (lambda (n)
-       (XmChangeColor n color-pixel)))))
-(change-fft-popup-color "orange")
-
-;(change-listener-popup-color "red")
 
 (add-to-menu 1 #f #f) ; separator
 
@@ -323,11 +267,11 @@
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(add-hook! open-raw-sound-hook
+(hook-push open-raw-sound-hook
            (lambda (file choices)
              (list 2 44100 (if (little-endian?) mus-lshort mus-bshort))))
 
-(add-hook! open-hook
+(hook-push open-hook
            (lambda (filename)
              (if (= (mus-sound-header-type filename) mus-raw)
                  (let ((rawfile (string-append filename ".raw")))
@@ -341,11 +285,11 @@
 ;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(add-hook! open-raw-sound-hook
+(hook-push open-raw-sound-hook
            (lambda (file choices)
              (list 2 44100 (if (little-endian?) mus-lshort mus-bshort))))
 
-(add-hook! open-hook
+(hook-push open-hook
            (lambda (filename)
              (if (= (mus-sound-header-type filename) mus-raw)
                  (let ((rawfile (string-append filename ".raw")))
@@ -375,7 +319,5 @@
 ;;; Deselect function
 ;;;
 
-(define (deselect-all)
-  (if (selection?)
-      (set! (selection-member? #t) #f)))
+(define deselect-all unselect-all)