Kaydet (Commit) d2038058 authored tarafından Caolán McNamara's avatar Caolán McNamara

move all X11SalData stuff together

Change-Id: I2dc27e8aa0231ad66955721029f61720d757967f
üst 495ad69a
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "salinst.hxx" #include "salinst.hxx"
#include "saltimer.hxx"
#include <osl/signal.h> #include <osl/signal.h>
#include <osl/thread.h> #include <osl/thread.h>
...@@ -564,6 +565,13 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) ...@@ -564,6 +565,13 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent )
m_aXErrorHandlerStack.back().m_bWas = true; m_aXErrorHandlerStack.back().m_bWas = true;
} }
void X11SalData::Timeout( bool idle )
{
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->mpSalTimer )
pSVData->mpSalTimer->CallCallback( idle );
}
struct YieldEntry struct YieldEntry
{ {
int fd; // file descriptor for reading int fd; // file descriptor for reading
......
...@@ -23,18 +23,10 @@ ...@@ -23,18 +23,10 @@
#include <unistd.h> #include <unistd.h>
#include <unx/salunx.h> #include <unx/salunx.h>
#include <unx/saldata.hxx>
#include <unx/saldisp.hxx> #include <unx/saldisp.hxx>
#include <unx/saltimer.h> #include <unx/saltimer.h>
#include <unx/salinst.h> #include <unx/salinst.h>
void X11SalData::Timeout( bool idle )
{
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->mpSalTimer )
pSVData->mpSalTimer->CallCallback( idle );
}
void SalXLib::StopTimer() void SalXLib::StopTimer()
{ {
m_aTimeout.tv_sec = 0; m_aTimeout.tv_sec = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment