Revision: 4389
          http://vexi.svn.sourceforge.net/vexi/?rev=4389&view=rev
Author:   clrg
Date:     2012-05-31 09:42:15 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Remove clipboard access limitations

Modified Paths:
--------------
    trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java
    trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Platform.java

Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java   
2012-05-31 02:05:33 UTC (rev 4388)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java   
2012-05-31 09:42:15 UTC (rev 4389)
@@ -441,24 +441,12 @@
                 if (control && !value.equals("control")) {
                     value = "C-" + value;
                 }
-                if (value.equals("C-v") || value.equals("A-v")) {
-                    Platform.clipboardReadEnabled = true;
-                }
                 this.value = JSU.S(value);
                 surface.keypress_scheduled = false;
             }
             
-            // allow clipboard access if pressing middle mouse button
-            if (event==SC_Press3) {
-                Platform.clipboardReadEnabled = true;
-            }
-            
             // propagate message through box tree
-            try {
-                surface.root.tryPropagateEvent(event, preevent, value, 
forceOnRoot);
-            } finally {
-                Platform.clipboardReadEnabled = false;
-            }
+            surface.root.tryPropagateEvent(event, preevent, value, 
forceOnRoot);
             return o;
         }
         public String toString() {
@@ -499,7 +487,7 @@
         }
         pendingWidth = width;
         pendingHeight = height;
-        abort = true;
+//        abort = true;
         Refresh();
         // FEATURE: notify root box of x/y change if align is not topleft 
     }

Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Platform.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Platform.java  
2012-05-31 02:05:33 UTC (rev 4388)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Platform.java  
2012-05-31 09:42:15 UTC (rev 4389)
@@ -40,7 +40,6 @@
 
     // Static Data 
/////////////////////////////////////////////////////////////////////////////////////
 
-    public static boolean clipboardReadEnabled = false;       ///< true iff 
inside a C-v/A-v/Press3 trap handler
     public static Platform platform = null;                   ///< The 
appropriate Platform object for this JVM
     public static String build = "unknown";                   ///< the current 
build
 
@@ -169,7 +168,7 @@
     protected String _altKeyName() { return "alt"; }
 
     /** returns the contents of the clipboard */    
-    public static Object getClipBoard() { return clipboardReadEnabled ? 
platform._getClipBoard() : null; }
+    public static Object getClipBoard() { return platform._getClipBoard(); }
     protected String _getClipBoard() { return null; }
 
     /** sets the contents of the clipboard */

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to