Changeset 2770 for trunk/synergy/lib/platform

Timestamp:

Aug 20, 2006, 8:15:41 AM (19 years ago)

Author:

bird

Message:

I hate tabs.

Location:

trunk/synergy/lib/platform

Files:

• CPMClipboard.cpp (modified) (15 diffs)
• CPMClipboard.h (modified) (3 diffs)

trunk/synergy/lib/platform/CPMClipboard.cpp

@@ -3 +3 @@
  * Copyright (C) 2002 Chris Schoeneman
  * Copyright (C) 2006 Knut St. Osmundsen
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25 +25 @@
 //
 
-ATOM                                    CPMClipboard::s_ownershipFormat = 0;
+ATOM                    CPMClipboard::s_ownershipFormat = 0;
 
 CPMClipboard::CPMClipboard(HWND window) :
-        m_window(window),
-        m_time(0)
-{
-        // add converters, most desired first
-        m_converters.push_back(new CPMClipboardTextConverter);
-        m_converters.push_back(new CPMClipboardBitmapConverter);
-        m_converters.push_back(new CPMClipboardHTMLConverter);
+    m_window(window),
+    m_time(0)
+{
+    // add converters, most desired first
+    m_converters.push_back(new CPMClipboardTextConverter);
+    m_converters.push_back(new CPMClipboardBitmapConverter);
+    m_converters.push_back(new CPMClipboardHTMLConverter);
 }
 
 CPMClipboard::~CPMClipboard()
 {
-        clearConverters();
+    clearConverters();
 }
 
@@ -45 +45 @@
 CPMClipboard::emptyUnowned()
 {
-        LOG((CLOG_DEBUG "empty clipboard"));
-
-        // empty the clipboard (and take ownership)
-        if (!WinEmptyClipbrd(CPMUtil::getHAB())) {
-                LOG((CLOG_DEBUG "failed to grab clipboard"));
-                return false;
-        }
-
-        return true;
+    LOG((CLOG_DEBUG "empty clipboard"));
+
+    // empty the clipboard (and take ownership)
+    if (!WinEmptyClipbrd(CPMUtil::getHAB())) {
+        LOG((CLOG_DEBUG "failed to grab clipboard"));
+        return false;
+    }
+
+    return true;
 }
 
@@ -59 +59 @@
 CPMClipboard::empty()
 {
-        if (!emptyUnowned()) {
-                return false;
-        }
-
-        // mark clipboard as being owned by synergy
+    if (!emptyUnowned()) {
+        return false;
+    }
+
+    // mark clipboard as being owned by synergy
     PVOID pv = NULL;
     APIRET rc = DosAllocSharedMem(&pv, NULL, 1, PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_GETTABLE | OBJ_GIVEABLE);
@@ -70 +70 @@
         return false;
     }
-        return !!WinSetClipbrdData(CPMUtil::getHAB(), (ULONG)pv, getOwnershipFormat(), CFI_POINTER);
+    return !!WinSetClipbrdData(CPMUtil::getHAB(), (ULONG)pv, getOwnershipFormat(), CFI_POINTER);
 }
 
@@ -76 +76 @@
 CPMClipboard::add(EFormat format, const CString& data)
 {
-        LOG((CLOG_DEBUG "add %d bytes to clipboard format: %d", data.size(), format));
-
-        // convert data to win32 form
-        for (ConverterList::const_iterator index = m_converters.begin();
-                 index != m_converters.end();
-                 ++index) {
-                IPMClipboardConverter* converter = *index;
-
-                // skip converters for other formats
-                if (converter->getFormat() == format) {
-                        ULONG ulPMData = converter->fromIClipboard(data);
-                        if (ulPMData != NULL) {
-                                ULONG ulPMFormat = converter->getPMFormat();
+    LOG((CLOG_DEBUG "add %d bytes to clipboard format: %d", data.size(), format));
+
+    // convert data to win32 form
+    for (ConverterList::const_iterator index = m_converters.begin();
+         index != m_converters.end();
+         ++index) {
+        IPMClipboardConverter* converter = *index;
+
+        // skip converters for other formats
+        if (converter->getFormat() == format) {
+            ULONG ulPMData = converter->fromIClipboard(data);
+            if (ulPMData != NULL) {
+                ULONG ulPMFormat = converter->getPMFormat();
                 ULONG ulPMFormatInfo = converter->getPMFormatInfo();
-                                if (!WinSetClipbrdData(CPMUtil::getHAB(), ulPMData, ulPMFormat, ulPMFormatInfo)) {
-                                        // free converted data if we couldn't put it on the clipboard
+                if (!WinSetClipbrdData(CPMUtil::getHAB(), ulPMData, ulPMFormat, ulPMFormatInfo)) {
+                    // free converted data if we couldn't put it on the clipboard
                     converter->freePMData(ulPMData);
-                                }
-                        }
-                }
-        }
+                }
+            }
+        }
+    }
 }
 
@@ -102 +102 @@
 CPMClipboard::open(Time time) const
 {
-        LOG((CLOG_DEBUG "open clipboard"));
-
-        if (!WinOpenClipbrd(m_window)) {
-                LOG((CLOG_WARN "failed to open clipboard"));
-                return false;
-        }
-
-        m_time = time;
-
-        return true;
+    LOG((CLOG_DEBUG "open clipboard"));
+
+    if (!WinOpenClipbrd(m_window)) {
+        LOG((CLOG_WARN "failed to open clipboard"));
+        return false;
+    }
+
+    m_time = time;
+
+    return true;
 }
 
@@ -117 +117 @@
 CPMClipboard::close() const
 {
-        LOG((CLOG_DEBUG "close clipboard"));
-        WinCloseClipbrd(CPMUtil::getHAB());
+    LOG((CLOG_DEBUG "close clipboard"));
+    WinCloseClipbrd(CPMUtil::getHAB());
 }
 
@@ -124 +124 @@
 CPMClipboard::getTime() const
 {
-        return m_time;
+    return m_time;
 }
 
@@ -130 +130 @@
 CPMClipboard::has(EFormat format) const
 {
-        for (ConverterList::const_iterator index = m_converters.begin();
-                 index != m_converters.end();
-                 ++index) {
-                IPMClipboardConverter* converter = *index;
-                if (converter->getFormat() == format) {
+    for (ConverterList::const_iterator index = m_converters.begin();
+         index != m_converters.end();
+         ++index) {
+        IPMClipboardConverter* converter = *index;
+        if (converter->getFormat() == format) {
             ULONG fFmtInfo;
-                        if (WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo)) {
-                                return true;
-                        }
-                }
-        }
-        return false;
+            if (WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo)) {
+                return true;
+            }
+        }
+    }
+    return false;
 }
 
@@ -147 +147 @@
 CPMClipboard::get(EFormat format) const
 {
-        // find the converter for the first clipboard format we can handle
-        IPMClipboardConverter* converter = NULL;
-        ULONG pmFormat = WinEnumClipbrdFmts(CPMUtil::getHAB(), 0);
-        while (converter == NULL && pmFormat != 0) {
-                for (ConverterList::const_iterator index = m_converters.begin();
-                         index != m_converters.end(); 
+    // find the converter for the first clipboard format we can handle
+    IPMClipboardConverter* converter = NULL;
+    ULONG pmFormat = WinEnumClipbrdFmts(CPMUtil::getHAB(), 0);
+    while (converter == NULL && pmFormat != 0) {
+        for (ConverterList::const_iterator index = m_converters.begin();
+             index != m_converters.end();
              ++index) {
-                        converter = *index;
-                        if (converter->getPMFormat() == pmFormat &&
-                                converter->getFormat()   == format) {
-                                break;
-                        }
-                        converter = NULL;
-                }
-                pmFormat = WinEnumClipbrdFmts(CPMUtil::getHAB(), pmFormat);
-        }
-
-        // if no converter then we don't recognize any formats
-        if (converter == NULL) {
-                return CString();
-        }
-
-        // get a handle to the clipboard data
-        ULONG ulData = WinQueryClipbrdData(CPMUtil::getHAB(), converter->getPMFormat());
-        if (ulData == 0) {
-                return CString();
-        }
-
-        // convert
-        return converter->toIClipboard(ulData);
+            converter = *index;
+            if (converter->getPMFormat() == pmFormat &&
+                converter->getFormat()   == format) {
+                break;
+            }
+            converter = NULL;
+        }
+        pmFormat = WinEnumClipbrdFmts(CPMUtil::getHAB(), pmFormat);
+    }
+
+    // if no converter then we don't recognize any formats
+    if (converter == NULL) {
+        return CString();
+    }
+
+    // get a handle to the clipboard data
+    ULONG ulData = WinQueryClipbrdData(CPMUtil::getHAB(), converter->getPMFormat());
+    if (ulData == 0) {
+        return CString();
+    }
+
+    // convert
+    return converter->toIClipboard(ulData);
 }
 
@@ -182 +182 @@
 CPMClipboard::clearConverters()
 {
-        for (ConverterList::iterator index = m_converters.begin();
-                 index != m_converters.end();
-                 ++index) {
-                delete *index;
-        }
-        m_converters.clear();
+    for (ConverterList::iterator index = m_converters.begin();
+         index != m_converters.end();
+         ++index) {
+        delete *index;
+    }
+    m_converters.clear();
 }
 
@@ -194 +194 @@
 {
     ULONG fFmtInfo;
-        return (!!WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo));
+    return (!!WinQueryClipbrdFmtInfo(CPMUtil::getHAB(), getOwnershipFormat(), &fFmtInfo));
 }
 
@@ -200 +200 @@
 CPMClipboard::getOwnershipFormat()
 {
-        // create ownership format if we haven't yet
-        if (s_ownershipFormat == 0) {
+    // create ownership format if we haven't yet
+    if (s_ownershipFormat == 0) {
         ATOM hAtom = WinAddAtom(WinQuerySystemAtomTable(), (PCSZ)"SynergyOwnership");
         if (hAtom == 0)
@@ -207 +207 @@
         assert(hAtom != 0);
         s_ownershipFormat = hAtom;
-        }
-
-        // return the format
-        return s_ownershipFormat;
-}
+    }
+
+    // return the format
+    return s_ownershipFormat;
+}

trunk/synergy/lib/platform/CPMClipboard.h

@@ -3 +3 @@
  * Copyright (C) 2002 Chris Schoeneman
  * Copyright (C) 2006 Knut St. Osmundsen
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file COPYING that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29 +29 @@
 class CPMClipboard : public IClipboard {
 public:
-        CPMClipboard(HWND window);
-        virtual ~CPMClipboard();
+    CPMClipboard(HWND window);
+    virtual ~CPMClipboard();
 
-        //! Empty clipboard without ownership
-        /*!
-        Take ownership of the clipboard and clear all data from it.
-        This must be called between a successful open() and close().
-        Return false if the clipboard ownership could not be taken;
-        the clipboard should not be emptied in this case.  Unlike
-        empty(), isOwnedBySynergy() will return false when emptied
-        this way.  This is useful when synergy wants to put data on
-        clipboard but pretend (to itself) that some other app did it.
-        When using empty(), synergy assumes the data came from the
-        server and doesn't need to be sent back.  emptyUnowned()
-        makes synergy send the data to the server.
-        */
-        bool                            emptyUnowned();
+    //! Empty clipboard without ownership
+    /*!
+    Take ownership of the clipboard and clear all data from it.
+    This must be called between a successful open() and close().
+    Return false if the clipboard ownership could not be taken;
+    the clipboard should not be emptied in this case.  Unlike
+    empty(), isOwnedBySynergy() will return false when emptied
+    this way.  This is useful when synergy wants to put data on
+    clipboard but pretend (to itself) that some other app did it.
+    When using empty(), synergy assumes the data came from the
+    server and doesn't need to be sent back.  emptyUnowned()
+    makes synergy send the data to the server.
+    */
+    bool                emptyUnowned();
 
-        //! Test if clipboard is owned by synergy
-        static bool                     isOwnedBySynergy();
+    //! Test if clipboard is owned by synergy
+    static bool         isOwnedBySynergy();
 
-        // IClipboard overrides
-        virtual bool            empty();
-        virtual void            add(EFormat, const CString& data);
-        virtual bool            open(Time) const;
-        virtual void            close() const;
-        virtual Time            getTime() const;
-        virtual bool            has(EFormat) const;
-        virtual CString         get(EFormat) const;
+    // IClipboard overrides
+    virtual bool        empty();
+    virtual void        add(EFormat, const CString& data);
+    virtual bool        open(Time) const;
+    virtual void        close() const;
+    virtual Time        getTime() const;
+    virtual bool        has(EFormat) const;
+    virtual CString     get(EFormat) const;
 
 private:
-        void                            clearConverters();
+    void                clearConverters();
 
-        ULONG                           convertFormatToPM(EFormat) const;
-        ULONG                           convertTextToPM(const CString& data) const;
-        CString                         convertTextFromPM(ULONG) const;
+    ULONG               convertFormatToPM(EFormat) const;
+    ULONG               convertTextToPM(const CString& data) const;
+    CString             convertTextFromPM(ULONG) const;
 
-        static ATOM                     getOwnershipFormat();
+    static ATOM         getOwnershipFormat();
 
 private:
-        typedef std::vector<IPMClipboardConverter*> ConverterList;
+    typedef std::vector<IPMClipboardConverter*> ConverterList;
 
-        HWND                            m_window;
-        mutable Time            m_time;
-        ConverterList           m_converters;
-        static ATOM                     s_ownershipFormat;
+    HWND                m_window;
+    mutable Time        m_time;
+    ConverterList       m_converters;
+    static ATOM         s_ownershipFormat;
 };
 
@@ -84 +84 @@
 class IPMClipboardConverter : public IInterface {
 public:
-        // accessors
+    // accessors
 
-        // return the clipboard format this object converts from/to
-        virtual IClipboard::EFormat
-                                                getFormat() const = 0;
+    // return the clipboard format this object converts from/to
+    virtual IClipboard::EFormat
+                        getFormat() const = 0;
 
-        // return the atom representing the PM clipboard format that
-        // this object converts from/to
-        virtual ULONG           getPMFormat() const = 0;
+    // return the atom representing the PM clipboard format that
+    // this object converts from/to
+    virtual ULONG       getPMFormat() const = 0;
 
-        // return the format info flags for the PM clipboard format 
-        // this object converts from/to
-        virtual ULONG           getPMFormatInfo() const = 0;
+    // return the format info flags for the PM clipboard format
+    // this object converts from/to
+    virtual ULONG       getPMFormatInfo() const = 0;
 
-        // convert from the IClipboard format to the PM clipboard format.
-        // the input data must be in the IClipboard format returned by
-        // getFormat().  the return data will be in the PM clipboard
-        // format returned by getPMFormat().
-        virtual ULONG           fromIClipboard(const CString&) const = 0;
+    // convert from the IClipboard format to the PM clipboard format.
+    // the input data must be in the IClipboard format returned by
+    // getFormat().  the return data will be in the PM clipboard
+    // format returned by getPMFormat().
+    virtual ULONG       fromIClipboard(const CString&) const = 0;
 
-        // free PM clipboard data (failure case).
-        virtual void            freePMData(ULONG) const = 0;
+    // free PM clipboard data (failure case).
+    virtual void        freePMData(ULONG) const = 0;
 
-        // convert from the win32 clipboard format to the IClipboard format
-        // (i.e., the reverse of fromIClipboard()).
-        virtual CString         toIClipboard(ULONG data) const = 0;
+    // convert from the win32 clipboard format to the IClipboard format
+    // (i.e., the reverse of fromIClipboard()).
+    virtual CString     toIClipboard(ULONG data) const = 0;
 };