Move processNextEvent() code into sub functions

This commit is contained in:
Markus Gans 2016-06-25 14:33:43 +02:00
parent 396525d80f
commit e29e58acb6
3 changed files with 22 additions and 7 deletions

View File

@ -1,3 +1,6 @@
2016-06-25 Markus Gans <guru.mail@muenster.de>
* Move processNextEvent() code into sub functions
2016-06-22 Markus Gans <guru.mail@muenster.de> 2016-06-22 Markus Gans <guru.mail@muenster.de>
* Adding required updateTerminal() calls for FMenuBar * Adding required updateTerminal() calls for FMenuBar

View File

@ -1218,14 +1218,8 @@ int FApplication::processTimerEvent()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FApplication::processNextEvent() void FApplication::processTerminalUpdate()
{ {
int num_events = 0;
processKeyboardEvent();
processMouseEvent();
processResizeEvent();
if ( terminal_update_pending ) if ( terminal_update_pending )
{ {
if ( ! input_data_pending ) if ( ! input_data_pending )
@ -1245,7 +1239,11 @@ bool FApplication::processNextEvent()
else else
skipped_terminal_update++; skipped_terminal_update++;
} }
}
//----------------------------------------------------------------------
void FApplication::processCloseWidget()
{
if ( close_widget && ! close_widget->empty() ) if ( close_widget && ! close_widget->empty() )
{ {
widgetList::iterator iter; widgetList::iterator iter;
@ -1258,6 +1256,18 @@ bool FApplication::processNextEvent()
} }
close_widget->clear(); close_widget->clear();
} }
}
//----------------------------------------------------------------------
bool FApplication::processNextEvent()
{
int num_events = 0;
processKeyboardEvent();
processMouseEvent();
processResizeEvent();
processTerminalUpdate();
processCloseWidget();
sendQueuedEvents(); sendQueuedEvents();
num_events += processTimerEvent(); num_events += processTimerEvent();

View File

@ -137,6 +137,8 @@ class FApplication : public FWidget
void processMouseEvent(); void processMouseEvent();
void processResizeEvent(); void processResizeEvent();
int processTimerEvent(); int processTimerEvent();
void processTerminalUpdate();
void processCloseWidget();
bool processNextEvent(); bool processNextEvent();
friend class FDialog; friend class FDialog;
friend class FWidget; friend class FWidget;