Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tried to fix some socket things. Wasn't enough.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-29 17:18:41 +00:00
parent 2b9bd418c5
commit db13126198
4 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/event.h
View File

@@ -50,6 +50,9 @@ const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_FIRST + 15;
const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16; const wxEventType wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_FIRST + 16;
const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17; const wxEventType wxEVT_COMMAND_TOOL_ENTER = wxEVT_FIRST + 17;
/* Sockets send events, too */
const wxEventType wxEVT_SOCKET = wxEVT_FIRST + 50;
/* Mouse event types */ /* Mouse event types */
const wxEventType wxEVT_LEFT_DOWN = wxEVT_FIRST + 100; const wxEventType wxEVT_LEFT_DOWN = wxEVT_FIRST + 100;
const wxEventType wxEVT_LEFT_UP = wxEVT_FIRST + 101; const wxEventType wxEVT_LEFT_UP = wxEVT_FIRST + 101;
@@ -66,7 +69,7 @@ const wxEventType wxEVT_RIGHT_DCLICK = wxEVT_FIRST + 111;
const wxEventType wxEVT_SET_FOCUS = wxEVT_FIRST + 112; const wxEventType wxEVT_SET_FOCUS = wxEVT_FIRST + 112;
const wxEventType wxEVT_KILL_FOCUS = wxEVT_FIRST + 113; const wxEventType wxEVT_KILL_FOCUS = wxEVT_FIRST + 113;
// Non-client mouse events /* Non-client mouse events */
const wxEventType wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200; const wxEventType wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 200;
const wxEventType wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201; const wxEventType wxEVT_NC_LEFT_UP = wxEVT_FIRST + 201;
const wxEventType wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202; const wxEventType wxEVT_NC_MIDDLE_DOWN = wxEVT_FIRST + 202;
@@ -139,8 +142,7 @@ const wxEventType wxEVT_UPDATE_UI = wxEVT_FIRST + 439;
const wxEventType wxEVT_END_PROCESS = wxEVT_FIRST + 440; const wxEventType wxEVT_END_PROCESS = wxEVT_FIRST + 440;
/* Generic command events */ /* Generic command events */
// Note: a click is a higher-level event /* Note: a click is a higher-level event than button down/up */
// than button down/up
const wxEventType wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500; const wxEventType wxEVT_COMMAND_LEFT_CLICK = wxEVT_FIRST + 500;
const wxEventType wxEVT_COMMAND_LEFT_DCLICK = wxEVT_FIRST + 501; const wxEventType wxEVT_COMMAND_LEFT_DCLICK = wxEVT_FIRST + 501;
const wxEventType wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502; const wxEventType wxEVT_COMMAND_RIGHT_CLICK = wxEVT_FIRST + 502;
@@ -189,7 +191,7 @@ const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED = wxEVT_FIRST + 800;
const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801; const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING = wxEVT_FIRST + 801;
#if defined(__BORLANDC__) && defined(__WIN16__) #if defined(__BORLANDC__) && defined(__WIN16__)
// For 16-bit BC++, these 2 are identical (truncated) /* For 16-bit BC++, these 2 are identical (truncated) */
const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGED = wxEVT_FIRST + 802; const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGED = wxEVT_FIRST + 802;
const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGING = wxEVT_FIRST + 803; const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGING = wxEVT_FIRST + 803;
#else #else
@@ -199,7 +201,7 @@ const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_FIRST + 803;
const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000; const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
// Compatibility /* Compatibility */
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY

6
include/wx/socket.h
View File

@@ -329,8 +329,8 @@ public:
typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&); typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
#define wxEVT_SOCKET wxEVT_FIRST+301 #define EVT_SOCKET(id, func) { wxEVT_SOCKET, id, 0, \
(wxObjectEventFunction) (wxEventFunction) (wxSocketEventFunction) & func, \
#define EVT_SOCKET(id, func) { wxEVT_SOCKET, id, 0, (wxObjectEventFunction) (wxEventFunction) (wxSocketEventFunction) & func }, (wxObject *) NULL },
#endif #endif

20
samples/wxsocket/client.cpp
View File

@@ -69,13 +69,13 @@ public:
}; };
// ID for the menu quit command // ID for the menu quit command
const SKDEMO_QUIT = 101; const int SKDEMO_QUIT = 101;
const SKDEMO_CONNECT = 102; const int SKDEMO_CONNECT = 102;
const SKDEMO_TEST1 = 103; const int SKDEMO_TEST1 = 103;
const SKDEMO_TEST2 = 104; const int SKDEMO_TEST2 = 104;
const SKDEMO_CLOSE = 105; const int SKDEMO_CLOSE = 105;
const SKDEMO_TEST3 = 106; const int SKDEMO_TEST3 = 106;
const ID_TEST_CLOSE = 107; const int ID_TEST_CLOSE = 107;
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
@@ -219,12 +219,12 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
if (!sock->IsConnected()) if (!sock->IsConnected())
return; return;
wxDialog *dlgbox = new wxDialog(this, -1, "Test 1", wxDefaultPosition, wxSize(410, 270)); wxDialog *dlgbox = new wxDialog(this, -1, "Test 1", wxDefaultPosition, wxSize(414, 250));
wxTextCtrl *text_win = new wxTextCtrl(dlgbox, -1, "", wxTextCtrl *text_win = new wxTextCtrl(dlgbox, -1, "",
wxPoint(0, 0), wxSize(400, 200), wxPoint(0, 0), wxSize(400, 200),
wxTE_MULTILINE); wxTE_MULTILINE);
(void)new wxButton(dlgbox, ID_TEST_CLOSE, "Close", (void)new wxButton(dlgbox, ID_TEST_CLOSE, "Close",
wxPoint(100, 210), wxSize(100, 40)); wxPoint(100, 210), wxSize(100, -1));
char *buf, *buf2; char *buf, *buf2;
dlgbox->Layout(); dlgbox->Layout();
@@ -232,6 +232,8 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
text_win->WriteText("Initializing test 1 ...\n"); text_win->WriteText("Initializing test 1 ...\n");
wxYield();
/* Init */ /* Init */
buf = copystring("Salut ! Salut ! Salut ! Salut Toto\n"); buf = copystring("Salut ! Salut ! Salut ! Salut Toto\n");
buf2 = new char[strlen(buf)+1]; buf2 = new char[strlen(buf)+1];

79
src/common/socket.cpp
View File

@@ -147,7 +147,7 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
#elif defined(__WXXT__) || defined(__WXMOTIF__) #elif defined(__WXXT__) || defined(__WXMOTIF__)
#define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll) #define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll)
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#define PROCESS_EVENTS() gtk_main_iteration() #define PROCESS_EVENTS() wxYield()
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -157,7 +157,8 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
// -------------------------------------------------------------- // --------------------------------------------------------------
// Module // Module
// -------------------------------------------------------------- // --------------------------------------------------------------
class wxSocketModule: public wxModule { class wxSocketModule: public wxModule
{
DECLARE_DYNAMIC_CLASS(wxSocketModule) DECLARE_DYNAMIC_CLASS(wxSocketModule)
public: public:
wxSocketModule() {} wxSocketModule() {}
@@ -177,24 +178,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
#endif #endif
class wxSockWakeUp : public wxTimer { class wxSockWakeUp : public wxTimer
{
public: public:
int *my_id; int *my_id;
int n_val; int n_val;
wxSocketBase *sock; wxSocketBase *sock;
wxSockWakeUp(wxSocketBase *_sock, int *id, int new_val) { wxSockWakeUp(wxSocketBase *_sock, int *id, int new_val)
{
my_id = id; n_val = new_val; my_id = id; n_val = new_val;
sock = _sock; sock = _sock;
} }
virtual void Notify() { virtual void Notify()
{
*my_id = n_val; *my_id = n_val;
if (sock) sock->Notify(FALSE); if (sock) sock->Notify(FALSE);
} }
}; };
/// Socket request /// Socket request
class SockRequest : public wxObject { class SockRequest : public wxObject
{
public: public:
char *buffer; char *buffer;
size_t size, nbytes; size_t size, nbytes;
@@ -222,7 +227,7 @@ wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
m_cbkon(FALSE), m_cbkon(FALSE),
m_unread(NULL), m_unrd_size(0), m_unread(NULL), m_unrd_size(0),
m_processing(FALSE), m_processing(FALSE),
m_timeout(3600), m_wantbuf(0) m_timeout(1), m_wantbuf(0)
{ {
m_internal = new wxSockInternal; m_internal = new wxSockInternal;
#if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__) #if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__)
@@ -245,7 +250,7 @@ wxSocketBase::wxSocketBase() :
m_cbkon(FALSE), m_cbkon(FALSE),
m_unread(NULL), m_unrd_size(0), m_unread(NULL), m_unrd_size(0),
m_processing(FALSE), m_processing(FALSE),
m_timeout(3600), m_wantbuf(0) m_timeout(1), m_wantbuf(0)
{ {
m_internal = new wxSockInternal; m_internal = new wxSockInternal;
#if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__) #if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__)
@@ -469,13 +474,12 @@ void wxSocketBase::Discard()
bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
{ {
struct sockaddr my_addr; struct sockaddr my_addr;
int len_addr = sizeof(my_addr); uint len_addr = sizeof(my_addr);
if (m_fd < 0) if (m_fd < 0)
return FALSE; return FALSE;
if (getpeername(m_fd, (struct sockaddr *)&my_addr, if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
&len_addr) < 0)
return FALSE; return FALSE;
addr_man.Disassemble(&my_addr, len_addr); addr_man.Disassemble(&my_addr, len_addr);
@@ -485,13 +489,12 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
{ {
struct sockaddr my_addr; struct sockaddr my_addr;
int len_addr = sizeof(my_addr); uint len_addr = sizeof(my_addr);
if (m_fd < 0) if (m_fd < 0)
return FALSE; return FALSE;
if (getsockname(m_fd, (struct sockaddr *)&my_addr, if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0)
&len_addr) < 0)
return FALSE; return FALSE;
@@ -502,6 +505,7 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
// -------------------------------------------------------------- // --------------------------------------------------------------
// --------- wxSocketBase wait functions ------------------------ // --------- wxSocketBase wait functions ------------------------
// -------------------------------------------------------------- // --------------------------------------------------------------
void wxSocketBase::SaveState() void wxSocketBase::SaveState()
{ {
wxSockState *state = new wxSockState; wxSockState *state = new wxSockState;
@@ -543,7 +547,7 @@ void wxSocketBase::RestoreState()
// -------------------------------------------------------------- // --------------------------------------------------------------
// --------- wxSocketBase wait functions ------------------------ // --------- wxSocketBase wait functions ------------------------
// -------------------------------------------------------------- // --------------------------------------------------------------
//
bool wxSocketBase::_Wait(long seconds, long microseconds, int type) bool wxSocketBase::_Wait(long seconds, long microseconds, int type)
{ {
if ((!m_connected && !m_connecting) || m_fd < 0) if ((!m_connected && !m_connecting) || m_fd < 0)
@@ -698,7 +702,8 @@ Notify_value wx_sock_write_xview (Notify_client client, int fd)
wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt) wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
{ {
switch (evt) { switch (evt)
{
case EVT_READ: case EVT_READ:
return REQ_READ; return REQ_READ;
case EVT_PEEK: case EVT_PEEK:
@@ -718,7 +723,8 @@ wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
void wxSocketBase::SetFlags(wxSockFlags _flags) void wxSocketBase::SetFlags(wxSockFlags _flags)
{ {
m_flags = _flags; m_flags = _flags;
if (_flags & SPEED) { if (_flags & SPEED)
{
unsigned long flag = 0; unsigned long flag = 0;
ioctl(m_fd, FIONBIO, &flag); ioctl(m_fd, FIONBIO, &flag);
@@ -726,7 +732,9 @@ void wxSocketBase::SetFlags(wxSockFlags _flags)
m_flags = (wxSockFlags)(m_flags & ~WAITALL); m_flags = (wxSockFlags)(m_flags & ~WAITALL);
Notify(FALSE); Notify(FALSE);
} else { }
else
{
unsigned long flag = 1; unsigned long flag = 1;
ioctl(m_fd, FIONBIO, &flag); ioctl(m_fd, FIONBIO, &flag);
} }
@@ -735,13 +743,20 @@ void wxSocketBase::SetFlags(wxSockFlags _flags)
void wxSocketBase::SetNotify(wxRequestNotify flags) void wxSocketBase::SetNotify(wxRequestNotify flags)
{ {
wxRequestNotify old_needed_req = m_neededreq; wxRequestNotify old_needed_req = m_neededreq;
if (flags & REQ_ACCEPT) { if (flags & REQ_ACCEPT)
{
/* Check if server */ /* Check if server */
if (!(GetClassInfo()->IsKindOf(CLASSINFO(wxSocketServer)))) if (!(GetClassInfo()->IsKindOf(CLASSINFO(wxSocketServer))))
flags &= ~REQ_ACCEPT; flags &= ~REQ_ACCEPT;
} }
m_neededreq = flags; m_neededreq = flags;
if (m_cbkon && old_needed_req != flags)
/*
if (m_cbkon && old_needed_req != flags) seems to be wrong, Robert Roebling
SetupCallbacks();
*/
if ((!m_cbkon) || (old_needed_req != flags))
SetupCallbacks(); SetupCallbacks();
} }
@@ -766,7 +781,7 @@ void wxSocketBase::SetupCallbacks()
} }
if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) { if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) {
#ifdef __WXGTK__ #ifdef __WXGTK__
m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_WRITE, m_internal->sock_outputid = gdk_input_add(m_fd, GDK_INPUT_WRITE,
wx_socket_write, (gpointer)this); wx_socket_write, (gpointer)this);
#else #else
m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd, m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
@@ -802,6 +817,7 @@ void wxSocketBase::DestroyCallbacks()
{ {
if (!m_cbkon || !m_handler) if (!m_cbkon || !m_handler)
return; return;
m_cbkon = FALSE; m_cbkon = FALSE;
m_processing = FALSE; m_processing = FALSE;
#if defined(__WXMOTIF__) || defined(__WXXT__) #if defined(__WXMOTIF__) || defined(__WXXT__)
@@ -846,9 +862,11 @@ void wxSocketBase::OnRequest(wxRequestEvent req_evt)
if (req_evt <= EVT_WRITE && DoRequests(req_evt)) if (req_evt <= EVT_WRITE && DoRequests(req_evt))
return; return;
if (m_waitflags & 0xF0) { if (m_waitflags & 0xF0)
{
// Wake up // Wake up
if ((m_waitflags & 0x0F) == req_evt) { if ((m_waitflags & 0x0F) == req_evt)
{
m_waitflags = 0x80; m_waitflags = 0x80;
#ifndef __WXGTK__ #ifndef __WXGTK__
DestroyCallbacks(); // I disable it to prevent infinite loop on X11. DestroyCallbacks(); // I disable it to prevent infinite loop on X11.
@@ -857,7 +875,8 @@ void wxSocketBase::OnRequest(wxRequestEvent req_evt)
return; return;
} }
if (req_evt == EVT_LOST) { if (req_evt == EVT_LOST)
{
m_connected = FALSE; m_connected = FALSE;
Close(); Close();
} }
@@ -891,6 +910,7 @@ void wxSocketBase::OldOnNotify(wxRequestEvent evt)
// -------------------------------------------------------------- // --------------------------------------------------------------
// --------- wxSocketBase functions [Callback, CallbackData] ---- // --------- wxSocketBase functions [Callback, CallbackData] ----
// -------------------------------------------------------------- // --------------------------------------------------------------
wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk) wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk)
{ {
wxSockCbk old_cbk = m_cbk; wxSockCbk old_cbk = m_cbk;
@@ -916,6 +936,7 @@ void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
// -------------------------------------------------------------- // --------------------------------------------------------------
// --------- wxSocketBase pushback library ---------------------- // --------- wxSocketBase pushback library ----------------------
// -------------------------------------------------------------- // --------------------------------------------------------------
void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size) void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
{ {
char *curr_pos; char *curr_pos;
@@ -979,7 +1000,8 @@ bool wxSocketBase::DoRequests(wxRequestEvent req_flag)
delete node; delete node;
switch (req->type) { switch (req->type)
{
case EVT_READ: case EVT_READ:
case EVT_PEEK: case EVT_PEEK:
ret = recv(m_fd, req->buffer, req->size, ret = recv(m_fd, req->buffer, req->size,
@@ -1088,9 +1110,12 @@ void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
buf_timed_out = FALSE; buf_timed_out = FALSE;
s_wake.Start(m_timeout*1000, TRUE); s_wake.Start(m_timeout*1000, TRUE);
if (m_flags & NOWAIT) { if (m_flags & NOWAIT)
{
DoRequests(evt); DoRequests(evt);
} else { }
else
{
while (!buf->done && !buf_timed_out) while (!buf->done && !buf_timed_out)
PROCESS_EVENTS(); PROCESS_EVENTS();
} }