X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/813c20a67e8a82d16700344625b8fdfb32e04833..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/motif/gsockmot.cpp?ds=inline

diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp
index f9870d43c8..e4904f6610 100644
--- a/src/motif/gsockmot.cpp
+++ b/src/motif/gsockmot.cpp
@@ -1,9 +1,10 @@
-// -------------------------------------------------------------------------
-// Project: GSocket (Generic Socket) for WX
-// Name:    gsockmot.cpp
-// Purpose: GSocket: Motif part
-// CVSID:   $Id$
-// -------------------------------------------------------------------------
+/* -------------------------------------------------------------------------
+ * Project: GSocket (Generic Socket) for WX
+ * Name:    gsockmot.c
+ * Purpose: GSocket: Motif part
+ * CVSID:   $Id$
+ * Licence: The wxWindows licence
+ * ------------------------------------------------------------------------- */
 
 #include "wx/setup.h"
 
@@ -11,18 +12,17 @@
 
 #include <stdlib.h>
 #include <X11/Intrinsic.h>
-#include <wx/gsocket.h>
-#include <wx/app.h>
-#include "../unix/gsockunx.h"
+#include "wx/gsocket.h"
+#include "wx/unix/gsockunx.h"
 
-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
+extern XtAppContext wxGetAppContext();
 
 static void _GSocket_Motif_Input(XtPointer data, int *fid,
                                  XtInputId *id)
 {
   GSocket *socket = (GSocket *)data;
 
-  _GSocket_Detected_Read(socket);
+  socket->m_functions->Detected_Read(socket);
 }
 
 static void _GSocket_Motif_Output(XtPointer data, int *fid,
@@ -30,78 +30,84 @@ static void _GSocket_Motif_Output(XtPointer data, int *fid,
 {
   GSocket *socket = (GSocket *)data;
 
-  _GSocket_Detected_Write(socket);
+  socket->m_functions->Detected_Write(socket);
 }
 
-void _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(void)
 {
-  int i;
-  int *m_id;
-
-  socket->m_gui_dependent = (char *)malloc(sizeof(int)*3);
-  m_id = (int *)(socket->m_gui_dependent);
+    return 1;
+}
 
-  for (i=0;i<3;i++)
-    m_id[i] = -1;
+void _GSocket_GUI_Cleanup(void)
+{
 }
 
-void _GSocket_GUI_Destroy(GSocket *socket)
+int _GSocket_GUI_Init_Socket(GSocket *socket)
 {
-  int i;
   int *m_id;
 
+  socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
   m_id = (int *)(socket->m_gui_dependent);
 
-  for (i=0;i<3;i++)
-    if (m_id[i] == -1)
-      XtRemoveInput(m_id[i]);
+  m_id[0] = -1;
+  m_id[1] = -1;
 
+  return TRUE;
+}
+
+void _GSocket_GUI_Destroy_Socket(GSocket *socket)
+{
   free(socket->m_gui_dependent);
 }
 
-void _GSocket_Install_Fallback(GSocket *socket, GSocketEvent event)
+void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
 {
-  int *m_id;
+  int *m_id = (int *)(socket->m_gui_dependent);
+  int c;
 
-  m_id = (int *)(socket->m_gui_dependent);
+  if (socket->m_fd == -1)
+    return;
 
-  switch (event) {
-  case GSOCK_CONNECTION:
-  case GSOCK_LOST:
-  case GSOCK_INPUT: 
-     if (m_id[0] != -1)
-       XtRemoveInput(m_id[0]);
-     m_id[0] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
+  switch (event)
+  {
+    case GSOCK_LOST:       /* fall-through */
+    case GSOCK_INPUT:      c = 0; break;
+    case GSOCK_OUTPUT:     c = 1; break;
+    case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
+    default: return;
+  }
+
+  if (m_id[c] != -1)
+    XtRemoveInput(m_id[c]);
+
+  if (c == 0)
+  {
+     m_id[0] = XtAppAddInput(wxGetAppContext(), socket->m_fd,
                              (XtPointer *)XtInputReadMask,
                              (XtInputCallbackProc) _GSocket_Motif_Input,
                              (XtPointer) socket);
-     break;
-  case GSOCK_OUTPUT:
-     if (m_id[1] != -1)
-       XtRemoveInput(m_id[1]);
-     m_id[1] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
+  }
+  else
+  {
+     m_id[1] = XtAppAddInput(wxGetAppContext(), socket->m_fd,
                              (XtPointer *)XtInputWriteMask,
                              (XtInputCallbackProc) _GSocket_Motif_Output,
                              (XtPointer) socket);
-     break;
-  default: return;
   }
 }
 
-void _GSocket_Uninstall_Fallback(GSocket *socket, GSocketEvent event)
+void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
 {
+  int *m_id = (int *)(socket->m_gui_dependent);
   int c;
-  int *m_id;
-
-  m_id = (int *)(socket->m_gui_dependent);
 
-  switch (event) {
-  case GSOCK_CONNECTION: 
-  case GSOCK_LOST:
-  case GSOCK_INPUT: c = 0; break;
-  case GSOCK_OUTPUT: c = 1; break;
-     break;
-  default: return;
+  switch (event)
+  {
+    case GSOCK_LOST:       /* fall-through */
+    case GSOCK_INPUT:      c = 0; break;
+    case GSOCK_OUTPUT:     c = 1; break;
+    case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
+    default: return;
   }
 
   if (m_id[c] != -1)
@@ -110,13 +116,21 @@ void _GSocket_Uninstall_Fallback(GSocket *socket, GSocketEvent event)
   m_id[c] = -1;
 }
 
-unsigned long GSocket_GetEventID(GSocket *socket)
+void _GSocket_Enable_Events(GSocket *socket)
 {
-  return 0;
+  _GSocket_Install_Callback(socket, GSOCK_INPUT);
+  _GSocket_Install_Callback(socket, GSOCK_OUTPUT);
 }
 
-void GSocket_DoEvent(unsigned long evt_id)
+void _GSocket_Disable_Events(GSocket *socket)
 {
+  _GSocket_Uninstall_Callback(socket, GSOCK_INPUT);
+  _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
-#endif // wxUSE_SOCKETS
+#else /* !wxUSE_SOCKETS */
+
+/* some compilers don't like having empty source files */
+static int wxDummyGsockVar = 0;
+
+#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */