[BACK]Return to AHTBridge.c CVS log [TXT] [DIR] Up to [Public] / Amaya / amaya

Diff for /Amaya/amaya/AHTBridge.c between versions 1.104 and 1.105

version 1.104, 2006/01/06 10:12:57 version 1.105, 2006/11/15 11:48:53
Line 39 Line 39
 #define THD_TRACE 1  #define THD_TRACE 1
 #endif  #endif
   
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
 /* Private functions */  /* Private functions */
 static void         RequestRegisterReadXtevent (SOCKET);  static void         RequestRegisterReadXtevent (SOCKET);
 static void         RequestKillReadXtevent (SOCKET);  static void         RequestKillReadXtevent (SOCKET);
Line 78  typedef struct sStatus { Line 78  typedef struct sStatus {
   int except;    int except;
 } SocketStatus;  } SocketStatus;
 #endif /* _WX */  #endif /* _WX */
 #if defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
 typedef struct sStatus {  
   int read;  
   int write;  
   int except;  
 } SocketStatus;  
 #endif /* #ifdef _NOGUI */  
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  
 #define SOCK_TABLE_SIZE 67  #define SOCK_TABLE_SIZE 67
 #define HASH(s) ((s) % SOCK_TABLE_SIZE)  #define HASH(s) ((s) % SOCK_TABLE_SIZE)
 static SocketStatus persSockets[SOCK_TABLE_SIZE];  static SocketStatus persSockets[SOCK_TABLE_SIZE];
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */  #endif /* defined(_GTK) || defined(_WX) */
   
 /*--------------------------------------------------------------------  /*--------------------------------------------------------------------
   AHTCallback_bridge    AHTCallback_bridge
Line 419  int AHTEvent_unregister (SOCKET sock, HT Line 412  int AHTEvent_unregister (SOCKET sock, HT
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 void RequestKillAllXtevents (AHTReqContext * me)  void RequestKillAllXtevents (AHTReqContext * me)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int sock = INVSOC;    int sock = INVSOC;
   
   return;    return;
Line 441  void RequestKillAllXtevents (AHTReqConte Line 434  void RequestKillAllXtevents (AHTReqConte
   RequestKillReadXtevent (sock);    RequestKillReadXtevent (sock);
   RequestKillWriteXtevent (sock);    RequestKillWriteXtevent (sock);
   RequestKillExceptXtevent (sock);    RequestKillExceptXtevent (sock);
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */     #endif /* defined(_GTK) || defined(_WX) */   
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 450  void RequestKillAllXtevents (AHTReqConte Line 443  void RequestKillAllXtevents (AHTReqConte
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 static void RequestRegisterReadXtevent (SOCKET sock)  static void RequestRegisterReadXtevent (SOCKET sock)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int v;    int v;
   
   v = HASH (sock);    v = HASH (sock);
Line 474  static void RequestRegisterReadXtevent ( Line 467  static void RequestRegisterReadXtevent (
                  persSockets[v].read, sock);                   persSockets[v].read, sock);
 #endif /* DEBUG_LIBWWW */  #endif /* DEBUG_LIBWWW */
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */  #endif /* defined(_GTK) || defined(_WX) */
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 483  static void RequestRegisterReadXtevent ( Line 476  static void RequestRegisterReadXtevent (
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 static void RequestKillReadXtevent (SOCKET sock)  static void RequestKillReadXtevent (SOCKET sock)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int v;    int v;
   
   v = HASH (sock);    v = HASH (sock);
Line 505  static void RequestKillReadXtevent (SOCK Line 498  static void RequestKillReadXtevent (SOCK
 #endif /* _WX */  #endif /* _WX */
   
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */    #endif /* defined(_GTK) || defined(_WX) */  
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 514  static void RequestKillReadXtevent (SOCK Line 507  static void RequestKillReadXtevent (SOCK
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 static void RequestRegisterWriteXtevent (SOCKET sock)  static void RequestRegisterWriteXtevent (SOCKET sock)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int v;    int v;
   
   v = HASH (sock);    v = HASH (sock);
Line 539  static void RequestRegisterWriteXtevent Line 532  static void RequestRegisterWriteXtevent
 #endif /* DEBUG_LIBWWW */  #endif /* DEBUG_LIBWWW */
       
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */    #endif /* defined(_GTK) || defined(_WX) */  
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 549  static void RequestRegisterWriteXtevent Line 542  static void RequestRegisterWriteXtevent
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 static void RequestKillWriteXtevent (SOCKET sock)  static void RequestKillWriteXtevent (SOCKET sock)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int v;    int v;
   
   v = HASH (sock);    v = HASH (sock);
Line 572  static void RequestKillWriteXtevent (SOC Line 565  static void RequestKillWriteXtevent (SOC
 #endif /* _WX */  #endif /* _WX */
   
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */    #endif /* defined(_GTK) || defined(_WX) */  
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 581  static void RequestKillWriteXtevent (SOC Line 574  static void RequestKillWriteXtevent (SOC
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 static void RequestRegisterExceptXtevent (SOCKET sock)  static void RequestRegisterExceptXtevent (SOCKET sock)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int v;    int v;
   
   v = HASH (sock);    v = HASH (sock);
Line 606  static void RequestRegisterExceptXtevent Line 599  static void RequestRegisterExceptXtevent
                  persSockets[v].except, sock);                   persSockets[v].except, sock);
 #endif /* DEBUG_LIBWWW */  #endif /* DEBUG_LIBWWW */
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */     #endif /* defined(_GTK) || defined(_WX) */   
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 616  static void RequestRegisterExceptXtevent Line 609  static void RequestRegisterExceptXtevent
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 static void RequestKillExceptXtevent (SOCKET sock)  static void RequestKillExceptXtevent (SOCKET sock)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   int v;    int v;
   
   v = HASH (sock);    v = HASH (sock);
Line 637  static void RequestKillExceptXtevent (SO Line 630  static void RequestKillExceptXtevent (SO
       persSockets[v].except = 0;        persSockets[v].except = 0;
 #endif /* _WX */  #endif /* _WX */
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */  #endif /* defined(_GTK) || defined(_WX) */
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 661  struct _AmayaTimer { Line 654  struct _AmayaTimer {
 #ifdef _WX  #ifdef _WX
   wxAmayaTimer * xt_timer;    wxAmayaTimer * xt_timer;
 #endif /* _WX */  #endif /* _WX */
 #ifdef _NOGUI  
   unsigned int xt_timer;  
 #endif /* #ifdef _NOGUI */    
 };  };
 typedef struct _AmayaTimer AmayaTimer;  typedef struct _AmayaTimer AmayaTimer;
   
Line 766  void TimerCallbackWX( void * p_context ) Line 756  void TimerCallbackWX( void * p_context )
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 void KillAllTimers (void)  void KillAllTimers (void)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   /* @@@ maybe add something else to kill the Xt things */    /* @@@ maybe add something else to kill the Xt things */
   if (Timers)    if (Timers)
     HTList_delete (Timers);      HTList_delete (Timers);
   Timers = NULL;    Timers = NULL;
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */  #endif /* defined(_GTK) || defined(_WX) */
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 779  void KillAllTimers (void) Line 769  void KillAllTimers (void)
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 void AMAYA_SetTimer (HTTimer *libwww_timer)  void AMAYA_SetTimer (HTTimer *libwww_timer)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   HTList *cur, *last;    HTList *cur, *last;
   AmayaTimer *me;    AmayaTimer *me;
   
Line 837  void AMAYA_SetTimer (HTTimer *libwww_tim Line 827  void AMAYA_SetTimer (HTTimer *libwww_tim
   me->xt_timer->Start( me->libwww_timer->millis, TRUE );    me->xt_timer->Start( me->libwww_timer->millis, TRUE );
 #endif /* _WX */  #endif /* _WX */
   
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */    #endif /* defined(_GTK) || defined(_WX) */  
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 845  void AMAYA_SetTimer (HTTimer *libwww_tim Line 835  void AMAYA_SetTimer (HTTimer *libwww_tim
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 void AMAYA_DeleteTimer (HTTimer *libwww_timer)  void AMAYA_DeleteTimer (HTTimer *libwww_timer)
 {  {
 #if defined(_GTK) || defined(_WX) || defined(_NOGUI)  #if defined(_GTK) || defined(_WX)
   HTList *cur, *last;    HTList *cur, *last;
   AmayaTimer *me;    AmayaTimer *me;
   
Line 876  void AMAYA_DeleteTimer (HTTimer *libwww_ Line 866  void AMAYA_DeleteTimer (HTTimer *libwww_
       HTList_removeObject (Timers, me);        HTList_removeObject (Timers, me);
       TtaFreeMemory (me);        TtaFreeMemory (me);
     }      }
 #endif /* #if defined(_GTK) || defined(_WX) || defined(_NOGUI) */  #endif /* defined(_GTK) || defined(_WX) */
 }  }
   
Removed from v.1.104  
changed lines
  Added in v.1.105

Webmaster