wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
: m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
- m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
- m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
+ m_buffer_size(0), m_fixed(TRUE), m_flushable(TRUE), m_stream(&stream),
m_mode(mode), m_destroybuf(FALSE), m_destroystream(FALSE)
{
}
wxStreamBuffer::wxStreamBuffer(BufMode mode)
: m_buffer_start(NULL), m_buffer_end(NULL), m_buffer_pos(NULL),
- m_buffer_size(0), m_wback(NULL), m_wbacksize(0), m_wbackcur(0),
- m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
+ m_buffer_size(0), m_fixed(TRUE), m_flushable(FALSE), m_stream(NULL),
m_mode(mode), m_destroybuf(FALSE), m_destroystream(TRUE)
{
m_stream = new wxStreamBase();
m_mode = buffer.m_mode;
m_destroybuf = FALSE;
m_destroystream = FALSE;
- m_wback = NULL;
- m_wbacksize = 0;
- m_wbackcur = 0;
}
wxStreamBuffer::~wxStreamBuffer()
{
- if (m_wback)
- free(m_wback);
if (m_destroybuf)
wxDELETEA(m_buffer_start);
if (m_destroystream)
delete m_stream;
}
-size_t wxStreamBuffer::WriteBack(const char *buf, size_t bufsize)
-{
- char *ptrback;
-
- if (m_mode != read)
- return 0;
-
- ptrback = AllocSpaceWBack(bufsize);
- if (!ptrback)
- return 0;
-
- memcpy(ptrback, buf, bufsize);
- return bufsize;
-}
-
-bool wxStreamBuffer::WriteBack(char c)
-{
- char *ptrback;
-
- ptrback = AllocSpaceWBack(1);
- if (!ptrback)
- return FALSE;
-
- *ptrback = c;
- return TRUE;
-}
-
void wxStreamBuffer::SetBufferIO(char *buffer_start, char *buffer_end)
{
if (m_destroybuf)
m_buffer_pos = m_buffer_start;
}
-char *wxStreamBuffer::AllocSpaceWBack(size_t needed_size)
-{
- char *temp_b;
-
- m_wbacksize += needed_size;
-
- if (!m_wback)
- temp_b = (char *)malloc(m_wbacksize);
- else
- temp_b = (char *)realloc(m_wback, m_wbacksize);
-
- if (!temp_b)
- return NULL;
- m_wback = temp_b;
-
- return (char *)(m_wback+(m_wbacksize-needed_size));
-}
-
-size_t wxStreamBuffer::GetWBack(char *buf, size_t bsize)
-{
- size_t s_toget = m_wbacksize-m_wbackcur;
-
- if (bsize < s_toget)
- s_toget = bsize;
-
- memcpy(buf, (m_wback+m_wbackcur), s_toget);
-
- m_wbackcur += s_toget;
- if (m_wbackcur == m_wbacksize) {
- free(m_wback);
- m_wback = (char *)NULL;
- m_wbacksize = 0;
- m_wbackcur = 0;
- }
-
- return s_toget;
-}
-
bool wxStreamBuffer::FillBuffer()
{
size_t count;
m_stream->m_lastcount = 1;
}
+char wxStreamBuffer::Peek()
+{
+ char c;
+
+ wxASSERT(m_stream != NULL && m_buffer_size != 0);
+
+ if (!GetDataLeft()) {
+ CHECK_ERROR(wxStream_READ_ERR);
+ return 0;
+ }
+
+ GetFromBuffer(&c, 1);
+ m_buffer_pos--;
+
+ return c;
+}
+
char wxStreamBuffer::GetChar()
{
char c;
}
GetFromBuffer(&c, 1);
+
m_stream->m_lastcount = 1;
return c;
}
// ------------------
m_stream->m_lasterror = wxStream_NOERROR;
- m_stream->m_lastcount = GetWBack((char *)buffer, size);
- size -= m_stream->m_lastcount;
- if (size == 0)
- return m_stream->m_lastcount;
-
- buffer = (void *)((char *)buffer+m_stream->m_lastcount);
-
if (!m_buffer_size)
return (m_stream->m_lastcount += m_stream->OnSysRead(buffer, size));
buffer = (char *)buffer + buf_left; // ANSI C++ violation.
if (!FillBuffer()) {
- CHECK_ERROR(wxStream_READ_ERR);
+ CHECK_ERROR(wxStream_EOF);
return (m_stream->m_lastcount = orig_size-size);
}
} else {
{
char buf[BUF_TEMP_SIZE];
size_t s = 0, bytes_count = BUF_TEMP_SIZE, b_count2;
+ wxInputStream *in_stream;
if (m_mode == read)
return 0;
+ in_stream = (wxInputStream *)sbuf->Stream();
+
while (bytes_count == BUF_TEMP_SIZE) {
b_count2 = sbuf->Read(buf, bytes_count);
bytes_count = Write(buf, b_count2);
if (b_count2 > bytes_count)
- sbuf->WriteBack(buf+bytes_count, b_count2-bytes_count);
+ in_stream->Ungetch(buf+bytes_count, b_count2-bytes_count);
s += bytes_count;
}
return s;
diff = pos + GetIntPosition();
if ( (diff > last_access) || (diff < 0) ) {
- ret_off = m_stream->OnSysSeek(pos, wxFromCurrent);
+ // We must take into account the fact that we have read something
+ // previously.
+ ret_off = m_stream->OnSysSeek(diff-last_access, wxFromCurrent);
ResetBuffer();
return ret_off;
} else {
// ----------------------------------------------------------------------------
wxInputStream::wxInputStream()
- : wxStreamBase()
+ : wxStreamBase(),
+ m_wback(NULL), m_wbacksize(0), m_wbackcur(0)
{
- m_i_destroybuf = TRUE;
- m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
}
-wxInputStream::wxInputStream(wxStreamBuffer *buffer)
- : wxStreamBase()
+wxInputStream::~wxInputStream()
{
- m_i_destroybuf = FALSE;
- m_i_streambuf = buffer;
+ if (m_wback)
+ free(m_wback);
}
-wxInputStream::~wxInputStream()
+char *wxInputStream::AllocSpaceWBack(size_t needed_size)
{
- if (m_i_destroybuf)
- delete m_i_streambuf;
+ char *temp_b;
+
+ m_wbacksize += needed_size;
+
+ if (!m_wback)
+ temp_b = (char *)malloc(m_wbacksize);
+ else
+ temp_b = (char *)realloc(m_wback, m_wbacksize);
+
+ if (!temp_b)
+ return NULL;
+ m_wback = temp_b;
+
+ return (char *)(m_wback+(m_wbacksize-needed_size));
+}
+
+size_t wxInputStream::GetWBack(char *buf, size_t bsize)
+{
+ size_t s_toget = m_wbacksize-m_wbackcur;
+
+ if (!m_wback)
+ return 0;
+
+ if (bsize < s_toget)
+ s_toget = bsize;
+
+ memcpy(buf, (m_wback+m_wbackcur), s_toget);
+
+ m_wbackcur += s_toget;
+ if (m_wbackcur == m_wbacksize) {
+ free(m_wback);
+ m_wback = (char *)NULL;
+ m_wbacksize = 0;
+ m_wbackcur = 0;
+ }
+
+ return s_toget;
+}
+
+size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
+{
+ char *ptrback;
+
+ ptrback = AllocSpaceWBack(bufsize);
+ if (!ptrback)
+ return 0;
+
+ memcpy(ptrback, buf, bufsize);
+ return bufsize;
+}
+
+bool wxInputStream::Ungetch(char c)
+{
+ char *ptrback;
+
+ ptrback = AllocSpaceWBack(1);
+ if (!ptrback)
+ return FALSE;
+
+ *ptrback = c;
+ return TRUE;
}
char wxInputStream::GetC()
{
char c;
- m_i_streambuf->Read(&c, 1);
+ Read(&c, 1);
return c;
}
wxInputStream& wxInputStream::Read(void *buffer, size_t size)
{
- m_i_streambuf->Read(buffer, size);
- // wxStreamBuffer sets all variables for us
+ size_t retsize;
+ char *buf = (char *)buffer;
+
+ retsize = GetWBack(buf, size);
+ if (retsize == size) {
+ m_lastcount = size;
+ m_lasterror = wxStream_NOERROR;
+ return *this;
+ }
+ size -= retsize;
+ buf += retsize;
+
+ m_lastcount = OnSysRead(buf, size);
return *this;
}
char wxInputStream::Peek()
{
- m_i_streambuf->GetDataLeft();
+ char c;
- return *(m_i_streambuf->GetBufferPos());
+ Read(&c, 1);
+ if (m_lasterror == wxStream_NOERROR) {
+ Ungetch(c);
+ return c;
+ }
+ return 0;
}
-
wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
{
char buf[BUF_TEMP_SIZE];
off_t wxInputStream::SeekI(off_t pos, wxSeekMode mode)
{
- return m_i_streambuf->Seek(pos, mode);
+ //should be check and improve, just to remove a slight bug !
+ // I don't know whether it should be put as well in wxFileInputStream::OnSysSeek ?
+ if (m_lasterror==wxSTREAM_EOF) m_lasterror=wxSTREAM_NOERROR;
+
+ return OnSysSeek(pos, mode);
}
off_t wxInputStream::TellI() const
{
- return m_i_streambuf->Tell();
+ return OnSysTell();
}
// --------------------
// Overloaded operators
// --------------------
-wxInputStream& wxInputStream::operator>>(wxString& line)
+#if wxUSE_SERIAL
+wxInputStream& wxInputStream::operator>>(wxObject *& obj)
{
- wxDataInputStream s(*this);
-
- line = s.ReadLine();
+ wxObjectInputStream obj_s(*this);
+ obj = obj_s.LoadObject();
return *this;
}
+#endif
+
-wxInputStream& wxInputStream::operator>>(char& c)
+// ----------------------------------------------------------------------------
+// wxOutputStream
+// ----------------------------------------------------------------------------
+wxOutputStream::wxOutputStream()
+ : wxStreamBase()
{
- c = GetC();
- return *this;
}
-wxInputStream& wxInputStream::operator>>(short& i)
+wxOutputStream::~wxOutputStream()
{
- long l;
+}
- *this >> l;
- i = (short)l;
+wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
+{
+ m_lastcount = OnSysWrite(buffer, size);
return *this;
}
-wxInputStream& wxInputStream::operator>>(int& i)
+wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
{
- long l;
-
- *this >> l;
- i = (short)l;
+ stream_in.Read(*this);
return *this;
}
-wxInputStream& wxInputStream::operator>>(long& i)
+off_t wxOutputStream::TellO() const
{
- /* I only implemented a simple integer parser */
- int c, sign;
-
- while (isspace( c = GetC() ) )
- /* Do nothing */ ;
+ return OnSysTell();
+}
- i = 0;
- if (! (c == '-' || isdigit(c)) ) {
- InputStreamBuffer()->WriteBack(c);
- return *this;
- }
+off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
+{
+ return OnSysSeek(pos, mode);
+}
- if (c == '-') {
- sign = -1;
- c = GetC();
- } else
- sign = 1;
+void wxOutputStream::Sync()
+{
+}
- while (isdigit(c)) {
- i = i*10 + c;
- c = GetC();
- }
+#if wxUSE_SERIAL
+wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
+{
+ wxObjectOutputStream obj_s(*this);
+ obj_s.SaveObject(obj);
+ return *this;
+}
+#endif
- i *= sign;
+// ----------------------------------------------------------------------------
+// wxCountingOutputStream
+// ----------------------------------------------------------------------------
- return *this;
+wxCountingOutputStream::wxCountingOutputStream ()
+ : wxOutputStream()
+{
+ m_currentPos = 0;
}
-wxInputStream& wxInputStream::operator>>(double& f)
+size_t wxCountingOutputStream::GetSize() const
{
- /* I only implemented a simple float parser */
- int c, sign;
+ return m_lastcount;
+}
- while (isspace( c = GetC() ) )
- /* Do nothing */ ;
+size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer), size_t size)
+{
+ m_currentPos += size;
+ if (m_currentPos > m_lastcount) m_lastcount = m_currentPos;
+ return m_currentPos;
+}
- f = 0.0;
- if (! (c == '-' || isdigit(c)) ) {
- InputStreamBuffer()->WriteBack(c);
- return *this;
+off_t wxCountingOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+{
+ if (mode == wxFromStart)
+ {
+ m_currentPos = pos;
}
-
- if (c == '-') {
- sign = -1;
- c = GetC();
- } else
- sign = 1;
-
- while (isdigit(c)) {
- f = f*10 + (c - '0');
- c = GetC();
+ if (mode == wxFromEnd)
+ {
+ m_currentPos = m_lastcount + pos;
}
-
- if (c == '.') {
- double f_multiplicator = (double) 0.1;
- c = GetC();
-
- while (isdigit(c)) {
- f += (c-'0')*f_multiplicator;
- f_multiplicator /= 10;
- c = GetC();
- }
+ else
+ {
+ m_currentPos += pos;
}
-
- f *= sign;
-
- return *this;
+ if (m_currentPos > m_lastcount) m_lastcount = m_currentPos;
+
+ return m_currentPos; // ?
}
-#if wxUSE_SERIAL
-wxInputStream& wxInputStream::operator>>(wxObject *& obj)
+off_t wxCountingOutputStream::OnSysTell() const
{
- wxObjectInputStream obj_s(*this);
- obj = obj_s.LoadObject();
- return *this;
+ return m_currentPos; // ?
}
-#endif
-
-
+
// ----------------------------------------------------------------------------
-// wxOutputStream
+// wxFilterInputStream
// ----------------------------------------------------------------------------
-wxOutputStream::wxOutputStream()
- : wxStreamBase()
+
+wxFilterInputStream::wxFilterInputStream()
+ : wxInputStream()
{
- m_o_destroybuf = TRUE;
- m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
}
-wxOutputStream::wxOutputStream(wxStreamBuffer *buffer)
- : wxStreamBase()
+wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
+ : wxInputStream()
{
- m_o_destroybuf = FALSE;
- m_o_streambuf = buffer;
+ m_parent_i_stream = &stream;
}
-wxOutputStream::~wxOutputStream()
+wxFilterInputStream::~wxFilterInputStream()
{
- if (m_o_destroybuf)
- delete m_o_streambuf;
}
-wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
+// ----------------------------------------------------------------------------
+// wxFilterOutputStream
+// ----------------------------------------------------------------------------
+wxFilterOutputStream::wxFilterOutputStream()
+ : wxOutputStream()
{
- m_o_streambuf->Write(buffer, size);
- return *this;
}
-wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
+wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
+ : wxOutputStream()
{
- stream_in.Read(*this);
- return *this;
+ m_parent_o_stream = &stream;
}
-off_t wxOutputStream::TellO() const
+wxFilterOutputStream::~wxFilterOutputStream()
{
- return m_o_streambuf->Tell();
}
-off_t wxOutputStream::SeekO(off_t pos, wxSeekMode mode)
+// ----------------------------------------------------------------------------
+// wxBufferedInputStream
+// ----------------------------------------------------------------------------
+wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s)
+ : wxFilterInputStream(s)
{
- return m_o_streambuf->Seek(pos, mode);
+ m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
+ m_i_streambuf->SetBufferIO(1024);
}
-void wxOutputStream::Sync()
+wxBufferedInputStream::~wxBufferedInputStream()
{
- m_o_streambuf->FlushBuffer();
+ delete m_i_streambuf;
}
-wxOutputStream& wxOutputStream::operator<<(const char *string)
+char wxBufferedInputStream::Peek()
{
- return Write(string, strlen(string));
+ return m_i_streambuf->Peek();
}
-wxOutputStream& wxOutputStream::operator<<(wxString& string)
+wxInputStream& wxBufferedInputStream::Read(void *buffer, size_t size)
{
-#if wxUSE_UNICODE
- const wxWX2MBbuf buf = string.mb_str();
- return *this << buf;
-#else
- return Write(string, string.Len());
-#endif
+ size_t retsize;
+ char *buf = (char *)buffer;
+
+ retsize = GetWBack(buf, size);
+ m_lastcount = retsize;
+ if (retsize == size) {
+ m_lasterror = wxStream_NOERROR;
+ return *this;
+ }
+ size -= retsize;
+ buf += retsize;
+
+ m_i_streambuf->Read(buf, size);
+
+ return *this;
}
-wxOutputStream& wxOutputStream::operator<<(char c)
+off_t wxBufferedInputStream::SeekI(off_t pos, wxSeekMode mode)
{
- return Write(&c, 1);
+ return m_i_streambuf->Seek(pos, mode);
}
-wxOutputStream& wxOutputStream::operator<<(short i)
+off_t wxBufferedInputStream::TellI() const
{
- wxString strint;
-
- strint.Printf(_T("%i"), i);
- return *this << strint;
+ return m_i_streambuf->Tell();
}
-wxOutputStream& wxOutputStream::operator<<(int i)
+size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize)
{
- wxString strint;
-
- strint.Printf(_T("%i"), i);
- return *this << strint;
+ return m_parent_i_stream->Read(buffer, bufsize).LastRead();
}
-wxOutputStream& wxOutputStream::operator<<(long i)
+off_t wxBufferedInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
{
- wxString strlong;
+ return m_parent_i_stream->SeekI(seek, mode);
+}
- strlong.Printf(_T("%i"), i);
- return *this << strlong;
+off_t wxBufferedInputStream::OnSysTell() const
+{
+ return m_parent_i_stream->TellI();
}
-wxOutputStream& wxOutputStream::operator<<(double f)
+// ----------------------------------------------------------------------------
+// wxBufferedOutputStream
+// ----------------------------------------------------------------------------
+
+wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s)
+ : wxFilterOutputStream(s)
{
- wxString strfloat;
+ m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+ m_o_streambuf->SetBufferIO(1024);
+}
- strfloat.Printf(_T("%f"), f);
- return *this << strfloat;
+wxBufferedOutputStream::~wxBufferedOutputStream()
+{
+ delete m_o_streambuf;
}
-#if wxUSE_SERIAL
-wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
+wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
{
- wxObjectOutputStream obj_s(*this);
- obj_s.SaveObject(obj);
+ m_lastcount = 0;
+ m_o_streambuf->Write(buffer, size);
return *this;
}
-#endif
-// ----------------------------------------------------------------------------
-// wxFilterInputStream
-// ----------------------------------------------------------------------------
-wxFilterInputStream::wxFilterInputStream()
- : wxInputStream(NULL)
+off_t wxBufferedOutputStream::SeekO(off_t pos, wxSeekMode mode)
{
- // WARNING streambuf set to NULL !
+ return m_o_streambuf->Seek(pos, mode);
}
-wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
- : wxInputStream(stream.InputStreamBuffer())
+off_t wxBufferedOutputStream::TellO() const
{
- m_parent_i_stream = &stream;
+ return m_o_streambuf->Tell();
}
-wxFilterInputStream::~wxFilterInputStream()
+void wxBufferedOutputStream::Sync()
{
+ m_o_streambuf->FlushBuffer();
+ m_parent_o_stream->Sync();
}
-// ----------------------------------------------------------------------------
-// wxFilterOutputStream
-// ----------------------------------------------------------------------------
-wxFilterOutputStream::wxFilterOutputStream()
- : wxOutputStream(NULL)
+size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
{
+ return m_parent_o_stream->Write(buffer, bufsize).LastWrite();
}
-wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
- : wxOutputStream(stream.OutputStreamBuffer())
+off_t wxBufferedOutputStream::OnSysSeek(off_t seek, wxSeekMode mode)
{
- m_parent_o_stream = &stream;
+ return m_parent_o_stream->SeekO(seek, mode);
}
-wxFilterOutputStream::~wxFilterOutputStream()
+off_t wxBufferedOutputStream::OnSysTell() const
{
+ return m_parent_o_stream->TellO();
}
// ----------------------------------------------------------------------------
{
#ifdef __MSW__
return stream.Write("\r\n", 2);
+#else
+#ifdef __WXMAC__
+ return stream.Write("\r", 1);
#else
return stream.Write("\n", 1);
#endif
+#endif
}
#endif
projects / wxWidgets.git / blobdiff