don't use deprecated toolbar API

[wxWidgets.git] / src / motif / gsockmot.cpp

diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp
index d7ed9ebf908c1e5f77e945772dd33247cfd9e3e7..238c0cbca81e0c6a5a362e4a51dc7466a5255d04 100644 (file)
--- a/src/motif/gsockmot.cpp
+++ b/src/motif/gsockmot.cpp
@@ -1,121 +1,70 @@
-// -------------------------------------------------------------------------
-// Project: GSocket (Generic Socket) for WX
-// Name:    gsockmot.cpp
-// Purpose: GSocket: Motif part
-// CVSID:   $Id$
-// -------------------------------------------------------------------------
-
-#include "wx/setup.h"
+///////////////////////////////////////////////////////////////////////////////
+// Name:        motif/gsockmot.cpp
+// Purpose:     implementation of wxMotif-specific socket event handling
+// Author:      Guilhem Lavaux, Vadim Zeitlin
+// Created:     1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 1999, 2007 wxWidgets dev team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SOCKETS
 
-#include <stdlib.h>
-#include <X11/Intrinsic.h>
+#include <X11/Intrinsic.h>      // XtAppAdd/RemoveInput()
+#include "wx/motif/private.h"   // wxGetAppContext()
 #include "wx/gsocket.h"
-#include "wx/app.h"
-#include "wx/unix/gsockunx.h"
-
-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
-
-static void _GSocket_Motif_Input(XtPointer data, int *fid,
-                                 XtInputId *id)
-{
-  GSocket *socket = (GSocket *)data;
+#include "wx/apptrait.h"
 
-  _GSocket_Detected_Read(socket);
-}
+extern "C" {
 
-static void _GSocket_Motif_Output(XtPointer data, int *fid,
-                                  XtInputId *id)
+static void _GSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid),
+                                 XtInputId *WXUNUSED(id))
 {
-  GSocket *socket = (GSocket *)data;
-
-  _GSocket_Detected_Write(socket);
-}
-
-void _GSocket_GUI_Init(GSocket *socket)
-{
-  int i;
-  int *m_id;
-
-  socket->m_gui_dependent = (char *)malloc(sizeof(int)*2);
-  m_id = (int *)(socket->m_gui_dependent);
-
-  m_id[0] = -1;
-  m_id[1] = -1;
-}
+    GSocket *socket = (GSocket *)data;
 
-void _GSocket_GUI_Destroy(GSocket *socket)
-{
-  free(socket->m_gui_dependent);
+    socket->Detected_Read();
 }
 
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
+static void _GSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid),
+                                  XtInputId *WXUNUSED(id))
 {
-  int *m_id = (int *)(socket->m_gui_dependent);
-  int c;
-
-  if (socket->m_fd == -1)
-    return;
+    GSocket *socket = (GSocket *)data;
 
-  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(wxAPP_CONTEXT, socket->m_fd,
-                             (XtPointer *)XtInputReadMask,
-                             (XtInputCallbackProc) _GSocket_Motif_Input,
-                             (XtPointer) socket);
-  }
-  else
-  {
-     m_id[1] = XtAppAddInput(wxAPP_CONTEXT, socket->m_fd,
-                             (XtPointer *)XtInputWriteMask,
-                             (XtInputCallbackProc) _GSocket_Motif_Output,
-                             (XtPointer) socket);
-  }
+    socket->Detected_Write();
 }
 
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
-{
-  int *m_id = (int *)(socket->m_gui_dependent);
-  int c;
-
-  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]);
-
-  m_id[c] = -1;
 }
 
-void _GSocket_Enable_Events(GSocket *socket)
+class MotifSocketManager : public GSocketInputBasedManager
 {
-  _GSocket_Install_Callback(socket, GSOCK_INPUT);
-  _GSocket_Install_Callback(socket, GSOCK_OUTPUT);
-}
-
-void _GSocket_Disable_Events(GSocket *socket)
+public:
+    virtual int AddInput(GSocket *socket, SocketDir d)
+    {
+        return XtAppAddInput
+               (
+                    wxGetAppContext(),
+                    socket->m_fd,
+                    (XtPointer)(d == FD_OUTPUT ? XtInputWriteMask
+                                               : XtInputReadMask),
+                    d == FD_OUTPUT ? _GSocket_Motif_Output
+                                   : _GSocket_Motif_Input,
+                    socket
+               );
+    }
+
+    virtual void RemoveInput(int fd)
+    {
+        XtRemoveInput(fd);
+    }
+};
+
+GSocketManager *wxGUIAppTraits::GetSocketManager()
 {
-  _GSocket_Uninstall_Callback(socket, GSOCK_INPUT);
-  _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
+    static MotifSocketManager s_manager;
+    return &s_manager;
 }
 
 #endif // wxUSE_SOCKETS