Added GSocket for Unix (only GTK for the moment)

Updated wxSocket to use GSocket API
Added a progress bar to client.cpp
Added CopyTo to wxMemoryOutputStream to copy the internal buffer to a specified buffer.
Various changes/fixes to the high-level protocols FTP/HTTP
Various Unicode fixes
Removed sckint.*


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-07-22 17:51:54 +00:00
parent e4d18e7f60
commit a324a7bccf
30 changed files with 2082 additions and 1905 deletions

View File

@@ -29,6 +29,8 @@ libwx_gtk_la_SOURCES = \
win_gtk.c \
extended.c \
parser.c \
gsocket.c \
gsockgtk.c \
\
cmndata.cpp \
config.cpp \
@@ -80,7 +82,6 @@ libwx_gtk_la_SOURCES = \
resource.cpp \
sckaddr.cpp \
sckfile.cpp \
sckint.cpp \
sckipc.cpp \
sckstrm.cpp \
serbase.cpp \

100
src/gtk1/gsockgtk.c Normal file
View File

@@ -0,0 +1,100 @@
#include <stdlib.h>
#include <gdk/gdk.h>
#include <glib.h>
#include <wx/gsocket.h>
#include "../unix/gsockunx.h"
void _GSocket_GDK_Input(gpointer data, gint source, GdkInputCondition condition)
{
GSocket *socket = (GSocket *)data;
switch (condition) {
case GDK_INPUT_READ:
_GSocket_Detected_Read(socket);
break;
case GDK_INPUT_WRITE:
_GSocket_Detected_Write(socket);
break;
default:
break;
}
}
void _GSocket_GUI_Init(GSocket *socket)
{
int i;
gint *m_id;
socket->m_gui_dependent = (char *)malloc(sizeof(gint)*3);
m_id = (gint *)(socket->m_gui_dependent);
for (i=0;i<3;i++)
m_id[i] = -1;
}
void _GSocket_GUI_Destroy(GSocket *socket)
{
int i;
gint *m_id;
m_id = (gint *)(socket->m_gui_dependent);
for (i=0;i<3;i++)
if (m_id[i] == -1)
gdk_input_remove(m_id[i]);
free(socket->m_gui_dependent);
}
void _GSocket_Install_Fallback(GSocket *socket, GSocketEvent event)
{
GdkInputCondition flag;
int c;
gint *m_id;
m_id = (gint *)(socket->m_gui_dependent);
switch (event) {
case GSOCK_CONNECTION:
case GSOCK_LOST:
case GSOCK_INPUT: c = 0; flag = GDK_INPUT_READ; break;
case GSOCK_OUTPUT: c = 1;flag = GDK_INPUT_WRITE; break;
default: return;
}
if (m_id[c] != -1)
gdk_input_remove(m_id[c]);
m_id[c] = gdk_input_add(socket->m_fd, flag,
_GSocket_GDK_Input, (gpointer)socket);
}
void _GSocket_Uninstall_Fallback(GSocket *socket, GSocketEvent event)
{
int c;
gint *m_id;
m_id = (gint *)(socket->m_gui_dependent);
switch (event) {
case GSOCK_CONNECTION:
case GSOCK_LOST:
case GSOCK_INPUT: c = 0; break;
case GSOCK_OUTPUT: c = 1; break;
default: return;
}
if (m_id[c] != -1)
gdk_input_remove(m_id[c]);
m_id[c] = -1;
}
unsigned long GSocket_GetEventID(GSocket *socket)
{
return 0;
}
void GSocket_DoEvent(unsigned long evt_id)
{
}