[Libreoffice-commits] core.git: Branch 'feature/priorities' - vcl/source

[Tobias Madl]

 vcl/source/app/svmain.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1769f834d9c199a75b48a897cc38bc878097be1
Author: Tobias Madl tobias.madl@gmail.com
Date:   Thu Jan 22 14:20:04 2015 +

Idle: Now using deinitialisation

Change-Id: I12290bed7e4f298ab90393b8de6e2b6e7061e53f

diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 3187f59..cd0ba59 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -390,7 +390,7 @@ void DeInitVCL()
 if ( pSVData-maAppData.mpIdleMgr )
 delete pSVData-maAppData.mpIdleMgr;
 Timer::ImplDeInitTimer();
-Idle::ImplDeInitIdle;
+Idle::ImplDeInitIdle();
 
 if ( pSVData-maWinData.mpMsgBoxImgList )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - vcl/source

[Tobias Madl]

 vcl/source/app/svapp.cxx |4 +++-
 vcl/source/app/timer.cxx |3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a373e59936a31a81d013869cf3b6cec2711ddab7
Author: Tobias Madl tobias.madl@gmail.com
Date:   Tue Jan 13 09:14:46 2015 +

Idle: Better place for Idle handling

Change-Id: I2e5462544d83572e8206bb1db92a2b9df032281b

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 0ed3219..cba619a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -354,9 +354,11 @@ inline void ImplYield( bool i_bWait, bool i_bAllEvents )
 {
 while ( pSVData-mbNotAllTimerCalled )
 Timer::ImplTimerCallbackProc();
-Timer::Timer::ProcessAllIdleHandlers();
 }
 
+//Process all idles
+Timer::Timer::ProcessAllIdleHandlers();
+
 pSVData-maAppData.mnDispatchLevel++;
 // do not wait for events if application was already quit; in that
 // case only dispatch events already available
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 0dea56d..0348543 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -234,7 +234,8 @@ void Timer::ImplTimerCallbackProc()
 void Timer::ProcessAllIdleHandlers()
 {
 // process all pending Idle timers
-while (ImplTimerData* pTimerData =
+ImplTimerData* pTimerData;
+while (pTimerData =
 ImplTimerData::GetFirstIdle())
 {
 pTimerData-Invoke();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - vcl/source

[Tobias Madl]

 vcl/source/app/timer.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 921da06de1d246652665c6dd535fd50c68647f74
Author: Tobias Madl tobias.madl@gmail.com
Date:   Wed Oct 29 15:17:32 2014 +

Minor bug fixes of scheduling process

Change-Id: I47ad343496aff29016941f6c894c517136f992d5

diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 894fb7a..bad6c1b 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -105,7 +105,7 @@ void Timer::ImplTimerCallbackProc()
 pSVData-mnTimerUpdate++;
 pSVData-mbNotAllTimerCalled = true;
 pTimerData = pSVData-mpFirstTimerData;
-pPrioFirstTimerData = pTimerData;
+pPrioFirstTimerData = NULL;
 
 while ( pTimerData )
 {
@@ -115,8 +115,9 @@ void Timer::ImplTimerCallbackProc()
  !pTimerData-mbDelete  !pTimerData-mbInTimeout )
 {
 // time has expired
-if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) = 
nTime )
+if ( (pTimerData-mnUpdateTime+pTimerData-mpTimer-mnTimeout) = 
nTime || pTimerData-mpTimer-GetPriority()  
pTimerData-mpTimer-GetDefaultPriority() )
 {
+
pTimerData-mpTimer-SetPriority(pTimerData-mpTimer-GetPriority() - 1);
 ImplTimerData* pCurrentTimer = pPrioFirstTimerData;
 pPrevTimerData = NULL;
 if(pCurrentTimer != pTimerData){
@@ -144,7 +145,6 @@ void Timer::ImplTimerCallbackProc()
 pCurrentTimer = pPrioFirstTimerData;
 }
 }
-
pTimerData-mpTimer-SetPriority(pTimerData-mpTimer-GetPriority() - 1);
 pPrioFirstTimerData = pCurrentTimer;
 }
 }
@@ -245,8 +245,8 @@ void Timer::ImplTimerCallbackProc()
 ImplStartTimer( pSVData, nMinPeriod );
 
 pSVData-mnTimerUpdate--;
-if(bAllTimerCalled)
-pSVData-mbNotAllTimerCalled = false;
+//if(bAllTimerCalled)
+pSVData-mbNotAllTimerCalled = false;
 }
 
 Timer::Timer():
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits