Changeset 2752 for trunk/synergy/cmd

Timestamp:

Jul 29, 2006, 6:43:07 AM (19 years ago)

Author:

bird

Message:

Two classes (CPMScreen and CPMKeyState) + the hook dll left (and debugging of course).

Location:

trunk/synergy/cmd

Files:

• Makefile.kmk (added)
• synergyc/CPMClientTaskBarReceiver.cpp (copied) (copied from trunk/synergy/cmd/synergyc/COSXClientTaskBarReceiver.cpp ) (7 diffs)
• synergyc/CPMClientTaskBarReceiver.h (copied) (copied from trunk/synergy/cmd/synergyc/COSXClientTaskBarReceiver.h ) (4 diffs)
• synergyc/Makefile.kmk (added)
• synergyc/synergyc.cpp (modified) (3 diffs)
• synergys/CPMServerTaskBarReceiver.cpp (copied) (copied from trunk/synergy/cmd/synergys/COSXServerTaskBarReceiver.cpp ) (7 diffs)
• synergys/CPMServerTaskBarReceiver.h (copied) (copied from trunk/synergy/cmd/synergys/COSXServerTaskBarReceiver.h ) (3 diffs)
• synergys/Makefile.kmk (added)
• synergys/synergys.cpp (modified) (3 diffs)

trunk/synergy/cmd/synergyc/CPMClientTaskBarReceiver.cpp

@@ -2 +2 @@
  * synergy -- mouse and keyboard sharing utility
  * Copyright (C) 2004 Chris Schoeneman
+ * Copyright (C) 2006 Knut St. Osmundsen
  * 
  * This package is free software; you can redistribute it and/or
@@ -13 +14 @@
  */
 
-#include "COSXClientTaskBarReceiver.h"
+#include "CPMClientTaskBarReceiver.h"
 #include "CArch.h"
 
 //
-// COSXClientTaskBarReceiver
+// CPMClientTaskBarReceiver
 //
 
-COSXClientTaskBarReceiver::COSXClientTaskBarReceiver(
+CPMClientTaskBarReceiver::CPMClientTaskBarReceiver(
                                 const CBufferedLogOutputter*)
 {
@@ -27 +28 @@
 }
 
-COSXClientTaskBarReceiver::~COSXClientTaskBarReceiver()
+CPMClientTaskBarReceiver::~CPMClientTaskBarReceiver()
 {
         ARCH->removeReceiver(this);
@@ -33 +34 @@
 
 void
-COSXClientTaskBarReceiver::showStatus()
+CPMClientTaskBarReceiver::showStatus()
 {
         // do nothing
@@ -39 +40 @@
 
 void
-COSXClientTaskBarReceiver::runMenu(int, int)
+CPMClientTaskBarReceiver::runMenu(int, int)
 {
         // do nothing
@@ -45 +46 @@
 
 void
-COSXClientTaskBarReceiver::primaryAction()
+CPMClientTaskBarReceiver::primaryAction()
 {
         // do nothing
@@ -51 +52 @@
 
 const IArchTaskBarReceiver::Icon
-COSXClientTaskBarReceiver::getIcon() const
+CPMClientTaskBarReceiver::getIcon() const
 {
         return NULL;
 }
+

trunk/synergy/cmd/synergyc/CPMClientTaskBarReceiver.h

@@ -2 +2 @@
  * synergy -- mouse and keyboard sharing utility
  * Copyright (C) 2004 Chris Schoeneman
+ * Copyright (C) 2006 Knut St. Osmundsen
  * 
  * This package is free software; you can redistribute it and/or
@@ -13 +14 @@
  */
 
-#ifndef COSXCLIENTTASKBARRECEIVER_H
-#define COSXCLIENTTASKBARRECEIVER_H
+#ifndef CPMCLIENTTASKBARRECEIVER_H
+#define CPMCLIENTTASKBARRECEIVER_H
 
 #include "CClientTaskBarReceiver.h"
@@ -20 +21 @@
 class CBufferedLogOutputter;
 
-//! Implementation of CClientTaskBarReceiver for OS X
-class COSXClientTaskBarReceiver : public CClientTaskBarReceiver {
+//! Implementation of CClientTaskBarReceiver for PM
+class CPMClientTaskBarReceiver : public CClientTaskBarReceiver {
 public:
-        COSXClientTaskBarReceiver(const CBufferedLogOutputter*);
-        virtual ~COSXClientTaskBarReceiver();
+        CPMClientTaskBarReceiver(const CBufferedLogOutputter*);
+        virtual ~CPMClientTaskBarReceiver();
 
         // IArchTaskBarReceiver overrides
@@ -34 +35 @@
 
 #endif
+

trunk/synergy/cmd/synergyc/synergyc.cpp

@@ -49 +49 @@
 #include "COSXScreen.h"
 #include "COSXClientTaskBarReceiver.h"
+#elif WINAPI_PM
+#include "CPMScreen.h"
+#include "CPMClientTaskBarReceiver.h"
 #endif
 
@@ -110 +113 @@
 #elif WINAPI_CARBON
         return new CScreen(new COSXScreen(false));
+#elif WINAPI_PM
+        return new CScreen(new CPMScreen(false));
 #endif
 }
@@ -124 +129 @@
 #elif WINAPI_CARBON
         return new COSXClientTaskBarReceiver(logBuffer);
+#elif WINAPI_PM
+        return new CPMClientTaskBarReceiver(logBuffer);
 #endif
 }

trunk/synergy/cmd/synergys/CPMServerTaskBarReceiver.cpp

@@ -2 +2 @@
  * synergy -- mouse and keyboard sharing utility
  * Copyright (C) 2004 Chris Schoeneman
+ * Copyright (C) 2006 Knut St. Osmundsen
  * 
  * This package is free software; you can redistribute it and/or
@@ -13 +14 @@
  */
 
-#include "COSXServerTaskBarReceiver.h"
+#include "CPMServerTaskBarReceiver.h"
 #include "CArch.h"
 
 //
-// COSXServerTaskBarReceiver
+// CPMServerTaskBarReceiver
 //
 
-COSXServerTaskBarReceiver::COSXServerTaskBarReceiver(
+CPMServerTaskBarReceiver::CPMServerTaskBarReceiver(
                                 const CBufferedLogOutputter*)
 {
@@ -27 +28 @@
 }
 
-COSXServerTaskBarReceiver::~COSXServerTaskBarReceiver()
+CPMServerTaskBarReceiver::~CPMServerTaskBarReceiver()
 {
         ARCH->removeReceiver(this);
@@ -33 +34 @@
 
 void
-COSXServerTaskBarReceiver::showStatus()
+CPMServerTaskBarReceiver::showStatus()
 {
         // do nothing
@@ -39 +40 @@
 
 void
-COSXServerTaskBarReceiver::runMenu(int, int)
+CPMServerTaskBarReceiver::runMenu(int, int)
 {
         // do nothing
@@ -45 +46 @@
 
 void
-COSXServerTaskBarReceiver::primaryAction()
+CPMServerTaskBarReceiver::primaryAction()
 {
         // do nothing
@@ -51 +52 @@
 
 const IArchTaskBarReceiver::Icon
-COSXServerTaskBarReceiver::getIcon() const
+CPMServerTaskBarReceiver::getIcon() const
 {
         return NULL;

trunk/synergy/cmd/synergys/CPMServerTaskBarReceiver.h

@@ -2 +2 @@
  * synergy -- mouse and keyboard sharing utility
  * Copyright (C) 2004 Chris Schoeneman
+ * Copyright (C) 2006 Knut St. Osmundsen
  * 
  * This package is free software; you can redistribute it and/or
@@ -13 +14 @@
  */
 
-#ifndef COSXSERVERTASKBARRECEIVER_H
-#define COSXSERVERTASKBARRECEIVER_H
+#ifndef CPMSERVERTASKBARRECEIVER_H
+#define CPMSERVERTASKBARRECEIVER_H
 
 #include "CServerTaskBarReceiver.h"
@@ -20 +21 @@
 class CBufferedLogOutputter;
 
-//! Implementation of CServerTaskBarReceiver for OS X
-class COSXServerTaskBarReceiver : public CServerTaskBarReceiver {
+//! Implementation of CServerTaskBarReceiver for PM
+class CPMServerTaskBarReceiver : public CServerTaskBarReceiver {
 public:
-        COSXServerTaskBarReceiver(const CBufferedLogOutputter*);
-        virtual ~COSXServerTaskBarReceiver();
+        CPMServerTaskBarReceiver(const CBufferedLogOutputter*);
+        virtual ~CPMServerTaskBarReceiver();
 
         // IArchTaskBarReceiver overrides

trunk/synergy/cmd/synergys/synergys.cpp

@@ -52 +52 @@
 #include "COSXScreen.h"
 #include "COSXServerTaskBarReceiver.h"
+#elif WINAPI_PM
+#include "CPMScreen.h"
+#include "CPMServerTaskBarReceiver.h"
 #endif
 
@@ -127 +130 @@
 #elif WINAPI_CARBON
         return new CScreen(new COSXScreen(true));
+#elif WINAPI_PM
+        return new CScreen(new CPMScreen(true));
 #endif
 }
@@ -141 +146 @@
 #elif WINAPI_CARBON
         return new COSXServerTaskBarReceiver(logBuffer);
+#elif WINAPI_PM
+        return new CPMServerTaskBarReceiver(logBuffer);
 #endif
 }