[yast-commit] r43743 - in /trunk/ncurses/src: NCurses.cc NCurses.h YNCursesComponent.h YNCursesUI.cc

Author: kmachalkova Date: Fri Jan 18 17:41:22 2008 New Revision: 43743 URL: http://svn.opensuse.org/viewcvs/yast?rev=43743&view=rev Log: Running separate UI-thread re-enables (adjusted idleLoop, file descriptor saving/restoring) Modified: trunk/ncurses/src/NCurses.cc trunk/ncurses/src/NCurses.h trunk/ncurses/src/YNCursesComponent.h trunk/ncurses/src/YNCursesUI.cc Modified: trunk/ncurses/src/NCurses.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCurses.cc?rev=43743&r1=43742&r2=43743&view=diff ============================================================================== --- trunk/ncurses/src/NCurses.cc (original) +++ trunk/ncurses/src/NCurses.cc Fri Jan 18 17:41:22 2008 @@ -271,11 +271,10 @@ } } - //FIXME: Enable these with multithread support //duplicate stdout and stderr before redirecting them to log //so that they can be regenerated before system() call - //stdout_save = dup(1); - //stderr_save = dup(2); + stdout_save = dup(1); + stderr_save = dup(2); RedirectToLog(); Modified: trunk/ncurses/src/NCurses.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCurses.h?rev=43743&r1=43742&r2=43743&view=diff ============================================================================== --- trunk/ncurses/src/NCurses.h (original) +++ trunk/ncurses/src/NCurses.h Fri Jan 18 17:41:22 2008 @@ -180,9 +180,8 @@ NCurses(); virtual ~NCurses(); - //FIXME: Enable these with multithread support - //int stdout_save; - //int stderr_save; + int stdout_save; + int stderr_save; static int cols() { return ::COLS; } static int lines() { return ::LINES; } Modified: trunk/ncurses/src/YNCursesComponent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesComponent.h?rev=43743&r1=43742&r2=43743&view=diff ============================================================================== --- trunk/ncurses/src/YNCursesComponent.h (original) +++ trunk/ncurses/src/YNCursesComponent.h Fri Jan 18 17:41:22 2008 @@ -43,7 +43,7 @@ const char * macro_file ) { // FIXME - with_threads = false; + //with_threads = false; return new YNCursesUI( argc, argv, with_threads, macro_file ); } Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=43743&r1=43742&r2=43743&view=diff ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Fri Jan 18 17:41:22 2008 @@ -135,7 +135,6 @@ // void YNCursesUI::idleLoop( int fd_ycp ) { - NCDialog * ncd = static_cast( YDialog::currentDialog() ); int timeout = 5; struct timeval tv; @@ -156,8 +155,15 @@ if ( errno != EINTR ) UIINT << "idleLoop error in select() (" << errno << ')' << endl; } else if ( retval != 0 ) { - if( ncd ) { - ncd->idleInput(); + //do not throw here, as current dialog may not necessarily exist yet + //if we have threads + YDialog *currentDialog = YDialog::currentDialog( false ); + + if (currentDialog) { + NCDialog * ncd = static_cast( currentDialog ); + if( ncd ) { + ncd->idleInput(); + } } } // else no input within timeout sec. } while ( !FD_ISSET( fd_ycp, &fdset ) ); @@ -442,11 +448,10 @@ ::def_prog_mode(); ::endwin(); - //FIXME: Enable these with multithread support //Regenerate saved stdout and stderr, so that app called //via system() can use them and draw something to the terminal - //dup2(NCurses::stdout_save, 1); - //dup2(NCurses::stderr_save, 2); + dup2(NCurses::stdout_save, 1); + dup2(NCurses::stderr_save, 2); //Call external program ret = system(cmd.c_str()); @@ -456,9 +461,8 @@ NCERR << cmd << " returned:" << ret << endl; } - //FIXME: Enable these with multithread support //Redirect stdout and stderr to y2log again - //NCurses::RedirectToLog(); + NCurses::RedirectToLog(); //Resume tty modes and refresh the screen ::reset_prog_mode(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org