1 files changed, 0 insertions, 383 deletions
diff --git a/portland/dapi/lib/comm.c b/portland/dapi/lib/comm.c
deleted file mode 100644
index 7c31ea9..0000000
--- a/portland/dapi/lib/comm.c
+++ /dev/null
@@ -1,383 +0,0 @@
-#include "comm.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-#include "comm_internal.h"
-#include "callbacks.h"
-
-static void getDisplay( char* ret, int max )
-    {
-    char hostname[ 256 ];
-    const char* disp = getenv( "DISPLAY" );
-    char* pos;
-    *ret = '\0';
-    if( disp == NULL )
-        disp = ":0";
-    if( *disp == ':' )
-        {
-        gethostname( ret, max );
-        hostname[ max - 1 ] = '\0';
-        }
-    strncat( ret, disp, max - 1 );
-    pos = strrchr( ret, '.' ); /* strip head */
-    if( pos != NULL && pos > strrchr( ret, ':' ))
-        *pos = '\0';
-    }
-
-static void socketName( char* sock_file, const char* name, int max )
-    {
-    const char* home;
-    char display[ 256 ];
-    home = getenv( "HOME" );
-    getDisplay( display, 255 );
-    snprintf( sock_file, max - 1, "%s/.dapi-%s%s%s", home, display, name != NULL ? "-" : "", name );
-    }
-
-DapiConnection* dapi_connect()
-    {
-    return dapi_namedConnect( "" );
-    }
-    
-DapiConnection* dapi_namedConnect( const char* name )
-    {
-    char sock_file[ 256 ];
-    int sock;
-    struct sockaddr_un addr;
-    DapiConnection* ret;
-    socketName( sock_file, name, 255 );
-    sock = socket( PF_UNIX, SOCK_STREAM, 0 );
-    if( sock < 0 )
-        {
-        perror( "socket" );
-        return NULL;
-        }
-    addr.sun_family = AF_UNIX;
-    strcpy( addr.sun_path, sock_file );
-    if( connect( sock, ( struct sockaddr* ) &addr, sizeof( addr )) < 0 )
-        {
-        perror( "connect" );
-        close( sock );
-        return NULL;
-        }
-    ret = malloc( sizeof( DapiConnection ));
-    if( ret != NULL )
-        {
-        ret->sock = sock;
-        ret->generic_callback = dapi_genericCallback;
-        ret->in_server = 0;
-        ret->last_seq = 0;
-        ret->callbacks = NULL;
-        }
-    return ret;
-    }
-
-int dapi_bindSocket()
-    {
-    return dapi_namedBindSocket( "" );
-    }
-
-int dapi_namedBindSocket( const char* name )
-    {
-    char sock_file[ 256 ];
-    int sock;
-    struct sockaddr_un addr;
-    socketName( sock_file, name, 255 );
-    sock = socket( PF_UNIX, SOCK_STREAM, 0 );
-    if( sock < 0 )
-        {
-        perror( "socket" );
-        return -1;
-        }
-    int opt = fcntl( sock, F_GETFL );
-    if( opt < 0 )
-        {
-        perror( "fcntl" );
-        close( sock );
-        return -1;
-        }
-    if( fcntl( sock, F_SETFL, opt | O_NONBLOCK ) < 0 )
-        {
-        perror( "nonblock" );
-        close( sock );
-        return -1;
-        }
-    unlink( sock_file );
-    addr.sun_family = AF_UNIX;
-    strcpy( addr.sun_path, sock_file );
-    if( bind( sock, ( struct sockaddr* ) &addr, sizeof( addr )) < 0 )
-        {
-        perror( "bind" );
-        close( sock );
-        return -1;
-        }
-    if( chmod( sock_file, 0600 ) != 0 )
-        {
-        perror( "chmod" );
-        close( sock );
-        return -1;
-        }
-    if( listen( sock, SOMAXCONN ) < 0 )
-        {
-        perror( "listen" );
-        close( sock );
-        return -1;
-        }
-    return sock;
-    }
-
-int dapi_socket( DapiConnection* conn )
-    {
-    return conn->sock;
-    }
-
-static int writeSocket( DapiConnection* conn, const void* data, int size )
-    {
-    int written = 0;
-    for(;;)
-        {
-        int len = write( conn->sock, ( const char* ) data + written, size - written );
-        if( len < 0 && errno != EINTR && errno != EAGAIN )
-            return -1;
-        if( len > 0 )
-            written += len;
-        if( written == size )
-            return 1;
-        }
-    }
-
-static int readSocket( DapiConnection* conn, void* data, int size )
-    {
-    int rd = 0;
-    for(;;)
-        {
-        int len = read( conn->sock, ( char* ) data + rd, size - rd );
-        if( len < 0 && errno != EINTR && errno != EAGAIN )
-            return -1;
-        if( len == 0 )
-            return 0;
-        if( len > 0 )
-            rd += len;
-        if( rd == size )
-            return 1;
-        }
-    }
-
-DapiConnection* dapi_acceptSocket( int sock )
-    {
-    struct sockaddr_un addr;
-    DapiConnection* ret = NULL;
-    socklen_t addr_len = sizeof( addr );
-    int sock2 = accept( sock, ( struct sockaddr* ) &addr, &addr_len );
-    if( sock2 > 0 )
-        {
-        ret = malloc( sizeof( DapiConnection ));
-        if( ret != NULL )
-            {
-            ret->sock = sock2;
-            ret->generic_callback = dapi_genericCallback;
-            ret->in_server = 1;
-            ret->last_seq = 0;
-            ret->callbacks = NULL;
-            }
-        else
-            close( sock2 );
-        }
-    return ret;
-    }
-
-void dapi_close( DapiConnection* conn )
-    {
-    close( conn->sock );
-    }
-
-int dapi_hasData( DapiConnection* conn )
-    {
-    fd_set fd;
-    struct timeval tm = { 0, 0 };
-    FD_ZERO( &fd );
-    FD_SET( conn->sock, &fd );
-    if( select( conn->sock + 1, &fd, NULL, NULL, &tm ) > 0 )
-        return FD_ISSET( conn->sock, &fd );
-    return 0;
-    }
-
-static int getNextSeq( DapiConnection* conn )
-    {
-    if( ++conn->last_seq == 0 ) // 0 means invalid
-        ++conn->last_seq;
-    return conn->last_seq;
-    }
-
-static char* readString( DapiConnection* conn )
-    {
-    int len;
-    if( readSocket( conn, &len, sizeof( len )) <= 0 )
-        return NULL;
-    char* ret = malloc( len + 1 );
-    if( ret == NULL )
-        return NULL;
-    if( len > 0 )
-        {
-        if( readSocket( conn, ret, len ) <= 0 )
-            {
-            free( ret );
-            return NULL;
-            }
-        }
-    ret[ len ] = '\0';
-    return ret;
-    }
-
-static void writeString( DapiConnection* conn, const char* str )
-    {
-    int len = ( str == NULL ? 0 : strlen( str ));
-    writeSocket( conn, &len, sizeof( len ));
-    if( len > 0 )
-        writeSocket( conn, str, len );
-    }
-
-int dapi_readCommand( DapiConnection* conn, int* comm, int* seq )
-    {
-    int magic;
-    /* TODO kontrola failure */
-    readSocket( conn, &magic, sizeof( magic ));
-    readSocket( conn, comm, sizeof( *comm ));
-    readSocket( conn, seq, sizeof( *seq ));
-    if( magic != MAGIC )
-        return 0;
-    return 1;
-    }
-
-static void writeCommand( DapiConnection* conn, int comm, int seq )
-    {
-    int magic = MAGIC;
-    writeSocket( conn, &magic, sizeof( magic ));
-    writeSocket( conn, &comm, sizeof( comm ));
-    writeSocket( conn, &seq, sizeof( seq ));
-    }
-
-/* TODO generovat? */
-static intarr readintarr( DapiConnection* conn )
-    {
-    intarr ret;
-    int i;
-    readSocket( conn, &ret.count, sizeof( ret.count ));
-    if( ret.count == 0 )
-        return ret;
-    ret.data = malloc( ret.count * sizeof( int ));
-    if( ret.data == NULL )
-        return ret; /* TODO ? */
-    for( i = 0;
-         i < ret.count;
-         ++i )
-        readSocket( conn, &ret.data[ i ], sizeof( ret.data[ i ] ));
-    return ret;        
-    }
-
-static stringarr readstringarr( DapiConnection* conn )
-    {
-    stringarr ret;
-    int i;
-    readSocket( conn, &ret.count, sizeof( ret.count ));
-    if( ret.count == 0 )
-        return ret;
-    ret.data = malloc( ret.count * sizeof( char* ));
-    if( ret.data == NULL )
-        return ret; /* TODO ? */
-    for( i = 0;
-         i < ret.count;
-         ++i )
-        ret.data[ i ] = readString( conn );
-    return ret;        
-    }
-
-static DapiWindowInfo readWindowInfo( DapiConnection* conn )
-    {
-    DapiWindowInfo ret;
-    readSocket( conn, &ret.flags, sizeof( ret.flags ));
-    if( ret.flags == 0 )
-        return ret;
-    readSocket( conn, &ret.window, sizeof( ret.window ));
-    return ret;
-    }
-
-static void writeintarr( DapiConnection* conn, intarr arr )
-    {
-    int i;
-    writeSocket( conn, &arr.count, sizeof( arr.count ));
-    for( i = 0;
-         i < arr.count;
-         ++i )
-        writeSocket( conn, &arr.data[ i ], sizeof( arr.data[ i ] ));
-    }
-
-static void writestringarr( DapiConnection* conn, stringarr arr )
-    {
-    int i;
-    writeSocket( conn, &arr.count, sizeof( arr.count ));
-    for( i = 0;
-         i < arr.count;
-         ++i )
-        writeString( conn, arr.data[ i ] );
-    }
-
-static void writeWindowInfo( DapiConnection* conn, DapiWindowInfo winfo )
-    {
-    writeSocket( conn, &winfo.flags, sizeof( winfo.flags ));
-    writeSocket( conn, &winfo.window, sizeof( winfo.window ));
-    }
-
-void dapi_freeintarr( intarr arr )
-    {
-    free( arr.data );
-    }
-
-void dapi_freestringarr( stringarr arr )
-    {
-    int i;
-    for( i = 0;
-         i < arr.count;
-         ++i )
-        free( arr.data[ i ] );
-    free( arr.data );
-    }
-
-void dapi_freeWindowInfo( DapiWindowInfo winfo )
-    {
-    ( void ) winfo; /* nothing for now */
-    }
-
-void dapi_windowInfoInitWindow( DapiWindowInfo* winfo, long window )
-    {
-    winfo->flags = 1;
-    winfo->window = window;
-    }
-
-DapiConnection* dapi_connectAndInit()
-    {
-    return dapi_namedConnectAndInit( "" );
-    }
-
-DapiConnection* dapi_namedConnectAndInit( const char* name )
-    {
-    DapiConnection* conn = dapi_namedConnect( name );
-    if( conn == NULL )
-        return NULL;
-    if( !dapi_Init( conn ))
-        {
-        dapi_close( conn );
-        return NULL;
-        }
-    return conn;
-    }
-
-#include <dapi/comm_generated.c>