I've rebased the new-parser branch to the current master. I've not yet tested it, but it compiles and has no mention of "mvwm" in its history anymore, so coming rebases should be much easier.
@Thomas: Can you remember what the patches to FScreen.h in ~2 and ~6 are about? On Tue, Oct 25, 2016 at 03:41:45PM -0700, GitHub wrote: > Branch: refs/heads/dv/new-parser-2 > Home: https://github.com/fvwmorg/fvwm > Commit: 1d38f7a2727f28f1817e1c951bc07267002d2006 > > https://github.com/fvwmorg/fvwm/commit/1d38f7a2727f28f1817e1c951bc07267002d2006 > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/Makefile.am > M fvwm/add_window.c > M fvwm/builtins.c > A fvwm/cmdparser.h > A fvwm/cmdparser_old.c > A fvwm/cmdparser_old.h > M fvwm/colorset.c > M fvwm/conditional.c > M fvwm/events.c > M fvwm/ewmh.c > M fvwm/ewmh_events.c > M fvwm/expand.c > M fvwm/expand.h > M fvwm/functions.c > M fvwm/functions.h > M fvwm/fvwm.c > M fvwm/fvwm.h > M fvwm/menucmd.c > M fvwm/menus.c > M fvwm/module_interface.c > M fvwm/move_resize.c > M fvwm/read.c > M fvwm/repeat.c > M fvwm/schedule.c > M fvwm/update.c > M fvwm/virtual.c > M fvwm/windowlist.c > > Log Message: > ----------- > !!! Start work on replacing the parsing in __execute_command_line ... > > ... with hook functions that are implemented elsewhere. This aims > at allowing to writing and testing multiple parsers in parallel > and at moving all parsing and expansion stuff to a different > place. > > > Commit: 71b8dd6064553ad646bfadebfb501a95f7d5da9c > > https://github.com/fvwmorg/fvwm/commit/71b8dd6064553ad646bfadebfb501a95f7d5da9c > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/cmdparser.h > M fvwm/cmdparser_old.c > M fvwm/functions.c > > Log Message: > ----------- > add debug output and fix positional arguments > > > Commit: 4deefa9510ef6da3ca9d2e4d1a90aa59785e4a74 > > https://github.com/fvwmorg/fvwm/commit/4deefa9510ef6da3ca9d2e4d1a90aa59785e4a74 > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/cmdparser_old.c > M fvwm/functions.c > > Log Message: > ----------- > add debug output and fix command line prefixes > > > Commit: 7f357808de11b36d40f86c1d5731597036df56f3 > > https://github.com/fvwmorg/fvwm/commit/7f357808de11b36d40f86c1d5731597036df56f3 > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/Makefile.am > M fvwm/cmdparser.h > A fvwm/cmdparser_hooks.h > M fvwm/cmdparser_old.c > M fvwm/conditional.h > M fvwm/functable.c > M fvwm/functable.h > A fvwm/functable_complex.c > A fvwm/functable_complex.h > M fvwm/functions.c > M fvwm/functions.h > M fvwm/fvwm.h > M fvwm/misc.c > M fvwm/repeat.c > M fvwm/screen.h > M libs/FScreen.h > > Log Message: > ----------- > Convert special logic in __execute_command_line for functions ... > > ... that may move a window to a separate function flag. > > Move find_builtin_function() to functable.[ch]. > > Moved some functions to functable.[ch] and functable_complex.[ch]. > > This separation is needed for the parsing hooks. It was very difficult to get > the #icludes right. The DesktopsInfo structure was moved to libs/FScreen.h > so that the library does not depend on core header files anymore. > > Move WindowConditionMask from mvwm.h to conditional.h. > > Finish 1st draft of hook implementation (__execute_command_line) > > > Commit: 5f747ebc65614dd91906bb8bfbcf7f73452fa7ec > > https://github.com/fvwmorg/fvwm/commit/5f747ebc65614dd91906bb8bfbcf7f73452fa7ec > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/cmdparser.h > M fvwm/cmdparser_hooks.h > M fvwm/cmdparser_old.c > M fvwm/expand.c > M fvwm/functions.c > > Log Message: > ----------- > Split pos_args into a string with all positional args and an array. > > > Commit: 6c1872dd38731d9a5a8f42bcfa5a2b36f5b73149 > > https://github.com/fvwmorg/fvwm/commit/6c1872dd38731d9a5a8f42bcfa5a2b36f5b73149 > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/builtins.c > M fvwm/events.c > > Log Message: > ----------- > Update execute_function calls for libstroke. > > > Commit: fd9bf7044023134b056ca85be61ae45a08345c47 > > https://github.com/fvwmorg/fvwm/commit/fd9bf7044023134b056ca85be61ae45a08345c47 > Author: Dominik Vogt <dominik.v...@gmx.de> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/cmdparser_old.c > M fvwm/functions.c > M fvwm/modconf.c > M modules/FvwmButtons/dynamic.c > > Log Message: > ----------- > !!!debug fprintfs > > > Commit: 830f0fada1254f92245d445a5efc0f9f114e0805 > > https://github.com/fvwmorg/fvwm/commit/830f0fada1254f92245d445a5efc0f9f114e0805 > Author: Thomas Adam <tho...@fvwm.org> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M libs/FScreen.h > > Log Message: > ----------- > Reinstate libs/FScreen.h > > > Commit: db3c3dea3be2029e27694636067caf793c1ae714 > > https://github.com/fvwmorg/fvwm/commit/db3c3dea3be2029e27694636067caf793c1ae714 > Author: Thomas Adam <tho...@fvwm.org> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/conditional.h > > Log Message: > ----------- > Add missing field to WindowConditionMask > > > Commit: 3e4bb9680203d93e9a1307fe48c924b9862c8639 > > https://github.com/fvwmorg/fvwm/commit/3e4bb9680203d93e9a1307fe48c924b9862c8639 > Author: Thomas Adam <tho...@fvwm.org> > Date: 2016-10-25 (Tue, 25 Oct 2016) > > Changed paths: > M fvwm/functable.c > M fvwm/functable_complex.c > M fvwm/functions.c > > Log Message: > ----------- > Fixup mvwm-specific fallout > > > Compare: https://github.com/fvwmorg/fvwm/compare/1d38f7a2727f^...3e4bb9680203 > > Ciao Dominik ^_^ ^_^ -- Dominik Vogt
