[98884] trunk/dports/sysutils/synergy-devel/files

raimue at macports.org raimue at macports.org
Fri Oct 19 12:55:43 PDT 2012


Revision: 98884
          http://trac.macports.org//changeset/98884
Author:   raimue at macports.org
Date:     2012-10-19 12:55:43 -0700 (Fri, 19 Oct 2012)
Log Message:
-----------
sysutils/synergy-devel:
Remove unnecessary patchfiles copied accidentally in r98883.

Revision Links:
--------------
    http://trac.macports.org//changeset/98883

Removed Paths:
-------------
    trunk/dports/sysutils/synergy-devel/files/patch-bug2962-clipboard.diff
    trunk/dports/sysutils/synergy-devel/files/patch-bug57-keypress.diff
    trunk/dports/sysutils/synergy-devel/files/patch-bug57-modifiers.diff

Deleted: trunk/dports/sysutils/synergy-devel/files/patch-bug2962-clipboard.diff
===================================================================
--- trunk/dports/sysutils/synergy-devel/files/patch-bug2962-clipboard.diff	2012-10-19 19:53:45 UTC (rev 98883)
+++ trunk/dports/sysutils/synergy-devel/files/patch-bug2962-clipboard.diff	2012-10-19 19:55:43 UTC (rev 98884)
@@ -1,28 +0,0 @@
---- src/lib/platform/COSXClipboard.cpp.orig	(revision 1169)
-+++ src/lib/platform/COSXClipboard.cpp	(revision 1170)
-@@ -87,6 +87,7 @@
- 	void
- COSXClipboard::add(EFormat format, const CString & data)
- {
-+	bool emptied = false;
- 	if (m_pboard == NULL)
- 		return;
- 
-@@ -105,9 +106,14 @@
- 
- 			// integ tests showed that if you call add(...) twice, then the
- 			// second call will actually fail to set clipboard data. calling
--			// empty() seems to solve this problem.
--			empty();
--
-+			// empty() seems to solve this problem. but, only clear the clipboard
-+			// for the first converter, otherwise further converters will wipe out
-+			// what we just added.
-+			if (!emptied) {
-+				empty();
-+				emptied = true;
-+			}
-+			
- 			PasteboardPutItemFlavor(
- 					m_pboard,
- 					(PasteboardItemID) 0,

Deleted: trunk/dports/sysutils/synergy-devel/files/patch-bug57-keypress.diff
===================================================================
--- trunk/dports/sysutils/synergy-devel/files/patch-bug57-keypress.diff	2012-10-19 19:53:45 UTC (rev 98883)
+++ trunk/dports/sysutils/synergy-devel/files/patch-bug57-keypress.diff	2012-10-19 19:55:43 UTC (rev 98884)
@@ -1,49 +0,0 @@
-Index: src/lib/platform/COSXScreen.cpp
-===================================================================
---- src/lib/platform/COSXScreen.cpp	(revision 909)
-+++ src/lib/platform/COSXScreen.cpp	(working copy)
-@@ -620,7 +620,7 @@
- 		// FIXME -- start watching jump zones
- 		
- 		// kCGEventTapOptionDefault = 0x00000000 (Missing in 10.4, so specified literally)
--		m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHIDEventTap, 0, 
-+		m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, 0, 
- 										kCGEventMaskForAllEvents, 
- 										handleCGInputEvent, 
- 										this);
-@@ -640,7 +640,7 @@
-                 // there may be a better way to do this, but we register an event handler even if we're
-                 // not on the primary display (acting as a client). This way, if a local event comes in
-                 // (either keyboard or mouse), we can make sure to show the cursor if we've hidden it. 
--		m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHIDEventTap, 0, 
-+		m_eventTapPort=CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, 0, 
- 										kCGEventMaskForAllEvents, 
- 										handleCGInputEventSecondary, 
- 										this);
-Index: src/lib/platform/COSXKeyState.cpp
-===================================================================
---- src/lib/platform/COSXKeyState.cpp	(revision 909)
-+++ src/lib/platform/COSXKeyState.cpp	(working copy)
-@@ -284,22 +284,6 @@
- #endif
- 
- 	if (layoutValid) {
--
--		// choose action
--		UInt16 action;
--		switch (eventKind) {
--		case kEventRawKeyDown:
--			action = kUCKeyActionDown;
--			break;
--
--		case kEventRawKeyRepeat:
--			action = kUCKeyActionAutoKey;
--			break;
--
--		default:
--			return 0;
--		}
--
- 		// translate key
- 		UniCharCount count;
- 		UniChar chars[2];

Deleted: trunk/dports/sysutils/synergy-devel/files/patch-bug57-modifiers.diff
===================================================================
--- trunk/dports/sysutils/synergy-devel/files/patch-bug57-modifiers.diff	2012-10-19 19:53:45 UTC (rev 98883)
+++ trunk/dports/sysutils/synergy-devel/files/patch-bug57-modifiers.diff	2012-10-19 19:55:43 UTC (rev 98884)
@@ -1,80 +0,0 @@
-Index: src/lib/platform/COSXScreen.cpp
-===================================================================
---- src/lib/platform/COSXScreen.cpp	(revision 1077)
-+++ src/lib/platform/COSXScreen.cpp	(working copy)
-@@ -1097,14 +1097,14 @@
- 
- 	// get the key and active modifiers
- 	UInt32 virtualKey = CGEventGetIntegerValueField(event, kCGKeyboardEventKeycode);
--	CGEventFlags macMask = CGEventGetFlags(event);
-+	CGEventFlags macMaskCarbon = m_keyState->mapModifiersToCarbon(CGEventGetFlags(event));
- 	LOG((CLOG_DEBUG1 "event: Key event kind: %d, keycode=%d", eventKind, virtualKey));
- 
- 	// Special handling to track state of modifiers
- 	if (eventKind == kCGEventFlagsChanged) {
- 		// get old and new modifier state
- 		KeyModifierMask oldMask = getActiveModifiers();
--		KeyModifierMask newMask = m_keyState->mapModifiersFromOSX(macMask);
-+		KeyModifierMask newMask = m_keyState->mapModifiersFromOsxCarbon(macMaskCarbon);
- 		m_keyState->handleModifierKeys(getEventTarget(), oldMask, newMask);
- 
- 		// if the current set of modifiers exactly matches a modifiers-only
-@@ -1141,9 +1141,7 @@
- 	// so we check for a key/modifier match in our hot key map.
- 	if (!m_isOnScreen) {
- 		HotKeyToIDMap::const_iterator i =
--			m_hotKeyToIDMap.find(CHotKeyItem(virtualKey, 
--											 m_keyState->mapModifiersToCarbon(macMask) 
--											 & 0xff00u));
-+			m_hotKeyToIDMap.find(CHotKeyItem(virtualKey, macMaskCarbon & 0xff00u));
- 		if (i != m_hotKeyToIDMap.end()) {
- 			UInt32 id = i->second;
- 	
-Index: src/lib/platform/COSXKeyState.cpp
-===================================================================
---- src/lib/platform/COSXKeyState.cpp	(revision 1077)
-+++ src/lib/platform/COSXKeyState.cpp	(working copy)
-@@ -155,7 +155,7 @@
- }
- 
- KeyModifierMask
--COSXKeyState::mapModifiersFromOSX(UInt32 mask) const
-+COSXKeyState::mapModifiersFromOsxCarbon(UInt32 mask) const
- {
- 	LOG((CLOG_DEBUG1 "mask: %04x", mask));
- 
-@@ -336,7 +336,7 @@
- KeyModifierMask
- COSXKeyState::pollActiveModifiers() const
- {
--	return mapModifiersFromOSX(GetCurrentKeyModifiers());
-+	return mapModifiersFromOsxCarbon(GetCurrentKeyModifiers());
- }
- 
- SInt32
-@@ -620,10 +620,10 @@
- 			}
- 
- 			// now add a key entry for each key/required modifier pair.
--			item.m_sensitive = mapModifiersFromOSX(sensitive << 8);
-+			item.m_sensitive = mapModifiersFromOsxCarbon(sensitive << 8);
- 			for (std::set<UInt32>::iterator k = required.begin();
- 											k != required.end(); ++k) {
--				item.m_required = mapModifiersFromOSX(*k << 8);
-+				item.m_required = mapModifiersFromOsxCarbon(*k << 8);
- 				keyMap.addKeyEntry(item);
- 			}
- 		}
-Index: src/lib/platform/COSXKeyState.h
-===================================================================
---- src/lib/platform/COSXKeyState.h	(revision 1077)
-+++ src/lib/platform/COSXKeyState.h	(working copy)
-@@ -62,7 +62,7 @@
- 	Returns the synergy modifier mask corresponding to the OS X modifier
- 	mask in \p mask.
- 	*/
--	KeyModifierMask		mapModifiersFromOSX(UInt32 mask) const;
-+	KeyModifierMask		mapModifiersFromOsxCarbon(UInt32 mask) const;
- 
- 	//! Convert CG flags-style modifier mask to old-style Carbon
- 	/*!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121019/684690ef/attachment.html>


More information about the macports-changes mailing list