diff --git a/externals/Makefile b/externals/Makefile
index 363736cf580cf0f63198b8c36d8412b8140a0543..3cefc37fc5ed505805856f0ce57b20172a2eeba5 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -134,11 +134,9 @@ ifeq ($(LIGHT),yes)
lib_targets = loaders-libdir pddp
INCREMENTAL = yes
else
-lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
+lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease flatgui fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
endif
-# DISABLED: flatgui
-
# NEW (IN-PROGRESS): flext
# this is for libraries that don't compile (yet) on all platforms
@@ -538,16 +536,21 @@ fftease_clean:
#------------------------------------------------------------------------------#
# FLATGUI
+#
+# Right now we're just building footils/knob and throwing it in the flatgui
+# external directory for compatibility
+#
flatgui:
- make -C $(externals_src)/flatgui CFLAGS="$(CFLAGS)" \
- PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
+ make -C $(externals_src)/footils/knob CFLAGS="$(CFLAGS)" \
+ PD_PATH=$(pd_src) pdbinpath=$(pd_src)/src \
+ PD_INCLUDE=$(pd_src)/src
flatgui_install:
- make -C $(externals_src)/flatgui STRIP="$(STRIP)" \
+ make -C $(externals_src)/footils/knob STRIP="$(STRIP)" \
DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
flatgui_clean:
- make -C $(externals_src)/flatgui clean
+ make -C $(externals_src)/footils/knob clean
#------------------------------------------------------------------------------#
# FLEXT and FLEXT externals
diff --git a/externals/footils/knob/Makefile.pdlibbuilder.revised b/externals/footils/knob/Makefile.pdlibbuilder.revised
new file mode 100644
index 0000000000000000000000000000000000000000..ed11b2259b0c5f674cd6005c810f9d9ff1e20379
--- /dev/null
+++ b/externals/footils/knob/Makefile.pdlibbuilder.revised
@@ -0,0 +1,1207 @@
+# Makefile.pdlibbuilder dated 2016-06-26
+
+version = 0.2.5
+
+# Helper makefile for Pure Data external libraries.
+# Written by Katja Vetter March-June 2015 for the public domain. No warranties.
+# Inspired by Hans Christoph Steiner's Makefile Template and Stephan Beal's
+# ShakeNMake.
+#
+# GNU make version >= 3.81 required.
+#
+#
+#=== characteristics ===========================================================
+#
+#
+# - defines build settings based on autodetected OS and architecture
+# - defines rules to build Pd class- or lib executables from C or C++ sources
+# - defines rules for libdir installation
+# - defines convenience targets for developer and user
+# - evaluates implicit dependencies for non-clean builds
+#
+#
+#=== basic usage ===============================================================
+#
+#
+# In your Makefile, define your Pd lib name and class files, and include
+# Makefile.pdlibbuilder at the end of the Makefile. Like so:
+#
+# ________________________________________________________________________
+#
+# # Makefile for mylib
+#
+# lib.name = mylib
+#
+# class.sources = myclass1.c myclass2.c
+#
+# datafiles = myclass1-help.pd myclass2-help.pd README.txt LICENSE.txt
+#
+# include Makefile.pdlibbuilder
+# ________________________________________________________________________
+#
+#
+# For files in class.sources it is assumed that class basename == source file
+# basename. The default target builds all classes as individual executables
+# with Pd's default extension for the platform. For anything more than the
+# most basic usage, continue reading.
+#
+#
+#=== list of Makefile.pdlibbuilder API variables ===============================
+#
+#
+# Variables available for definition in your library Makefile:
+#
+# - lib.name
+# - lib.setup.sources
+# - class.sources
+# - common.sources
+# - shared.sources
+# - <classname>.class.sources
+# - <classname>.class.ldflags
+# - <classname>.class.ldlibs
+# - cflags
+# - ldflags
+# - ldlibs
+# - datafiles
+# - datadirs
+# - makefiles
+# - makefiledirs
+# - externalsdir
+#
+# Optional multiline defines evaluated per operating system:
+#
+# - forLinux
+# - forDarwin
+# - forWindows
+#
+#
+# Variables avaialable for (re)definition via command arguments:
+#
+# - pdbinpath (Windows only)
+# - pdincludepath
+# - DESTDIR
+# - prefix
+# - libdir
+# - pkglibdir
+# - CPPFLAGS
+# - CFLAGS
+# - LDFLAGS
+# - CC
+# - CXX
+# - INSTALL
+# - INSTALL_PROGRAM
+# - INSTALL_DATA
+# - INSTALL_DIR
+#
+# Variables available for your makefile or as command argument:
+#
+# - objectsdir
+# - make-lib-executable
+# - suppress-wunused
+#
+#
+#=== descriptions of Makefile.pdlibbuilder API variables =======================
+#
+#
+# lib.name:
+# Name of the library directory as it will be installed / distributed. Also the
+# name of the lib executable in the case where all classes are linked into
+# a single binary.
+#
+# lib.setup.sources:
+# Source file(s) (C or C++) which must be compiled only when linking all classes
+# into a single lib binary.
+#
+# class.sources:
+# All sources files (C or C++) for which the condition holds that
+# class name == source file basename.
+#
+# <classname>.class.sources:
+# Source file(s) (C or C++) specific to class <classname>. Use this for
+# multiple-source classes or when class name != source file basename.
+#
+# common.sources:
+# Source file(s) which must be statically linked to each class in the library.
+#
+# shared.sources:
+# Source file(s) (C or C++) to build a shared dynamic link lib, to be linked
+# with all class executables.
+#
+# cflags, ldflags, ldlibs:
+# Define cflags (preprocessor&compiler), ldflags (linker) and ldlibs (dynamic
+# link libs) for the whole library. These flags are added to platform-specific
+# flags defined by Makefile.pdlibbuilder.
+#
+# <classname>.class.ldflags and <classname>.class.ldlibs:
+# Define ldflags resp. ldlibs specific to class <classname>. These flags are
+# added to platform-specific flags defined by Makefile.pdlibbuilder, and flags
+# defined in your Makefile for the whole library. Note: cflags can not be
+# defined per class in the current implementation.
+#
+# datafiles and datadirs:
+# All extra files you want to include in binary distributions of the
+# library: abstractions and help patches, example patches, meta patch, readme
+# and license texts, manuals, sound files, etcetera. Use 'datafiles' for all
+# files that should go into your lib rootdir and 'datadirs' for complete
+# directories you want to copy from source to distribution.
+#
+# externalsdir:
+# Relative path to directory 'externals' in the context of pd-extended SVN, or
+# any other centralized build layout for multiple libraries. Default value
+# is '..', meaning the direct parent. The value is used in search paths for
+# pd core components (header files, and executable in the case of Windows).
+#
+# forLinux, forDarwin, forWindows:
+# Shorthand for 'variable definitions for Linux only' etc. Use like:
+# define forLinux
+# cflags += -DLINUX
+# class.sources += linuxthing.c
+# endef
+#
+# makefiles and makefiledirs:
+# Extra makefiles or directories with makefiles that should be made in sub-make
+# processes.
+#
+# pdbinpath:
+# For Windows only. Directory where pd.dll can be found for linking.
+#
+# pdincludepath:
+# Directory where Pd API m_pd.h can be found, and other Pd header files.
+#
+# DESTDIR, prefix, libdir:
+# Components of the path for installation as conventionally used on Linux.
+#
+# pkglibdir:
+# Base path for installation of Pd library directories. Default is specified
+# per OS, see section about paths below.
+#
+# objectsdir:
+# Alias of pkglibdir. Can be defined in your makefile to enable project-
+# dependent relative install locations.
+#
+# CPPFLAGS:
+# Preprocessor flags which are not strictly required for building.
+#
+# CFLAGS:
+# Compiler flags which are not strictly required for building. Compiler flags
+# defined by Makefile.pdlibbuilder for warning, optimization and architecture
+# specification are overriden by CFLAGS.
+#
+# LDFLAGS:
+# Linker flags which are not strictly required for building. Linker flags
+# defined by Makefile.pdlibbuilder for architecture specification are overriden
+# by LDFLAGS.
+#
+# CC and CXX:
+# C and C++ compiler programs as defined in your build environment.
+#
+# INSTALL, INSTALL_PROGRAM, INSTALL_DATA, INSTALL_DIR:
+# Definitions of install program, may be overriden via command argument.
+#
+# make-lib-executable:
+# When this variable is defined 'yes' in your makefile or as command argument,
+# Makefile.pdlibbuilder will try to build all classes into a single library
+# executable (but it will force exit if lib.setup.sources is undefined).
+# If your makefile defines 'make-lib-executable=yes' as the library default,
+# this can still be overriden with 'make-lib-executable=no' as command argument
+# to build individual class executables (the Makefile.pdlibbuilder default.)
+#
+# suppress-wunused:
+# When this variable is defined ('yes' or any other value), -Wunused-variable,
+# -Wunused-parameter, -Wunused-value and -Wunused-function are suppressed,
+# but the other warnings from -Wall are retained.
+#
+#
+#=== paths =====================================================================
+#
+#
+# Source files in directories other than current working directory must be
+# prefixed with their relative path. Do not rely on VPATH or vpath.
+# Object (.o) files are built in the directory of their source files.
+# Executables are built in current working directory.
+#
+# Variable 'pdincludepath' stores a location where m_pd.h is expected to reside.
+# Locations where Makefile.pdlibbuilder tries to find it, in order of priority:
+#
+# any OS: $(externalsdir)../pd/src
+#
+# Linux: /usr/include/pdextended
+# /usr/include/pd
+#
+# OSX: /Applications/Pd-extended.app/Contents/Resources/include/pdextended
+# /Applications/Pd.app/Contents/Resources/src
+#
+# Windows: %PROGRAMFILES%/pd/include/pdextended
+# %PROGRAMFILES%/pd/src
+#
+# The path for installation of all library components is constructed as:
+#
+# installpath := $(DESTDIR)$(objectsdir)/$(lib.name)
+#
+# Default for 'objectsdir' is defined per platform and follows this convention:
+# https://puredata.info/docs/faq/how-do-i-install-externals-and-help-files
+#
+# Linux: /usr/local/lib/pd-externals
+# OSX: ~/Library/Pd
+# Windows: %APPDATA%/Pd
+#
+# The rationale for not installing to ~/pd-externals by default on Linux
+# is that some people share the home dir between 32 and 64 bit installations.
+#
+#
+#=== targets ===================================================================
+#
+#
+# all: build $(executables) plus optional post target
+# post: target to build after $(executables)
+# alldebug: build all with -g option turned on for debug symbols
+# <classname>: force clean build of an individual class
+# <sourcefile>.pre: make preprocessor output file in current working directory
+# <sourcefile>.lst: make asm/source output file in current working directory
+#
+# install: install executables and data files
+# clean: remove build products from source tree
+#
+# help: print help text
+# vars: print makefile variables
+# allvars: print all variables
+# depend: print generated prerequisites
+# coffee: dummy target
+#
+# Variable $(executables) expands to class executables plus optional shared lib,
+# or alternatively to single lib executable when make-lib-executable=true.
+# Targets pre and post can be defined by library makefile. Make sure to include
+# Makefile.pdlibbuilder first so default target all will not be redefined.
+#
+#
+#=== Pd-extended libdir concept ================================================
+#
+#
+# For libdir layout as conceived by Hans-Christoph Steiner, see:
+#
+# https://puredata.info/docs/developer/Libdir
+#
+# Files README.txt, LICENSE.txt and <lib.name>-meta.pd are part of the libdir
+# convention. Help patches for each class and abstraction are supposed to be
+# available. Makefile.pdlibbuilder does not force the presence of these files
+# however. It does not automatically include such files in libdir installations.
+# Data files you want to include in distributions must be defined explicitly in
+# your Makefile.
+#
+#
+#=== Makefile.pdlibbuilder syntax conventions ==================================
+#
+#
+# Makefile.pdlibbuilder variable names are lower case. Default make variables,
+# environment variables, and standard user variables (CC, CXX, CFLAGS, DESTDIR)
+# are upper case. Use target 'allvars' to print all variables and their values.
+#
+# 'Fields' in data variables are separated by dots, like in 'foo.class.sources'.
+# Words in variables expressing a function or command are separated by dashes,
+# like in 'make-lib-executable'.
+#
+#
+#=== useful make options =======================================================
+#
+#
+# Use 'make -d <target>' to print debug details of the make process.
+# Use 'make -p <target>' to print make's database.
+#
+#
+#=== TODO ======================================================================
+#
+#
+# - decide whether to use -static-libgcc or shared dll in MinGW
+# - cygwin support
+# - android support
+# - Windows 64 bit support
+# - figure out how to handle '$' in filenames
+# - add makefile template targets dpkg-source dist libdir distclean tags?
+#
+#
+#=== end of documentation sections =============================================
+#
+#
+################################################################################
+################################################################################
+################################################################################
+
+
+# GNU make version 3.81 (2006) or higher is required because of the following:
+# - function 'info'
+# - variable '.DEFAULT_GOAL'
+
+# force exit when make version is < 3.81
+ifneq ($(firstword $(sort 3.81 $(MAKE_VERSION))), 3.81)
+ $(error GNU make version 3.81 or higher is required)
+endif
+
+# Relative path to externals root dir in multi-lib source tree like
+# pd-extended SVN. Default is parent of current working directory. May be
+# defined differently in including makefile. This variable is used to probe for
+# paths.
+externalsdir ?= ..
+
+# variable you can use to check if Makefile.pdlibbuilder is already included
+Makefile.pdlibbuilder = true
+
+
+################################################################################
+### variables: library name and version ########################################
+################################################################################
+
+
+# strip possibles spaces from lib.name, they mess up calculated file names
+lib.name := $(strip $(lib.name))
+
+# if meta file exists, check library version
+metafile := $(wildcard $(lib.name)-meta.pd)
+
+ifdef metafile
+ lib.version := $(shell sed -n \
+ 's|^\#X text [0-9][0-9]* [0-9][0-9]* VERSION \(.*\);|\1|p' \
+ $(metafile))
+endif
+
+
+################################################################################
+### variables: files ###########################################################
+################################################################################
+
+
+#=== sources ===================================================================
+
+
+# (re)define <classname>.class.sources using file names in class.sources
+
+define add-class-source
+$(notdir $(basename $v)).class.sources += $v
+endef
+
+$(foreach v, $(class.sources), $(eval $(add-class-source)))
+
+# derive class names from <classname>.class.sources variables
+sourcevariables := $(filter %.class.sources, $(.VARIABLES))
+classes := $(basename $(basename $(sourcevariables)))
+
+# accumulate all source files specified in makefile
+classes.sources := $(sort $(foreach v, $(sourcevariables), $($v)))
+all.sources := $(classes.sources) $(lib.setup.sources) \
+ $(shared.sources) $(common.sources)
+
+
+#=== object files ==============================================================
+
+
+# construct object filenames from all C and C++ source file names
+classes.objects := $(addsuffix .o, $(basename $(classes.sources)))
+common.objects := $(addsuffix .o, $(basename $(common.sources)))
+shared.objects := $(addsuffix .o, $(basename $(shared.sources)))
+lib.setup.objects := $(addsuffix .o, $(basename $(lib.setup.sources)))
+all.objects = $(classes.objects) $(common.objects) $(shared.objects) \
+ $(lib.setup.objects)
+
+
+#=== executables ===============================================================
+
+
+# use recursive variables here because executable extension is not yet known
+
+# construct class executable names from class names
+classes.executables = $(addsuffix .$(extension), $(classes))
+
+# construct shared lib executable name if shared sources are defined
+ifdef shared.sources
+ shared.lib = lib$(lib.name).$(shared.extension)
+else
+ shared.lib =
+endif
+
+
+################################################################################
+### variables per platform #####################################################
+################################################################################
+
+
+#=== flags per architecture ====================================================
+
+
+# Set architecture-dependent cflags, mainly for Linux. For Mac and Windows,
+# arch.c.flags are overriden below.
+
+machine := $(shell uname -m)
+
+# Raspberry Pi 1st generation
+ifeq ($(machine), armv6l)
+ arch.c.flags = -march=armv6 -mfpu=vfp -mfloat-abi=hard
+endif
+
+# Beagle, Udoo, RPi2 etc.
+ifeq ($(machine), armv7l)
+ arch.c.flags = -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard
+endif
+
+# Intel 32 bit, build with SSE and SSE2 instructions
+ifeq ($(findstring $(machine), i386 i686), $(machine))
+ arch.c.flags = -march=pentium4 -mfpmath=sse -msse -msse2
+endif
+
+# Intel/AMD 64 bit, build with SSE, SSE2 and SSE3 instructions
+ifeq ($(findstring $(machine), ia64 x86_64), $(machine))
+ arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3
+endif
+
+
+#=== operating system ==========================================================
+
+
+# The following systems are defined: Linux, Darwin, Windows. GNU and
+# GNU/kFreeBSD are treated as Linux to get the same options. System-specific
+# multiline defines (optionally set in library makefile) are conditionally
+# evaluated here.
+
+uname := $(shell uname)
+
+ifeq ($(findstring $(uname), Linux GNU GNU/kFreeBSD), $(uname))
+ system = Linux
+ $(eval $(forLinux))
+endif
+
+ifeq ($(uname), Darwin)
+ system = Darwin
+ $(eval $(forDarwin))
+endif
+
+ifeq ($(findstring MINGW, $(uname)), MINGW)
+ system = Windows
+ $(eval $(forWindows))
+endif
+
+# TODO: Cygwin, Android
+
+
+#=== flags and paths for Linux =================================================
+
+
+ifeq ($(system), Linux)
+ prefix = /usr/local
+ libdir := $(prefix)/lib
+ pkglibdir = $(libdir)/pd-externals
+ pdincludepath := $(firstword $(wildcard \
+ $(externalsdir)/../pd/src \
+ /usr/include/pdextended \
+ /usr/include/pd))
+ extension = pd_linux
+ cpp.flags := -DUNIX
+ c.flags := -fpic
+ c.ldflags := -rdynamic -shared -fpic -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags
+ c.ldlibs := -lc -lm
+ cxx.flags := -fpic -fcheck-new
+ cxx.ldflags := -rdynamic -shared -fpic -Wl,-rpath,"\$$ORIGIN",--enable-new-dtags
+ cxx.ldlibs := -lc -lm -lstdc++
+ shared.extension = so
+ shared.ldflags := -rdynamic -fpic -shared -Wl,-soname,$(shared.lib)
+ stripflags = --strip-unneeded -R .note -R .comment
+endif
+
+
+#=== flags and paths for Darwin ================================================
+
+
+# On OSX we try to build fat binaries by default. It is assumed that OSX i386
+# can build for ppc and OSX x86_64 can't. TODO: try to refine this condition.
+# LLVM-clang doesn't support -fcheck-new, therefore this flag is omitted for
+# OSX x86_64.
+
+ifeq ($(system), Darwin)
+ pkglibdir = $(HOME)/Library/Pd
+ pdincludepath := $(firstword $(wildcard \
+ $(externalsdir)/../pd/src \
+ /Applications/Pd-extended*.app/Contents/Resources/include/pdextended \
+ /Applications/Pd*.app/Contents/Resources/src))
+ extension = pd_darwin
+ cpp.flags := -DUNIX -DMACOSX -I /sw/include
+ c.flags :=
+ c.ldflags := -undefined suppress -flat_namespace -bundle
+ c.ldlibs := -lc
+ cxx.ldflags := -undefined suppress -flat_namespace -bundle
+ cxx.ldlibs := -lc
+ shared.extension = dylib
+ shared.ldflags = -dynamiclib -undefined dynamic_lookup \
+ -install_name @loader_path/$(shared.lib) \
+ -compatibility_version 1 -current_version 1.0
+ stripflags = -x
+ ifeq ($(machine), i386)
+ cxx.flags := -fcheck-new
+ arch.c.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+ arch.ld.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4
+ endif
+ ifeq ($(machine), x86_64)
+ arch.c.flags := -arch x86_64 -mmacosx-version-min=10.5
+ arch.ld.flags := -arch x86_64 -mmacosx-version-min=10.5
+ endif
+endif
+
+
+#=== flags and paths for Windows ===============================================
+
+
+# Standard paths on Windows contain spaces, and GNU make functions treat such
+# paths as lists, with unintended effects. Therefore we must use shell function
+# ls instead of make's wildcard, and probe for each standard path individually.
+# Using double quotes around paths with spaces is obligatory. Since some path
+# variables are assembled or re-expanded later, great care must be taken to put
+# quotes at appropriate points throughout the makefile. Thanks, Bill.
+
+# paths for 32-bit executables on 64-bit Windows aren't yet defined here (TODO)
+ifeq ($(system), Windows)
+ pkglibdir := $(APPDATA)/Pd
+ pdbinpath := $(wildcard $(externalsdir)/../pd/bin)
+ pdincludepath := $(wildcard $(externalsdir)/../pd/src)
+ ifndef pdbinpath
+ pdbinpath := $(shell ls -d "$(PROGRAMFILES)/pd/bin")
+ endif
+ ifndef pdincludepath
+ pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/include/pdextended")
+ endif
+ ifndef pdincludepath
+ pdincludepath := $(shell ls -d "$(PROGRAMFILES)/pd/src")
+ endif
+endif
+
+# On Windows we build 32 bit by default to match Pd(-extended) binary
+# distributions. This may change in the future.
+# TODO: decide whether -mms-bitfields should be specified.
+ifeq ($(system), Windows)
+ extension = dll
+ CC = gcc
+ CXX = g++
+ arch.c.flags := -march=pentium4 -msse -msse2 -mfpmath=sse
+ cpp.flags := -DMSW -DNT
+ c.flags :=
+ c.ldflags := -static-libgcc -shared \
+ -Wl,--enable-auto-import "$(pdbinpath)/pd.dll"
+ c.ldlibs :=
+ cxx.flags := -fcheck-new
+ cxx.ldflags := -static-libstdc++ -shared \
+ -Wl,--enable-auto-import "$(pdbinpath)/pd.dll"
+ cxx.ldlibs :=
+ shared.extension = dll
+ shared.ldflags := -static-libgcc -shared "$(pdbinpath)/pd.dll"
+ stripflags = --strip-unneeded -R .note -R .comment
+endif
+
+
+#=== paths =====================================================================
+
+
+# Default pkglibdir is specified above per operating system. It is aliased as
+# 'objectsdir' to retain compatibility with pd-extended template. Assignment
+# operator '?=' is used to enable a project-relative path definition in the
+# including makefile.
+objectsdir ?= $(pkglibdir)
+
+# base path where all components of the lib will be installed by default
+installpath := $(DESTDIR)$(objectsdir)/$(lib.name)
+
+# check if pdincludepath contains spaces (as is often the case on Windows)
+# if so, store the path so we can later do checks with it
+pdincludepathwithspaces := $(if $(word 2, $(pdincludepath)), $(pdincludepath))
+
+
+#=== accumulated build flags ===================================================
+
+
+# From GNU make docs: 'Users expect to be able to specify CFLAGS freely
+# themselves.' So we use CFLAGS to define options which are not strictly
+# required for compilation: optimizations, architecture specifications, and
+# warnings. CFLAGS can be safely overriden using a make command argument.
+# Variables cflags, ldflags and ldlibs may be defined in including makefile.
+
+optimization.flags = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+warn.flags = -Wall -Wextra -Wshadow -Winline -Wstrict-aliasing
+
+# suppress -Wunused-variable & Co if you don't want to clutter a build log
+ifdef suppress-wunused
+ warn.flags += $(addprefix -Wno-unused-, function parameter value variable)
+endif
+
+CFLAGS = $(warn.flags) $(optimization.flags) $(arch.c.flags)
+
+# preprocessor flags
+cpp.flags += -DPD -I "$(pdincludepath)" $(CPPFLAGS)
+
+# architecture specifications for linker are overridable by LDFLAGS
+LDFLAGS := $(arch.ld.flags)
+
+# now add the same ld flags to shared dynamic lib
+shared.ldflags := $(shared.ldflags) $(LDFLAGS)
+
+# accumulated flags for C compiler / linker
+c.flags := $(cpp.flags) $(c.flags) $(cflags) $(CFLAGS)
+c.ldflags := $(c.ldflags) $(ldflags) $(LDFLAGS)
+c.ldlibs := $(c.ldlibs) $(ldlibs)
+
+# accumulated flags for C++ compiler / linker
+cxx.flags := $(cpp.flags) $(cxx.flags) $(cflags) $(CFLAGS)
+cxx.ldflags := $(cxx.ldflags) $(ldflags) $(LDFLAGS)
+cxx.ldlibs := $(cxx.ldlibs) $(ldlibs)
+
+
+################################################################################
+### variables: tools ###########################################################
+################################################################################
+
+
+# aliases so we can later define 'compile-$1' and set 'c' or 'cxx' as argument
+compile-c := $(CC)
+compile-cxx := $(CXX)
+
+
+################################################################################
+### checks #####################################################################
+################################################################################
+
+
+# At this point most variables are defined. Now do some checks and info's
+# before rules begin.
+
+# 'forward declaration' of default target, needed to do checks
+all:
+
+# To avoid unpredictable results, make sure the default target is not redefined
+# by including makefile.
+ifneq ($(.DEFAULT_GOAL), all)
+ $(error Default target must be 'all'.)
+endif
+
+# find out which target(s) will be made
+ifdef MAKECMDGOALS
+ goals := $(MAKECMDGOALS)
+else
+ goals := all
+endif
+
+# store path to Pd API m_pd.h if it is found
+ifdef pdincludepath
+ mpdh := $(shell ls "$(pdincludepath)/m_pd.h")
+endif
+
+# print Makefile.pdlibbuilder version
+$(info ++++ info: using Makefile.pdlibbuilder version $(version))
+
+# when making target all, check if m_pd.h is found and print info about it
+ifeq ($(goals), all)
+ $(if $(mpdh), \
+ $(info ++++ info: using Pd API $(mpdh)), \
+ $(warning Where is Pd API m_pd.h? Do 'make help' for info.))
+endif
+
+# print target info
+$(info ++++ info: making target $(goals) $(if $(lib.name),in lib $(lib.name)))
+
+# when installing, print installpath info
+$(if $(filter install install-lib, $(goals)), $(info ++++ info: \
+ installpath is '$(installpath)'))
+
+
+#=== define executables ========================================================
+
+
+# By default we build class executables, and optionally a shared dynamic link
+# lib. When make-lib-executable=yes we build all classes into a single lib
+# executable, on the condition that variable lib.setup.sources is defined.
+
+ifeq ($(make-lib-executable),yes)
+ $(if $(lib.setup.sources), ,\
+ $(error Can not build library blob because lib.setup.sources is undefined))
+ executables := $(lib.name).$(extension)
+else
+ executables := $(classes.executables) $(shared.lib)
+endif
+
+
+################################################################################
+### rules: special targets #####################################################
+################################################################################
+
+
+# Disable built-in rules. If some target can't be built with the specified
+# rules, it should not be built at all.
+MAKEFLAGS += --no-builtin-rules
+
+.PRECIOUS:
+.SUFFIXES:
+.PHONY: all post build-lib \
+ $(classes) $(makefiledirs) $(makefiles) \
+ install install-executables install-datafiles install-datadirs \
+ force clean vars allvars depend help
+
+
+################################################################################
+### rules: build targets #######################################################
+################################################################################
+
+
+# Target all forces the build of targets [$(executables) post] in
+# deterministic order. Target $(executables) builds class executables plus
+# optional shared lib or alternatively a single lib executable when
+# make-lib-executable=true. Target post is optionally defined by
+# library makefile.
+
+all: post
+post: $(executables)
+
+all:
+ $(info ++++info: target all in lib $(lib.name) completed)
+
+# build all with -g option turned on for debug symbols
+alldebug: c.flags += -g
+alldebug: cxx.flags += -g
+alldebug: all
+
+
+#=== class executable ==========================================================
+
+
+# recipe for linking objects in class executable
+# argument $1 = compiler type (c or cxx)
+# argument $2 = class basename
+define link-class
+ $(compile-$1) \
+ $($1.ldflags) $($2.class.ldflags) \
+ -o $2.$(extension) \
+ $(addsuffix .o, $(basename $($2.class.sources))) \
+ $(addsuffix .o, $(basename $(common.sources))) \
+ $($1.ldlibs) $($2.class.ldlibs) $(shared.lib)
+endef
+
+# general rule for linking object files in class executable
+%.$(extension): $(shared.lib)
+ $(info ++++ info: linking objects in $@ for lib $(lib.name))
+ $(if $(filter %.cc %.cpp, $($*.class.sources)), \
+ $(call link-class,cxx,$*), \
+ $(call link-class,c,$*))
+
+
+#=== library blob ==============================================================
+
+
+# build all classes into single executable
+build-lib: $(lib.name).$(extension)
+ $(info ++++ info: library blob $(lib.name).$(extension) completed)
+
+# recipe for linking objects in lib executable
+# argument $1 = compiler type (c or cxx)
+define link-lib
+ $(compile-$1) \
+ $($1.ldflags) $(lib.ldflags) \
+ -o $(lib.name).$(extension) $(all.objects) \
+ $($1.ldlibs) $(lib.ldlibs)
+endef
+
+# rule for linking objects in lib executable
+# declared conditionally to avoid name clashes
+ifeq ($(make-lib-executable),yes)
+$(lib.name).$(extension): $(all.objects)
+ $(if $(filter %.cc %.cpp, $(all.sources)), \
+ $(call link-lib,cxx), \
+ $(call link-lib,c))
+endif
+
+
+#=== shared dynamic lib ========================================================
+
+
+# recipe for linking objects in shared executable
+# argument $1 = compiler type (c or cxx)
+define link-shared
+ $(compile-$1) \
+ $(shared.ldflags) \
+ -o lib$(lib.name).$(shared.extension) $(shared.objects) \
+ $($1.ldlibs) $(shared.ldlibs)
+endef
+
+# rule for linking objects in shared executable
+# build recipe is in macro 'link-shared'
+lib$(lib.name).$(shared.extension): $(shared.objects)
+ $(info ++++ info: linking objects in shared lib $@)
+ $(if $(filter %.cc %.cpp, $(shared.sources)), \
+ $(call link-shared,cxx), \
+ $(call link-shared,c))
+
+
+#=== object files ==============================================================
+
+
+# recipe to make .o file from source
+# argument $1 is compiler type (c or cxx)
+define make-object-file
+ $(info ++++ info: making $@ in lib $(lib.name))
+ $(compile-$1) \
+ $($1.flags) \
+ -o $@ -c $<
+endef
+
+# Three rules to create .o files. These are double colon 'terminal' rules,
+# meaning they are the last in a rules chain.
+
+%.o:: %.c
+ $(call make-object-file,c)
+
+%.o:: %.cc
+ $(call make-object-file,cxx)
+
+%.o:: %.cpp
+ $(call make-object-file,cxx)
+
+
+#=== explicit prerequisites for class executables ==============================
+
+
+# For class executables, prerequisite rules are declared in run time. Target
+# 'depend' prints these rules for debugging purposes.
+
+# declare explicit prerequisites rule like 'class: class.extension'
+# argument $v is class basename
+define declare-class-target
+$v: $v.$(extension)
+endef
+
+# declare explicit prerequisites rule like 'class.extension: object1.o object2.o'
+# argument $v is class basename
+define declare-class-executable-target
+$v.$(extension): $(addsuffix .o, $(basename $($v.class.sources))) \
+ $(addsuffix .o, $(basename $(common.sources)))
+endef
+
+# evaluate explicit prerequisite rules for all classes
+$(foreach v, $(classes), $(eval $(declare-class-target)))
+$(foreach v, $(classes), $(eval $(declare-class-executable-target)))
+
+
+#=== implicit prerequisites for class executables ==============================
+
+
+# Evaluating implicit prerequisites (header files) with help from the
+# preprocessor is 'expensive' so this is done conditionally and selectively.
+# Note that it is also possible to trigger a build via install targets, in
+# which case implicit prerequisites are not checked.
+
+# When the Pd include path contains spaces it will mess up the implicit
+# prerequisites rules. Also it is known that multiple arch flags are
+# incompatible with preprocessor option -MM on OSX <= 10.5. Dependency
+# tracking must be disabled in those cases.
+
+oldfat := $(and $(filter ppc i386, $(machine)), \
+ $(filter-out 0 1, $(words $(filter -arch, $(c.flags)))))
+
+disable-dependency-tracking := $(strip $(pdincludepathwithspaces) $(oldfat))
+
+ifndef disable-dependency-tracking
+ must-build-everything := $(filter all, $(goals))
+ must-build-class := $(filter $(classes), $(goals))
+ must-build-sources := $(foreach v, $(must-build-class), $($v.class.sources))
+endif
+
+# declare implicit prerequisites rule like 'object.o: header1.h header2.h ...'
+# argument $1 is input source file(s)
+# dir is explicitly added because option -MM strips it by default
+define declare-object-target
+$(dir $1)$(filter %.o: %.h, $(shell $(CPP) $(c.flags) -MM $1)) $(MAKEFILE_LIST)
+endef
+
+# evaluate implicit prerequisite rules when rebuilding everything
+ifdef must-build-everything
+ $(if $(wildcard $(all.objects)), \
+ $(info ++++ info: evaluating implicit prerequisites in lib $(lib.name).....) \
+ $(foreach v, $(all.sources), $(eval $(call declare-object-target, $v))))
+endif
+
+# evaluate implicit prerequisite rules when selectively building classes
+ifdef must-build-class
+ $(foreach v, $(must-build-sources), \
+ $(eval $(call declare-object-target, $v)))
+ $(foreach v, $(shared.sources), \
+ $(eval $(call declare-object-target, $v)))
+endif
+
+
+################################################################################
+### rules: preprocessor and assembly files #####################################
+################################################################################
+
+
+# Preprocessor and assembly output files for bug tracing etc. They are not part
+# of the build processes for executables. By default these files are created in
+# the current working directory. Dependency tracking is not performed, the build
+# is forced instead to make sure it's up to date.
+
+force:
+
+
+#=== preprocessor file =========================================================
+
+
+# make preprocessor output file with extension .pre
+# argument $1 = compiler type (c or cxx)
+define make-preprocessor-file
+ $(info ++++ info: making preprocessor output file $(notdir $*.pre) \
+ in current working directory)
+ $(compile-$1) -E $< $(c.flags) $($1.flags) -o $(notdir $*.pre)
+endef
+
+%.pre:: %.c force
+ $(call make-preprocessor-file,c)
+
+%.pre:: %.cc force
+ $(call make-preprocessor-file,cxx)
+
+%.pre:: %.cpp force
+ $(call make-preprocessor-file,cxx)
+
+
+#=== assembly file =============================================================
+
+
+# make C / assembly interleaved output file with extension .lst
+# argument $1 = compiler type (c or cxx)
+define make-assembly-file
+ $(info ++++ info: making assembly output file $(notdir $*.lst) \
+ in current working directory)
+ $(compile-$1) \
+ -c -Wa,-a,-ad -fverbose-asm \
+ $($1.flags) \
+ $< > $(notdir $*.lst)
+endef
+
+%.lst:: %.c force
+ $(call make-assembly-file,c)
+
+%.lst:: %.cc force
+ $(call make-assembly-file,cxx)
+
+%.lst:: %.cpp force
+ $(call make-assembly-file,cxx)
+
+
+################################################################################
+### rules: installation targets ################################################
+################################################################################
+
+
+# Install targets depend on successful exit status of target all because nothing
+# must be installed in case of a build error.
+
+
+# -p = preserve time stamps
+# -m = set permission mode (as in chmod)
+# -d = create all components of specified directories
+INSTALL = install
+INSTALL_PROGRAM := $(INSTALL) -p -m 644
+INSTALL_DATA := $(INSTALL) -p -m 644
+INSTALL_DIR := $(INSTALL) -m 755 -d
+
+# strip spaces from file names
+executables := $(strip $(executables))
+datafiles := $(strip $(datafiles))
+datadirs := $(strip $(datadirs))
+
+# Do not make any install sub-target with empty variable definition because the
+# install program would exit with an error.
+install: $(if $(executables), install-executables)
+install: $(if $(datafiles), install-datafiles)
+install: $(if $(datadirs), install-datadirs)
+
+install-executables: all
+ $(INSTALL_DIR) -v "$(installpath)"
+ $(INSTALL_PROGRAM) $(executables) "$(installpath)"
+ $(info ++++ info: executables of lib $(lib.name) installed \
+ from $(CURDIR) to $(installpath))
+
+install-datafiles: all
+ $(INSTALL_DIR) -v "$(installpath)"
+ $(INSTALL_DATA) $(datafiles) "$(installpath)"
+ $(info ++++ info: data files of lib $(lib.name) installed \
+ from $(CURDIR) to $(installpath))
+
+install-datadirs: all
+ $(foreach v, $(datadirs), $(INSTALL_DIR) "$(installpath)/$v";)
+ $(foreach v, $(datadirs), \
+ $(INSTALL_DATA) $(wildcard $v/*) "$(installpath)/$v";)
+ $(info ++++ info: data directories of lib $(lib.name) installed \
+ from $(CURDIR) to $(installpath))
+
+
+################################################################################
+### rules: distribution targets ################################################
+################################################################################
+
+
+# TODO
+# These targets are implemented in Makefile Template, but I have to figure out
+# how to do it under the not-so-strict conditions of Makefile.pdlibbuilder.
+
+# make source package
+dist:
+ @echo "target dist not yet implemented"
+
+# make Debian source package
+dpkg-source:
+ @echo "target dpkg-source not yet implemented"
+
+$(ORIGDIR):
+
+$(DISTDIR):
+
+
+################################################################################
+### rules: clean targets #######################################################
+################################################################################
+
+
+# delete build products from build tree
+clean:
+ rm -f $(all.objects)
+ rm -f $(classes.executables) $(lib.name).$(extension) $(shared.lib)
+ rm -f *.pre *.lst
+
+# remove distribution directories and tarballs from build tree
+distclean: clean
+ @echo "target distclean not yet implemented"
+
+
+################################################################################
+### rules: submake targets #####################################################
+################################################################################
+
+
+# Iterate over sub-makefiles or makefiles in other directories.
+
+# When 'continue-make=yes' is set, sub-makes will report 'true' to the parent
+# process regardless of their real exit status. This prevents the parent make
+# from being aborted by a sub-make error. Useful when you want to quickly find
+# out which sub-makes from a large set will succeed.
+ifeq ($(continue-make),yes)
+ continue = || true
+endif
+
+# These targets will trigger sub-make processes for entries in 'makefiledirs'
+# and 'makefiles'.
+all alldebug install clean distclean dist dkpg-source: \
+ $(makefiledirs) $(makefiles)
+
+# this expands to identical rules for each entry in 'makefiledirs'
+$(makefiledirs):
+ $(MAKE) --directory=$@ $(MAKECMDGOALS) $(continue)
+
+# this expands to identical rules for each entry in 'makefiles'
+$(makefiles):
+ $(MAKE) --directory=$(dir $@) --makefile=$(notdir $@) $(MAKECMDGOALS) $(continue)
+
+
+################################################################################
+### rules: convenience targets #################################################
+################################################################################
+
+
+#=== show variables ============================================================
+
+
+# Several 'function' macro's cause errors when expanded within a rule or without
+# proper arguments. Variables which are set with the define directive are only
+# shown by name for that reason.
+functions = \
+add-class-source \
+declare-class-target \
+declare-class-executable-target \
+declare-object-target \
+link-class \
+link-lib \
+link-shared \
+make-object-file \
+make-preprocessor-file \
+make-assembly-file
+
+
+# show variables from makefiles
+vars:
+ $(info ++++ info: showing makefile variables:)
+ $(foreach v,\
+ $(sort $(filter-out $(functions) functions, $(.VARIABLES))),\
+ $(if $(filter file, $(origin $v)),\
+ $(info variable $v = $($v))))
+ $(foreach v, $(functions), $(info 'function' name: $v))
+ @echo
+
+# show all variables
+allvars:
+ $(info ++++ info: showing default, automatic and makefile variables:)
+ $(foreach v, \
+ $(sort $(filter-out $(functions) functions, $(.VARIABLES))), \
+ $(info variable ($(origin $v)) $v = $($v)))
+ $(foreach v, $(functions), $(info 'function' name: $v))
+ @echo
+
+
+#=== show dependencies =========================================================
+
+
+# show generated prerequisites rules
+depend:
+ $(info ++++ info: generated prerequisite rules)
+ $(foreach v, $(classes), $(info $(declare-class-target)))
+ $(foreach v, $(classes), $(info $(declare-class-executable-target)))
+ $(foreach v, $(all.sources), $(info $(call declare-object-target, $v)))
+ @echo
+
+
+#=== show help text ============================================================
+
+
+# brief info about targets and paths
+
+ifdef mpdh
+ mpdhinfo := $(mpdh)
+else
+ mpdhinfo := m_pd.h was not found. Is Pd(-extended) installed?
+endif
+
+help:
+ @echo
+ @echo " Main targets:"
+ @echo " all: build executables (default target)"
+ @echo " install: install all components of the library"
+ @echo " vars: print makefile variables for troubleshooting"
+ @echo " allvars: print all variables for troubleshooting"
+ @echo " help: print this help text"
+ @echo
+ @echo " Pd API m_pd.h:"
+ @echo " $(mpdhinfo)"
+ @echo " You may specify your preferred Pd include path as argument to"
+ @echo " the make command, like 'pdincludepath=path/to/pd/src'."
+ @echo
+ @echo " Path for installation of your libdir(s):"
+ @echo " $(objectsdir)"
+ @echo " Alternatively you may specify your path for installation as argument"
+ @echo " to the make command, like 'objectsdir=path/to/pd-externals'."
+ @echo
+ @echo " Default paths are listed in the doc sections in Makefile.pdlibbuilder."
+ @echo
+
+
+#=== dummy target ==============================================================
+
+
+coffee:
+ @echo "Makefile.pdlibbuilder: Can not make coffee. Sorry."
+
+
+################################################################################
+### end of rules sections ######################################################
+################################################################################
+
+
+# for syntax highlighting in vim and github
+# vim: set filetype=make:
+
diff --git a/externals/footils/knob/knob.c b/externals/footils/knob/knob.c
index b3c0c2ca10818ee367cfbf3c618d1f45b27ce360..bdb953e032ee15222f3ef2b3190c766c9a899c0e 100644
--- a/externals/footils/knob/knob.c
+++ b/externals/footils/knob/knob.c
@@ -26,7 +26,7 @@
#include "g_canvas.h"
-#include "../../old_g_all_guis.inc"
+#include "g_all_guis.h"
#include <math.h>
#ifdef WIN32
@@ -47,13 +47,14 @@ t_widgetbehavior knob_widgetbehavior;
static t_class *knob_class;
t_symbol *iemgui_key_sym=0; /* taken from g_all_guis.c */
-typedef struct _knob /* taken from Frank's modyfied g_all_guis.h */
+typedef struct _knob /* taken from Frank's modified g_all_guis.h */
{
t_iemgui x_gui;
int x_pos;
int x_val;
int x_lin0_log1;
int x_steady;
+ int x_explained_surprising_behavior;
double x_min;
double x_max;
double x_k;
@@ -63,34 +64,39 @@ typedef struct _knob /* taken from Frank's modyfied g_all_guis.h */
static void knob_draw_update(t_knob *x, t_glist *glist)
{
- if (glist_isvisible(glist))
- {
+ /* All this complicated data and no normalized value stored anywhere!
+ So we roll our own here for the sake of sanity... */
+ double normalized_value = (double)(((x->x_val)*0.01*x->x_k + x->x_min)
+ / x->x_max);
/* compute dial:*/
float radius = 0.5*(float)x->x_gui.x_h;
- double angle = 7.0/36.0 + 34.0/36.0*2.0*M_PI*( (double)x->x_val*0.01/(double)x->x_gui.x_h );
- int start = -80;
- int extent = 350 - (int)(360.0*angle/(2.0*M_PI));
+ double angle = 7.0/36.0 + 34.0/36.0*2.0*M_PI*((double)x->x_val*0.01/(double)x->x_gui.x_h );
+// int start = -80;
+// int extent = 350 - (int)(360.0*angle/(2.0*M_PI));
/* center point: */
- int x1 = text_xpix(&x->x_gui.x_obj, glist) + radius;
- int y1 = text_ypix(&x->x_gui.x_obj, glist) + radius;
- int x2 = text_xpix(&x->x_gui.x_obj, glist) + radius + radius * sin( -angle);
- int y2 = text_ypix(&x->x_gui.x_obj, glist) + radius + radius * cos( angle);
-
- sys_vgui(".x%lx.c coords %xKNOB %d %d %d %d\n",
- glist_getcanvas(glist), x,
- x1, /* x1 */
- y1, /* y1 */
- x2, /* x2 */
- y2 /* y2 */
- );
-
+ int x1 = radius;
+ int y1 = radius;
+ int x2 = radius + radius * sin(-angle);
+ int y2 = radius + radius * cos(angle);
+
+ gui_vmess("gui_turn_mknob", "xxiiiiif",
+ glist_getcanvas(glist),
+ x,
+ x1,
+ y1,
+ x2,
+ y2,
+ 1,
+ normalized_value
+ );
/* post("knob: (%d, %d) (%d, %d)", x1,y1,x2,y2); */
- sys_vgui(".x%lx.c itemconfigure %xBASE -start %d -extent %d \n", glist_getcanvas(glist), x,
- start, extent);
- }
+ //sys_vgui(".x%lx.c itemconfigure %xBASE -start %d -extent %d \n",
+ // glist_getcanvas(glist), x,
+ // start, extent);
}
+static void knob_draw_config(t_knob *x,t_glist *glist);
static void knob_draw_new(t_knob *x, t_glist *glist)
{
int xpos=text_xpix(&x->x_gui.x_obj, glist);
@@ -99,130 +105,101 @@ static void knob_draw_new(t_knob *x, t_glist *glist)
t_canvas *canvas=glist_getcanvas(glist);
/* compute dial:*/
- float radius = 0.5*(float)x->x_gui.x_h;
+// float radius = 0.5*(float)x->x_gui.x_h;
/* center point: */
- int x1 = xpos + radius;
- int y1 = ypos + radius;
+// int x1 = xpos + radius;
+// int y1 = ypos + radius;
/* dial */
- double angle = 7.0/36.0 + 34.0/36.0*2.0*M_PI*((float)x->x_val*0.01/(float)(x->x_gui.x_h));
- int x2 = x1 + radius * sin(-angle);
- int y2 = y1 + radius * cos(angle);
+// double angle = 7.0/36.0 + 34.0/36.0*2.0*M_PI*((float)x->x_val*0.01/(float)(x->x_gui.x_h));
+// int x2 = x1 + radius * sin(-angle);
+// int y2 = y1 + radius * cos(angle);
+ /* reuse mknob drawing routine */
+ gui_vmess("gui_mknob_new", "xxiiiiii",
+ canvas,
+ x,
+ xpos,
+ ypos,
+ glist_istoplevel(glist),
+ !iemgui_has_snd(&x->x_gui),
+ !iemgui_has_rcv(&x->x_gui),
+ 1
+ );
+ knob_draw_config(x, glist);
/* BASE2 */
+ /*
sys_vgui(".x%lx.c create arc %d %d %d %d -outline #%6.6x -style arc -width 3 -start -80 -extent 340 -tags %xBASE2\n",
canvas,
- xpos, ypos, /* upper left */
- xpos + x->x_gui.x_h, ypos + x->x_gui.x_h, /* lower right */
+ xpos, ypos,
+ xpos + x->x_gui.x_h, ypos + x->x_gui.x_h,
x->x_gui.x_fcol, x);
-
+ */
/* BASE */
+ /*
sys_vgui(".x%lx.c create arc %d %d %d %d -fill #%6.6x -style arc -width 3 -start -80 -extent 340 -tags %xBASE\n",
- canvas,
- xpos, ypos, /* upper left */
- xpos + x->x_gui.x_h, ypos + x->x_gui.x_h, /* lower right */
+ canvas,
+ xpos, ypos,
+ xpos + x->x_gui.x_h, ypos + x->x_gui.x_h,
x->x_gui.x_bcol, x);
+ */
/* LINE */
+ /*
sys_vgui(".x%lx.c create line %d %d %d %d -width 3 -fill #%6.6x -capstyle round -tags %xKNOB\n",
- canvas,
- x1, /* x1 */
- y1, /* y1 */
- x2, /* x2 */
- y2, /* y2 */
- x->x_gui.x_fcol, /* color */
- x);
-
+ canvas,
+ x1,
+ y1,
+ x2,
+ y2,
+ x->x_gui.x_fcol,
+ x);
+
sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor w \
-font {%s %d bold} -fill #%6.6x -tags %xLABEL\n",
canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
- x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x);
- if(!x->x_gui.x_fsf.x_snd_able)
+ iem_fstyletoint(&x->x_gui), x->x_gui.x_fontsize, x->x_gui.x_lcol,
+ x);
+ if (!iemgui_has_snd(&x->x_gui))
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xOUT%d\n",
canvas,
xpos, ypos + x->x_gui.x_h+2,
xpos+7, ypos + x->x_gui.x_h+3,
x, 0);
- if(!x->x_gui.x_fsf.x_rcv_able)
+ if (!iemgui_has_rcv(&x->x_gui))
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xIN%d\n",
canvas,
xpos, ypos-2,
xpos+7, ypos-1,
x, 0);
+ */
}
-static void knob_draw_move(t_knob *x, t_glist *glist)
+static void knob_draw_config(t_knob *x,t_glist *glist)
{
- int xpos=text_xpix(&x->x_gui.x_obj, glist);
- int ypos=text_ypix(&x->x_gui.x_obj, glist);
- /* int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; */
- t_canvas *canvas=glist_getcanvas(glist);
- /* compute dial:*/
- float radius = 0.5*(float)x->x_gui.x_h;
- /* float angle = 7.0/36.0 + 34.0/36.0*2.0*M_PI*((float)x->x_val*0.01/(float)(x->x_gui.x_h)); */
- double angle = 7.0/36.0 + 34.0/36.0*2.0*M_PI*( (double)x->x_val*0.01/(double)x->x_gui.x_h );
- /* center point: */
- int x1 = text_xpix(&x->x_gui.x_obj, glist) + radius;
- int y1 = text_ypix(&x->x_gui.x_obj, glist) + radius;
- int x2 = text_xpix(&x->x_gui.x_obj, glist) + radius + radius * sin( -angle);
- int y2 = text_ypix(&x->x_gui.x_obj, glist) + radius + radius * cos( angle);
-
-
-
- sys_vgui(".x%lx.c coords %xKNOB %d %d %d %d\n",
- canvas, x,
- x1, /* x1 */
- y1, /* y1 */
- x2, /* x2 */
- y2 /* y2 */
- );
- /* post("knob: (%d, %d) (%d, %d)", x1,y1,x2,y2); */
-
- sys_vgui(".x%lx.c coords %xBASE %d %d %d %d\n",
- canvas, x,
- xpos, ypos,
- xpos + x->x_gui.x_h, ypos + x->x_gui.x_h);
-
- sys_vgui(".x%lx.c coords %xBASE2 %d %d %d %d\n",
- canvas, x,
- xpos, ypos,
- xpos + x->x_gui.x_h, ypos + x->x_gui.x_h);
-
- sys_vgui(".x%lx.c coords %xLABEL %d %d\n",
- canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy);
- if(!x->x_gui.x_fsf.x_snd_able)
- sys_vgui(".x%lx.c coords %xOUT%d %d %d %d %d\n",
- canvas, x, 0,
- xpos, ypos + x->x_gui.x_h+2,
- xpos+7, ypos + x->x_gui.x_h+3);
- if(!x->x_gui.x_fsf.x_rcv_able)
- sys_vgui(".x%lx.c coords %xIN%d %d %d %d %d\n",
- canvas, x, 0,
- xpos, ypos-2,
- xpos+7, ypos-1);
-}
+ t_canvas *canvas = glist_getcanvas(glist);
+ char bcol[8], fcol[8], lcol[8];
-static void knob_draw_erase(t_knob* x,t_glist* glist)
-{
- t_canvas *canvas=glist_getcanvas(glist);
+ sprintf(bcol, "#%6.6x", x->x_gui.x_bcol);
+ sprintf(fcol, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(lcol, "#%6.6x", x->x_gui.x_lcol);
- sys_vgui(".x%lx.c delete %xBASE\n", canvas, x);
- sys_vgui(".x%lx.c delete %xBASE2\n", canvas, x);
- sys_vgui(".x%lx.c delete %xKNOB\n", canvas, x);
- sys_vgui(".x%lx.c delete %xLABEL\n", canvas, x);
- if(!x->x_gui.x_fsf.x_snd_able)
- sys_vgui(".x%lx.c delete %xOUT%d\n", canvas, x, 0);
- if(!x->x_gui.x_fsf.x_rcv_able)
- sys_vgui(".x%lx.c delete %xIN%d\n", canvas, x, 0);
-}
-
-static void knob_draw_config(t_knob* x,t_glist* glist)
-{
- t_canvas *canvas=glist_getcanvas(glist);
+ /* reuse mknob interface */
+ gui_vmess("gui_configure_mknob", "xxissi",
+ canvas,
+ x,
+ x->x_gui.x_h,
+ bcol,
+ fcol,
+ 1 /* flag to tell we are a footils/knob */
+ );
+ knob_draw_update(x, glist);
+/*
sys_vgui(".x%lx.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n",
- canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize,
- x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol,
+ canvas, x, iem_fstyletoint(&x->x_gui), x->x_gui.x_fontsize,
+ glist_isselected(canvas, (t_gobj *)x) ?
+ 0 : x->x_gui.x_lcol,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
sys_vgui(".x%lx.c itemconfigure %xKNOB -fill #%6.6x\n", canvas,
x, x->x_gui.x_fcol);
@@ -230,68 +207,77 @@ static void knob_draw_config(t_knob* x,t_glist* glist)
x, x->x_gui.x_fcol);
sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas,
x, x->x_gui.x_bcol);
+*/
}
+/*
static void knob_draw_io(t_knob* x,t_glist* glist, int old_snd_rcv_flags)
{
int xpos=text_xpix(&x->x_gui.x_obj, glist);
int ypos=text_ypix(&x->x_gui.x_obj, glist);
t_canvas *canvas=glist_getcanvas(glist);
- if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able)
+ if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !iemgui_has_snd(&x->x_gui))
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xOUT%d\n",
canvas,
xpos, ypos + x->x_gui.x_h+2,
xpos+7, ypos + x->x_gui.x_h+3,
x, 0);
- if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able)
+ if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && iemgui_has_rcv(&x->x_gui))
sys_vgui(".x%lx.c delete %xOUT%d\n", canvas, x, 0);
- if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able)
+ if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !iemgui_has_rcv(&x->x_gui))
sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %xIN%d\n",
canvas,
xpos, ypos-2,
xpos+7, ypos-1,
x, 0);
- if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able)
+ if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && iemgui_has_rcv(&x->x_gui))
sys_vgui(".x%lx.c delete %xIN%d\n", canvas, x, 0);
}
+*/
+/*
static void knob_draw_select(t_knob *x, t_glist *glist)
{
t_canvas *canvas=glist_getcanvas(glist);
- if(x->x_gui.x_fsf.x_selected)
+ if(glist_isselected(canvas, (t_gobj *)x))
{
pd_bind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym);
- sys_vgui(".x%lx.c itemconfigure %xBASE2 -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
- sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
- sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
+ sys_vgui(".x%lx.c itemconfigure %xBASE2 -outline #%6.6x\n", canvas, x, 0);
+ sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, 0);
+ sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, 0);
}
else
{
pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym);
- sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL);
+ sys_vgui(".x%lx.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, 0);
sys_vgui(".x%lx.c itemconfigure %xBASE2 -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
sys_vgui(".x%lx.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol);
}
}
+*/
-void knob_draw(t_knob *x, t_glist *glist, int mode)
+static void knob_draw(t_knob *x, t_glist *glist, int mode)
{
if(mode == IEM_GUI_DRAW_MODE_UPDATE)
knob_draw_update(x, glist);
else if(mode == IEM_GUI_DRAW_MODE_MOVE)
- knob_draw_move(x, glist);
+ iemgui_base_draw_move(&x->x_gui);
else if(mode == IEM_GUI_DRAW_MODE_NEW)
knob_draw_new(x, glist);
+/*
else if(mode == IEM_GUI_DRAW_MODE_SELECT)
knob_draw_select(x, glist);
else if(mode == IEM_GUI_DRAW_MODE_ERASE)
knob_draw_erase(x, glist);
+*/
else if(mode == IEM_GUI_DRAW_MODE_CONFIG)
knob_draw_config(x, glist);
+/*
else if(mode >= IEM_GUI_DRAW_MODE_IO)
knob_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO);
+*/
}
/* ------------------------ knob widgetbehaviour----------------------------- */
@@ -311,27 +297,25 @@ static void knob_getrect(t_gobj *z, t_glist *glist,
static void knob_save(t_gobj *z, t_binbuf *b)
{
t_knob *x = (t_knob *)z;
- int bflcol[3], *ip1, *ip2;
+ int bflcol[3];
t_symbol *srl[3];
iemgui_save(&x->x_gui, srl, bflcol);
- ip1 = (int *)(&x->x_gui.x_isa);
- ip2 = (int *)(&x->x_gui.x_fsf);
binbuf_addv(b, "ssiisiiffiisssiiiiiiiii", gensym("#X"),gensym("obj"),
(t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix,
atom_getsymbol(binbuf_getvec(x->x_gui.x_obj.te_binbuf)),
x->x_gui.x_h, x->x_gui.x_h,
(float)x->x_min, (float)x->x_max,
- x->x_lin0_log1, (*ip1)&IEM_INIT_ARGS_ALL,
+ x->x_lin0_log1, iem_symargstoint(&x->x_gui),
srl[0], srl[1], srl[2],
x->x_gui.x_ldx, x->x_gui.x_ldy,
- (*ip2)&IEM_FSTYLE_FLAGS_ALL, x->x_gui.x_fontsize,
+ iem_fstyletoint(&x->x_gui), x->x_gui.x_fontsize,
bflcol[0], bflcol[1], bflcol[2],
x->x_val, x->x_steady);
binbuf_addv(b, ";");
}
-void knob_check_height(t_knob *x, int h)
+static void knob_check_height(t_knob *x, int h)
{
if(h < IEM_SL_MINSIZE)
h = IEM_SL_MINSIZE;
@@ -347,7 +331,7 @@ void knob_check_height(t_knob *x, int h)
x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_h - 1);
}
-void knob_check_minmax(t_knob *x, double min, double max)
+static void knob_check_minmax(t_knob *x, double min, double max)
{
if(x->x_lin0_log1)
{
@@ -367,9 +351,9 @@ void knob_check_minmax(t_knob *x, double min, double max)
x->x_min = min;
x->x_max = max;
if(x->x_min > x->x_max) /* bugfix */
- x->x_gui.x_isa.x_reverse = 1;
+ x->x_gui.x_reverse = 1;
else
- x->x_gui.x_isa.x_reverse = 0;
+ x->x_gui.x_reverse = 0;
if(x->x_lin0_log1)
x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_h - 1);
else
@@ -379,11 +363,43 @@ void knob_check_minmax(t_knob *x, double min, double max)
static void knob_properties(t_gobj *z, t_glist *owner)
{
t_knob *x = (t_knob *)z;
- char buf[800];
+// char buf[800];
+ char *gfx_tag;
t_symbol *srl[3];
iemgui_properties(&x->x_gui, srl);
-
+ gfx_tag = gfxstub_new2(&x->x_gui.x_obj.ob_pd, x);
+
+ gui_start_vmess("gui_iemgui_dialog", "s", gfx_tag);
+ gui_start_array();
+
+ gui_s("type"); gui_s("knob");
+ /* Since mknob reuses the iemgui dialog code, we just
+ use the "width" slot for "size" and the "height" slot
+ for the number of steps and re-label it on the GUI side. */
+// gui_s("width"); gui_i(x->x_gui.x_w);
+// gui_s("height"); gui_i(x->x_gui.x_h);
+ gui_s("size"); gui_i(x->x_gui.x_h);
+ gui_s("minimum_range"); gui_f(x->x_min);
+ gui_s("maximum_range"); gui_f(x->x_max);
+ gui_s("log_scaling"); gui_i(x->x_lin0_log1);
+ gui_s("init"); gui_i(x->x_gui.x_loadinit);
+ gui_s("steady_on_click"); gui_i(x->x_steady);
+ gui_s("send_symbol"); gui_s(srl[0]->s_name);
+ gui_s("receive_symbol"); gui_s(srl[1]->s_name);
+ gui_s("label"); gui_s(srl[2]->s_name);
+ gui_s("x_offset"); gui_i(x->x_gui.x_ldx);
+ gui_s("y_offset"); gui_i(x->x_gui.x_ldy);
+ gui_s("font_style"); gui_i(x->x_gui.x_font_style);
+ gui_s("font_size"); gui_i(x->x_gui.x_fontsize);
+ gui_s("background_color"); gui_i(0xffffff & x->x_gui.x_bcol);
+ gui_s("foreground_color"); gui_i(0xffffff & x->x_gui.x_fcol);
+ gui_s("label_color"); gui_i(0xffffff & x->x_gui.x_lcol);
+
+ gui_end_array();
+ gui_end_vmess();
+
+/*
sprintf(buf, "pdtk_iemgui_dialog %%s KNOB \
--------dimensions(pix)(pix):-------- %d %d NONE: %d %d height: \
-----------output-range:----------- %g left: %g right: %g \
@@ -393,13 +409,14 @@ static void knob_properties(t_gobj *z, t_glist *owner)
%d %d \
%d %d %d\n",
x->x_gui.x_w, IEM_SL_MINSIZE, x->x_gui.x_h, IEM_GUI_MINSIZE,
- x->x_min, x->x_max, 0.0,/*no_schedule*/
- x->x_lin0_log1, x->x_gui.x_isa.x_loadinit, x->x_steady, -1,/*no multi, but iem-characteristic*/
+ x->x_min, x->x_max, 0.0, //no_schedule
+ x->x_lin0_log1, x->x_gui.x_loadinit, x->x_steady, -1,//no multi, but iem-characteristic
srl[0]->s_name, srl[1]->s_name,
srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy,
- x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize,
+ iem_fstyletoint(&x->x_gui), x->x_gui.x_fontsize,
0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol);
gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf);
+*/
}
static void knob_bang(t_knob *x)
@@ -415,15 +432,32 @@ static void knob_bang(t_knob *x)
//post("knob_bang -- x_k: %f", x->x_k);
outlet_float(x->x_gui.x_obj.ob_outlet, out);
- if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing)
+ if(iemgui_has_snd(&x->x_gui) && x->x_gui.x_snd->s_thing)
pd_float(x->x_gui.x_snd->s_thing, out);
}
+static void complain_about_surprising_behavior(t_knob *x)
+{
+ if (!x->x_explained_surprising_behavior)
+ {
+ pd_error(x, "knob: value is coupled to its height. This "
+ "means its output value can change when you change its size. "
+ "If you don't need to change the widget's size when running "
+ "your patch this is probably ok. Otherwise, "
+ "consider using moonlib/knob instead. "
+ "(Or perhaps question why audio interfaces are the only UIs "
+ "which still employ 'knob' widgets.)");
+ x->x_explained_surprising_behavior = 1;
+ }
+}
+
static void knob_dialog(t_knob *x, t_symbol *s, int argc, t_atom *argv)
{
- t_symbol *srl[3];
+ if (atom_getintarg(19, argc, argv))
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
int w = (int)atom_getintarg(0, argc, argv);
int h = (int)atom_getintarg(1, argc, argv);
+ int old_h = x->x_gui.x_h;
double min = (double)atom_getfloatarg(2, argc, argv);
double max = (double)atom_getfloatarg(3, argc, argv);
int lilo = (int)atom_getintarg(4, argc, argv);
@@ -436,13 +470,20 @@ static void knob_dialog(t_knob *x, t_symbol *s, int argc, t_atom *argv)
x->x_steady = 1;
else
x->x_steady = 0;
- sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv);
+ sr_flags = iemgui_dialog(&x->x_gui, argc, argv);
x->x_gui.x_h = iemgui_clip_size(w);
knob_check_height(x, h);
knob_check_minmax(x, min, max);
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG);
+ if (old_h != x->x_gui.x_h)
+ complain_about_surprising_behavior(x);
+ iemgui_draw_config(&x->x_gui);
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG);
+ iemgui_draw_io(&x->x_gui, sr_flags);
+/*
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags);
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE);
+*/
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE);
+ iemgui_io_draw_move(&x->x_gui);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text*)x);
}
@@ -450,7 +491,7 @@ static void knob_motion(t_knob *x, t_floatarg dx, t_floatarg dy)
{
int old = x->x_val;
- if(x->x_gui.x_fsf.x_finemoved)
+ if(x->x_gui.x_finemoved)
x->x_pos -= (int)dy;
else
x->x_pos -= 100*(int)dy;
@@ -495,14 +536,14 @@ static int knob_newclick(t_gobj *z, struct _glist *glist,
{
t_knob* x = (t_knob *)z;
- if(doit)
+ if (doit)
{
- knob_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift,
+ knob_click (x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift,
0, (t_floatarg)alt);
- if(shift)
- x->x_gui.x_fsf.x_finemoved = 1;
+ if (shift)
+ x->x_gui.x_finemoved = 1;
else
- x->x_gui.x_fsf.x_finemoved = 0;
+ x->x_gui.x_finemoved = 0;
}
return (1);
}
@@ -511,21 +552,21 @@ static void knob_set(t_knob *x, t_floatarg f)
{
double g;
- if(x->x_gui.x_isa.x_reverse) /* bugfix */
+ if (x->x_gui.x_reverse) /* bugfix */
{
- if(f > x->x_min)
+ if (f > x->x_min)
f = x->x_min;
- if(f < x->x_max)
+ if (f < x->x_max)
f = x->x_max;
}
else
{
- if(f > x->x_max)
+ if (f > x->x_max)
f = x->x_max;
- if(f < x->x_min)
+ if (f < x->x_min)
f = x->x_min;
}
- if(x->x_lin0_log1)
+ if (x->x_lin0_log1)
g = log(f/x->x_min)/x->x_k;
else
g = (f - x->x_min) / x->x_k;
@@ -535,14 +576,15 @@ static void knob_set(t_knob *x, t_floatarg f)
// x->x_val = (int)(100.0*g);
x->x_pos = x->x_val;
//post("knob_set x_val: %f", x->x_val );
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+ if (glist_isvisible(x->x_gui.x_glist))
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
}
static void knob_float(t_knob *x, t_floatarg f)
{
- /* post("knob_set infloat f: %f", f ); */
+ /* post("knob_set infloat f: %f", f ); */
knob_set(x, f);
- if(x->x_gui.x_fsf.x_put_in2out)
+ if (x->x_gui.x_put_in2out)
knob_bang(x);
}
@@ -550,15 +592,20 @@ static void knob_size(t_knob *x, t_symbol *s, int ac, t_atom *av)
{
x->x_gui.x_h = iemgui_clip_size((int)atom_getintarg(0, ac, av));
if(ac > 1)
- knob_check_height(x, (int)atom_getintarg(1, ac, av));
- iemgui_size((void *)x, &x->x_gui);
+ knob_check_height(x, (int)atom_getintarg(1, ac, av));
+ complain_about_surprising_behavior(x);
+ iemgui_size(&x->x_gui);
}
static void knob_delta(t_knob *x, t_symbol *s, int ac, t_atom *av)
-{iemgui_delta((void *)x, &x->x_gui, s, ac, av);}
+{
+ iemgui_delta(&x->x_gui, s, ac, av);
+}
static void knob_pos(t_knob *x, t_symbol *s, int ac, t_atom *av)
-{iemgui_pos((void *)x, &x->x_gui, s, ac, av);}
+{
+ iemgui_pos(&x->x_gui, s, ac, av);
+}
static void knob_range(t_knob *x, t_symbol *s, int ac, t_atom *av)
{
@@ -567,22 +614,34 @@ static void knob_range(t_knob *x, t_symbol *s, int ac, t_atom *av)
}
static void knob_color(t_knob *x, t_symbol *s, int ac, t_atom *av)
-{iemgui_color((void *)x, &x->x_gui, s, ac, av);}
+{
+ iemgui_color(&x->x_gui, s, ac, av);
+}
static void knob_send(t_knob *x, t_symbol *s)
-{iemgui_send(x, &x->x_gui, s);}
+{
+ iemgui_send(&x->x_gui, s);
+}
static void knob_receive(t_knob *x, t_symbol *s)
-{iemgui_receive(x, &x->x_gui, s);}
+{
+ iemgui_receive(&x->x_gui, s);
+}
static void knob_label(t_knob *x, t_symbol *s)
-{iemgui_label((void *)x, &x->x_gui, s);}
+{
+ iemgui_label(&x->x_gui, s);
+}
static void knob_label_pos(t_knob *x, t_symbol *s, int ac, t_atom *av)
-{iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);}
+{
+ iemgui_label_pos(&x->x_gui, s, ac, av);
+}
static void knob_label_font(t_knob *x, t_symbol *s, int ac, t_atom *av)
-{iemgui_label_font((void *)x, &x->x_gui, s, ac, av);}
+{
+ iemgui_label_font(&x->x_gui, s, ac, av);
+}
static void knob_log(t_knob *x)
{
@@ -598,7 +657,7 @@ static void knob_lin(t_knob *x)
static void knob_init(t_knob *x, t_floatarg f)
{
- x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;
+ x->x_gui.x_loadinit = (f==0.0)?0:1;
}
static void knob_steady(t_knob *x, t_floatarg f)
@@ -610,7 +669,7 @@ static void knob_steady(t_knob *x, t_floatarg f)
static void knob_loadbang(t_knob *x, t_floatarg action)
{
- if (action == LB_LOAD && x->x_gui.x_isa.x_loadinit)
+ if (action == LB_LOAD && x->x_gui.x_loadinit)
{
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
knob_bang(x);
@@ -635,24 +694,101 @@ static void knob_list(t_knob *x, t_symbol *s, int ac, t_atom *av)
}
*/
+/* we may no longer need h_dragon... */
+static void knob__clickhook(t_scalehandle *sh, int newstate)
+{
+ t_knob *x = (t_knob *)(sh->h_master);
+ if (newstate)
+ {
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
+ if (!sh->h_scale) /* click on a label handle */
+ scalehandle_click_label(sh);
+ }
+ /* We no longer need this "clickhook", as we can handle the dragging
+ either in the GUI (for the label handle) or or in canvas_doclick */
+ //iemgui__clickhook3(sh,newstate);
+ sh->h_dragon = newstate;
+}
+
+static void knob__motionhook(t_scalehandle *sh,
+ t_floatarg mouse_x, t_floatarg mouse_y)
+{
+ if (sh->h_scale)
+ {
+ t_knob *x = (t_knob *)(sh->h_master);
+ int width = x->x_gui.x_h,
+ height = x->x_gui.x_h;
+ int x1, y1, x2, y2, d;
+ x1 = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ y1 = text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ x2 = x1 + width;
+ y2 = y1 + height;
+
+ /* This is convoluted, but I can't think of another
+ way to get this behavior... */
+ if (mouse_x <= x2)
+ {
+ if (mouse_y > y2)
+ d = mouse_y - y2;
+ else if (abs(mouse_y - y2) < abs(mouse_x - x2))
+ d = mouse_y - y2;
+ else
+ d = mouse_x - x2;
+ }
+ else
+ {
+ if (mouse_y <= y2)
+ d = mouse_x - x2;
+ else
+ d = maxi(mouse_y - y2, mouse_x - x2);
+ }
+ sh->h_dragx = d;
+ sh->h_dragy = d;
+ scalehandle_drag_scale(sh);
+
+ width = maxi(width + d, IEM_GUI_MINSIZE);
+ height = width;
+
+ /* Explain some suprising behavior to the user... */
+
+ x->x_gui.x_w = width;
+ x->x_gui.x_h = height;
+ /* recalculate x_k and stuff */
+ knob_check_height(x, height);
+ knob_check_minmax(x, x->x_min, x->x_max);
+
+ complain_about_surprising_behavior(x);
+
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ knob_draw_config(x, x->x_gui.x_glist);
+ scalehandle_unclick_scale(sh);
+ }
+
+ int properties = gfxstub_haveproperties((void *)x);
+ if (properties)
+ {
+ int new_w = x->x_gui.x_w + sh->h_dragx;
+ // This should actually be "size", but we're using the
+ // "width" input in dialog_iemgui and just relabelling it
+ // as a kluge.
+ properties_set_field_int(properties, "width", new_w);
+ }
+ }
+ scalehandle_dragon_label(sh, mouse_x, mouse_y);
+}
+
static void *knob_new(t_symbol *s, int argc, t_atom *argv)
{
t_knob *x = (t_knob *)pd_new(knob_class);
int bflcol[]={-262144, -1, -1};
- t_symbol *srl[3];
int w=IEM_KNOB_DEFAULTSIZE, h=IEM_KNOB_DEFAULTSIZE;
int lilo=0, ldx=0, ldy=-8;
int fs=8, v=0, steady=1;
double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1);
- char str[144];
-
- //srl[0] = gensym("empty");
- //srl[1] = gensym("empty");
- //srl[2] = gensym("empty");
-
- iem_inttosymargs(&x->x_gui.x_isa, 0);
- iem_inttofstyle(&x->x_gui.x_fsf, 0);
+ iem_inttosymargs(&x->x_gui, 0);
+ iem_inttofstyle(&x->x_gui, 0);
if(((argc == 17)||(argc == 18))&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1)
&&IS_A_FLOAT(argv,2)&&IS_A_FLOAT(argv,3)
@@ -669,11 +805,11 @@ static void *knob_new(t_symbol *s, int argc, t_atom *argv)
min = (double)atom_getfloatarg(2, argc, argv);
max = (double)atom_getfloatarg(3, argc, argv);
lilo = (int)atom_getintarg(4, argc, argv);
- iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv));
+ iem_inttosymargs(&x->x_gui, atom_getintarg(5, argc, argv));
iemgui_new_getnames(&x->x_gui, 6, argv);
ldx = (int)atom_getintarg(9, argc, argv);
ldy = (int)atom_getintarg(10, argc, argv);
- iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv));
+ iem_inttofstyle(&x->x_gui, atom_getintarg(11, argc, argv));
fs = (int)atom_getintarg(12, argc, argv);
bflcol[0] = (int)atom_getintarg(13, argc, argv);
bflcol[1] = (int)atom_getintarg(14, argc, argv);
@@ -681,16 +817,18 @@ static void *knob_new(t_symbol *s, int argc, t_atom *argv)
v = (int)atom_getintarg(16, argc, argv);
}
else iemgui_new_getnames(&x->x_gui, 6, 0);
- if((argc == 18)&&IS_A_FLOAT(argv,17))
+ if ((argc == 18)&&IS_A_FLOAT(argv,17))
steady = (int)atom_getintarg(17, argc, argv);
x->x_gui.x_draw = (t_iemfunptr)knob_draw;
+/*
x->x_gui.x_fsf.x_snd_able = 1;
x->x_gui.x_fsf.x_rcv_able = 1;
+*/
x->x_gui.x_glist = (t_glist *)canvas_getcurrent();
- if(x->x_gui.x_isa.x_loadinit)
+ if (x->x_gui.x_loadinit)
x->x_val = v;
else
x->x_val = 0;
@@ -699,19 +837,30 @@ static void *knob_new(t_symbol *s, int argc, t_atom *argv)
x->x_lin0_log1 = lilo;
if(steady != 0) steady = 1;
x->x_steady = steady;
+/*
if (!strcmp(x->x_gui.x_snd->s_name, "empty"))
x->x_gui.x_fsf.x_snd_able = 0;
if (!strcmp(x->x_gui.x_rcv->s_name, "empty"))
x->x_gui.x_fsf.x_rcv_able = 0;
- if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica");
- else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times");
- else { x->x_gui.x_fsf.x_font_style = 0;
- strcpy(x->x_gui.x_font, "courier"); }
- if(x->x_gui.x_fsf.x_rcv_able)
+*/
+ if (iem_fstyletoint(&x->x_gui) == 1)
+ {
+ //strcpy(x->x_gui.x_font, "helvetica");
+ }
+ else if (iem_fstyletoint(&x->x_gui) == 2)
+ {
+ //strcpy(x->x_gui.x_font, "times");
+ }
+ else
+ {
+ x->x_gui.x_font_style = 0;
+ //strcpy(x->x_gui.x_font, "courier");
+ }
+ if (iemgui_has_rcv(&x->x_gui))
pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
x->x_gui.x_ldx = ldx;
x->x_gui.x_ldy = ldy;
- if(fs < 4)
+ if (fs < 4)
fs = 4;
x->x_gui.x_fontsize = fs;
x->x_gui.x_h = iemgui_clip_size(h);
@@ -721,6 +870,14 @@ static void *knob_new(t_symbol *s, int argc, t_atom *argv)
//x->x_thick = 0;
iemgui_verify_snd_ne_rcv(&x->x_gui);
outlet_new(&x->x_gui.x_obj, &s_float);
+ x->x_gui.x_obj.te_iemgui = 1;
+ x->x_explained_surprising_behavior = 0;
+
+ x->x_gui.x_handle = scalehandle_new((t_object *)x,
+ x->x_gui.x_glist, 1, knob__clickhook, knob__motionhook);
+ x->x_gui.x_lhandle = scalehandle_new((t_object *)x,
+ x->x_gui.x_glist, 0, knob__clickhook, knob__motionhook);
+
return (x);
}
@@ -728,9 +885,9 @@ static void *knob_new(t_symbol *s, int argc, t_atom *argv)
static void knob_free(t_knob *x)
{
- if(x->x_gui.x_fsf.x_selected)
+ if (iemgui_has_snd(&x->x_gui))
pd_unbind(&x->x_gui.x_obj.ob_pd, iemgui_key_sym);
- if(x->x_gui.x_fsf.x_rcv_able)
+ if (iemgui_has_rcv(&x->x_gui))
pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv);
gfxstub_deleteforkey(x);
}
@@ -771,6 +928,7 @@ void knob_setup(void)
iemgui_key_sym = gensym("#keyname");
knob_widgetbehavior.w_getrectfn = knob_getrect;
knob_widgetbehavior.w_displacefn = iemgui_displace;
+ knob_widgetbehavior.w_displacefnwtag = iemgui_displace_withtag;
knob_widgetbehavior.w_selectfn = iemgui_select;
knob_widgetbehavior.w_activatefn = NULL;
knob_widgetbehavior.w_deletefn = iemgui_delete;
diff --git a/externals/footils/knob/makefile b/externals/footils/knob/makefile
index 5fdf212db7d7c5c085d4f8b9ba88109f308eb96c..cdb8e075f5c344eff79071fc690d164e03a6b350 100644
--- a/externals/footils/knob/makefile
+++ b/externals/footils/knob/makefile
@@ -1,91 +1,13 @@
-NAME=knob
-CSYM=knob
-
-# !!!
-# change these two
-PD_DIR=../../../pd
-#current: pd_nt pd_linux
-current: pd_linux
-
-# ----------------------- NT -----------------------
-
-pd_nt: $(NAME).dll
-
-.SUFFIXES: .dll
-
-PDNTCFLAGS = /W3 /WX /O2 /G6 /DNT /DPD /nologo
-
-# where is VC++ ???
-VC="C:\Programme\Microsoft Visual Studio\VC98"
-
-# where is your m_pd.h ???
-PDNTINCLUDE = /I. /Ic:\pd\tcl\include /Ic:\pd\src /I$(VC)\include /Iinclude
-
-PDNTLDIR = $(VC)\Lib
-PDNTLIB = $(PDNTLDIR)\libc.lib \
- $(PDNTLDIR)\oldnames.lib \
- $(PDNTLDIR)\kernel32.lib \
- $(PDNTLDIR)\user32.lib \
- $(PDNTLDIR)\uuid.lib \
- $(PDNTLDIR)\ws2_32.lib \
- c:\pd\bin\pd.lib
-
-.c.dll:
- cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
- link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
-
-# ----------------------- IRIX 5.x -----------------------
-
-pd_irix5: $(NAME).pd_irix5
-
-.SUFFIXES: .pd_irix5
-
-SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2
-
-SGIINCLUDE = -I../../src
-
-.c.pd_irix5:
- cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c
- ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o
- rm $*.o
-
-# ----------------------- IRIX 6.x -----------------------
-
-pd_irix6: $(NAME).pd_irix6
-
-.SUFFIXES: .pd_irix6
-
-SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
- -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
- -Ofast=ip32
-
-.c.pd_irix6:
- cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c
- ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o
- rm $*.o
-
-# ----------------------- LINUX i386 -----------------------
-
-pd_linux: $(NAME).pd_linux
-
-.SUFFIXES: .pd_linux
-
-LINUXCFLAGS = -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \
- -Wall -W -Wshadow -Wstrict-prototypes -Werror \
- -Wno-unused -Wno-parentheses -Wno-switch
-
-# where is your m_pd.h ???
-LINUXINCLUDE = -I../../src -I$(PD_DIR)/src
-
-.c.pd_linux:
- cc -O2 -Wall -DPD -fPIC $(LINUXINCLUDE) -c $*.c
- ld --export-dynamic -shared -o $*.pd_linux $*.o -lc
- strip $*.pd_linux
-
-# ----------------------------------------------------------
-
-install:
- cp help-*.pd ../../doc/5.reference
-
-clean:
- rm -f *.o *.pd_* so_locations
+# Makefile for mylib
+
+lib.name = flatgui
+
+class.sources = knob.c
+
+# ldlibs = -lfluidsynth
+
+datafiles = knob-help.pd clock.pd README
+
+externalsdir = ../../
+
+include Makefile.pdlibbuilder.revised
diff --git a/externals/iem/iemgui/src/room_sim_2d.c b/externals/iem/iemgui/src/room_sim_2d.c
index fff669083b63bee23b8f27b0f79d1b2ccaa05730..7f57c69296527284c511a119488afb5a8d2798ec 100644
--- a/externals/iem/iemgui/src/room_sim_2d.c
+++ b/externals/iem/iemgui/src/room_sim_2d.c
@@ -7,7 +7,7 @@ iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 *
#include "iemlib.h"
#include "iemgui.h"
#include "g_canvas.h"
-#include "../../../old_g_all_guis.inc"
+#include "g_all_guis.h"
#include <stdio.h>
#include <stdlib.h>
@@ -60,72 +60,163 @@ static void room_sim_2d_out_rho(t_room_sim_2d *x)
static void room_sim_2d_out_para(t_room_sim_2d *x)
{
int i, n = x->x_nr_src;
- int w2=x->x_gui.x_w/2, h2=x->x_gui.x_h/2;
-
+ int w2 = x->x_gui.x_w / 2,
+ h2 = x->x_gui.x_h/2;
+
SETFLOAT(x->x_at, 0.0f);
SETSYMBOL(x->x_at+1, x->x_s_head_xy);
SETFLOAT(x->x_at+2, (t_float)(h2 - x->x_pix_src_y[0])/x->x_cnvrt_roomlx2pixh);
SETFLOAT(x->x_at+3, (t_float)(w2 - x->x_pix_src_x[0])/x->x_cnvrt_roomlx2pixh);
outlet_list(x->x_out_para, &s_list, 4, x->x_at);
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
SETFLOAT(x->x_at, (t_float)i);
SETSYMBOL(x->x_at+1, x->x_s_src_xy);
- SETFLOAT(x->x_at+2, (t_float)(h2 - x->x_pix_src_y[i])/x->x_cnvrt_roomlx2pixh);
- SETFLOAT(x->x_at+3, (t_float)(w2 - x->x_pix_src_x[i])/x->x_cnvrt_roomlx2pixh);
+ SETFLOAT(x->x_at+2,
+ (t_float)(h2 - x->x_pix_src_y[i]) / x->x_cnvrt_roomlx2pixh);
+ SETFLOAT(x->x_at+3,
+ (t_float)(w2 - x->x_pix_src_x[i]) / x->x_cnvrt_roomlx2pixh);
outlet_list(x->x_out_para, &s_list, 4, x->x_at);
}
}
static void room_sim_2d_draw_update(t_room_sim_2d *x, t_glist *glist)
{
- if(glist_isvisible(glist))
+ if (glist_isvisible(glist))
{
- int xpos=text_xpix(&x->x_gui.x_obj, glist);
- int ypos=text_ypix(&x->x_gui.x_obj, glist);
+ int xpos = text_xpix(&x->x_gui.x_obj, glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, glist);
int dx, dy;
t_canvas *canvas=glist_getcanvas(glist);
- dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
- dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
+ dx = -(int)((t_float)x->x_pix_rad * (t_float)sin(x->x_rho_head *
+ 0.0174533f) + 0.49999f);
+ dy = -(int)((t_float)x->x_pix_rad * (t_float)cos(x->x_rho_head *
+ 0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
+
+ gui_vmess("gui_room_sim_update", "xxiiiii",
+ canvas,
+ x,
+ x->x_pix_src_x[0],
+ x->x_pix_src_y[0],
+ dx,
+ dy,
+ x->x_pix_rad
+ );
}
}
-void room_sim_2d_draw_new(t_room_sim_2d *x, t_glist *glist)
+void room_sim_2d_draw_unmap(t_room_sim_2d *x, t_glist *glist)
{
- int xpos=text_xpix(&x->x_gui.x_obj, glist);
- int ypos=text_ypix(&x->x_gui.x_obj, glist);
+ gui_vmess("gui_room_sim_erase", "xx",
+ x->x_gui.x_glist, x);
+}
+
+void room_sim_2d_draw_map(t_room_sim_2d *x, t_glist *glist)
+{
+ int xpos = text_xpix(&x->x_gui.x_obj, glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, glist);
int dx, dy;
- int i, n=x->x_nr_src;
- int fs=x->x_fontsize;
+ int i, n = x->x_nr_src;
+ int fs = x->x_fontsize;
t_canvas *canvas=glist_getcanvas(glist);
-
- sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBASE\n",
- canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
- x->x_gui.x_bcol, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:IEM_GUI_COLOR_NORMAL, x);
- for(i=1; i<=n; i++)
+ char fcol[MAXPDSTRING];
+ char bcol[MAXPDSTRING];
+ char elemcol[MAXPDSTRING];
+ sprintf(fcol, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(bcol, "#%6.6x", x->x_gui.x_bcol);
+
+ gui_start_vmess("gui_room_sim_map", "xxiiifiiiss",
+ canvas,
+ x,
+ x->x_gui.x_w,
+ x->x_gui.x_h,
+ x->x_pix_rad,
+ x->x_rho_head,
+ x->x_pix_src_x[0],
+ x->x_pix_src_y[0],
+ x->x_fontsize,
+ fcol,
+ bcol
+ );
+ gui_start_array();
+ for(i = 1; i <= n; i++)
{
- sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
- -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
- canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fs,
- x->x_col_src[i], x, i);
+// sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
+// -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
+// canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fs,
+// x->x_col_src[i], x, i);
+ gui_start_array();
+ gui_i(x->x_pix_src_x[i]);
+ gui_i(x->x_pix_src_y[i]);
+ sprintf(elemcol, "#%6.6x", x->x_col_src[i]);
+ gui_s(elemcol);
+ gui_end_array();
}
+ gui_end_array();
+ gui_end_vmess();
- sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n",
- canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
- xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1,
- x->x_gui.x_fcol, x);
+// sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n",
+// canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
+// xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1,
+// x->x_gui.x_fcol, x);
dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n",
- canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy,
- x->x_gui.x_fcol, x);
+// sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n",
+// canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy,
+// x->x_gui.x_fcol, x);
+}
+
+void room_sim_2d_draw_new(t_room_sim_2d *x, t_glist *glist)
+{
+ int xpos = text_xpix(&x->x_gui.x_obj, glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, glist);
+ int dx, dy;
+ int i, n = x->x_nr_src;
+ int fs = x->x_fontsize;
+ t_canvas *canvas=glist_getcanvas(glist);
+
+ gui_vmess("gui_room_sim_new", "xxiiiii",
+ canvas,
+ x,
+ xpos,
+ ypos,
+ x->x_gui.x_w,
+ x->x_gui.x_h,
+ glist_istoplevel(glist)
+ );
+
+ room_sim_2d_draw_map(x, glist);
+/* sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBASE\n",
+ canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
+ x->x_gui.x_bcol, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:IEM_GUI_COLOR_NORMAL, x);
+*/
+
+// for(i=1; i<=n; i++)
+// {
+// sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
+// -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
+// canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fs,
+// x->x_col_src[i], x, i);
+// }
+
+// sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n",
+// canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
+// xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1,
+// x->x_gui.x_fcol, x);
+// dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
+// dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n",
+// canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy,
+// x->x_gui.x_fcol, x);
}
+/*
void room_sim_2d_draw_move(t_room_sim_2d *x, t_glist *glist)
{
int xpos=text_xpix(&x->x_gui.x_obj, glist);
@@ -152,51 +243,22 @@ void room_sim_2d_draw_move(t_room_sim_2d *x, t_glist *glist)
canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
}
-
-void room_sim_2d_draw_erase(t_room_sim_2d* x, t_glist* glist)
-{
- int i, n;
- t_canvas *canvas=glist_getcanvas(glist);
-
- sys_vgui(".x%x.c delete %xBASE\n", canvas, x);
- n = x->x_nr_src;
- for(i=1; i<=n; i++)
- {
- sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, i);
- }
- sys_vgui(".x%x.c delete %xHEAD\n", canvas, x);
- sys_vgui(".x%x.c delete %xNOSE\n", canvas, x);
-}
-
-void room_sim_2d_draw_select(t_room_sim_2d* x, t_glist* glist)
-{
- t_canvas *canvas=glist_getcanvas(glist);
-
- if(x->x_gui.x_fsf.x_selected)
- {
- int xpos=text_xpix(&x->x_gui.x_obj, glist);
- int ypos=text_ypix(&x->x_gui.x_obj, glist);
-
- sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
- }
- else
- {
- sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL);
- }
-}
+*/
void room_sim_2d_draw(t_room_sim_2d *x, t_glist *glist, int mode)
{
- if(mode == IEM_GUI_DRAW_MODE_UPDATE)
+ if (mode == IEM_GUI_DRAW_MODE_UPDATE)
room_sim_2d_draw_update(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_MOVE)
- room_sim_2d_draw_move(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_NEW)
+ else if (mode == IEM_GUI_DRAW_MODE_MOVE)
+ iemgui_base_draw_move(&x->x_gui);
+ else if (mode == IEM_GUI_DRAW_MODE_NEW)
room_sim_2d_draw_new(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_SELECT)
+/*
+ else if (mode == IEM_GUI_DRAW_MODE_SELECT)
room_sim_2d_draw_select(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_ERASE)
+ else if (mode == IEM_GUI_DRAW_MODE_ERASE)
room_sim_2d_draw_erase(x, glist);
+*/
}
/* ------------------------ cnv widgetbehaviour----------------------------- */
@@ -238,14 +300,14 @@ static void room_sim_2d_save(t_gobj *z, t_binbuf *b)
static void room_sim_2d_motion(t_room_sim_2d *x, t_floatarg dx, t_floatarg dy)
{
- int sel=x->x_sel_index;
- int pixrad=x->x_pix_rad;
- int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int ddx, ddy;
+ int sel = x->x_sel_index;
+ int pixrad = x->x_pix_rad;
+ int xpos = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
+// int ddx, ddy;
t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
- if(x->x_gui.x_fsf.x_finemoved && (sel == 0))
+ if (x->x_gui.x_finemoved && (sel == 0))
{
x->x_rho_head -= dy;
@@ -256,47 +318,59 @@ static void room_sim_2d_motion(t_room_sim_2d *x, t_floatarg dx, t_floatarg dy)
room_sim_2d_out_rho(x);
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
}
- else if(sel == 0)
+ else if (sel == 0)
{
x->x_pos_x += (int)dx;
x->x_pos_y += (int)dy;
x->x_pix_src_x[0] = x->x_pos_x;
x->x_pix_src_y[0] = x->x_pos_y;
- if(x->x_pix_src_x[0] < 0)
+ if (x->x_pix_src_x[0] < 0)
x->x_pix_src_x[0] = 0;
- if(x->x_pix_src_x[0] > x->x_gui.x_w)
+ if (x->x_pix_src_x[0] > x->x_gui.x_w)
x->x_pix_src_x[0] = x->x_gui.x_w;
- if(x->x_pix_src_y[0] < 0)
+ if (x->x_pix_src_y[0] < 0)
x->x_pix_src_y[0] = 0;
- if(x->x_pix_src_y[0] > x->x_gui.x_h)
+ if (x->x_pix_src_y[0] > x->x_gui.x_h)
x->x_pix_src_y[0] = x->x_gui.x_h;
room_sim_2d_out_para(x);
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
- xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
- ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
- ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
+// sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
+// xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
+// ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
+// ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
}
else
{
+ char col[MAXPDSTRING];
x->x_pos_x += (int)dx;
x->x_pos_y += (int)dy;
x->x_pix_src_x[sel] = x->x_pos_x;
x->x_pix_src_y[sel] = x->x_pos_y;
- if(x->x_pix_src_x[sel] < 0)
+ if (x->x_pix_src_x[sel] < 0)
x->x_pix_src_x[sel] = 0;
- if(x->x_pix_src_x[sel] > x->x_gui.x_w)
+ if (x->x_pix_src_x[sel] > x->x_gui.x_w)
x->x_pix_src_x[sel] = x->x_gui.x_w;
- if(x->x_pix_src_y[sel] < 0)
+ if (x->x_pix_src_y[sel] < 0)
x->x_pix_src_y[sel] = 0;
- if(x->x_pix_src_y[sel] > x->x_gui.x_h)
+ if (x->x_pix_src_y[sel] > x->x_gui.x_h)
x->x_pix_src_y[sel] = x->x_gui.x_h;
room_sim_2d_out_para(x);
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
- canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]);
+// sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+// canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]);
+ sprintf(col, "#%6.6x", x->x_col_src[sel]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ sel - 1,
+ x->x_pix_src_x[sel],
+ x->x_pix_src_y[sel],
+ x->x_fontsize,
+ col
+ );
}
}
@@ -305,81 +379,88 @@ static void room_sim_2d_click(t_room_sim_2d *x, t_floatarg xpos, t_floatarg ypos
{
int w = (int)xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
int h = (int)ypos - text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int i, n=x->x_nr_src;
- int pixrad=x->x_pix_rad;
- int fsi=x->x_fontsize;
- int diff, maxdiff=10000, sel=-1;
+ int i, n = x->x_nr_src;
+ int pixrad = x->x_pix_rad;
+ int fsi = x->x_fontsize;
+ int diff, maxdiff = 10000, sel =- 1;
i = 0;/* head */
- if((w >= (x->x_pix_src_x[i]-pixrad)) && (w <= (x->x_pix_src_x[i]+pixrad)) && (h >= (x->x_pix_src_y[i]-pixrad)) && (h <= (x->x_pix_src_y[i]+pixrad)))
+ if ((w >= (x->x_pix_src_x[i] - pixrad)) &&
+ (w <= (x->x_pix_src_x[i] + pixrad)) &&
+ (h >= (x->x_pix_src_y[i] - pixrad)) &&
+ (h <= (x->x_pix_src_y[i] + pixrad)))
{
diff = w - x->x_pix_src_x[i];
- if(diff < 0)
+ if (diff < 0)
diff *= -1;
- if(diff < maxdiff)
+ if (diff < maxdiff)
{
maxdiff = diff;
sel = i;
}
diff = h - x->x_pix_src_y[i];
- if(diff < 0)
+ if (diff < 0)
diff *= -1;
- if(diff < maxdiff)
+ if (diff < maxdiff)
{
maxdiff = diff;
sel = i;
}
}
-
fsi *= 2;
fsi /= 3;
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
- if((w >= (x->x_pix_src_x[i]-fsi)) && (w <= (x->x_pix_src_x[i]+fsi)) &&
- (h >= (x->x_pix_src_y[i]-fsi)) && (h <= (x->x_pix_src_y[i]+fsi)))
+ if ((w >= (x->x_pix_src_x[i] - fsi)) &&
+ (w <= (x->x_pix_src_x[i] + fsi)) &&
+ (h >= (x->x_pix_src_y[i] - fsi)) &&
+ (h <= (x->x_pix_src_y[i] + fsi)))
{
diff = w - x->x_pix_src_x[i];
- if(diff < 0)
+ if (diff < 0)
diff *= -1;
- if(diff < maxdiff)
+ if (diff < maxdiff)
{
maxdiff = diff;
sel = i;
}
diff = h - x->x_pix_src_y[i];
- if(diff < 0)
+ if (diff < 0)
diff *= -1;
- if(diff < maxdiff)
+ if (diff < maxdiff)
{
maxdiff = diff;
sel = i;
}
}
}
- if(sel >= 0)
+ if (sel >= 0)
{
x->x_sel_index = sel;
x->x_pos_x = x->x_pix_src_x[sel];
x->x_pos_y = x->x_pix_src_y[sel];
- glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, (t_glistmotionfn)room_sim_2d_motion, 0, xpos, ypos);
+ glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g,
+ (t_glistmotionfn)room_sim_2d_motion, 0, xpos, ypos);
}
}
-static int room_sim_2d_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit)
+static int room_sim_2d_newclick(t_gobj *z, struct _glist *glist, int xpix,
+ int ypix, int shift, int alt, int dbl, int doit)
{
t_room_sim_2d* x = (t_room_sim_2d *)z;
- if(doit)
+ if (doit)
{
- room_sim_2d_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt);
- if(shift)
+ room_sim_2d_click(x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift,
+ 0, (t_floatarg)alt);
+ if (shift)
{
- x->x_gui.x_fsf.x_finemoved = 1;
+ x->x_gui.x_finemoved = 1;
room_sim_2d_out_rho(x);
}
else
{
- x->x_gui.x_fsf.x_finemoved = 0;
+ x->x_gui.x_finemoved = 0;
room_sim_2d_out_para(x);
}
}
@@ -394,27 +475,29 @@ static void room_sim_2d_bang(t_room_sim_2d *x)
static void room_sim_2d_src_font(t_room_sim_2d *x, t_floatarg ff)
{
- int fs=(int)(ff + 0.49999f);
- int i, n=x->x_nr_src;
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ int fs = (int)(ff + 0.49999f);
+ int i, n = x->x_nr_src;
+ t_canvas *canvas = glist_getcanvas(x->x_gui.x_glist);
- if(fs < 8)
+ if (fs < 8)
fs = 8;
- if(fs > 250)
+ if (fs > 250)
fs = 250;
x->x_fontsize = fs;
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fs);
+// sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fs);
+ gui_vmess("gui_room_sim_fontsize", "xxii",
+ canvas, x, i, fs);
}
}
static void room_sim_2d_set_rho(t_room_sim_2d *x, t_floatarg rho)
{
- while(rho <= -180.0f)
+ while (rho <= -180.0f)
rho += 360.0f;
- while(rho > 180.0f)
+ while (rho > 180.0f)
rho -= 360.0f;
x->x_rho_head = rho;
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
@@ -428,38 +511,50 @@ static void room_sim_2d_rho(t_room_sim_2d *x, t_floatarg rho)
static void room_sim_2d_set_src_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *argv)
{
+ char col[MAXPDSTRING];
t_float xsrc, ysrc;
t_float roomx2=0.5f*x->x_room_x, roomy2=0.5f*x->x_room_y;
- int i, n=x->x_nr_src;
- int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int w2=x->x_gui.x_w/2, h2=x->x_gui.x_h/2;
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ int i, n = x->x_nr_src;
+ int xpos = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int w2 = x->x_gui.x_w/2, h2 = x->x_gui.x_h/2;
+ t_canvas *canvas = glist_getcanvas(x->x_gui.x_glist);
- if(argc < 3)
+ if (argc < 3)
{
- post("room_sim_2d ERROR: src_xy-input needs 1 index + 2 float-dimensions: src_index, x [m], y [m]");
+ post("room_sim_2d ERROR: src_xy-input needs 1 index + 2 float-dimensions: "
+ "src_index, x [m], y [m]");
return;
}
i = (int)atom_getint(argv++);
- if((i > 0)&&(i <= n))
+ if ((i > 0) && (i <= n))
{
ysrc = atom_getfloat(argv++);
xsrc = atom_getfloat(argv);
- if(xsrc < -roomy2)
+ if (xsrc < -roomy2)
xsrc = -roomy2;
- if(xsrc > roomy2)
+ if (xsrc > roomy2)
xsrc = roomy2;
- if(ysrc < -roomx2)
+ if (ysrc < -roomx2)
ysrc = -roomx2;
- if(ysrc > roomx2)
+ if (ysrc > roomx2)
ysrc = roomx2;
x->x_pix_src_x[i] = w2 - (int)(x->x_cnvrt_roomlx2pixh * xsrc + 0.49999f);
x->x_pix_src_y[i] = h2 - (int)(x->x_cnvrt_roomlx2pixh * ysrc + 0.49999f);
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
- canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]);
+// sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+// canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]);
+ sprintf(col, "#%6.6x", x->x_col_src[i]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ i - 1,
+ x->x_pix_src_x[i],
+ x->x_pix_src_y[i],
+ x->x_fontsize,
+ col
+ );
}
}
@@ -469,18 +564,20 @@ static void room_sim_2d_src_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *
room_sim_2d_out_para(x);
}
-static void room_sim_2d_set_head_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *argv)
+static void room_sim_2d_set_head_xy(t_room_sim_2d *x, t_symbol *s, int argc,
+ t_atom *argv)
{
- int pixrad=x->x_pix_rad;
- int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int w2=x->x_gui.x_w/2, h2=x->x_gui.x_h/2;
+ int pixrad = x->x_pix_rad;
+ int xpos = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int w2 = x->x_gui.x_w / 2, h2=x->x_gui.x_h / 2;
int ddx, ddy;
t_float xh, yh;
- t_float roomx2=0.5f*x->x_room_x, roomy2=0.5f*x->x_room_y;
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ t_float roomx2 = 0.5f * x->x_room_x,
+ roomy2 = 0.5f * x->x_room_y;
+ t_canvas *canvas = glist_getcanvas(x->x_gui.x_glist);
- if(argc < 2)
+ if (argc < 2)
{
post("room_sim_2d ERROR: head_xy-input needs 2 float-dimensions: x [m], y [m]");
return;
@@ -488,25 +585,26 @@ static void room_sim_2d_set_head_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_a
yh = atom_getfloat(argv++);
xh = atom_getfloat(argv);
- if(xh < -roomy2)
+ if (xh < -roomy2)
xh = -roomy2;
- if(xh > roomy2)
+ if (xh > roomy2)
xh = roomy2;
- if(yh < -roomx2)
+ if (yh < -roomx2)
yh = -roomx2;
- if(yh > roomx2)
+ if (yh > roomx2)
yh = roomx2;
x->x_pix_src_x[0] = w2 - (int)(x->x_cnvrt_roomlx2pixh * xh + 0.49999f);
x->x_pix_src_y[0] = h2 - (int)(x->x_cnvrt_roomlx2pixh * yh + 0.49999f);
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
- xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
- ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
- ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
+// sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
+// xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
+// ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
+// ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
}
static void room_sim_2d_head_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *argv)
@@ -517,9 +615,9 @@ static void room_sim_2d_head_xy(t_room_sim_2d *x, t_symbol *s, int argc, t_atom
static void room_sim_2d_room_dim(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *argv)
{
- int i, n=x->x_nr_src;
+ int i, n = x->x_nr_src;
- if(argc < 2)
+ if (argc < 2)
{
post("room_sim_2d ERROR: room_dim-input needs 2 float-dimensions: x-Length [m], y-Width [m]");
return;
@@ -527,19 +625,19 @@ static void room_sim_2d_room_dim(t_room_sim_2d *x, t_symbol *s, int argc, t_atom
x->x_room_x = atom_getfloat(argv++);
x->x_room_y = atom_getfloat(argv);
- if(x->x_room_x < 1.0f)
+ if (x->x_room_x < 1.0f)
x->x_room_x = 1.0f;
- if(x->x_room_y < 1.0f)
+ if (x->x_room_y < 1.0f)
x->x_room_y = 1.0f;
x->x_gui.x_h = (int)(x->x_cnvrt_roomlx2pixh * (t_float)x->x_room_x + 0.49999f);
x->x_gui.x_w = (int)(x->x_cnvrt_roomlx2pixh * (t_float)x->x_room_y + 0.49999f);
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
- if(x->x_pix_src_x[i] > x->x_gui.x_w)
+ if (x->x_pix_src_x[i] > x->x_gui.x_w)
x->x_pix_src_x[i] = x->x_gui.x_w;
- if(x->x_pix_src_y[i] > x->x_gui.x_h)
+ if (x->x_pix_src_y[i] > x->x_gui.x_h)
x->x_pix_src_y[i] = x->x_gui.x_h;
}
@@ -550,86 +648,123 @@ static void room_sim_2d_room_dim(t_room_sim_2d *x, t_symbol *s, int argc, t_atom
/*static void room_sim_2d_n_src(t_room_sim_2d *x, t_floatarg fnsrc)
{
-int n_src=(int)fnsrc;
+ int n_src = (int)fnsrc;
- if(n_src < 1)
+ if (n_src < 1)
n_src = 1;
- if(n_src > 30)
+ if (n_src > 30)
n_src = 30;
- if(n_src != x->x_nr_src)
+ if (n_src != x->x_nr_src)
{
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE);
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE);
+ room_sim_2d_draw_unmap(x, x->x_gui.x_glist);
x->x_nr_src = n_src;
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
- }
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
+ room_sim_2d_draw_map(x, x->x_gui.x_glist);
}
+}
*/
static void room_sim_2d_room_col(t_room_sim_2d *x, t_floatarg fcol)
{
- int col=(int)fcol;
+ int col = (int)fcol;
+ char fgstring[MAXPDSTRING];
+ char bgstring[MAXPDSTRING];
int i;
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ t_canvas *canvas = glist_getcanvas(x->x_gui.x_glist);
- if(col < 0)
+ if (col < 0)
{
i = -1 - col;
x->x_gui.x_bcol = ((i & 0x3f000) << 6)|((i & 0xfc0) << 4)|((i & 0x3f) << 2);
}
else
{
- if(col > 29)
+ if (col > 29)
col = 29;
x->x_gui.x_bcol = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol);
+ sprintf(fgstring, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(bgstring, "#%6.6x", x->x_gui.x_bcol);
+ gui_vmess("gui_room_sim_colors", "xxss",
+ canvas,
+ x,
+ fgstring,
+ bgstring
+ );
+// sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol);
}
static void room_sim_2d_head_col(t_room_sim_2d *x, t_floatarg fcol)
{
- int col=(int)fcol;
+ int col = (int)fcol;
+ char fgstring[MAXPDSTRING];
+ char bgstring[MAXPDSTRING];
int i;
t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
- if(col < 0)
+ if (col < 0)
{
i = -1 - col;
x->x_gui.x_fcol = ((i & 0x3f000) << 6)|((i & 0xfc0) << 4)|((i & 0x3f) << 2);
}
else
{
- if(col > 29)
+ if (col > 29)
col = 29;
x->x_gui.x_fcol = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
- sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+ sprintf(fgstring, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(bgstring, "#%6.6x", x->x_gui.x_bcol);
+ gui_vmess("gui_room_sim_colors", "xxss",
+ canvas,
+ x,
+ fgstring,
+ bgstring
+ );
+ //sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+ //sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol);
}
static void room_sim_2d_src_col(t_room_sim_2d *x, t_symbol *s, int argc, t_atom *argv)
{
int col;
- int i, j, n=x->x_nr_src;
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ char colstring[MAXPDSTRING];
+ int i, j, n = x->x_nr_src;
+ t_canvas *canvas = glist_getcanvas(x->x_gui.x_glist);
- if((argc >= 2)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1))
+ if ((argc >= 2) && IS_A_FLOAT(argv,0) && IS_A_FLOAT(argv,1))
{
j = (int)atom_getintarg(0, argc, argv);
- if((j > 0)&&(j <= n))
+ if ((j > 0)&&(j <= n))
{
col = (int)atom_getintarg(1, argc, argv);
- if(col < 0)
+ if (col < 0)
{
i = -1 - col;
- x->x_col_src[j] = ((i & 0x3f000) << 6)|((i & 0xfc0) << 4)|((i & 0x3f) << 2);
+ x->x_col_src[j] = ((i & 0x3f000) << 6) |
+ ((i & 0xfc0) << 4) |
+ ((i & 0x3f) << 2);
}
else
{
- if(col > 29)
+ if (col > 29)
+ {
col = 29;
+ }
x->x_col_src[j] = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]);
+ sprintf(colstring, "#%6.6x", x->x_col_src[j]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ j,
+ x->x_pix_src_x[j],
+ x->x_pix_src_y[j],
+ x->x_fontsize,
+ colstring
+ );
+// sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]);
}
}
}
@@ -637,18 +772,18 @@ static void room_sim_2d_src_col(t_room_sim_2d *x, t_symbol *s, int argc, t_atom
static void room_sim_2d_pix_per_m_ratio(t_room_sim_2d *x, t_floatarg ratio)
{
t_float rr;
- int i, n=x->x_nr_src;
+ int i, n = x->x_nr_src;
- if(ratio < 1.0f)
+ if (ratio < 1.0f)
ratio = 1.0f;
- if(ratio > 200.0f)
+ if (ratio > 200.0f)
ratio = 200.0f;
rr = ratio / x->x_cnvrt_roomlx2pixh;
x->x_cnvrt_roomlx2pixh = ratio;
x->x_gui.x_w = (int)(x->x_cnvrt_roomlx2pixh * x->x_room_y + 0.49999f);
x->x_gui.x_h = (int)(x->x_cnvrt_roomlx2pixh * x->x_room_x + 0.49999f);
x->x_pix_rad = (int)(x->x_cnvrt_roomlx2pixh * x->x_r_ambi + 0.49999f);
- for(i=0; i<=n; i++)
+ for (i = 0; i <= n; i++)
{
x->x_pix_src_x[i] = (int)((t_float)x->x_pix_src_x[i]*rr + 0.49999f);
x->x_pix_src_y[i] = (int)((t_float)x->x_pix_src_y[i]*rr + 0.49999f);
@@ -659,7 +794,7 @@ static void room_sim_2d_pix_per_m_ratio(t_room_sim_2d *x, t_floatarg ratio)
static void room_sim_2d_r_ambi(t_room_sim_2d *x, t_floatarg r_ambi)
{
- if(r_ambi < 0.1f)
+ if (r_ambi < 0.1f)
r_ambi = 0.1f;
x->x_r_ambi = r_ambi;
x->x_pix_rad = (int)(x->x_cnvrt_roomlx2pixh*r_ambi + 0.49999f);
@@ -672,51 +807,103 @@ static void room_sim_2d_nr_src(t_room_sim_2d *x, t_floatarg fnr_src)
int nr_src = (int)fnr_src;
int old_nr_src, i, j;
- if(nr_src < 1)
+ if (nr_src < 1)
nr_src = 1;
- else if(nr_src > IEM_GUI_ROOMSIM_2D_MAX_NR_SRC)
+ else if (nr_src > IEM_GUI_ROOMSIM_2D_MAX_NR_SRC)
nr_src = IEM_GUI_ROOMSIM_2D_MAX_NR_SRC;
- if(nr_src != x->x_nr_src)
+ if (nr_src != x->x_nr_src)
{
- if(glist_isvisible(x->x_gui.x_glist))
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE);
+ if (glist_isvisible(x->x_gui.x_glist))
+ room_sim_2d_draw_unmap(x, x->x_gui.x_glist);
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE);
old_nr_src = x->x_nr_src;
x->x_nr_src = nr_src;
j = (old_nr_src + 1) % 7;
- for(i=old_nr_src+1; i<=nr_src; i++)
+ for (i = old_nr_src + 1; i <= nr_src; i++)
{
x->x_col_src[i] = simularca_color_hex[j];
- if(i & 1)
- x->x_pix_src_x[i] = 125 + (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i)*4;
+ if (i & 1)
+ x->x_pix_src_x[i] = 125 + (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i) * 4;
else
- x->x_pix_src_x[i] = 125 - (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i)*4;
+ x->x_pix_src_x[i] = 125 - (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i) * 4;
x->x_pix_src_y[i] = 100;
j++;
j %= 7;
}
-
- if(glist_isvisible(x->x_gui.x_glist))
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
+ if (glist_isvisible(x->x_gui.x_glist))
+ room_sim_2d_draw_map(x, x->x_gui.x_glist);
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
}
}
+/* we may no longer need h_dragon... */
+static void room_sim_2d__clickhook(t_scalehandle *sh, int newstate)
+{
+ t_room_sim_2d *x = (t_room_sim_2d *)(sh->h_master);
+ if (newstate)
+ {
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
+ if (!sh->h_scale) /* click on a label handle */
+ scalehandle_click_label(sh);
+ }
+ /* We no longer need this "clickhook", as we can handle the dragging
+ either in the GUI (for the label handle) or or in canvas_doclick */
+ //iemgui__clickhook3(sh,newstate);
+ sh->h_dragon = newstate;
+}
+
+static void room_sim_2d__motionhook(t_scalehandle *sh,
+ t_floatarg mouse_x, t_floatarg mouse_y)
+{
+ if (sh->h_scale)
+ {
+ t_room_sim_2d *x = (t_room_sim_2d *)(sh->h_master);
+ int width = mouse_x - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist),
+ height = mouse_y - text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist),
+ minx = IEM_GUI_MINSIZE,
+ miny = IEM_GUI_MINSIZE;
+ x->x_gui.x_w = maxi(width, minx);
+ x->x_gui.x_h = maxi(height, miny);
+// slider_check_length(x, x->x_orient ? x->x_gui.x_h : x->x_gui.x_w);
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ room_sim_2d_draw_unmap(x, x->x_gui.x_glist);
+ room_sim_2d_draw_map(x, x->x_gui.x_glist);
+ scalehandle_unclick_scale(sh);
+ }
+
+ int properties = gfxstub_haveproperties((void *)x);
+ if (properties)
+ {
+ /* No properties for room_sim externals atm */
+ //properties_set_field_int(properties,"width",new_w);
+ //properties_set_field_int(properties,"height",new_h);
+ }
+ }
+ scalehandle_dragon_label(sh,mouse_x, mouse_y);
+}
+
+/* from the old header... */
+#define IEM_GUI_COLNR_GREEN 16
+#define IEM_GUI_COLNR_D_ORANGE 24
+
static void *room_sim_2d_new(t_symbol *s, int argc, t_atom *argv)
{
t_room_sim_2d *x = (t_room_sim_2d *)pd_new(room_sim_2d_class);
- int i, j, n=1, c;
+ int i, j, n = 1, c;
- if((argc >= 1)&&IS_A_FLOAT(argv,0))
+ if ((argc >= 1) && IS_A_FLOAT(argv,0))
{
n = (int)atom_getintarg(0, argc, argv);
- if(n < 1)
+ if (n < 1)
n = 1;
- if(n > IEM_GUI_ROOMSIM_2D_MAX_NR_SRC)
+ if (n > IEM_GUI_ROOMSIM_2D_MAX_NR_SRC)
n = IEM_GUI_ROOMSIM_2D_MAX_NR_SRC;
x->x_nr_src = n;
}
- if(argc == (3*n + 11))
+ if (argc == (3 * n + 11))
{
x->x_cnvrt_roomlx2pixh = atom_getfloatarg(1, argc, argv);
x->x_rho_head = atom_getfloatarg(2, argc, argv);
@@ -730,12 +917,14 @@ static void *room_sim_2d_new(t_symbol *s, int argc, t_atom *argv)
x->x_gui.x_fcol = ((c & 0x3f000) << 6)|((c & 0xfc0) << 4)|((c & 0x3f) << 2);
x->x_pix_src_x[0] = (int)atom_getintarg(9, argc, argv);
x->x_pix_src_y[0] = (int)atom_getintarg(10, argc, argv);
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
c = (int)atom_getintarg(8+3*i, argc, argv);
- x->x_col_src[i] = ((c & 0x3f000) << 6)|((c & 0xfc0) << 4)|((c & 0x3f) << 2);
- x->x_pix_src_x[i] = (int)atom_getintarg(9+3*i, argc, argv);
- x->x_pix_src_y[i] = (int)atom_getintarg(10+3*i, argc, argv);
+ x->x_col_src[i] = ((c & 0x3f000) << 6) |
+ ((c & 0xfc0) << 4) |
+ ((c & 0x3f) << 2);
+ x->x_pix_src_x[i] = (int)atom_getintarg(9 + 3 * i, argc, argv);
+ x->x_pix_src_y[i] = (int)atom_getintarg(10 + 3 * i, argc, argv);
}
}
else
@@ -751,13 +940,13 @@ static void *room_sim_2d_new(t_symbol *s, int argc, t_atom *argv)
x->x_pix_src_x[0] = 125;
x->x_pix_src_y[0] = 200;
j = 0;
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
x->x_col_src[i] = simularca_color_hex[j];
- if(i & 1)
- x->x_pix_src_x[i] = 125 + (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i)*4;
+ if (i & 1)
+ x->x_pix_src_x[i] = 125 + (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i) * 4;
else
- x->x_pix_src_x[i] = 125 - (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i)*4;
+ x->x_pix_src_x[i] = 125 - (IEM_GUI_ROOMSIM_2D_MAX_NR_SRC - i) * 4;
x->x_pix_src_y[i] = 100;
j++;
j %= 7;
@@ -776,6 +965,15 @@ static void *room_sim_2d_new(t_symbol *s, int argc, t_atom *argv)
x->x_s_head_xy = gensym("head_xy");
x->x_s_src_xy = gensym("src_xy");
+
+ x->x_gui.x_lab = s_empty;
+
+ x->x_gui.x_obj.te_iemgui = 1;
+ x->x_gui.x_handle = scalehandle_new((t_object *)x,
+ x->x_gui.x_glist, 1, room_sim_2d__clickhook, room_sim_2d__motionhook);
+ x->x_gui.x_lhandle = scalehandle_new((t_object *)x,
+ x->x_gui.x_glist, 0, room_sim_2d__clickhook, room_sim_2d__motionhook);
+
return (x);
}
@@ -786,31 +984,49 @@ static void room_sim_2d_ff(t_room_sim_2d *x)
void room_sim_2d_setup(void)
{
- room_sim_2d_class = class_new(gensym("room_sim_2d"), (t_newmethod)room_sim_2d_new,
- (t_method)room_sim_2d_ff, sizeof(t_room_sim_2d), 0, A_GIMME, 0);
+ room_sim_2d_class = class_new(gensym("room_sim_2d"),
+ (t_newmethod)room_sim_2d_new, (t_method)room_sim_2d_ff,
+ sizeof(t_room_sim_2d), 0, A_GIMME, 0);
// class_addcreator((t_newmethod)room_sim_2d_new, gensym("room_sim_2d"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_click, gensym("click"),
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_click,
+ gensym("click"),
A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_motion, gensym("motion"),
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_motion,
+ gensym("motion"),
A_FLOAT, A_FLOAT, 0);
class_addbang(room_sim_2d_class, (t_method)room_sim_2d_bang);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_room_dim, gensym("room_dim"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_r_ambi, gensym("r_ambi"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_room_col, gensym("room_col"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_head_col, gensym("head_col"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_src_col, gensym("src_col"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_rho, gensym("rho"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_src_xy, gensym("src_xy"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_head_xy, gensym("head_xy"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_set_rho, gensym("set_rho"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_set_src_xy, gensym("set_src_xy"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_set_head_xy, gensym("set_head_xy"), A_GIMME, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_pix_per_m_ratio, gensym("pix_per_m_ratio"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_src_font, gensym("src_font"), A_DEFFLOAT, 0);
- class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_nr_src, gensym("nr_src"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_room_dim,
+ gensym("room_dim"), A_GIMME, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_r_ambi,
+ gensym("r_ambi"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_room_col,
+ gensym("room_col"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_head_col,
+ gensym("head_col"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_src_col,
+ gensym("src_col"), A_GIMME, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_rho,
+ gensym("rho"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_src_xy,
+ gensym("src_xy"), A_GIMME, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_head_xy,
+ gensym("head_xy"), A_GIMME, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_set_rho,
+ gensym("set_rho"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_set_src_xy,
+ gensym("set_src_xy"), A_GIMME, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_set_head_xy,
+ gensym("set_head_xy"), A_GIMME, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_pix_per_m_ratio,
+ gensym("pix_per_m_ratio"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_src_font,
+ gensym("src_font"), A_DEFFLOAT, 0);
+ class_addmethod(room_sim_2d_class, (t_method)room_sim_2d_nr_src,
+ gensym("nr_src"), A_DEFFLOAT, 0);
room_sim_2d_widgetbehavior.w_getrectfn = room_sim_2d_getrect;
room_sim_2d_widgetbehavior.w_displacefn = iemgui_displace;
+ room_sim_2d_widgetbehavior.w_displacefnwtag = iemgui_displace_withtag;
room_sim_2d_widgetbehavior.w_selectfn = iemgui_select;
room_sim_2d_widgetbehavior.w_activatefn = NULL;
room_sim_2d_widgetbehavior.w_deletefn = iemgui_delete;
diff --git a/externals/iem/iemgui/src/room_sim_3d.c b/externals/iem/iemgui/src/room_sim_3d.c
index 043d8660b39a983fff3b60375c435d8d07a00555..7b845683760bd0e0aabcabc774872bbdf52bef70 100644
--- a/externals/iem/iemgui/src/room_sim_3d.c
+++ b/externals/iem/iemgui/src/room_sim_3d.c
@@ -7,7 +7,7 @@ iemgui written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2006 *
#include "iemlib.h"
#include "iemgui.h"
#include "g_canvas.h"
-#include "../../../old_g_all_guis.inc"
+#include "g_all_guis.h"
#include <stdio.h>
#include <stdlib.h>
@@ -54,6 +54,7 @@ typedef struct _room_sim_3d
t_symbol *x_s_head_xyz;
t_symbol *x_s_src_xyz;
t_atom x_at[6];
+ int x_steady;
} t_room_sim_3d;
static void room_sim_3d_out_rho(t_room_sim_3d *x)
@@ -94,57 +95,131 @@ static void room_sim_3d_draw_update(t_room_sim_3d *x, t_glist *glist)
dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
+// sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
+
+ gui_vmess("gui_room_sim_update", "xxiiiii",
+ canvas,
+ x,
+ x->x_pix_src_x[0],
+ x->x_pix_src_y[0],
+ dx,
+ dy,
+ x->x_pix_rad
+ );
}
}
-void room_sim_3d_draw_new(t_room_sim_3d *x, t_glist *glist)
+void room_sim_3d_draw_unmap(t_room_sim_3d *x, t_glist *glist)
{
- int xpos=text_xpix(&x->x_gui.x_obj, glist);
- int ypos=text_ypix(&x->x_gui.x_obj, glist);
+ gui_vmess("gui_room_sim_erase", "xx",
+ x->x_gui.x_glist, x);
+}
+
+void room_sim_3d_draw_map(t_room_sim_3d *x, t_glist *glist)
+{
+ int xpos = text_xpix(&x->x_gui.x_obj, glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, glist);
int dx, dy;
- int H=(int)(0.5f * x->x_room_z * x->x_cnvrt_roomlx2pixh + 0.49999f);
- int H2=H*H;
+ int H = (int)(0.5f * x->x_room_z * x->x_cnvrt_roomlx2pixh + 0.49999f);
+ int H2 = H*H;
int rad2;
- int i, n=x->x_nr_src;
- int fsi, fs=x->x_fontsize;
- t_canvas *canvas=glist_getcanvas(glist);
+ int i, n = x->x_nr_src;
+ int fsi, fs = x->x_fontsize;
+ t_canvas *canvas = glist_getcanvas(glist);
+ char bcol[MAXPDSTRING];
+ char fcol[MAXPDSTRING];
+ char elemcol[MAXPDSTRING];
+ sprintf(fcol, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(bcol, "#%6.6x", x->x_gui.x_bcol);
- sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBASE\n",
- canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
- x->x_gui.x_bcol, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:IEM_GUI_COLOR_NORMAL, x);
- for(i=1; i<=n; i++)
+ gui_start_vmess("gui_room_sim_map", "xxiiifiiiss",
+ canvas,
+ x,
+ x->x_gui.x_w,
+ x->x_gui.x_h,
+ x->x_pix_rad,
+ x->x_rho_head,
+ x->x_pix_src_x[0],
+ x->x_pix_src_y[0],
+ x->x_fontsize,
+ fcol,
+ bcol
+ );
+ gui_start_array();
+ for (i = 1; i <= n; i++)
{
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
- -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
- canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fsi,
- x->x_col_src[i], x, i);
+ gui_start_array();
+ gui_i(x->x_pix_src_x[i]);
+ gui_i(x->x_pix_src_y[i]);
+ sprintf(elemcol, "#%6.6x", x->x_col_src[i]);
+ gui_s(elemcol);
+ gui_i(fsi);
+ gui_end_array();
+// sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
+// -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
+// canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fsi,
+// x->x_col_src[i], x, i);
}
+ gui_end_array();
- sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n",
- canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
- xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1,
- x->x_gui.x_fcol, x);
+// sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n",
+// canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
+// xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1,
+// x->x_gui.x_fcol, x);
+
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= x->x_pix_rad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD2\n",
- canvas, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
- xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1,
- x->x_gui.x_fcol, x);
- dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
- dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n",
- canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy,
- x->x_gui.x_fcol, x);
+ gui_start_array();
+ gui_i(x->x_pix_src_x[0] - rad2);
+ gui_i(x->x_pix_src_y[0] - rad2);
+ gui_i(x->x_pix_src_x[0] + rad2 - 1);
+ gui_i(x->x_pix_src_y[0] + rad2 - 1);
+ gui_end_array();
+ gui_end_vmess();
+// sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD2\n",
+// canvas, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
+// xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1,
+// x->x_gui.x_fcol, x);
+// dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
+// dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n",
+// canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy,
+// x->x_gui.x_fcol, x);
+}
+
+void room_sim_3d_draw_new(t_room_sim_3d *x, t_glist *glist)
+{
+ int xpos=text_xpix(&x->x_gui.x_obj, glist);
+ int ypos=text_ypix(&x->x_gui.x_obj, glist);
+ int dx, dy;
+ int H=(int)(0.5f * x->x_room_z * x->x_cnvrt_roomlx2pixh + 0.49999f);
+ int H2=H*H;
+ int rad2;
+ int i, n=x->x_nr_src;
+ int fsi, fs=x->x_fontsize;
+ t_canvas *canvas=glist_getcanvas(glist);
+
+ gui_vmess("gui_room_sim_new", "xxiiiii",
+ canvas,
+ x,
+ xpos,
+ ypos,
+ x->x_gui.x_w,
+ x->x_gui.x_h,
+ glist_istoplevel(glist)
+ );
+
+ room_sim_3d_draw_map(x, glist);
}
+/*
void room_sim_3d_draw_move(t_room_sim_3d *x, t_glist *glist)
{
int xpos=text_xpix(&x->x_gui.x_obj, glist);
@@ -185,52 +260,22 @@ void room_sim_3d_draw_move(t_room_sim_3d *x, t_glist *glist)
canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
}
-
-void room_sim_3d_draw_erase(t_room_sim_3d* x, t_glist* glist)
-{
- int i, n;
- t_canvas *canvas=glist_getcanvas(glist);
-
- sys_vgui(".x%x.c delete %xBASE\n", canvas, x);
- n = x->x_nr_src;
- for(i=1; i<=n; i++)
- {
- sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, i);
- }
- sys_vgui(".x%x.c delete %xHEAD\n", canvas, x);
- sys_vgui(".x%x.c delete %xHEAD2\n", canvas, x);
- sys_vgui(".x%x.c delete %xNOSE\n", canvas, x);
-}
-
-void room_sim_3d_draw_select(t_room_sim_3d* x, t_glist* glist)
-{
- t_canvas *canvas=glist_getcanvas(glist);
-
- if(x->x_gui.x_fsf.x_selected)
- {
- int xpos=text_xpix(&x->x_gui.x_obj, glist);
- int ypos=text_ypix(&x->x_gui.x_obj, glist);
-
- sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
- }
- else
- {
- sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL);
- }
-}
+*/
void room_sim_3d_draw(t_room_sim_3d *x, t_glist *glist, int mode)
{
- if(mode == IEM_GUI_DRAW_MODE_UPDATE)
+ if (mode == IEM_GUI_DRAW_MODE_UPDATE)
room_sim_3d_draw_update(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_MOVE)
- room_sim_3d_draw_move(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_NEW)
+ else if (mode == IEM_GUI_DRAW_MODE_MOVE)
+ iemgui_base_draw_move(&x->x_gui);
+ else if (mode == IEM_GUI_DRAW_MODE_NEW)
room_sim_3d_draw_new(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_SELECT)
+/*
+ else if (mode == IEM_GUI_DRAW_MODE_SELECT)
room_sim_3d_draw_select(x, glist);
- else if(mode == IEM_GUI_DRAW_MODE_ERASE)
+ else if (mode == IEM_GUI_DRAW_MODE_ERASE)
room_sim_3d_draw_erase(x, glist);
+*/
}
/* ------------------------ cnv widgetbehaviour----------------------------- */
@@ -272,44 +317,44 @@ static void room_sim_3d_save(t_gobj *z, t_binbuf *b)
static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy)
{
- int i, n=x->x_nr_src;
- int pixrad=x->x_pix_rad;
- int sel=x->x_sel_index;
- int xpos=text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
- int ypos=text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int i, n = x->x_nr_src;
+ int pixrad = x->x_pix_rad;
+ int sel = x->x_sel_index;
+ int xpos = text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist);
+ int ypos = text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist);
int ddx, ddy;
- int fs=x->x_fontsize, fsi;
- int H=(int)(0.5f * x->x_room_z * x->x_cnvrt_roomlx2pixh + 0.49999f);
- int H2=H*H;
+ int fs = x->x_fontsize, fsi;
+ int H = (int)(0.5f * x->x_room_z * x->x_cnvrt_roomlx2pixh + 0.49999f);
+ int H2 = H*H;
int rad2;
- t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
+ t_canvas *canvas = glist_getcanvas(x->x_gui.x_glist);
- if(x->x_gui.x_fsf.x_finemoved && (sel == 0))
+ if (x->x_gui.x_finemoved && (sel == 0))
{
- if(x->x_gui.x_fsf.x_steady)/*alt-key, rhoy, rhox*/
+ if (x->x_steady)/*alt-key, rhoy, rhox*/
{
}
else
{
x->x_rho_head -= dy;
- if(x->x_rho_head <= -180.0f)
+ if (x->x_rho_head <= -180.0f)
x->x_rho_head += 360.0f;
- if(x->x_rho_head > 180.0f)
+ if (x->x_rho_head > 180.0f)
x->x_rho_head -= 360.0f;
room_sim_3d_out_rho(x);
(*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
}
}
- else if(sel == 0)
+ else if (sel == 0)
{
- if(x->x_gui.x_fsf.x_steady)/*alt-key, move head in z*/
+ if (x->x_steady) /*alt-key, move head in z */
{
x->x_pix_src_x[0] = x->x_pos_x;
x->x_pix_src_y[0] = x->x_pos_y;
x->x_pix_src_z[0] -= (int)dy;
- if(x->x_pix_src_z[0] < 0)
+ if (x->x_pix_src_z[0] < 0)
x->x_pix_src_z[0] = 0;
- if(x->x_pix_src_z[0] > x->x_height_z)
+ if (x->x_pix_src_z[0] > x->x_height_z)
x->x_pix_src_z[0] = x->x_height_z;
}
else
@@ -319,46 +364,66 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy)
x->x_pos_y += (int)dy;
x->x_pix_src_x[0] = x->x_pos_x;
x->x_pix_src_y[0] = x->x_pos_y;
- if(x->x_pix_src_x[0] < 0)
+ if (x->x_pix_src_x[0] < 0)
x->x_pix_src_x[0] = 0;
- if(x->x_pix_src_x[0] > x->x_gui.x_w)
+ if (x->x_pix_src_x[0] > x->x_gui.x_w)
x->x_pix_src_x[0] = x->x_gui.x_w;
- if(x->x_pix_src_y[0] < 0)
+ if (x->x_pix_src_y[0] < 0)
x->x_pix_src_y[0] = 0;
- if(x->x_pix_src_y[0] > x->x_gui.x_h)
+ if (x->x_pix_src_y[0] > x->x_gui.x_h)
x->x_pix_src_y[0] = x->x_gui.x_h;
}
room_sim_3d_out_para(x);
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
- xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+// sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
+// xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= x->x_pix_rad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
- xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
- ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
- ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
+// sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
+// xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
+ gui_vmess("gui_room_sim_head2", "xxiiii",
+ canvas,
+ x,
+ x->x_pix_src_x[0] - rad2,
+ x->x_pix_src_y[0] - rad2,
+ x->x_pix_src_x[0] + rad2 - 1,
+ x->x_pix_src_y[0] + rad2 - 1
+ );
+// ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
+// ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
}
else
{
- if(x->x_gui.x_fsf.x_steady)/*alt-key, move src in z*/
+ if (x->x_steady) /*alt-key, move src in z*/
{
x->x_pix_src_z[sel] -= (int)dy;
- if(x->x_pix_src_z[sel] < 0)
+ if (x->x_pix_src_z[sel] < 0)
x->x_pix_src_z[sel] = 0;
- if(x->x_pix_src_z[sel] > x->x_height_z)
+ if (x->x_pix_src_z[sel] > x->x_height_z)
x->x_pix_src_z[sel] = x->x_height_z;
room_sim_3d_out_para(x);
fsi = H2 + (H + 2 * x->x_pix_src_z[sel]) * x->x_pix_src_z[sel];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
+ char col[MAXPDSTRING];
+ sprintf(col, "#%6.6x", x->x_col_src[sel]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ sel - 1,
+ x->x_pix_src_x[sel],
+ x->x_pix_src_y[sel],
+ fsi,
+ col
+ );
+// sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
}
else
{
@@ -367,22 +432,33 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy)
x->x_pix_src_x[sel] = x->x_pos_x;
x->x_pix_src_y[sel] = x->x_pos_y;
x->x_pix_src_z[sel] = x->x_pos_z;
- if(x->x_pix_src_x[sel] < 0)
+ if (x->x_pix_src_x[sel] < 0)
x->x_pix_src_x[sel] = 0;
- if(x->x_pix_src_x[sel] > x->x_gui.x_w)
+ if (x->x_pix_src_x[sel] > x->x_gui.x_w)
x->x_pix_src_x[sel] = x->x_gui.x_w;
- if(x->x_pix_src_y[sel] < 0)
+ if (x->x_pix_src_y[sel] < 0)
x->x_pix_src_y[sel] = 0;
- if(x->x_pix_src_y[sel] > x->x_gui.x_h)
+ if (x->x_pix_src_y[sel] > x->x_gui.x_h)
x->x_pix_src_y[sel] = x->x_gui.x_h;
room_sim_3d_out_para(x);
fsi = H2 + (H + 2 * x->x_pix_src_z[sel]) * x->x_pix_src_z[sel];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
- canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]);
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
+ char col[MAXPDSTRING];
+ sprintf(col, "#%6.6x", x->x_col_src[sel]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ sel - 1,
+ x->x_pix_src_x[sel],
+ x->x_pix_src_y[sel],
+ fsi,
+ col
+ );
+ //sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+ // canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]);
+ //sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
}
}
}
@@ -468,18 +544,18 @@ static int room_sim_3d_newclick(t_gobj *z, struct _glist *glist, int xpix, int y
{
room_sim_3d_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt);
if(alt)
- x->x_gui.x_fsf.x_steady = 1;
+ x->x_steady = 1;
else
- x->x_gui.x_fsf.x_steady = 0;
+ x->x_steady = 0;
if(shift)
{
- x->x_gui.x_fsf.x_finemoved = 1;
+ x->x_gui.x_finemoved = 1;
room_sim_3d_out_rho(x);
}
else
{
- x->x_gui.x_fsf.x_finemoved = 0;
+ x->x_gui.x_finemoved = 0;
room_sim_3d_out_para(x);
}
}
@@ -511,7 +587,19 @@ static void room_sim_3d_src_font(t_room_sim_3d *x, t_floatarg ff)
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
+
+ char col[MAXPDSTRING];
+ sprintf(col, "#%6.6x", x->x_col_src[i]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ i - 1,
+ x->x_pix_src_x[i],
+ x->x_pix_src_y[i],
+ fsi,
+ col
+ );
+ //sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
}
}
@@ -577,9 +665,21 @@ static void room_sim_3d_set_src_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_a
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
- canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]);
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
+
+ char col[MAXPDSTRING];
+ sprintf(col, "#%6.6x", x->x_col_src[i]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ i - 1,
+ x->x_pix_src_x[i],
+ x->x_pix_src_y[i],
+ fsi,
+ col
+ );
+// sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+// canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]);
+// sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
}
}
@@ -626,20 +726,30 @@ static void room_sim_3d_set_head_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_
x->x_pix_src_y[0] = x->x_gui.x_h/2 - (int)(x->x_cnvrt_roomlx2pixh * yh + 0.49999f);
x->x_pix_src_z[0] = (int)(x->x_cnvrt_roomlx2pixh * zh + 0.49999f);
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
- xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
+ (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
+
+// sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
+// xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= pixrad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
- xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
- ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
- ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
- canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
- xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
+ gui_vmess("gui_room_sim_head2", "xxiiii",
+ canvas,
+ x,
+ x->x_pix_src_x[0] - rad2,
+ x->x_pix_src_y[0] - rad2,
+ x->x_pix_src_x[0] + rad2 - 1,
+ x->x_pix_src_y[0] + rad2 - 1
+ );
+// sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
+// xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
+// ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
+// ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
+// sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+// canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
+// xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
}
static void room_sim_3d_head_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_atom *argv)
@@ -673,13 +783,13 @@ static void room_sim_3d_room_dim(t_room_sim_3d *x, t_symbol *s, int argc, t_atom
x->x_height_z = (int)(x->x_cnvrt_roomlx2pixh * x->x_room_z + 0.49999f);
x->x_pix_rad = (int)(x->x_cnvrt_roomlx2pixh * x->x_r_ambi + 0.49999f);
- for(i=0; i<=n; i++)
+ for (i = 0; i <= n; i++)
{
- if(x->x_pix_src_x[i] > x->x_gui.x_w)
+ if (x->x_pix_src_x[i] > x->x_gui.x_w)
x->x_pix_src_x[i] = x->x_gui.x_w;
- if(x->x_pix_src_y[i] > x->x_gui.x_h)
+ if (x->x_pix_src_y[i] > x->x_gui.x_h)
x->x_pix_src_y[i] = x->x_gui.x_h;
- if(x->x_pix_src_z[i] > x->x_height_z)
+ if (x->x_pix_src_z[i] > x->x_height_z)
x->x_pix_src_z[i] = x->x_height_z;
}
@@ -691,26 +801,38 @@ static void room_sim_3d_room_dim(t_room_sim_3d *x, t_symbol *s, int argc, t_atom
static void room_sim_3d_room_col(t_room_sim_3d *x, t_floatarg fcol)
{
int col=(int)fcol;
+ char fgstring[MAXPDSTRING];
+ char bgstring[MAXPDSTRING];
int i;
t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
- if(col < 0)
+ if (col < 0)
{
i = -1 - col;
x->x_gui.x_bcol = ((i & 0x3f000) << 6)|((i & 0xfc0) << 4)|((i & 0x3f) << 2);
}
else
{
- if(col > 29)
+ if (col > 29)
col = 29;
x->x_gui.x_bcol = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol);
+ sprintf(fgstring, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(bgstring, "#%6.6x", x->x_gui.x_bcol);
+ gui_vmess("gui_room_sim_colors", "xxss",
+ canvas,
+ x,
+ fgstring,
+ bgstring
+ );
+// sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol);
}
static void room_sim_3d_head_col(t_room_sim_3d *x, t_floatarg fcol)
{
int col=(int)fcol;
+ char fgstring[MAXPDSTRING];
+ char bgstring[MAXPDSTRING];
int i;
t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
@@ -725,35 +847,54 @@ static void room_sim_3d_head_col(t_room_sim_3d *x, t_floatarg fcol)
col = 29;
x->x_gui.x_fcol = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+ sprintf(fgstring, "#%6.6x", x->x_gui.x_fcol);
+ sprintf(bgstring, "#%6.6x", x->x_gui.x_bcol);
+ gui_vmess("gui_room_sim_colors", "xxss",
+ canvas,
+ x,
+ fgstring,
+ bgstring
+ );
+// sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
sys_vgui(".x%x.c itemconfigure %xHEAD2 -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
- sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+// sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol);
}
static void room_sim_3d_src_col(t_room_sim_3d *x, t_symbol *s, int argc, t_atom *argv)
{
int col;
+ char colstring[MAXPDSTRING];
int i, j, n=x->x_nr_src;
t_canvas *canvas=glist_getcanvas(x->x_gui.x_glist);
- if((argc >= 2)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1))
+ if ((argc >= 2)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1))
{
j = (int)atom_getintarg(0, argc, argv);
- if((j > 0)&&(j <= n))
+ if ((j > 0)&&(j <= n))
{
col = (int)atom_getintarg(1, argc, argv);
- if(col < 0)
+ if (col < 0)
{
i = -1 - col;
x->x_col_src[j] = ((i & 0x3f000) << 6)|((i & 0xfc0) << 4)|((i & 0x3f) << 2);
}
else
{
- if(col > 29)
+ if (col > 29)
col = 29;
x->x_col_src[j] = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]);
+ sprintf(colstring, "#%6.6x", x->x_col_src[j]);
+ gui_vmess("gui_room_sim_update_src", "xxiiiis",
+ canvas,
+ x,
+ j,
+ x->x_pix_src_x[j],
+ x->x_pix_src_y[j],
+ x->x_fontsize,
+ colstring
+ );
+// sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]);
}
}
}
@@ -805,8 +946,9 @@ static void room_sim_3d_nr_src(t_room_sim_3d *x, t_floatarg fnr_src)
if(nr_src != x->x_nr_src)
{
- if(glist_isvisible(x->x_gui.x_glist))
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE);
+ if (glist_isvisible(x->x_gui.x_glist))
+ room_sim_3d_draw_unmap(x, x->x_gui.x_glist);
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE);
old_nr_src = x->x_nr_src;
x->x_nr_src = nr_src;
@@ -824,12 +966,64 @@ static void room_sim_3d_nr_src(t_room_sim_3d *x, t_floatarg fnr_src)
j %= 7;
}
- if(glist_isvisible(x->x_gui.x_glist))
- (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
+ if (glist_isvisible(x->x_gui.x_glist))
+ room_sim_3d_draw_map(x, x->x_gui.x_glist);
+// (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW);
}
}
-static void *room_sim_3d_new(t_symbol *s, int argc, t_atom *argv)
+/* we may no longer need h_dragon... */
+static void room_sim_3d__clickhook(t_scalehandle *sh, int newstate)
+{
+ t_room_sim_3d *x = (t_room_sim_3d *)(sh->h_master);
+ if (newstate)
+ {
+ canvas_apply_setundo(x->x_gui.x_glist, (t_gobj *)x);
+ if (!sh->h_scale) /* click on a label handle */
+ scalehandle_click_label(sh);
+ }
+ /* We no longer need this "clickhook", as we can handle the dragging
+ either in the GUI (for the label handle) or or in canvas_doclick */
+ //iemgui__clickhook3(sh,newstate);
+ sh->h_dragon = newstate;
+}
+
+static void room_sim_3d__motionhook(t_scalehandle *sh,
+ t_floatarg mouse_x, t_floatarg mouse_y)
+{
+ if (sh->h_scale)
+ {
+ t_room_sim_3d *x = (t_room_sim_3d *)(sh->h_master);
+ int width = mouse_x - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist),
+ height = mouse_y - text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist),
+ minx = IEM_GUI_MINSIZE,
+ miny = IEM_GUI_MINSIZE;
+ x->x_gui.x_w = maxi(width, minx);
+ x->x_gui.x_h = maxi(height, miny);
+// slider_check_length(x, x->x_orient ? x->x_gui.x_h : x->x_gui.x_w);
+ if (glist_isvisible(x->x_gui.x_glist))
+ {
+ room_sim_3d_draw_unmap(x, x->x_gui.x_glist);
+ room_sim_3d_draw_map(x, x->x_gui.x_glist);
+ scalehandle_unclick_scale(sh);
+ }
+
+ int properties = gfxstub_haveproperties((void *)x);
+ if (properties)
+ {
+ /* No properties for room_sim externals atm */
+ //properties_set_field_int(properties,"width",new_w);
+ //properties_set_field_int(properties,"height",new_h);
+ }
+ }
+ scalehandle_dragon_label(sh,mouse_x, mouse_y);
+}
+
+/* from the old header... */
+#define IEM_GUI_COLNR_GREEN 16
+#define IEM_GUI_COLNR_D_ORANGE 24
+
+void *room_sim_3d_new(t_symbol *s, int argc, t_atom *argv)
{
t_room_sim_3d *x = (t_room_sim_3d *)pd_new(room_sim_3d_class);
int i, j, n=1, c;
@@ -888,7 +1082,7 @@ static void *room_sim_3d_new(t_symbol *s, int argc, t_atom *argv)
x->x_pix_src_y[0] = 200;
x->x_pix_src_z[0] = 42;
j = 0;
- for(i=1; i<=n; i++)
+ for (i = 1; i <= n; i++)
{
x->x_col_src[i] = simularca_color_hex[j];
if(i & 1)
@@ -915,6 +1109,15 @@ static void *room_sim_3d_new(t_symbol *s, int argc, t_atom *argv)
x->x_s_head_xyz = gensym("head_xyz");
x->x_s_src_xyz = gensym("src_xyz");
+
+ x->x_gui.x_lab = s_empty;
+
+ x->x_gui.x_obj.te_iemgui = 1;
+ x->x_gui.x_handle = scalehandle_new((t_object *)x,
+ x->x_gui.x_glist, 1, room_sim_3d__clickhook, room_sim_3d__motionhook);
+ x->x_gui.x_lhandle = scalehandle_new((t_object *)x,
+ x->x_gui.x_glist, 0, room_sim_3d__clickhook, room_sim_3d__motionhook);
+
return (x);
}
@@ -949,6 +1152,7 @@ void room_sim_3d_setup(void)
class_addmethod(room_sim_3d_class, (t_method)room_sim_3d_nr_src, gensym("nr_src"), A_DEFFLOAT, 0);
room_sim_3d_widgetbehavior.w_getrectfn = room_sim_3d_getrect;
+ room_sim_3d_widgetbehavior.w_displacefnwtag = iemgui_displace_withtag;
room_sim_3d_widgetbehavior.w_displacefn = iemgui_displace;
room_sim_3d_widgetbehavior.w_selectfn = iemgui_select;
room_sim_3d_widgetbehavior.w_activatefn = NULL;
diff --git a/externals/moonlib/mknob.c b/externals/moonlib/mknob.c
index bbba8d7ae3f5ba95e45c49f1f130b72f0a370536..f12edcf074f1e1726cf0b65bf2ab5c49113ce996 100644
--- a/externals/moonlib/mknob.c
+++ b/externals/moonlib/mknob.c
@@ -744,7 +744,7 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv)
x->x_thick = 0;
iemgui_verify_snd_ne_rcv(&x->x_gui);
outlet_new(&x->x_gui.x_obj, &s_float);
- x->x_gui.x_obj.te_iemgui = 1;
+ x->x_gui.x_obj.te_iemgui = 1;
x->x_gui.x_handle = scalehandle_new((t_object *)x,
x->x_gui.x_glist, 1, mknob__clickhook, mknob__motionhook);
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index 348cc1a353d06656490e980151c0e26b884ee10c..2303725c378090363d6e67cb6cb45586b40a6755 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -108,7 +108,7 @@ ifneq ($(LIGHT),yes)
install -p $(bin_src)/libsystre-0.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libtre-5.dll $(DESTDIR)$(bindir)/
# For fluid~
- install -p $(bin_src)/libfluidsynth-1.dll $(DESTDIR)$(bindir)/
+ install -p $(bin_src)/libfluidsynth-2.dll $(DESTDIR)$(bindir)/
# For other external libs
install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/
diff --git a/pd/doc/5.reference/unpost-help.pd b/pd/doc/5.reference/unpost-help.pd
new file mode 100644
index 0000000000000000000000000000000000000000..bf9dea67e30eaa2917a6c2314f54a0bc73d7ef3f
--- /dev/null
+++ b/pd/doc/5.reference/unpost-help.pd
@@ -0,0 +1,83 @@
+#N canvas 430 62 555 619 10;
+#X obj 0 585 cnv 15 552 21 empty \$0-pddp.cnv.footer empty 20 12 0
+14 -228856 -66577 0;
+#X obj 0 0 cnv 15 552 40 empty \$0-pddp.cnv.header unpost 3 12 0 18
+-204280 -1 0;
+#X obj 0 279 cnv 3 550 3 empty \$0-pddp.cnv.inlets inlets 8 12 0 13
+-228856 -1 0;
+#N canvas 497 325 482 332 META 0;
+#X text 12 145 LIBRARY internal;
+#X text 12 185 WEBSITE http://crca.ucsd.edu/~msp/;
+#X text 12 45 LICENSE SIBSD;
+#X text 12 165 AUTHOR Miller Puckette;
+#X text 12 225 HELP_PATCH_AUTHORS Jonathan Wilkes revised the patch
+to conform to the PDDP template for Pd version 0.42.;
+#X text 12 25 KEYWORDS control storage;
+#X text 12 205 RELEASE_DATE 1997;
+#X text 12 65 DESCRIPTION reroute console messages to an outlet;
+#X text 12 85 INLET_0 anything;
+#X text 12 125 OUTLET_1 anything;
+#X text 12 105 OUTLET_0 symbol;
+#X restore 500 587 pd META;
+#X obj 0 336 cnv 3 550 3 empty \$0-pddp.cnv.outlets outlets 8 12 0
+13 -228856 -1 0;
+#X obj 0 503 cnv 3 550 3 empty \$0-pddp.cnv.argument arguments 8 12
+0 13 -228856 -1 0;
+#X obj 0 553 cnv 3 550 3 empty \$0-pddp.cnv.more_info more_info 8 12
+0 13 -228856 -1 0;
+#X obj 78 352 cnv 17 3 17 empty \$0-pddp.cnv.let.0 0 5 9 0 16 -228856
+-162280 0;
+#N canvas 215 545 428 131 Related_objects 0;
+#X obj 1 1 cnv 15 425 20 empty \$0-pddp.cnv.subheading empty 3 12 0
+14 -204280 -1 0;
+#X text 7 1 [unpost] Related Objects;
+#X obj 22 36 print;
+#X restore 101 587 pd Related_objects;
+#X obj 78 295 cnv 17 3 17 empty \$0-pddp.cnv.let.0 0 5 9 0 16 -228856
+-162280 0;
+#X obj 4 587 pddp/pddplink all_about_help_patches.pd -text Usage Guide
+;
+#X text 11 20 reroute console messages to an outlet;
+#X obj 502 12 unpost;
+#X msg 58 60 bad_method;
+#X obj 58 112 unpost;
+#X symbolatom 58 194 0 0 0 0 - - -;
+#X text 98 351 symbol;
+#X text 168 351 - outputs the console messages. The messages triggered
+by the right outlet are split at newlines. Then each resulting line
+is converted to a symbol and output in sequence. (This means a single
+message to the inlet of [unpost] may trigger multiple messages to this
+outlet.;
+#X text 99 295 anything;
+#X text 169 295 - then input is sent to the right outlet;
+#X obj 78 432 cnv 17 3 17 empty \$0-pddp.cnv.let.1 1 5 9 0 16 -228856
+-162280 0;
+#X text 98 431 anything;
+#X obj 91 163 print redirected;
+#X msg 81 85 1;
+#X obj 91 141 + 41;
+#X msg 238 60 bad_method;
+#X symbolatom 238 194 0 0 0 0 - - -;
+#X obj 271 163 print redirected;
+#X msg 261 85 1;
+#X obj 271 141 + 41;
+#X obj 238 112 unpost error;
+#X text 319 112 <- only reroute errors;
+#X text 168 431 - the message sent to the inlet is received to this
+outlet. Any console messages which are triggered from the rest of object
+chain connected below it will get forwarded to the left outlet. If
+the "error" argument was given \, then only error messages will be
+redirected to the left outlet.;
+#X text 81 520 1) symbol;
+#X text 171 520 - the symbol "error" will only redirect error messages.
+All other console messages will get printed as usual.;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 14 1 24 0;
+#X connect 23 0 14 0;
+#X connect 24 0 22 0;
+#X connect 25 0 30 0;
+#X connect 28 0 30 0;
+#X connect 29 0 27 0;
+#X connect 30 0 26 0;
+#X connect 30 1 29 0;
diff --git a/pd/nw/pd_canvas.js b/pd/nw/pd_canvas.js
index 570b20e99bb0d78b99a15a6e7cf6d33a20381804..db54bda82cc9a561b3f0fe2187b9920661862f20 100644
--- a/pd/nw/pd_canvas.js
+++ b/pd/nw/pd_canvas.js
@@ -11,102 +11,6 @@ pdgui.skin.apply(window);
var l = pdgui.get_local_string;
-console.log("my working dir is " + pdgui.get_pwd());
-document.getElementById("saveDialog")
- .setAttribute("nwworkingdir", pdgui.get_pwd());
-document.getElementById("fileDialog")
- .setAttribute("nwworkingdir", pdgui.get_pwd());
-document.getElementById("fileDialog").setAttribute("accept",
- Object.keys(pdgui.pd_filetypes).toString());
-
-function close_save_dialog() {
- document.getElementById("save_before_quit").close();
-}
-
-function text_to_normalized_svg_path(text) {
- text = text.slice(4).trim() // draw
- .slice(4).trim() // path
- .slice(1).trim() // d
- .slice(1).trim(); // =
- if (text.slice(0, 1) === '"') {
- text = text.slice(1);
- }
- if (text.slice(-1) === '"') {
- text = text.slice(0, -1);
- }
- text = pdgui.parse_svg_path(text);
- return "draw path " + text.reduce(function (prev, curr) {
- return prev.concat(curr)
- }).join(" ");
-}
-
-function text_to_fudi(text) {
- text = text.trim();
- // special case for draw path d="arbitrary path string" ...
- if (text.search(/^draw\s+path\s+d\s*=\s*"/) !== -1) {
- text = text_to_normalized_svg_path(text);
- }
- text = text.replace(/(\$[0-9]+)/g, "\\$1"); // escape dollar signs
- text = text.replace(/(\$@)/g, "\\$@"); // escape special $@ sign
- text = text.replace(/(?!\\)(,|;)/g, " \\$1 "); // escape "," and ";"
- text = text.replace(/\u0020+/g, " "); // filter consecutive ascii32
- return text;
-}
-
-// Convert a string (FUDI message) to an array of strings small enough
-// to fit in Pd's socketreceiver buffer of 4096 bytes
-function string_to_array_of_chunks(msg) {
- var chunk_max = 1024,
- max_pd_string = 1000,
- left,
- in_array = [],
- out_array = [];
- if (msg.length <= chunk_max) {
- out_array.push([msg]);
- } else {
- in_array = msg.split(/[\s\n]/); // split on newlines or spaces
- while (in_array.length) {
- left = in_array.slice(); // make a copy of in_array
- if (left.toString().length > chunk_max) {
- while (1) {
- if (left.length < 2) {
- pdgui.post("Warning: string truncated:");
- pdgui.post(left.toString().
- match(/............................../g).join("\n")
- );
- break;
- }
- left = left.splice(0, left.length >> 1);
- if (left.toString().length <= chunk_max) {
- break;
- }
- }
- }
- // might need a check here for max_pd_string to warn
- // user if a string is going to get truncated. (That's
- // what max_pd_string is for above.)
- out_array.push(left);
- in_array = in_array.splice(left.length);
- }
- }
- return out_array;
-}
-
-// Super-simplistic guess at whether the string from the clipboard
-// starts with Pd code. This is just meant as a convenience so that
-// stuff in the copy buffer that obviously isn't Pd code doesn't get
-// in the way when editing.
-function might_be_a_pd_file(stuff_from_clipboard) {
- var text = stuff_from_clipboard.trim(),
- one = text.charAt(0),
- two = text.charAt(1);
- return (one === "#" && (two === "N" || two === "X"));
-}
-
-function permission_to_paste_from_external_clipboard() {
- return global.confirm(l("canvas.paste_clipboard_prompt"));
-}
-
function nw_window_focus_callback(name) {
pdgui.set_focused_patchwin(name);
// on OSX, update the menu on focus
@@ -132,28 +36,10 @@ function nw_window_zoom(name, delta) {
}
}
-// These three functions need to be inside canvas_events closure
-function canvas_find_whole_word(elem) {
- canvas_events.match_words(elem.checked);
-}
-
-function canvas_find_blur() {
- canvas_events.normal();
-}
-
-function canvas_find_focus() {
- var state = canvas_events.get_state();
- canvas_events.search();
-}
-
-function canvas_find_reset() {
- canvas_events.find_reset();
-}
-
var canvas_events = (function() {
var name,
state,
- scalar_draggables = {}, // elements of a scalar which have the "drag" event enabled
+ scalar_draggables = {}, // scalar child with the "drag" event enabled
draggable_elem, // last scalar we dragged
draggable_label, // kluge for handling [cnv] label/size anchors
last_draggable_x, // last x coord for the element we're dragging
@@ -188,6 +74,89 @@ var canvas_events = (function() {
return 0;
}
},
+ text_to_normalized_svg_path = function(text) {
+ text = text.slice(4).trim() // draw
+ .slice(4).trim() // path
+ .slice(1).trim() // d
+ .slice(1).trim(); // =
+ if (text.slice(0, 1) === '"') {
+ text = text.slice(1);
+ }
+ if (text.slice(-1) === '"') {
+ text = text.slice(0, -1);
+ }
+ text = pdgui.parse_svg_path(text);
+ return "draw path " + text.reduce(function (prev, curr) {
+ return prev.concat(curr)
+ }).join(" ");
+ },
+ text_to_fudi = function(text) {
+ text = text.trim();
+ // special case for draw path d="arbitrary path string" ...
+ if (text.search(/^draw\s+path\s+d\s*=\s*"/) !== -1) {
+ text = text_to_normalized_svg_path(text);
+ }
+ // escape dollar signs
+ text = text.replace(/(\$[0-9]+)/g, "\\$1");
+
+ // escape special $@ sign
+ text = text.replace(/(\$@)/g, "\\$@");
+
+ // escape "," and ";"
+ text = text.replace(/(?!\\)(,|;)/g, " \\$1 ");
+
+ // filter consecutive ascii32
+ text = text.replace(/\u0020+/g, " ");
+ return text;
+ },
+ string_to_array_of_chunks = function(msg) {
+ // Convert a string (FUDI message) to an array of strings small enough
+ // to fit in Pd's socketreceiver buffer of 4096 bytes
+ var chunk_max = 1024,
+ max_pd_string = 1000,
+ left,
+ in_array = [],
+ out_array = [];
+ if (msg.length <= chunk_max) {
+ out_array.push([msg]);
+ } else {
+ in_array = msg.split(/[\s\n]/); // split on newlines or spaces
+ while (in_array.length) {
+ left = in_array.slice(); // make a copy of in_array
+ if (left.toString().length > chunk_max) {
+ while (1) {
+ if (left.length < 2) {
+ pdgui.post("Warning: string truncated:");
+ pdgui.post(left.toString().
+ match(/............................../g).join("\n")
+ );
+ break;
+ }
+ left = left.splice(0, left.length >> 1);
+ if (left.toString().length <= chunk_max) {
+ break;
+ }
+ }
+ }
+ // might need a check here for max_pd_string to warn
+ // user if a string is going to get truncated. (That's
+ // what max_pd_string is for above.)
+ out_array.push(left);
+ in_array = in_array.splice(left.length);
+ }
+ }
+ return out_array;
+ },
+ might_be_a_pd_file = function(stuff_from_clipboard) {
+ // Super-simplistic guess at whether the string from the clipboard
+ // starts with Pd code. This is just meant as a convenience so that
+ // stuff in the copy buffer that obviously isn't Pd code doesn't get
+ // in the way when editing.
+ var text = stuff_from_clipboard.trim(),
+ one = text.charAt(0),
+ two = text.charAt(1);
+ return (one === "#" && (two === "N" || two === "X"));
+ },
grow_svg_for_element= function(elem) {
// See if an element overflows the svg bbox, and
// enlarge the svg to accommodate it.
@@ -683,175 +652,6 @@ var canvas_events = (function() {
}
;
- // Dialog events -- these are set elsewhere now because of a bug
- // with nwworkingdir
- document.querySelector("#saveDialog").addEventListener("change",
- function(evt) {
- pdgui.saveas_callback(name, evt.target.value, 0);
- // reset value so that we can open the same file twice
- evt.target.value = null;
- console.log("tried to save something");
- }, false
- );
-
- // Whoa-- huge workaround!
- // Right now we're getting the popup menu the way Pd Vanilla does it:
- // 1) send a mouse(down) message to Pd
- // 2) Pd checks whether it wants to send us a popup
- // 3) Pd checks what popup menu items are available for this object/canvas
- // 4) Pd sends GUI back a message with this info
- // 5) GUI finally displays the popup
- // 6) GUI keeps a _global_ _variable_ to remember where the popup coords
- // 7) User clicks an option in the popup
- // 8) GUI sends a message back to Pd with the popup index and coords
- // 9) Pd walks the linked list of objects to look up the object
- // 10) Pd asks that object if it reacts to popups, and if it reacts to the
- // selected item in the popup
- // 11) Pd sends a message to the relevant object for the item in question
- // nw.js has a nice little "contextmenu" event handler, but it's too
- // difficult to use when we're passing between GUI and Pd (twice). In the
- // future we should just do all the popup menu event handling in the GUI,
- // and only pass a message to Pd when the user has clicked an item.
- // For now, however, we just turn off its default behavior and control
- // it with a bunch of complicated callbacks. :(
- document.addEventListener("contextmenu", function(evt) {
- console.log("got a context menu evt...");
- evt.preventDefault();
- });
-
- // Cut event
- document.addEventListener("cut", function(evt) {
- // This event doesn't currently get called because the
- // nw menubar receives the event and doesn't propagate
- // to the DOM. But if we add the ability to toggle menubar
- // display, we might need to rely on this listener.
- pdgui.pdsend(name, "cut");
- });
-
- // Copy event
- document.addEventListener("copy", function(evt) {
- // On OSX, this event gets triggered when we're editing
- // inside an object/message box. So we only forward the
- // copy message to Pd if we're in a "normal" canvas state
- if (canvas_events.get_state() === "normal") {
- pdgui.pdsend(name, "copy");
- }
- });
-
- // Listen to paste event
- // XXXTODO: Not sure whether this is even needed any more, as the
- // paste-from-clipboard functionality has been moved to its own menu
- // option. So this code may possibly be removed in the future. -ag
- document.addEventListener("paste", function(evt) {
- if (canvas_events.get_state() !== "normal") {
- return;
- }
- // Send a canvas "paste" message to Pd
- pdgui.pdsend(name, "paste");
- });
-
- // MouseWheel event for zooming
- document.addEventListener("wheel", function(evt) {
- var d = { deltaX: 0, deltaY: 0, deltaZ: 0 };
- Object.keys(d).forEach(function(key) {
- if (evt[key] < 0) {
- d[key] = -1;
- } else if (evt[key] > 0) {
- d[key] = 1;
- } else {
- d[key] = 0;
- }
- });
- if (pdgui.cmd_or_ctrl_key(evt)) {
- // scroll up for zoom-in, down for zoom-out
- nw_window_zoom(name, -d.deltaY);
- }
- // Send a message on to Pd for the [mousewheel] legacy object
- // (in the future we can refcount if we want to prevent forwarding
- // these messages when there's no extant receiver)
- pdgui.pdsend(name, "legacy_mousewheel", d.deltaX, d.deltaY, d.deltaZ);
- });
-
- // The following is commented out because we have to set the
- // event listener inside nw_create_pd_window_menus due to a
- // bug with nwworkingdir
-
- //document.querySelector("#fileDialog").addEventListener("change",
- // function(evt) {
- // var file_array = this.value;
- // // reset value so that we can open the same file twice
- // this.value = null;
- // pdgui.menu_open(file_array);
- // console.log("tried to open something\n\n\n\n\n\n\n\n");
- // }, false
- //);
- document.querySelector("#openpanel_dialog").addEventListener("change",
- function(evt) {
- var file_string = evt.target.value;
- // reset value so that we can open the same file twice
- evt.target.value = null;
- pdgui.file_dialog_callback(file_string);
- console.log("tried to openpanel something");
- }, false
- );
- document.querySelector("#savepanel_dialog").addEventListener("change",
- function(evt) {
- var file_string = evt.target.value;
- // reset value so that we can open the same file twice
- evt.target.value = null;
- pdgui.file_dialog_callback(file_string);
- console.log("tried to savepanel something");
- }, false
- );
- document.querySelector("#canvas_find_text").addEventListener("focusin",
- canvas_find_focus, false
- );
-
- // disable drag and drop for the time being
- window.addEventListener("dragover", function (evt) {
- evt.preventDefault();
- }, false);
- window.addEventListener("drop", function (evt) {
- evt.preventDefault();
- }, false);
-
- // Add placeholder text... this all needs to be collected into an
- // add_events function similiar to the one in index.js
- document.querySelector("#canvas_find_text").placeholder =
- l("canvas.find.placeholder");
- document.querySelector("#canvas_find_text").addEventListener("blur",
- canvas_find_blur, false
- );
- document.querySelector("#canvas_find_button").addEventListener("click",
- events.find_click);
- // We need to separate these into nw_window events and html5 DOM events
- // closing the Window this isn't actually closing the window yet
- gui.Window.get().on("close", function() {
- pdgui.pdsend(name, "menuclose 0");
- });
- // update viewport size when window size changes
- gui.Window.get().on("maximize", function() {
- pdgui.gui_canvas_get_scroll(name);
- });
- gui.Window.get().on("unmaximize", function() {
- pdgui.gui_canvas_get_scroll(name);
- });
- gui.Window.get().on("resize", function() {
- pdgui.gui_canvas_get_scroll(name);
- });
- gui.Window.get().on("focus", function() {
- nw_window_focus_callback(name);
- });
- gui.Window.get().on("blur", function() {
- nw_window_blur_callback(name);
- });
- gui.Window.get().on("move", function(x, y) {
- var w = gui.Window.get();
- pdgui.pdsend(name, "setbounds", x, y, x + w.width, y + w.height);
- });
- // set minimum window size
- gui.Window.get().setMinimumSize(150, 100);
-
return {
none: function() {
var evt_name, prop;
@@ -868,7 +668,7 @@ var canvas_events = (function() {
}
},
normal: function() {
- this.none();
+ canvas_events.none();
document.addEventListener("mousemove", events.mousemove, false);
document.addEventListener("keydown", events.keydown, false);
@@ -895,14 +695,14 @@ var canvas_events = (function() {
// The exception is my_canvas, which is weird because the visible
// rectangle extends past the bbox that it reports to Pd.
// Unfortunately that means a lot of work to treat it separately.
- this.none();
+ canvas_events.none();
document.addEventListener("mousemove",
events.iemgui_label_mousemove, false);
document.addEventListener("mouseup",
events.iemgui_label_mouseup, false);
},
text: function() {
- this.none();
+ canvas_events.none();
document.addEventListener("mousemove", events.text_mousemove, false);
document.addEventListener("keydown", events.text_keydown, false);
@@ -915,8 +715,8 @@ var canvas_events = (function() {
set_edit_menu_modals(false);
},
floating_text: function() {
- this.none();
- this.text();
+ canvas_events.none();
+ canvas_events.text();
document.removeEventListener("mousedown", events.text_mousedown, false);
document.removeEventListener("mouseup", events.text_mouseup, false);
document.removeEventListener("keypress", events.text_keypress, false);
@@ -928,7 +728,7 @@ var canvas_events = (function() {
set_edit_menu_modals(false);
},
dropdown_menu: function() {
- this.none();
+ canvas_events.none();
document.addEventListener("mousedown", events.dropdown_menu_mousedown, false);
document.addEventListener("mouseup", events.dropdown_menu_mouseup, false);
document.addEventListener("mousemove", events.dropdown_menu_mousemove, false);
@@ -938,7 +738,7 @@ var canvas_events = (function() {
.addEventListener("wheel", events.dropdown_menu_wheel, false);
},
search: function() {
- this.none();
+ canvas_events.none();
document.addEventListener("keydown", events.find_keydown, false);
state = "search";
},
@@ -985,6 +785,189 @@ var canvas_events = (function() {
close_without_saving: function(cid, force) {
pdgui.pdsend(name, "dirty 0");
pdgui.pdsend(cid, "menuclose", force);
+ },
+ close_save_dialog: function() {
+ document.getElementById("save_before_quit").close();
+ },
+ init: function() {
+ document.getElementById("saveDialog")
+ .setAttribute("nwworkingdir", pdgui.get_pwd());
+ document.getElementById("fileDialog")
+ .setAttribute("nwworkingdir", pdgui.get_pwd());
+ document.getElementById("fileDialog").setAttribute("accept",
+ Object.keys(pdgui.pd_filetypes).toString());
+ // Dialog events -- these are set elsewhere now because of a bug
+ // with nwworkingdir
+ document.querySelector("#saveDialog").addEventListener("change",
+ function(evt) {
+ pdgui.saveas_callback(name, evt.target.value, 0);
+ // reset value so that we can open the same file twice
+ evt.target.value = null;
+ console.log("tried to save something");
+ }, false
+ );
+ // Whoa-- huge workaround! Right now we're getting
+ // the popup menu the way Pd Vanilla does it:
+ // 1) send a mouse(down) message to Pd
+ // 2) Pd checks whether it wants to send us a popup
+ // 3) Pd checks what popup menu items are available for obj/canvas
+ // 4) Pd sends GUI back a message with this info
+ // 5) GUI finally displays the popup
+ // 6) GUI keeps a _global_ _variable_ to remember the popup coords
+ // 7) User clicks an option in the popup
+ // 8) GUI sends a message back to Pd with the popup index and coords
+ // 9) Pd walks the linked list of objects to look up the object
+ // 10) Pd asks the object if it reacts to popups, and if it reacts
+ // to the selected item in the popup
+ // 11) Pd sends a message to the relevant object for the item in
+ // question
+ // nw.js has a nice little "contextmenu" event handler, but it's too
+ // difficult to use when passing between GUI and Pd (twice). In the
+ // future we should do all popup menu event handling in the GUI,
+ // and only pass a message to Pd when the user has clicked an item.
+ // For now, however, we just turn off its default behavior and
+ // control it with a bunch of complicated callbacks.
+ document.addEventListener("contextmenu", function(evt) {
+ console.log("got a context menu evt...");
+ evt.preventDefault();
+ });
+
+ // Cut event
+ document.addEventListener("cut", function(evt) {
+ // This event doesn't currently get called because the
+ // nw menubar receives the event and doesn't propagate
+ // to the DOM. But if we add the ability to toggle menubar
+ // display, we might need to rely on this listener.
+ pdgui.pdsend(name, "cut");
+ });
+
+ // Copy event
+ document.addEventListener("copy", function(evt) {
+ // On OSX, this event gets triggered when we're editing
+ // inside an object/message box. So we only forward the
+ // copy message to Pd if we're in a "normal" canvas state
+ if (canvas_events.get_state() === "normal") {
+ pdgui.pdsend(name, "copy");
+ }
+ });
+
+ // Listen to paste event
+ // XXXTODO: Not sure whether this is even needed any more, as the
+ // paste-from-clipboard functionality has been moved to its own menu
+ // option. So this code may possibly be removed in the future. -ag
+ document.addEventListener("paste", function(evt) {
+ if (canvas_events.get_state() !== "normal") {
+ return;
+ }
+ // Send a canvas "paste" message to Pd
+ pdgui.pdsend(name, "paste");
+ });
+
+ // MouseWheel event for zooming
+ document.addEventListener("wheel", function(evt) {
+ var d = { deltaX: 0, deltaY: 0, deltaZ: 0 };
+ Object.keys(d).forEach(function(key) {
+ if (evt[key] < 0) {
+ d[key] = -1;
+ } else if (evt[key] > 0) {
+ d[key] = 1;
+ } else {
+ d[key] = 0;
+ }
+ });
+ if (pdgui.cmd_or_ctrl_key(evt)) {
+ // scroll up for zoom-in, down for zoom-out
+ nw_window_zoom(name, -d.deltaY);
+ }
+ // Send a message on to Pd for the [mousewheel] legacy object
+ // (in the future we can refcount to prevent forwarding
+ // these messages when there's no extant receiver)
+ pdgui.pdsend(name, "legacy_mousewheel",
+ d.deltaX, d.deltaY, d.deltaZ);
+ });
+
+ // The following is commented out because we have to set the
+ // event listener inside nw_create_pd_window_menus due to a
+ // bug with nwworkingdir
+
+ //document.querySelector("#fileDialog").addEventListener("change",
+ // function(evt) {
+ // var file_array = this.value;
+ // // reset value so that we can open the same file twice
+ // this.value = null;
+ // pdgui.menu_open(file_array);
+ // console.log("tried to open something\n\n\n\n\n\n\n\n");
+ // }, false
+ //);
+ document.querySelector("#openpanel_dialog")
+ .addEventListener("change", function(evt) {
+ var file_string = evt.target.value;
+ // reset value so that we can open the same file twice
+ evt.target.value = null;
+ pdgui.file_dialog_callback(file_string);
+ console.log("tried to openpanel something");
+ }, false
+ );
+ document.querySelector("#savepanel_dialog")
+ .addEventListener("change", function(evt) {
+ var file_string = evt.target.value;
+ // reset value so that we can open the same file twice
+ evt.target.value = null;
+ pdgui.file_dialog_callback(file_string);
+ console.log("tried to savepanel something");
+ }, false
+ );
+ document.querySelector("#canvas_find_text")
+ .addEventListener("focusin", canvas_events.search, false
+ );
+
+ // disable drag and drop for the time being
+ window.addEventListener("dragover", function (evt) {
+ evt.preventDefault();
+ }, false);
+ window.addEventListener("drop", function (evt) {
+ evt.preventDefault();
+ }, false);
+
+ // Add placeholder text... this all needs to be collected into an
+ // add_events function similiar to the one in index.js
+ document.querySelector("#canvas_find_text").placeholder =
+ l("canvas.find.placeholder");
+ document.querySelector("#canvas_find_text").addEventListener("blur",
+ canvas_events.normal, false
+ );
+ document.querySelector("#canvas_find_button")
+ .addEventListener("click", events.find_click
+ );
+ // We need to separate these into nw_window events and html5 DOM
+ // events closing the Window this isn't actually closing the window
+ // yet
+ gui.Window.get().on("close", function() {
+ pdgui.pdsend(name, "menuclose 0");
+ });
+ // update viewport size when window size changes
+ gui.Window.get().on("maximize", function() {
+ pdgui.gui_canvas_get_scroll(name);
+ });
+ gui.Window.get().on("unmaximize", function() {
+ pdgui.gui_canvas_get_scroll(name);
+ });
+ gui.Window.get().on("resize", function() {
+ pdgui.gui_canvas_get_scroll(name);
+ });
+ gui.Window.get().on("focus", function() {
+ nw_window_focus_callback(name);
+ });
+ gui.Window.get().on("blur", function() {
+ nw_window_blur_callback(name);
+ });
+ gui.Window.get().on("move", function(x, y) {
+ var w = gui.Window.get();
+ pdgui.pdsend(name, "setbounds", x, y,
+ x + w.width, y + w.height);
+ });
+ // set minimum window size
+ gui.Window.get().setMinimumSize(150, 100);
}
};
}());
@@ -1022,6 +1005,8 @@ function register_window_id(cid, attr_array) {
}
create_popup_menu(cid);
canvas_events.register(cid);
+ // Initialize global DOM state/events
+ canvas_events.init(document);
translate_form();
// Trigger a "focus" event so that OSX updates the menu for this window
nw_window_focus_callback(cid);
@@ -1157,11 +1142,6 @@ function canvas_paste_from_clipboard(name, clipboard_data)
return;
}
- // Maybe we want a warning prompt here? Then uncomment the line below. I
- // disabled this for now, as the paste-from-clipboard command now has its
- // own menu option, so presumably the user knows what he's doing. -ag
- //if (!permission_to_paste_from_external_clipboard()) return;
-
// clear the buffer
pdgui.pdsend(name, "copyfromexternalbuffer");
pd_message = "";
diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index e40a3072c64c9bfdede723e6f138b894c7714e40..97d0fa3a013323cee5624eadf55911722285334c 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -1995,7 +1995,12 @@ function add_gobj_to_svg(svg, gobj) {
var gui = (function() {
var c = {}; // object to hold references to all our canvas closures
- var last_thing; // last thing we got
+ // We store the last "thing" we fetched from the window. This is either
+ // the window itself or a "gobj". Regular old DOM elements that aren't
+ // a "gobj" container don't count. This way we can do a "get_gobj" then
+ // gang multiple element queries after it that work within our last
+ // "gobj." (Same for window.)
+ var last_thing;
var null_fn, null_canvas;
var create_canvas = function(cid, w) {
var get = function(parent, sel, arg, suffix) {
@@ -4152,7 +4157,8 @@ function gui_grid_point(cid, tag, x, y) {
}
// mknob from moonlib
-function gui_mknob_new(cid, tag, x, y, is_toplevel, show_in, show_out) {
+function gui_mknob_new(cid, tag, x, y, is_toplevel, show_in, show_out,
+ is_footils_knob) {
gui(cid).get_elem("patchsvg", function(svg_elem) {
gui_gobj_new(cid, tag, "obj", x, y, is_toplevel);
});
@@ -4162,50 +4168,239 @@ function gui_mknob_new(cid, tag, x, y, is_toplevel, show_in, show_out) {
class: "border" // now we can inherit the css border styles
}),
circle = create_item(cid, "circle", {
- class: "circle"
+ //class: "circle"
}),
line = create_item(cid, "line", {
- class: "dial"
+ //class: "dial"
});
frag.appendChild(border);
frag.appendChild(circle);
+ /* An extra circle for footils/knob */
+ if (!!is_footils_knob) {
+ frag.appendChild(create_item(cid, "circle", {
+ class: "dial_frag"
+ }));
+ }
frag.appendChild(line);
return frag;
});
}
-function gui_configure_mknob(cid, tag, size, bg_color, fg_color) {
- gui(cid).get_gobj(tag)
+function knob_dashes(d, len) {
+ var c = d * 3.14159;
+ return (c * len) + " " + (c * (1 - len));
+}
+
+function knob_offset(d) {
+ return d * 3.14 * -0.28;
+}
+
+function gui_configure_mknob(cid, tag, size, bg_color, fg_color,
+ is_footils_knob) {
+ var w = size,
+ h = !!is_footils_knob ? size + 5 : size;
+ var g = gui(cid).get_gobj(tag)
.q(".border", {
- d: ["M", 0, 0, size, 0,
- "M", 0, size, size, size,
- "M", 0, 0, 0, size,
- "M", size, 0, size, size
+ d: ["M", 0, 0, w, 0,
+ "M", 0, h, w, h,
+ "M", 0, 0, 0, h,
+ "M", w, 0, w, h
].join(" "),
fill: "none",
})
- .q(".circle", {
+ .q("circle", {
cx: size / 2,
cy: size / 2,
r: size / 2,
- fill: bg_color,
+ fill: !!is_footils_knob ? "none" : bg_color,
stroke: "black",
- "stroke-width": 1
+ "stroke-width": !!is_footils_knob ? 3 : 1,
+ "stroke-dasharray": !!is_footils_knob ?
+ knob_dashes(size, 0.94) : "none",
+ "stroke-dashoffset": !!is_footils_knob ? knob_offset(size) : "0"
})
- .q(".dial", {
+ .q("line", { // indicator
"stroke-width": 2,
stroke: fg_color
});
+
+ if (!!is_footils_knob) {
+ g.q(".dial_frag", {
+ cx: size / 2,
+ cy: size / 2,
+ r: size / 2,
+ fill: "none",
+ stroke: bg_color,
+ "stroke-width": 3,
+ "stroke-dasharray": knob_dashes(size, 0.94),
+ "stroke-dashoffset": knob_offset(size)
+ });
+ }
}
-function gui_turn_mknob(cid, tag, x1, y1, x2, y2) {
- gui(cid).get_gobj(tag)
- .q(".dial", {
+function gui_turn_mknob(cid, tag, x1, y1, x2, y2, is_footils_knob, val) {
+ var g = gui(cid).get_gobj(tag)
+ .q("line", { // indicator
x1: x1,
y1: y1,
x2: x2,
y2: y2
});
+ if (!!is_footils_knob) {
+ g.q(".dial_frag", {
+ "stroke-dasharray": knob_dashes(x1 * 2, val * 0.94)
+ });
+ }
+}
+
+// room_sim_2d and room_sim_3d objects from iemlib
+function gui_room_sim_new(cid, tag, x, y, w, h, is_toplevel) {
+ gui(cid).get_elem("patchsvg", function(svg_elem) {
+ gui_gobj_new(cid, tag, "obj", x, y, is_toplevel);
+ });
+ gui(cid).get_gobj(tag)
+ .append(function(frag) {
+// frag.appendChild(line);
+ return frag;
+ });
+}
+
+function gui_room_sim_map(cid, tag, w, h, rad, head, xpix, ypix, fontsize,
+ fcol, bcol, src_array, r3d) {
+ gui(cid).get_gobj(tag, function(e) {
+ gui_text_draw_border(cid, tag, 0, 0, w, h);
+ // Set the style for the background directly... otherwise the
+ // default theme bgcolor will be used
+ e.querySelector(".border").style.fill = bcol;
+ })
+ .append(function(frag) {
+ var x1 = xpix - rad,
+ x2 = xpix + rad - 1,
+ y1 = ypix - rad,
+ y2 = ypix + rad - 1,
+ dx = -((rad * Math.sin(head * 0.0174533) + 0.49999)|0),
+ dy = -((rad * Math.cos(head * 0.0174533) + 0.49999)|0),
+ i,
+ text;
+ for (i = 0; i < src_array.length; i++) {
+ text = create_item(cid, "text", {
+ x: src_array[i][0],
+ y: src_array[i][1],
+ fill: src_array[i][2],
+ "font-size": fontsize,
+ "dominant-baseline": "middle"
+ });
+ text.textContent = (i + 1).toString();
+ frag.appendChild(text);
+ }
+ var ellipse = create_item(cid, "ellipse", {
+ cx: (x2 - x1) * 0.5 + x1,
+ cy: (y2 - y1) * 0.5 + y1,
+ rx: (x2 - x1) * 0.5,
+ ry: (y2 - y1) * 0.5,
+ "stroke-width": 1,
+ "stroke": fcol,
+ "fill": "none"
+ }),
+ ellipse2 = create_item(cid, "ellipse", {
+ // for room_sim_3d
+ cx: r3d ? (r3d[2] - r3d[0]) * 0.5 + r3d[0] : 0,
+ cy: r3d ? (r3d[3] - r3d[1]) * 0.5 + r3d[1] : 0,
+ rx: r3d ? (r3d[2] - r3d[0]) * 0.5 : 0,
+ ry: r3d ? (r3d[3] - r3d[1]) * 0.5 : 0,
+ "stroke-width": 1,
+ stroke: fcol,
+ fill: "none"
+ }),
+ line = create_item(cid, "line", {
+ x1: xpix,
+ y1: ypix,
+ x2: xpix + dx,
+ y2: ypix + dy,
+ "stroke-width": 3,
+ stroke: fcol
+ });
+ frag.appendChild(ellipse);
+ frag.appendChild(ellipse2);
+ frag.appendChild(line);
+ return frag;
+ })
+}
+
+function gui_room_sim_update_src(cid, tag, i, x, y, font_size, col) {
+ gui(cid).get_gobj(tag, function(e) {
+ var a = e.querySelectorAll("text");
+ if (a.length && i < a.length) {
+ configure_item(a[i], {
+ x: x,
+ y: y,
+ "font-size": font_size,
+ fill: col
+ });
+ }
+ });
+}
+
+function gui_room_sim_update(cid, tag, x0, y0, dx, dy, pixrad) {
+ gui(cid).get_gobj(tag)
+ .q("line", {
+ x1: x0,
+ y1: y0,
+ x2: x0 + dx,
+ y2: y0 + dy
+ })
+ .q("ellipse", {
+ rx: ((x0 + pixrad - 1) - (x0 - pixrad)) * 0.5,
+ ry: ((y0 + pixrad - 1) - (y0 - pixrad)) * 0.5,
+ cx: ((x0 + pixrad - 1) - (x0 - pixrad)) * 0.5 + (x0 - pixrad),
+ cy: ((y0 + pixrad - 1) - (y0 - pixrad)) * 0.5 + (y0 - pixrad),
+ });
+}
+
+// for room_sim_3d
+function gui_room_sim_head2(cid, tag, x1, y1, x2, y2) {
+ gui(cid).get_gobj(tag, function(e) {
+ configure_item(e.querySelectorAll("ellipse")[1], {
+ rx: (x2 - x1) * 0.5,
+ ry: (y2 - y1) * 0.5,
+ cx: (x2 - x1) * 0.5 + x1,
+ cy: (y2 - y1) * 0.5 + y1
+ });
+ });
+}
+
+function gui_room_sim_fontsize(cid, tag, i, size) {
+ gui(cid).get_gobj(tag, function(e) {
+ var i, a;
+ a = e.querySelectorAll("text");
+ if (a.length) {
+ for (i = 0; i < a.length; i++) {
+ configure_item(a[i], {
+ "font-size": size
+ });
+ }
+ }
+ });
+}
+
+// for the dial thingy
+function gui_room_sim_colors(cid, tag, fg, bg) {
+ gui(cid).get_gobj(tag)
+ .q("ellipse", {
+ stroke: fg
+ })
+ .q("line", {
+ stroke: fg
+ })
+ .q(".border", function(e) {
+ e.style.fill = bg;
+ });
+}
+
+function gui_room_sim_erase(cid, tag) {
+ gui(cid).get_gobj(tag, function(e) {
+ e.innerHTML = "";
+ });
}
function add_popup(cid, popup) {
diff --git a/pd/src/g_all_guis.c b/pd/src/g_all_guis.c
index faaf731a41d081acede7293a0fd4f4d5642de81d..c2381e0f12f3d6d283868cf82e2c936143a31ef7 100644
--- a/pd/src/g_all_guis.c
+++ b/pd/src/g_all_guis.c
@@ -513,7 +513,6 @@ void iemgui_displace_withtag(t_gobj *z, t_glist *glist, int dx, int dy)
canvas_fixlinesfor(glist_getcanvas(glist), (t_text *)z);
}
-
void iemgui_select(t_gobj *z, t_glist *glist, int selected)
{
t_iemgui *x = (t_iemgui *)z;
diff --git a/pd/src/s_print.c b/pd/src/s_print.c
index 19d1760cb0b40e67c5bc9525af06cb763153e532..e00b814f3c25eadb37c3c08bb43e19f1a173c338 100644
--- a/pd/src/s_print.c
+++ b/pd/src/s_print.c
@@ -14,6 +14,7 @@
#endif
t_printhook sys_printhook;
+t_printhook sys_printhook_error;
int sys_printtostderr;
/* escape characters for tcl/tk */
@@ -51,11 +52,13 @@ static void doerror(const void *object, const char *s)
char upbuf[MAXPDSTRING];
upbuf[MAXPDSTRING-1]=0;
- // what about sys_printhook_error ?
- if (sys_printhook)
+ if (sys_printhook || sys_printhook_error)
{
snprintf(upbuf, MAXPDSTRING-1, "error: %s", s);
- (*sys_printhook)(upbuf);
+ if (sys_printhook_error)
+ (*sys_printhook_error)(upbuf);
+ if (sys_printhook)
+ (*sys_printhook)(upbuf);
}
else if (sys_printtostderr)
fprintf(stderr, "error: %s", s);
diff --git a/pd/src/x_interface.c b/pd/src/x_interface.c
index 63223bb9b2d641c05b403e9ee9a3405d9e6e734c..34307dbeaa41713f71b1eca929e0668d6ecfc3e9 100644
--- a/pd/src/x_interface.c
+++ b/pd/src/x_interface.c
@@ -64,7 +64,7 @@ static void *print_new(t_symbol *sel, int argc, t_atom *argv)
static void print_bang(t_print *x)
{
- if (sys_nogui)
+ if (sys_nogui || sys_printhook)
post("%s%sbang", x->x_sym->s_name, (*x->x_sym->s_name ? ": " : ""));
else
{
@@ -78,7 +78,7 @@ static void print_bang(t_print *x)
static void print_pointer(t_print *x, t_gpointer *gp)
{
- if (sys_nogui)
+ if (sys_nogui || sys_printhook)
post("%s%s(gpointer)", x->x_sym->s_name,
(*x->x_sym->s_name ? ": " : ""));
else
@@ -93,7 +93,7 @@ static void print_pointer(t_print *x, t_gpointer *gp)
static void print_float(t_print *x, t_floatarg f)
{
- if (sys_nogui)
+ if (sys_nogui || sys_printhook)
post("%s%s" FLOAT_SPECIFIER, x->x_sym->s_name,
(*x->x_sym->s_name ? ": " : ""), f);
else
@@ -108,7 +108,7 @@ static void print_float(t_print *x, t_floatarg f)
static void print_symbol(t_print *x, t_symbol *s)
{
- if (sys_nogui)
+ if (sys_nogui || sys_printhook)
post("%s%s%s", x->x_sym->s_name, (*x->x_sym->s_name ? ": " : ""),
s->s_name);
else
@@ -126,7 +126,7 @@ static void print_anything(t_print *x, t_symbol *s, int argc, t_atom *argv)
{
char buf[MAXPDSTRING];
t_atom at;
- if (sys_nogui)
+ if (sys_nogui || sys_printhook)
{
startpost("%s%s", x->x_sym->s_name, (*x->x_sym->s_name ? ":" : ""));
if (s && (s != &s_list || (argc && argv->a_type != A_FLOAT)))
@@ -164,6 +164,134 @@ static void print_setup(void)
class_addanything(print_class, print_anything);
}
+/* -------------------------- unpost ------------------------------ */
+
+#define NEWBUFSIZE MAXPDSTRING * 2
+static t_class *unpost_class;
+
+typedef struct _unpost {
+ t_object x_obj;
+ t_outlet *x_out0;
+ t_outlet *x_out1;
+ int x_all;
+} t_unpost;
+
+typedef struct _unpost_frame {
+ t_unpost *u_self;
+ char *u_buf;
+ unsigned int u_bufsize;
+ unsigned int u_index;
+} t_unpost_frame;
+
+static t_unpost_frame *current_unpost;
+
+static void *unpost_frame_new(t_unpost *x)
+{
+ t_unpost_frame *u = (t_unpost_frame *)t_getbytes(sizeof(t_unpost_frame));
+ u->u_self = x;
+ u->u_buf = (char *)t_getbytes(sizeof(char) * NEWBUFSIZE);
+ u->u_buf[0] = '\0';
+ u->u_bufsize = NEWBUFSIZE;
+ u->u_index = 0;
+ return u;
+}
+
+static void unpost_frame_resize(t_unpost_frame *u, int newsize)
+{
+ u->u_buf = (char *)t_resizebytes(u->u_buf, sizeof(*u->u_buf) * u->u_bufsize,
+ sizeof(*u->u_buf) * newsize);
+ u->u_bufsize = newsize;
+}
+
+static void unpost_frame_free(t_unpost_frame* u)
+{
+ t_freebytes(u->u_buf, sizeof(*u->u_buf));
+ u->u_buf = NULL;
+}
+
+static void *unpost_new(t_symbol *s)
+{
+ t_unpost *x = (t_unpost *)pd_new(unpost_class);
+ x->x_all = s != gensym("error");
+ x->x_out0 = outlet_new(&x->x_obj, &s_symbol);
+ x->x_out1 = outlet_new(&x->x_obj, &s_symbol);
+ return x;
+}
+
+extern t_printhook sys_printhook;
+extern t_printhook sys_printhook_error;
+static void unpost_printhook(const char *s) {
+ t_unpost *x = current_unpost->u_self;
+ /* does strlen include terminator? can't remember... */
+ unsigned int needbytes = strlen(current_unpost->u_buf) + strlen(s) + 1;
+ if (needbytes >= current_unpost->u_bufsize)
+ {
+ /* Raise the bufsize to NEWBUFSIZE * n where n is a power of two that
+ will fit the number of bytes we need) */
+ unsigned int n = ((needbytes / NEWBUFSIZE) >> 1) +
+ (needbytes % NEWBUFSIZE != 0);
+ unpost_frame_resize(current_unpost,
+ current_unpost->u_bufsize * (1 << n));
+ }
+
+ else if (strlen(current_unpost->u_buf) + strlen(s) <
+ current_unpost->u_bufsize / 4)
+ {
+ /* Pretty sure I prematurely optimized here. There's no good reason to
+ shrink the buffer in the midst of receiving some enormous number of
+ posts from an object chain. Besides, we free the buffer once the
+ object chain downstream from the [unpost] outlet finishes computing.
+ Anyhow, here we are. */
+ unpost_frame_resize(current_unpost,
+ (current_unpost->u_bufsize / 4 < NEWBUFSIZE) ?
+ NEWBUFSIZE :
+ current_unpost->u_bufsize / 4);
+ }
+ strcat(current_unpost->u_buf, s);
+ const char *p;
+ const char *d = current_unpost->u_buf, *dd = d;
+ for (;;) {
+ p = strchr(d, '\n');
+ if (!p) break;
+ /* To avoid infinite recursion, let's reset our hooks before we
+ send to the right outlet. */
+ t_printhook print_backup = sys_printhook,
+ error_backup = sys_printhook_error;
+ sys_printhook = NULL;
+ sys_printhook_error = NULL;
+ outlet_symbol(x->x_out0, gensym(d));
+ sys_printhook = print_backup;
+ sys_printhook_error = error_backup;
+ d = p + 1;
+ }
+ if (d != dd)
+ {
+ char *q = strdup(d);
+ strcpy(current_unpost->u_buf, q);
+ t_freebytes(q, sizeof(*q) * strlen(q));
+ }
+}
+
+static void unpost_anything(t_unpost *x, t_symbol *s, int argc, t_atom *argv)
+{
+ t_printhook *myhook = x->x_all ? &sys_printhook : &sys_printhook_error;
+ t_printhook backup1 = *myhook;
+ t_unpost_frame *backup2 = current_unpost;
+ *myhook = unpost_printhook;
+ current_unpost = unpost_frame_new(x);
+ outlet_anything(x->x_out1, s, argc, argv);
+ *myhook = backup1;
+ unpost_frame_free(current_unpost);
+ current_unpost = backup2;
+}
+
+static void unpost_setup(void)
+{
+ unpost_class = class_new(gensym("unpost"), (t_newmethod)unpost_new, 0,
+ sizeof(t_unpost), 0, A_DEFSYM, 0);
+ class_addanything(unpost_class, unpost_anything);
+}
+
/* --------------pdinfo, canvasinfo, classinfo, objectinfo --------------- */
static t_class *canvasinfo_class;
@@ -1497,6 +1625,7 @@ void objectinfo_setup(void)
void x_interface_setup(void)
{
print_setup();
+ unpost_setup();
canvasinfo_setup();
pdinfo_setup();
classinfo_setup();
diff --git a/scripts/regression_tests.pd b/scripts/regression_tests.pd
index 6b7af932edfb94f49b3c6f47709cdb7a20d3cb9d..d691cc83e49212a6574072dc3a9b7d4fa4f4e2bf 100644
--- a/scripts/regression_tests.pd
+++ b/scripts/regression_tests.pd
@@ -34,10 +34,13 @@ is handy for some binbuf tests.;
#X text 536 150 <- we have to escape the arg;
#X text 556 190 escape it in a comment.;
#X text 556 170 in bash but we can't;
-#X obj 521 374 spigot;
-#X obj 537 440 route 1;
-#X obj 537 495 print success;
-#X obj 145 353 rtest makefilename_percent_parsing;
+#X obj 391 374 spigot;
+#X obj 407 440 route 1;
+#X obj 407 495 print success;
+#X obj 145 358 rtest unpost_sanity;
+#X obj 145 414 rtest unpost_error;
+#X obj 145 465 rtest unpost_print;
+#X obj 145 516 rtest unpost_long_message;
#X connect 0 0 1 0;
#X connect 1 0 7 0;
#X connect 1 1 29 0;
@@ -64,3 +67,6 @@ is handy for some binbuf tests.;
#X connect 29 0 7 0;
#X connect 30 0 31 0;
#X connect 30 1 2 0;
+#X connect 32 0 33 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
diff --git a/scripts/regression_tests/msg_click.pd b/scripts/regression_tests/msg_click.pd
index 4e715320f4466cf6f1c6da41afdcf1db8b072c22..49e54fefb47eede644b59277bcdf5f50ab70eb93 100644
--- a/scripts/regression_tests/msg_click.pd
+++ b/scripts/regression_tests/msg_click.pd
@@ -1,4 +1,4 @@
-#N canvas 34 75 582 396 12;
+#N canvas 37 104 582 396 12;
#X obj 36 25 inlet;
#X msg 152 97 click 0 0 0 0 0;
#X msg 152 122 \$1;
diff --git a/scripts/regression_tests/unpost_error.pd b/scripts/regression_tests/unpost_error.pd
new file mode 100644
index 0000000000000000000000000000000000000000..f799db61968cd04572aa60617382a28e69aa0211
--- /dev/null
+++ b/scripts/regression_tests/unpost_error.pd
@@ -0,0 +1,29 @@
+#N canvas 170 138 650 396 12;
+#X obj 36 25 inlet;
+#X obj 36 349 outlet;
+#X msg 36 63 unknown_method;
+#X obj 61 126 unpost error;
+#X obj 36 226 list;
+#X obj 36 251 route bang;
+#X text 155 16 Unpost takes an argument "error" to set it to only redirect
+error messages. Here we make sure it redirects an error message.;
+#X obj 36 88 trigger bang anything bang;
+#X obj 142 181 float;
+#X text 189 181 <- trigger an error;
+#X obj 36 276 f 0;
+#X msg 103 276 1;
+#X obj 36 309 list append unpost with "error" argument should redirect
+an error message;
+#X connect 0 0 2 0;
+#X connect 2 0 7 0;
+#X connect 3 0 4 1;
+#X connect 3 1 8 0;
+#X connect 4 0 5 0;
+#X connect 5 0 10 0;
+#X connect 5 1 11 0;
+#X connect 7 0 4 0;
+#X connect 7 1 3 0;
+#X connect 7 2 4 1;
+#X connect 10 0 12 0;
+#X connect 11 0 12 0;
+#X connect 12 0 1 0;
diff --git a/scripts/regression_tests/unpost_error2.pd b/scripts/regression_tests/unpost_error2.pd
new file mode 100644
index 0000000000000000000000000000000000000000..a6aed2efc7b35231111a3b3ea89393493285fa59
--- /dev/null
+++ b/scripts/regression_tests/unpost_error2.pd
@@ -0,0 +1,31 @@
+#N canvas 170 138 650 396 12;
+#X obj 36 25 inlet;
+#X obj 36 349 outlet;
+#X msg 36 63 unknown_method;
+#X text 155 16 Unpost takes an argument "error" to set it to only redirect
+error messages. Here we make sure it doesn't allow non-error messages
+through;
+#X obj 61 126 unpost error;
+#X obj 142 211 print -n;
+#X obj 36 226 list;
+#X obj 36 88 trigger bang bang bang;
+#X obj 36 251 route bang;
+#X obj 36 309 list append unpost with "error" argument should not redirect
+non-error messages;
+#X obj 36 276 f 1;
+#X msg 103 276 0;
+#X msg 142 186 unpost_error test message;
+#X connect 0 0 2 0;
+#X connect 2 0 7 0;
+#X connect 4 0 6 1;
+#X connect 4 1 12 0;
+#X connect 6 0 8 0;
+#X connect 7 0 6 0;
+#X connect 7 1 4 0;
+#X connect 7 2 6 1;
+#X connect 8 0 10 0;
+#X connect 8 1 11 0;
+#X connect 9 0 1 0;
+#X connect 10 0 9 0;
+#X connect 11 0 9 0;
+#X connect 12 0 5 0;
diff --git a/scripts/regression_tests/unpost_long_message.pd b/scripts/regression_tests/unpost_long_message.pd
new file mode 100644
index 0000000000000000000000000000000000000000..e3738436dc55768a3a906ddf2984c63325fdeaa3
--- /dev/null
+++ b/scripts/regression_tests/unpost_long_message.pd
@@ -0,0 +1,22 @@
+#N canvas 86 182 696 396 12;
+#X obj 36 25 inlet;
+#X obj 36 349 outlet;
+#X obj 36 266 f 1;
+#X text 155 16 Unpost should be able to handle long messages. Here
+we trigger one by sending a list of all the class names to the left
+inlet of unpost.;
+#X msg 36 63 classlist;
+#X obj 36 88 unpost;
+#X obj 75 116 pdinfo;
+#X obj 75 148 print long_message;
+#X obj 36 113 b;
+#X obj 36 299 list append unpost should print long messages without
+crashing;
+#X connect 0 0 4 0;
+#X connect 2 0 9 0;
+#X connect 4 0 5 0;
+#X connect 5 0 8 0;
+#X connect 5 1 6 0;
+#X connect 6 0 7 0;
+#X connect 8 0 2 0;
+#X connect 9 0 1 0;
diff --git a/scripts/regression_tests/unpost_print.pd b/scripts/regression_tests/unpost_print.pd
new file mode 100644
index 0000000000000000000000000000000000000000..7dda0dabec1bf919d9c7ba1c2d1a027b64cbfb7d
--- /dev/null
+++ b/scripts/regression_tests/unpost_print.pd
@@ -0,0 +1,44 @@
+#N canvas 35 102 696 396 12;
+#X obj 36 25 inlet;
+#X obj 36 349 outlet;
+#X msg 36 63 unknown_method;
+#X obj 36 266 f 1;
+#X obj 528 228 print unpost_print;
+#X obj 378 146 unpost;
+#X msg 528 146 testing unpost...;
+#X obj 198 228 print unpost_print;
+#X msg 198 146 testing unpost error...;
+#X obj 58 146 unpost error;
+#X obj 139 171 float;
+#X obj 58 171 b;
+#X msg 58 201 test message;
+#X obj 36 88 trigger bang anything bang bang bang;
+#X text 155 16 Unpost allows printing from the left outlet *without*
+redirecting back to the outlet. This prevents infinite loops. Without
+this protection this test would crash.;
+#X obj 36 299 list append when unpost's left-outlet messages are printed
+to the console an infinite loop should not occur;
+#X obj 58 228 print -n;
+#X obj 378 228 print -n;
+#X obj 378 171 b;
+#X msg 378 196 test message;
+#X obj 417 171 print test;
+#X connect 0 0 2 0;
+#X connect 2 0 13 0;
+#X connect 3 0 15 0;
+#X connect 5 0 18 0;
+#X connect 5 1 20 0;
+#X connect 6 0 4 0;
+#X connect 8 0 7 0;
+#X connect 9 0 11 0;
+#X connect 9 1 10 0;
+#X connect 11 0 12 0;
+#X connect 12 0 16 0;
+#X connect 13 0 3 0;
+#X connect 13 1 9 0;
+#X connect 13 2 8 0;
+#X connect 13 3 5 0;
+#X connect 13 4 6 0;
+#X connect 15 0 1 0;
+#X connect 18 0 19 0;
+#X connect 19 0 17 0;
diff --git a/scripts/regression_tests/unpost_sanity.pd b/scripts/regression_tests/unpost_sanity.pd
new file mode 100644
index 0000000000000000000000000000000000000000..d9fc5715abe85412cd5b510d5a3e2b958c1591e3
--- /dev/null
+++ b/scripts/regression_tests/unpost_sanity.pd
@@ -0,0 +1,28 @@
+#N canvas 164 80 650 396 12;
+#X obj 36 25 inlet;
+#X obj 36 309 outlet;
+#X text 155 16 Unpost is used to redirect messages from the console.
+We need it for some of the following tests \, so we make sure it operates
+correctly here first.;
+#X obj 61 136 unpost;
+#X msg 36 63 unknown_method;
+#X obj 100 166 float;
+#X obj 36 166 list;
+#X obj 36 88 trigger bang anything bang;
+#X obj 36 191 route bang;
+#X obj 36 269 list append unpost should redirect an error message;
+#X msg 103 225 1;
+#X obj 36 226 f 0;
+#X connect 0 0 4 0;
+#X connect 3 0 6 1;
+#X connect 3 1 5 0;
+#X connect 4 0 7 0;
+#X connect 6 0 8 0;
+#X connect 7 0 6 0;
+#X connect 7 1 3 0;
+#X connect 7 2 6 1;
+#X connect 8 0 11 0;
+#X connect 8 1 10 0;
+#X connect 9 0 1 0;
+#X connect 10 0 9 0;
+#X connect 11 0 9 0;