moss-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Moss-devel] CVS: moss/colpatik/include/modules/input ColpatikDevice.h,1


From: Manfred Morgner <address@hidden>
Subject: [Moss-devel] CVS: moss/colpatik/include/modules/input ColpatikDevice.h,1.3,1.4 ColpatikInput.h,1.2,1.3 Device.h,1.3,1.4 DeviceInterrupt.h,1.3,1.4 DevicePoll.h,1.2,1.3 DeviceQuery.h,1.2,1.3 Event.h,1.5,1.6 Makefile.am,1.2,1.3 Queue.h,1.3,1.4
Date: Wed, 30 Oct 2002 18:35:55 -0500

Update of /cvsroot/moss//moss/colpatik/include/modules/input
In directory subversions:/tmp/cvs-serv4779/include/modules/input

Modified Files:
        ColpatikDevice.h ColpatikInput.h Device.h DeviceInterrupt.h 
        DevicePoll.h DeviceQuery.h Event.h Makefile.am Queue.h 
Log Message:
Check under and back-port to Win32


Index: ColpatikDevice.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/ColpatikDevice.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ColpatikDevice.h    28 Oct 2002 22:42:29 -0000      1.3
--- ColpatikDevice.h    30 Oct 2002 23:35:53 -0000      1.4
***************
*** 1,66 ****
! /***************************************************************************
!                             ColpatikDevice.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *
!  *
!  ***************************************************************************/
! 
! #ifndef __COLPATIK_DEVICE_H
! #define __COLPATIK_DEVICE_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable: 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! 
! 
! namespace colpatik
!   {
!   
!   class CColpatikDevice
!     {
!     public:
!                CColpatikDevice();
!       virtual ~CColpatikDevice();
! 
!     protected:
!       void Initialize();
! 
!       
!     }; // class CColpatikDevice
!   
!   } // namespace colpatik
! 
! #endif // __COLPATIK_DEVICE_H
--- 1,66 ----
! /***************************************************************************
!                             ColpatikDevice.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *
!  *
!  ***************************************************************************/
! 
! #ifndef __COLPATIK_DEVICE_H
! #define __COLPATIK_DEVICE_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable: 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! 
! 
! namespace colpatik
!   {
!   
!   class CColpatikDevice
!     {
!     public:
!                CColpatikDevice();
!       virtual ~CColpatikDevice();
! 
!     protected:
!       void Initialize();
! 
!       
!     }; // class CColpatikDevice
!   
!   } // namespace colpatik
! 
! #endif // __COLPATIK_DEVICE_H

Index: ColpatikInput.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/ColpatikInput.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ColpatikInput.h     28 Oct 2002 22:42:29 -0000      1.2
--- ColpatikInput.h     30 Oct 2002 23:35:53 -0000      1.3
***************
*** 1,89 ****
! /***************************************************************************
!                             ColpatikInput.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *
!  *
!  ***************************************************************************/
! 
! #ifndef __COLPATIK_INPUT_H
! #define __COLPATIK_INPUT_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! 
! #include <list>
! #include <string>
! 
! 
! #include "ColpatikDevice.h"
! 
! namespace colpatik
!   {
!   typedef std::list<std::string> CListString;
!   typedef std::list<colpatik::CColpatikDevice*> CListPDevice;
! 
!   class CColpatikInput  
!     {
!     protected:
!       CListString  m_lsDriverList;
!       CListPDevice m_lpoDevicesPoll;
!       CListPDevice m_lpoDevicesInterrupt;
! 
!     private:
!       static void Action(void* pData);
! 
!     public:
!                CColpatikInput();
!       virtual ~CColpatikInput();
! 
!       bool               DriverAdd   (const std::string& sDriver);
!       bool               DriverRemove(const std::string& sDriver);
!       const CListString& DriverList  ();
! 
!       void LoadDevices();
!       void Run();
! 
! 
!     protected:
!       void Initialize();
!       bool DriversLoad();
!     
!     }; // class CColpatikInput  
! 
!   #endif // __COLPATIK_INPUT_H
! 
!   } // namespace colpatik
--- 1,89 ----
! /***************************************************************************
!                             ColpatikInput.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *
!  *
!  ***************************************************************************/
! 
! #ifndef __COLPATIK_INPUT_H
! #define __COLPATIK_INPUT_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! 
! #include <list>
! #include <string>
! 
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   typedef std::list<std::string> CListString;
!   typedef std::list<colpatik::CDevice*> CListPDevice;
! 
!   class CColpatikInput  
!     {
!     protected:
!       CListString  m_lsDriverList;
!       CListPDevice m_lpoDevicesPoll;
!       CListPDevice m_lpoDevicesInterrupt;
! 
!     private:
!       static void Action(void* pData);
! 
!     public:
!                CColpatikInput();
!       virtual ~CColpatikInput();
! 
!       bool               DriverAdd   (const std::string& sDriver);
!       bool               DriverRemove(const std::string& sDriver);
!       const CListString& DriverList  ();
! 
!       void LoadDevices();
!       void Run();
! 
! 
!     protected:
!       void Initialize();
!       bool DriversLoad();
!     
!     }; // class CColpatikInput  
! 
!   #endif // __COLPATIK_INPUT_H
! 
!   } // namespace colpatik

Index: Device.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Device.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Device.h    30 Oct 2002 02:06:12 -0000      1.3
--- Device.h    30 Oct 2002 23:35:53 -0000      1.4
***************
*** 1,102 ****
! /***************************************************************************
!                              Device.h
!                         -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_H
! #define __DEVICE_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <string>
! #include <list>
! 
! #include "API_Device.h"
! 
! typedef std::list<colpatik::pfnDeviceCallback> CListCallback;
! 
! namespace colpatik
!   {
! 
!   class CDevice
!     {
!     protected:
!       static long s_nNoValue;
! 
!     protected:
!       std::string   m_sURI;
!       CListCallback m_lpfnCallbackData;
!       CListCallback m_lpfnCallbackStatus;
!       long          m_nError;
!       
!     public:
!                CDevice(const std::string& rsURI = "");
!       virtual ~CDevice();
! 
!     /*******************************************
!      *
!      *    interface
!      *
!      *******************************************/
! 
!     public:
! 
!       // abstract Interface
!       virtual long   GetVersion() = 0;
!       virtual long   GetType() = 0;
!       virtual double GetPollingIntervall() = 0;
!       virtual long   GetCapabilities() = 0;
!       virtual long   GetFunctions() = 0;
!       virtual void   GetInfo(long& rnVersion,
!                              long& rnType,
!                              long& rnCapabilities,
!                              long& rnFunctions) = 0;
!       virtual long   GetData(TDeviceData& rstData) = 0;
! 
!     public:
!       // virtual Interface
!       virtual long GetErrorLast();
!       virtual long GetErrorText(std::string& rsError,
!                                      long    nError = 0);
! 
!       virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
!                                           char              cType = CB_DATA);
!       virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! 
!     }; // class CDevice
! 
!   } // namespace colpatik
! 
! #endif // __DEVICE_H
--- 1,103 ----
! /***************************************************************************
!                              Device.h
!                         -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_H
! #define __DEVICE_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <string>
! #include <list>
! 
! #include "API_Device.h"
! 
! 
! typedef std::list<colpatik::pfnDeviceCallback> CListCallback;
! 
! namespace colpatik
!   {
! 
!   class CDevice
!     {
!     protected:
!       static long s_nNoValue;
! 
!     protected:
!       std::string   m_sURI;
!       CListCallback m_lpfnCallbackData;
!       CListCallback m_lpfnCallbackStatus;
!       long          m_nError;
!       
!     public:
!                CDevice(const std::string& rsURI = "");
!       virtual ~CDevice();
! 
!     /*******************************************
!      *
!      *    interface
!      *
!      *******************************************/
! 
!     public:
! 
!       // abstract Interface
!       virtual long   GetVersion() = 0;
!       virtual long   GetType() = 0;
!       virtual double GetPollingIntervall() = 0;
!       virtual long   GetCapabilities() = 0;
!       virtual long   GetFunctions() = 0;
!       virtual void   GetInfo(long& rnVersion,
!                              long& rnType,
!                              long& rnCapabilities,
!                              long& rnFunctions) = 0;
!       virtual long   GetData(TDeviceData& rstData) = 0;
! 
!     public:
!       // virtual Interface
!       virtual long GetErrorLast();
!       virtual long GetErrorText(std::string& rsError,
!                                      long    nError = 0);
! 
!       virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
!                                           char              cType = CB_DATA);
!       virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! 
!     }; // class CDevice
! 
!   } // namespace colpatik
! 
! #endif // __DEVICE_H

Index: DeviceInterrupt.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DeviceInterrupt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DeviceInterrupt.h   30 Oct 2002 02:06:12 -0000      1.3
--- DeviceInterrupt.h   30 Oct 2002 23:35:53 -0000      1.4
***************
*** 1,96 ****
! /***************************************************************************
!                                                               DevicePoll.h
!                                                        -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_INTERRUPT_H
! #define __DEVICE_INTERRUPT_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! 
! #if __GNUG__ >= 2
! //#  pragma interface
! #  endif
! 
! #include <string>
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   
!   class CDeviceInterrupt : public CDevice
!     {
!     private:
!       typedef CDevice inherited;
! 
!     protected:
!       time_t m_dTime; // system time 
!       
!     public:
!                CDeviceInterrupt(const std::string& rsURI = "");
!       virtual ~CDeviceInterrupt();
! 
!     /*******************************************
!      *
!      *    interface
!      *
!      *******************************************/
!      
!     public:
!       // abstract Interface
!       virtual long   GetVersion();
!       virtual long   GetType();
!       virtual double GetPollingIntervall();
!       virtual long   GetCapabilities();
!       virtual long   GetFunctions();
!       virtual void   GetInfo(long& rnVersion,
!                              long& rnType,
!                              long& rnCapabilities,
!                              long& rnFunctions);
!       virtual long   GetData(TDeviceData& rstData);
! 
!     public:
!       // virtual Interface
!       virtual long GetErrorLast();
!       virtual long GetErrorText(std::string& rsError,
!                                      long    nError = 0);
! 
!       virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
!                                           char              cType = CB_DATA);
!       virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! 
!     }; // class CDeviceInterrupt
!   
!   } // namespace colpatik
! 
! #endif //  __DEVICE_INTERRUPT_H
! 
--- 1,96 ----
! /***************************************************************************
!                                                               DevicePoll.h
!                                                        -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_INTERRUPT_H
! #define __DEVICE_INTERRUPT_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! 
! #if __GNUG__ >= 2
! //#  pragma interface
! #  endif
! 
! #include <string>
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   
!   class CDeviceInterrupt : public CDevice
!     {
!     private:
!       typedef CDevice inherited;
! 
!     protected:
!       time_t m_dTime; // system time 
!       
!     public:
!                CDeviceInterrupt(const std::string& rsURI = "");
!       virtual ~CDeviceInterrupt();
! 
!     /*******************************************
!      *
!      *    interface
!      *
!      *******************************************/
!      
!     public:
!       // abstract Interface
!       virtual long   GetVersion();
!       virtual long   GetType();
!       virtual double GetPollingIntervall();
!       virtual long   GetCapabilities();
!       virtual long   GetFunctions();
!       virtual void   GetInfo(long& rnVersion,
!                              long& rnType,
!                              long& rnCapabilities,
!                              long& rnFunctions);
!       virtual long   GetData(TDeviceData& rstData);
! /*
!     public:
!       // virtual Interface
!       virtual long GetErrorLast();
!       virtual long GetErrorText(std::string& rsError,
!                                      long    nError = 0);
! 
!       virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
!                                           char              cType = CB_DATA);
!       virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! */
!     }; // class CDeviceInterrupt
!   
!   } // namespace colpatik
! 
! #endif //  __DEVICE_INTERRUPT_H
! 

Index: DevicePoll.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DevicePoll.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DevicePoll.h        30 Oct 2002 01:48:48 -0000      1.2
--- DevicePoll.h        30 Oct 2002 23:35:53 -0000      1.3
***************
*** 1,68 ****
! /***************************************************************************
!                                                               DevicePoll.h
!                                                        -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_POLL_H
! #define __DEVICE_POLL_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #endif // #if __GNU__ >= 2
! 
! 
! #include <string>
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   
!   class CDevicePoll : public CDevice
!     {
!     private:
!       typedef CDevice inherited;
! 
!     protected:
!       double m_dIntervall; // in ms
!       
!     public:
!                CDevicePoll(const std::string& rsURI = "");
!       virtual ~CDevicePoll();
!          
!     protected:
!       
!     }; // class CDevicePoll
!   
!   } // namespace colpatik
! 
! #endif //  __DEVICE_POLL_H
--- 1,96 ----
! /***************************************************************************
!                                                               DevicePoll.h
!                                                        -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_POLL_H
! #define __DEVICE_POLL_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #endif // #if __GNU__ >= 2
! 
! 
! #include <string>
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   
!   class CDevicePoll : public CDevice
!     {
!     private:
!       typedef CDevice inherited;
! 
!     protected:
!       double m_dIntervall; // in ms
!       
!     public:
!                CDevicePoll(const std::string& rsURI = "");
!       virtual ~CDevicePoll();
!          
!     /*******************************************
!      *
!      *    interface
!      *
!      *******************************************/
!      
!     public:
!       // abstract Interface
!       virtual long   GetVersion();
!       virtual long   GetType();
!       virtual double GetPollingIntervall();
!       virtual long   GetCapabilities();
!       virtual long   GetFunctions();
!       virtual void   GetInfo(long& rnVersion,
!                              long& rnType,
!                              long& rnCapabilities,
!                              long& rnFunctions);
!       virtual long   GetData(TDeviceData& rstData);
!       
! /*
!     public:
!       // virtual Interface
!       virtual long GetErrorLast();
!       virtual long GetErrorText(std::string& rsError,
!                                      long    nError = 0);
! 
!       virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
!                                           char              cType = CB_DATA);
!       virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! */
!     }; // class CDevicePoll
!   
!   } // namespace colpatik
! 
! #endif //  __DEVICE_POLL_H

Index: DeviceQuery.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DeviceQuery.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DeviceQuery.h       30 Oct 2002 01:48:48 -0000      1.2
--- DeviceQuery.h       30 Oct 2002 23:35:53 -0000      1.3
***************
*** 1,69 ****
! /***************************************************************************
!                                                               DevicePoll.h
!                                                        -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_QUERY_H
! #define __DEVICE_QUERY_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <string>
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   
!   class CDeviceQuery : public CDevice
!     {
!     private:
!       typedef CDevice inherited;
! 
!     protected:
!       double m_dTimeout; // in ms
!       
!     public:
!                CDeviceQuery(const std::string& rsURI = "");
!       virtual ~CDeviceQuery();
!          //  virtual ~CDeviceQuery();
!          
!     protected:
!       
!     }; // class CDeviceQuery
!   
!   } // namespace colpatik
! 
! #endif //  __DEVICE_QUERY_H
--- 1,97 ----
! /***************************************************************************
!                                                               DevicePoll.h
!                                                        -------------------
!     begin                : Fri Mar 3 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************/
! 
! #ifndef __DEVICE_QUERY_H
! #define __DEVICE_QUERY_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <string>
! 
! #include "Device.h"
! 
! namespace colpatik
!   {
!   
!   class CDeviceQuery : public CDevice
!     {
!     private:
!       typedef CDevice inherited;
! 
!     protected:
!       double m_dTimeout; // in ms
!       
!     public:
!                CDeviceQuery(const std::string& rsURI = "");
!       virtual ~CDeviceQuery();
!          //  virtual ~CDeviceQuery();
!          
!     /*******************************************
!      *
!      *    interface
!      *
!      *******************************************/
!      
!     public:
!       // abstract Interface
!       virtual long   GetVersion();
!       virtual long   GetType();
!       virtual double GetPollingIntervall();
!       virtual long   GetCapabilities();
!       virtual long   GetFunctions();
!       virtual void   GetInfo(long& rnVersion,
!                              long& rnType,
!                              long& rnCapabilities,
!                              long& rnFunctions);
!       virtual long   GetData(TDeviceData& rstData);
!       
! /*
!     public:
!       // virtual Interface
!       virtual long GetErrorLast();
!       virtual long GetErrorText(std::string& rsError,
!                                      long    nError = 0);
! 
!       virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
!                                           char              cType = CB_DATA);
!       virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! */
!     }; // class CDeviceQuery
!   
!   } // namespace colpatik
! 
! #endif //  __DEVICE_QUERY_H

Index: Event.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Event.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Event.h     30 Oct 2002 01:48:48 -0000      1.5
--- Event.h     30 Oct 2002 23:35:53 -0000      1.6
***************
*** 1,93 ****
! /***************************************************************************
!                               Event.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *    Copy constructors and assignment operators will get
!  *    ownership of the given source entity if the source
!  *    is the owner of the data element
!  *
!  ***************************************************************************/
! 
! #ifndef __EVENT_H
! #define __EVENT_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <time.h>
! 
! enum eEventTypes
!   {
!   T_EVENT_UNKNOWN = 0
!   };
! 
! namespace colpatik
!   {
! 
!   typedef
!     struct tagEvent
!       {
!       time_t m_tStart;
!       time_t m_tId;
!       long   m_nType;
!       void*  m_pData;
!       } TEvent, *PEvent;
! 
!   class CEvent : public TEvent
!     {
!     protected:
!       static TEvent m_oNoEvent;
! 
!     protected:
!       bool m_bDataIsMe;
! 
!     public:
!                CEvent();
!                CEvent(      CEvent& src);
!                CEvent(const TEvent& src);
!       virtual ~CEvent();
! 
!     public:
!             CEvent& operator = (      CEvent& src);
!       const TEvent& operator = (const TEvent& src);
! 
!     protected:
!       void Initialize();
! 
!     }; // CEvent
! 
!   } // namespace colpatik
! 
! #endif // __EVENT_H
--- 1,116 ----
! /***************************************************************************
!                               Event.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *    Copy constructors and assignment operators will get
!  *    ownership of the given source entity if the source
!  *    is the owner of the data element
!  *
!  ***************************************************************************/
! 
! #ifndef __EVENT_H
! #define __EVENT_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <time.h>
! 
! 
! // -------------------------> THE EVENT
! 
! // currently not in the namespace, because the STL
! // has problems with the structure if the struct
! // is in a foreign namespace and we want to use
! // any STL container to store instances ot the struct
! 
! typedef unsigned char uchar;
! 
! typedef
!   struct tagEvent
!     {
!     size_t m_nSize;
!     time_t m_tStart;
!     time_t m_tId;
!     long   m_nType;
!     uchar *m_pData;
!     } TEvent, *PEvent;
! 
! bool operator <  (const TEvent& e1, const TEvent& e2);
! bool operator == (const TEvent& e1, const TEvent& e2);
! 
! // <------------------------- THE EVENT
! 
! namespace colpatik
!   {
!   enum eEventTypes
!     {
!     T_EVENT_UNKNOWN      = 0x0000,
!     T_EVENT_KEYDOWN      = 0x0001,
!     T_EVENT_KEYUP        = 0x0000,
!     T_EVENT_MOUSE_1_DOWN = 0x0011,
!     T_EVENT_MOUSE_1_UP   = 0x0010,
!     T_EVENT_MOUSE_2_DOWN = 0x0021,
!     T_EVENT_MOUSE_2_UP   = 0x0020,
!     T_EVENT_MOUSE_3_DOWN = 0x0041,
!     T_EVENT_MOUSE_3_UP   = 0x0040
!     }; // enum eEventTypes
! 
!   class CEvent : public TEvent
!     {
!     protected:
!       static TEvent m_oNoEvent;
! 
!     protected:
!       bool m_bDataIsMe;
! 
!     public:
!                CEvent();
!                CEvent(      CEvent& src);
!                CEvent(const TEvent& src);
!       virtual ~CEvent();
! 
!     public:
!             CEvent& operator = (      CEvent& src);
!       const TEvent& operator = (const TEvent& src);
! 
!     protected:
!       void Initialize();
! 
!     }; // CEvent
! 
!   } // namespace colpatik
! 
! #endif // __EVENT_H

Index: Makefile.am
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 28 Oct 2002 22:42:29 -0000      1.2
--- Makefile.am 30 Oct 2002 23:35:53 -0000      1.3
***************
*** 5,9 ****
  install-data-local:
        $(mkinstalldirs) $(prefix)/include/3Dsia/modules/input
-       $(INSTALL_DATA) ColpatikDevice.h  
$(prefix)/include/3Dsia/modules/input/ColpatikDevice.h
        $(INSTALL_DATA) ColpatikInput.h   
$(prefix)/include/3Dsia/modules/input/ColpatikInput.h
        $(INSTALL_DATA) Event.h           
$(prefix)/include/3Dsia/modules/input/Event.h
--- 5,8 ----

Index: Queue.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Queue.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Queue.h     30 Oct 2002 01:48:48 -0000      1.3
--- Queue.h     30 Oct 2002 23:35:53 -0000      1.4
***************
*** 1,73 ****
! /***************************************************************************
!                               queue.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *
!  *
!  ***************************************************************************/
! 
! #ifndef __QUEUE_H
! #define __QUEUE_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! 
! #include <queue>
! 
! #include "Event.h"
! 
! namespace colpatik
!   {
! 
!   class CQueue : public std::queue<CEvent>
!     {
!     protected:
! 
!     public:
!                CQueue();
!       virtual ~CQueue();
! 
!       CEvent& operator << (CEvent& roEvent);
!       CEvent& operator >> (CEvent& roEvent);
! 
!     protected:
!       void Initialize();
! 
!     }; // class Filter
! 
!   } // namespace colpatik
! 
! #endif // __QUEUE_H
--- 1,73 ----
! /***************************************************************************
!                               queue.h
!                           -------------------
!     begin                : Thu Jun 9 2000
!     copyright            : (C) 1993..2000 by Manfred Morgner
!     email                : address@hidden
!  ***************************************************************************/
! 
! /***************************************************************************
!  *                                                                         *
!  *   This program is free software; you can redistribute it and/or modify  *
!  *   it under the terms of the GNU General Public License as published by  *
!  *   the Free Software Foundation; either version 2 of the License, or     *
!  *   (at your option) any later version.                                   *
!  *                                                                         *
!  *   This program is distributed in the hope that it will be useful,       *
!  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
!  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
!  *   GNU General Public License for more details.                          *
!  *                                                                         *
!  *   You should have received a copy of the GNU General Public License     *
!  *   along with this program; if not, write to the                         *
!  *                                                                         *
!  *   Free Software Foundation, Inc.,                                       *
!  *   59 Temple Place Suite 330,                                            *
!  *   Boston, MA  02111-1307, USA.                                          *
!  *                                                                         *
!  ***************************************************************************
!  *
!  *
!  *
!  ***************************************************************************/
! 
! #ifndef __QUEUE_H
! #define __QUEUE_H
! 
! #if _MSC_VER >= 1000
! #  pragma once
! #  pragma warning (disable : 4786)
! #  endif // _MSC_VER >= 1000
! 
! #if __GNU__ >= 2
! #  pragma interface
! #  endif // #if __GNU__ >= 2
! 
! 
! #include <queue>
! 
! #include "Event.h"
! 
! 
! namespace colpatik
!   {
! 
!   class CQueue : public std::queue<TEvent>
!     {
!     protected:
! 
!     public:
!                CQueue();
!       virtual ~CQueue();
! 
!       CEvent& operator << (CEvent& roEvent);
!       CEvent& operator >> (CEvent& roEvent);
! 
!     protected:
!       void Initialize();
! 
!     }; // class Filter
! 
!   } // namespace colpatik
! 
! #endif // __QUEUE_H





reply via email to

[Prev in Thread] Current Thread [Next in Thread]