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 f9870d43c824051ec2c8b729d86f9bb652f2e917..238c0cbca81e0c6a5a362e4a51dc7466a5255d04 100644 (file)
--- a/src/motif/gsockmot.cpp
+++ b/src/motif/gsockmot.cpp
@@ -1,122 +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
 
 
 #if wxUSE_SOCKETS
 

-#include <stdlib.h>
-#include <X11/Intrinsic.h>
-#include <wx/gsocket.h>
-#include <wx/app.h>
-#include "../unix/gsockunx.h"
-
-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
-
-static void _GSocket_Motif_Input(XtPointer data, int *fid,
-                                 XtInputId *id)
-{
-  GSocket *socket = (GSocket *)data;
-
-  _GSocket_Detected_Read(socket);
-}
-
-static void _GSocket_Motif_Output(XtPointer data, int *fid,
-                                  XtInputId *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)*3);
-  m_id = (int *)(socket->m_gui_dependent);
+#include <X11/Intrinsic.h>      // XtAppAdd/RemoveInput()
+#include "wx/motif/private.h"   // wxGetAppContext()
+#include "wx/gsocket.h"
+#include "wx/apptrait.h"

 
 

-  for (i=0;i<3;i++)
-    m_id[i] = -1;
-}
+extern "C" {

 
 

-void _GSocket_GUI_Destroy(GSocket *socket)
+static void _GSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid),
+                                 XtInputId *WXUNUSED(id))

 {
 {

-  int i;
-  int *m_id;
-
-  m_id = (int *)(socket->m_gui_dependent);
+    GSocket *socket = (GSocket *)data;

 
 

-  for (i=0;i<3;i++)
-    if (m_id[i] == -1)
-      XtRemoveInput(m_id[i]);
-
-  free(socket->m_gui_dependent);
+    socket->Detected_Read();

 }
 
 }
 

-void _GSocket_Install_Fallback(GSocket *socket, GSocketEvent event)
+static void _GSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid),
+                                  XtInputId *WXUNUSED(id))

 {
 {

-  int *m_id;
-
-  m_id = (int *)(socket->m_gui_dependent);
+    GSocket *socket = (GSocket *)data;

 
 

-  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,
-                             (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,
-                             (XtPointer *)XtInputWriteMask,
-                             (XtInputCallbackProc) _GSocket_Motif_Output,
-                             (XtPointer) socket);
-     break;
-  default: return;
-  }
+    socket->Detected_Write();

 }
 
 }
 

-void _GSocket_Uninstall_Fallback(GSocket *socket, GSocketEvent event)
-{
-  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;
-  }
-
-  if (m_id[c] != -1)
-    XtRemoveInput(m_id[c]);
-
-  m_id[c] = -1;

 }
 
 }
 

-unsigned long GSocket_GetEventID(GSocket *socket)
+class MotifSocketManager : public GSocketInputBasedManager

 {
 {

-  return 0;
-}
-
-void GSocket_DoEvent(unsigned long evt_id)
+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()

 {
 {

+    static MotifSocketManager s_manager;
+    return &s_manager;

 }
 
 #endif // wxUSE_SOCKETS
 }
 
 #endif // wxUSE_SOCKETS