update to 0.48.1, fix rebase

did things wrong in the rebase.. hopefully nothing terrible
sebshader · Mar 31, 2018 · ec89f0a · ec89f0a
1 parent 7bb25da
commit ec89f0a
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 337 deletions.
diff --git a/doc/5.reference/help-intro.pd b/doc/5.reference/help-intro.pd
@@ -177,8 +177,7 @@
 #X text 126 2779 - add to a summing bus;
 #X obj 26 2803 catch~;
 #X text 126 2803 - define and read a summing bus;
-#X obj 24 3722 block~;
-#X text 296 3693 - switch DSP computation on and off;
+#X obj 28 3767 block~;
 #X obj 26 2827 readsf~;
 #X text 126 2827 - soundfile playback from disk;
 #X obj 26 2851 writesf~;
@@ -247,7 +246,7 @@
 #X obj 23 3688 outlet;
 #X text 123 3688 - add an outlet to a pd;
 #X obj 23 3713 inlet~;
-#X obj 83 3713 outlet~;
+#X obj 77 3716 outlet~;
 #X obj 24 3841 struct;
 #X text 124 3841 - define a data structure;
 #X obj 24 3865 drawcurve;
@@ -385,7 +384,7 @@ its "help window".;
 #X obj 27 4437 bob~;
 #X text 123 4439 - Moog resonant filter model;
 #X text 116 3740 - make copies of a subpatch;
-#X obj 24 3740 clone;
+#X obj 23 3740 clone;
 #X obj 194 1204 midirealtimein;
 #X obj 24 3594 delread4~;
 #X text 154 3595 - read with a time-varying delay time;
@@ -407,8 +406,8 @@ its "help window".;
 #X obj 21 1365 fudiparse;
 #X obj 100 1365 fudiformat;
 #X text 196 1367 - FUDI messages to and from Pd lists;
-#X msg 76 3722 switch;
-#X text 138 3763 - specify block size and overlap \, or \, if invoked
+#X msg 28 3792 switch;
+#X text 122 3772 - specify block size and overlap \, or \, if invoked
 as "switch" \, also switch subpatches on and off;
 #X obj 25 1629 initbang;
 #X obj 25 1654 closebang;

diff --git a/po/Makefile.am b/po/Makefile.am
@@ -49,11 +49,7 @@ TCLFILES = \
     scrollbox.tcl \
     pd_guiprefs.tcl \
     pd_deken.tcl \
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     pd_docsdir.tcl
-=======
-    pd_docspath.tcl
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
 
 LOCAL_TCLFILES = \
     iemgui_dynamic_strings.tcl \

diff --git a/src/g_editor.c b/src/g_editor.c
@@ -89,44 +89,6 @@ int gobj_filter_highlight_behavior(t_rtext *y)
         return 0;
 }
 
-/* ------------------ for inlet/outlet highlighting --------------- */
-static char canvas_cnct_inlet_tag[4096];
-static char canvas_cnct_outlet_tag[4096];
-static int outlet_issignal = 0;
-static int inlet_issignal = 0;
-static int last_inlet_filter = 0;
-static int last_outlet_filter = 0;
-
-/* iemgui uses black inlets and outlets while default objects use gray ones
-   add here more as necessary */
-int gobj_filter_highlight_behavior(t_rtext *y)
-{
-    char *buf;
-    char name[4];
-    int bufsize, i;
-    rtext_gettext(y, &buf, &bufsize);
-    for (i = 0; i < 3; i++)
-    {
-        name[i] = buf[i];
-    }
-    name[3]='\0';
-    if (!strcmp(name, "bng") ||
-        !strcmp(name, "nbx") ||
-        !strcmp(name, "hdl") ||
-        !strcmp(name, "hsl") ||
-        !strcmp(name, "tgl") ||
-        !strcmp(name, "vdl") ||
-        !strcmp(name, "vsl") ||
-        !strcmp(name, "vu ") ||
-/* alternative names for hradio and vradio when invoked from the menu */
-        !strcmp(name, "hra") ||
-        !strcmp(name, "vra")
-        )
-        return 1;
-    else
-        return 0;
-}
-
 /* ---------------- generic widget behavior ------------------------- */
 
 void gobj_getrect(t_gobj *x, t_glist *glist, int *x1, int *y1,

diff --git a/tcl/Makefile.am b/tcl/Makefile.am
@@ -49,11 +49,7 @@ dist_libpdtcl_DATA = \
     scrollbox.tcl \
     pd_guiprefs.tcl \
     pd_deken.tcl \
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     pd_docsdir.tcl \
-=======
-    pd_docspath.tcl \
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
     pd.ico
 
 #########################################

diff --git a/tcl/dialog_path.tcl b/tcl/dialog_path.tcl
@@ -62,37 +62,24 @@ proc ::dialog_path::create_dialog {mytoplevel} {
     pack $mytoplevel.extraframe.extra -side left -expand 1
     pack $mytoplevel.extraframe.verbose -side right -expand 1
 
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     # add docsdir path widgets if pd_docsdir is loaded
     if {[namespace exists ::pd_docsdir]} {
-=======
-    # modify the docs path if pd_docspath is loaded
-    if {[namespace exists ::pd_docspath]} {
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
         labelframe $mytoplevel.docspath -text [_ "Pd Documents Directory"] \
             -borderwidth 1 -padx 5 -pady 5
         pack $mytoplevel.docspath -side top -anchor s -fill x -padx {2m 4m} -pady 2m
 
         frame $mytoplevel.docspath.path
         pack $mytoplevel.docspath.path -fill x
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
         entry $mytoplevel.docspath.path.entry -textvariable docspath \
             -takefocus 0 -state readonly -readonlybackground $readonly_color
         button $mytoplevel.docspath.path.browse -text [_ "Browse"] \
             -command "::dialog_path::browse_docspath $mytoplevel"
-=======
-        entry $mytoplevel.docspath.path.entry -textvariable ::pd_docspath::docspath \
-            -takefocus 0 -state readonly -readonlybackground $readonly_color
-        button $mytoplevel.docspath.path.browse -text [_ "Browse"] \
-            -command "::dialog_path::browse_docspath %W"
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
         pack $mytoplevel.docspath.path.browse -side right -fill x -ipadx 8
         pack $mytoplevel.docspath.path.entry -side right -expand 1 -fill x
 
         frame $mytoplevel.docspath.buttons
         pack $mytoplevel.docspath.buttons -fill x
         button $mytoplevel.docspath.buttons.reset -text [_ "Reset"] \
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
             -command "::dialog_path::reset_docspath $mytoplevel"
         button $mytoplevel.docspath.buttons.disable -text [_ "Disable"] \
             -command "::dialog_path::disable_docspath $mytoplevel"
@@ -104,16 +91,6 @@ proc ::dialog_path::create_dialog {mytoplevel} {
     }
 
     # add deken path widgets if deken is loaded
-=======
-            -command "::dialog_path::reset_docspath %W"
-        button $mytoplevel.docspath.buttons.disable -text [_ "Disable"] \
-            -command "::dialog_path::disable_docspath %W"
-        pack $mytoplevel.docspath.buttons.reset -side left -ipadx 8
-        pack $mytoplevel.docspath.buttons.disable -side left -ipadx 8
-    }
-
-    # add deken path widgets if deken is available, increase window height to make room
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
     if {[namespace exists ::deken]} {
         labelframe $mytoplevel.installpath -text [_ "Externals Install Directory"] \
             -borderwidth 1 -padx 5 -pady 5
@@ -164,16 +141,12 @@ proc ::dialog_path::create_dialog {mytoplevel} {
     # re-adjust height based on optional sections
     update
     wm minsize $mytoplevel [winfo width $mytoplevel] [winfo height $mytoplevel]
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
 
     position_over_window $mytoplevel .pdwindow
-=======
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
 }
 
 # browse for a new Pd user docs path
 proc ::dialog_path::browse_docspath {mytoplevel} {
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     global docspath
     global installpath
     # set the new docs dir
@@ -184,62 +157,34 @@ proc ::dialog_path::browse_docspath {mytoplevel} {
         set installpath [::pd_docsdir::get_externals_path "$docspath"]
         $mytoplevel.docspath.path.entry xview moveto 1
         return 1
-=======
-    # set the new docs path
-    set newpath [tk_chooseDirectory -initialdir $::fileopendir \
-                                    -title [_ "Choose Pd documents directory:"]]
-    if {$newpath ne ""} {
-        if {[::pd_docspath::createpath $newpath]} {
-            ::pd_docspath::setpath $newpath
-            return 1
-        } else {
-            # didn't work
-            ::pdwindow::error [format [_ "Couldn't create Pd documents directory: %s"] $newpath]
-        }
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
     }
     return 0
 }
 
 # ignore the Pd user docs path
 proc ::dialog_path::disable_docspath {mytoplevel} {
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     global docspath
     set docspath [::pd_docsdir::get_disabled_path]
-=======
-    ::pd_docspath::disable
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
     return 1
 }
 
 # reset to the default Pd user docs path
 proc ::dialog_path::reset_docspath {mytoplevel} {
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     global docspath
     global installpath
     set docspath [::pd_docsdir::get_default_path]
     set installpath [::pd_docsdir::get_externals_path "$docspath"]
     $mytoplevel.docspath.path.entry xview moveto 1
     return 1
-=======
-    return [::pd_docspath::reset]
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
 }
 
 # browse for a new deken installpath, this assumes deken is available
 proc ::dialog_path::browse_installpath {mytoplevel} {
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
     global installpath
     if {![file isdirectory $installpath]} {
         set initialdir $::env(HOME)
     } else {
         set initialdir $installpath
-=======
-    if {![file isdirectory $::deken::installpath]} {
-        set initialdir $::fileopendir
-    } else {
-        set initialdir $::deken::installpath
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
     }
     set newpath [tk_chooseDirectory -initialdir $initialdir \
                                     -title [_ "Install externals to directory:"]]

diff --git a/tcl/pd-gui.tcl b/tcl/pd-gui.tcl
@@ -694,7 +694,7 @@ proc add_to_searchpaths {path {save true}} {
 }
 
 # ------------------------------------------------------------------------------
- consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
+# consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
 # procs called directly by pd
 
 proc pdtk_pd_startup {major minor bugfix test

diff --git a/tcl/pd_deken.tcl b/tcl/pd_deken.tcl
@@ -451,15 +451,9 @@ proc ::deken::clicked_link {URL filename} {
     set installdir [::deken::find_installpath]
     set extname [lindex [split $filename "-"] 0]
     if { "$installdir" == "" } {
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
         if {[namespace exists ::pd_docsdir] && [::pd_docsdir::externals_path_is_valid]} {
             # if the docspath is set, try the externals subdir
             set installdir [::pd_docsdir::get_externals_path]
-=======
-        if {[namespace exists ::pd_docspath] && [::pd_docspath::externalspath_is_valid]} {
-            # if the docspath is set, try the externals subdir
-            set installdir [::pd_docspath::get_externalspath]
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
         } else {
             # ask the user (and remember the decision)
             ::deken::prompt_installdir
@@ -494,11 +488,7 @@ proc ::deken::clicked_link {URL filename} {
                         # if docsdir is set & the install path is valid,
                         # saying "no" is temporary to ensure the docsdir
                         # hierarchy remains, use the Path dialog to override
-<<<<<<< 4a8535a829bb10c423d8da8daf45c4b17ad1dc2a
                         if {[namespace exists ::pd_docsdir] && [::pd_docsdir::path_is_valid] &&
-=======
-                        if {[namespace exists ::pd_docspath] && [::pd_docspath::is_valid] && \
->>>>>>> transitioned docspath into plugin file; use filenewdir & fileopendir consistently, default to home dir when opening GUI first for all platforms, default to home dir for Windows; dialog_path now sets minsize based on widget size due to optional sections
                             [file writable [file normalize $prevpath]] } {
                             set keepprevpath 0
                         }