Author: mvidner Date: Fri Aug 3 17:54:22 2007 New Revision: 39954 URL: http://svn.opensuse.org/viewcvs/yast?rev=39954&view=rev Log: brought back macro block playing Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace?rev=39954&r1=39953&r2=39954&view=diff ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace Fri Aug 3 17:54:22 2007 @@ -32,7 +32,7 @@ Y2UINamespace: created, copying code from YUI_bindings. - FIXME overloading -- FIXME macro player +- FIXME macro player: should work now, test Removed UI.h that served to register the builtins. (TODO: the docs is still done in builtin style. Take it as inspiration.) Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc?rev=39954&r1=39953&r2=39954&view=diff ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc Fri Aug 3 17:54:22 2007 @@ -615,10 +615,11 @@ // ------------- -Y2UIFunction::Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos) : +Y2UIFunction::Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos, bool play_macro_blocks) : m_position (pos) , m_instance (instance) , m_comp (comp) +, m_play_macro_blocks (play_macro_blocks) , m_param1 ( YCPNull () ) , m_param2 ( YCPNull () ) , m_param3 ( YCPNull () ) @@ -690,20 +691,13 @@ m_comp->createUI(); } - YCPValue ret = YCPVoid(); - -/* FIXME: - if ( macroPlayer ) + if ( m_play_macro_blocks && m_comp->ui ()->playingMacro () ) { - if ( function == UIUserInput || - function == UITimeoutUserInput || - function == UIWaitForEvent || - function == UIWaitForEventTimeout ) - { - playNextMacroBlock (); - } + m_comp->ui ()->playNextMacroBlock (); } -*/ + + YCPValue ret = YCPVoid(); + if ( m_comp->ui ()-> threads () ) { m_comp->ui ()->_builtinCallData.function = this; @@ -788,10 +782,12 @@ return NULL; } + bool play_macro_blocks = (name == "UserInput" || name == "TimeoutUserInput" || name == "WaitForEvent"); + // FIXME: // here we assume the linear adding of symbols to m_symbols // this holds so far, but might fall apart easily - return new Y2UIFunction (this, m_comp, it- m_symbols.begin ()); + return new Y2UIFunction (this, m_comp, it- m_symbols.begin (), play_macro_blocks); } void Y2UINamespace::registerFunctions() Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h?rev=39954&r1=39953&r2=39954&view=diff ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h Fri Aug 3 17:54:22 2007 @@ -41,6 +41,7 @@ unsigned int m_position; Y2UINamespace* m_instance; YUIComponent* m_comp; + bool m_play_macro_blocks; YCPValue m_param1; YCPValue m_param2; YCPValue m_param3; @@ -48,7 +49,8 @@ YCPValue m_param5; public: - Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos); + Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos, bool play_macro_blocks); + bool attachParameter (const YCPValue& arg, const int position); constTypePtr wantedParameterType () const; bool appendParameter (const YCPValue& arg); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org