@@ -24,4 +24,5 @@ $wizard.add Shop $wizard.add Warehouse $wizard.add About $wizard.add Credits -$wizard.go_to PlayerLoader \ No newline at end of file +$wizard.go_to PlayerLoader +$wizard.maintain_active_display! \ No newline at end of file bakery @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>currentDocument</key> - <string>bakery</string> + <string>src/bakery_wizard.rb</string> <key>documents</key> <array> <dict> @@ -13,8 +13,6 @@ <string>bakery</string> <key>regexFolderFilter</key> <string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string> - <key>selected</key> - <true/> <key>sourceDirectory</key> <string></string> </dict> @@ -28,9 +26,9 @@ <key>caret</key> <dict> <key>column</key> - <integer>23</integer> + <integer>0</integer> <key>line</key> - <integer>7</integer> + <integer>16</integer> </dict> <key>firstVisibleColumn</key> <integer>0</integer> @@ -116,14 +114,14 @@ <key>caret</key> <dict> <key>column</key> - <integer>12</integer> + <integer>31</integer> <key>line</key> <integer>116</integer> </dict> <key>firstVisibleColumn</key> <integer>0</integer> <key>firstVisibleLine</key> - <integer>74</integer> + <integer>76</integer> </dict> <key>src/common/text_field.rb</key> <dict> @@ -199,6 +197,36 @@ <key>firstVisibleLine</key> <integer>0</integer> </dict> + <key>src/customer.rb</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>7</integer> + <key>line</key> + <integer>122</integer> + </dict> + <key>columnSelection</key> + <false/> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>0</integer> + <key>selectFrom</key> + <dict> + <key>column</key> + <integer>5</integer> + <key>line</key> + <integer>122</integer> + </dict> + <key>selectTo</key> + <dict> + <key>column</key> + <integer>9</integer> + <key>line</key> + <integer>122</integer> + </dict> + </dict> <key>src/decorator.rb</key> <dict> <key>caret</key> @@ -313,6 +341,20 @@ <key>firstVisibleLine</key> <integer>0</integer> </dict> + <key>src/welcome_menu.rb</key> + <dict> + <key>caret</key> + <dict> + <key>column</key> + <integer>0</integer> + <key>line</key> + <integer>0</integer> + </dict> + <key>firstVisibleColumn</key> + <integer>0</integer> + <key>firstVisibleLine</key> + <integer>0</integer> + </dict> <key>src/zorder.rb</key> <dict> <key>caret</key> @@ -364,7 +406,7 @@ <key>column</key> <integer>0</integer> <key>line</key> - <integer>7</integer> + <integer>0</integer> </dict> <key>firstVisibleColumn</key> <integer>0</integer> @@ -375,7 +417,9 @@ <key>openDocuments</key> <array> <string>bakery</string> + <string>src/customer.rb</string> <string>src/bakery_wizard.rb</string> + <string>src/welcome_menu.rb</string> <string>tmp/bakery.log</string> <string>src/init.rb</string> </array> bakery.tmproj @@ -92,7 +92,7 @@ class BakeryWizard def go_to requested_screen, *args window_change_req = WindowChangeRequest.new(requested_screen, args) - @window_change_request && $logger.debug("Ignoring window change request#{window_change_request}. Another request#{@window_change_request} is in progress.") && return + @window_change_request && $logger.debug("Ignoring window change request#{window_change_req}. Another request#{@window_change_request} is in progress.") && return $logger.debug("Will try to add a new window change request#{window_change_req} NOW.") @window_change_in_pregress.synchronize do $logger.debug("Adding Window change request for #{window_change_req}") @@ -101,19 +101,30 @@ class BakeryWizard Process.kill("USR1", Process.pid) end + def maintain_active_display! + loop do + @active_display_thread = Thread.new { @current_screen.show } + @active_display_thread.join + end + end + private def process_window_change_req @window_change_in_pregress.synchronize do - $logger.debug("[#{@window_change_request.inspect}] -> Attempting to change screen to #{@window_change_request}") - @current_screen && @current_screen.close - arguments = [@context, @window] + @window_change_request.arguments - @current_screen = @screens.find { |screen| screen == @window_change_request.requested_screen }.build(*arguments) - $logger.debug("[#{@window_change_request.inspect}] -> Killing active_display_thread(if there)") - @active_display_thread && @active_display_thread.kill - @active_display_thread = Thread.new { @current_screen.show } - @window_change_request = nil - $logger.debug("[#{@window_change_request}] -> Changed screen to #{@window_change_request} successfully") + resurrect_active_display end - @active_display_thread.join + $logger.debug("Returning the stack(was waiting for thread #{@active_display_thread.inspect}).") + end + + def resurrect_active_display + request_id = "[#{@window_change_request.inspect}] -> " + $logger.debug("#{request_id}Display resurrection initiated") + @current_screen && @current_screen.close + $logger.debug("#{request_id}Existing display refresh loop stoped") + arguments = [@context, @window] + @window_change_request.arguments + @current_screen = @screens.find { |screen| screen == @window_change_request.requested_screen }.build(*arguments) + @active_display_thread && @active_display_thread.kill + $logger.debug("#{request_id} Killed active display.") + @window_change_request = nil end end \ No newline at end of file src/bakery_wizard.rb cbd1a7bf5a739ac0d2b0f8d4c73460086f3fb205 Janmejay Singh singh.janmejay@gmail.com http://github.com/janmejay/bakery/commit/a4ea3b979c1c978e05c00b2077e10d70ad19a5ea a4ea3b979c1c978e05c00b2077e10d70ad19a5ea 2008-12-25T07:13:04-08:00 2008-12-25T07:13:04-08:00 made the display thread truly indipendent of event processing thread(worker thread) eb78bd233cc4fcf044cdd5c11fe4f7d702fec86a Janmejay Singh singh.janmejay@gmail.com