tkinterdnd2 0.6.0__tar.gz → 0.6.1__tar.gz

{tkinterdnd2-0.6.0 → tkinterdnd2-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tkinterdnd2
-Version: 0.6.0
+Version: 0.6.1
 Summary: TkinterDnD2 is a python wrapper for George Petasis'' tkDnD Tk extension version 2
 Home-page: https://github.com/Eliav2/tkinterdnd2
 Author: petasis\pmgagne\eliav2\squiblydoo

{tkinterdnd2-0.6.0 → tkinterdnd2-0.6.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tkinterdnd2",
-    version="0.6.0",
+    version="0.6.1",
     author="petasis\\pmgagne\\eliav2\\squiblydoo",
     description="TkinterDnD2 is a python wrapper for George Petasis'' tkDnD Tk extension version 2",
     long_description=long_description,
@@ -18,7 +18,7 @@ setuptools.setup(
         "tkinterdnd2": [
             "tkdnd/linux-x64/*.*", "tkdnd/linux-x64-tcl9/*.*",
             "tkdnd/linux-arm64/*.*", "tkdnd/linux-arm64-tcl9/*.*",
-            "tkdnd/osx-x64/*.*", "tkdnd/osx-arm64/*.*",
+            "tkdnd/osx-x64/*.*", "tkdnd/osx-arm64/*.*", "tkdnd/osx-arm64-tcl9/*.*",
             "tkdnd/win-x64/*.*", "tkdnd/win-x64-tcl9/*.*",
             "tkdnd/win-x86/*.*", "tkdnd/win-x86-tcl9/*.*",
             "tkdnd/win-arm64/*.*",

{tkinterdnd2-0.6.0 → tkinterdnd2-0.6.1}/tests/test_tkinterdnd2.py

@@ -53,14 +53,6 @@ class TestTkinterDnD2(unittest.TestCase):
         """Binary loaded and TkdndVersion is populated."""
         self.assertIsNotNone(tkinterdnd2.TkinterDnD.TkdndVersion)
 
-    def test_expected_version(self):
-        """Loaded tkdnd version matches what is shipped for this platform."""
-        # osx-x64 still ships the old 2.9.4 binary; all others are 2.10.0
-        if self.base_dir == 'osx-x64':
-            self.assertEqual(tkinterdnd2.TkinterDnD.TkdndVersion, '2.9.4')
-        else:
-            self.assertEqual(tkinterdnd2.TkinterDnD.TkdndVersion, '2.10.0')
-
     def test_binary_directory_exists(self):
         """The directory that was selected exists inside the installed package."""
         path = os.path.join(self.tkdnd_root, self.chosen_dir)

{tkinterdnd2-0.6.0 → tkinterdnd2-0.6.1}/tkinterdnd2/tkdnd/linux-arm64/pkgIndex.tcl

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.10.0 \
+package ifneeded tkdnd 2.10.1 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtkdnd2.10.0.so tkdnd"
+   tkdnd::initialise \{$dir\} libtkdnd2.10.1.so tkdnd"
 
-package ifneeded tkdnd::utils 2.10.0 \
+package ifneeded tkdnd::utils 2.10.1 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.10.0"
+   package provide tkdnd::utils 2.10.1"

{tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64-tcl9 → tkinterdnd2-0.6.1/tkinterdnd2/tkdnd/linux-arm64}/tkdnd_generic.tcl

@@ -520,6 +520,54 @@ proc generic::GetDropTargetCommonTypes { } {
   return  $_common_drag_source_types
 };# generic::GetDropTargetCommonTypes
 
+# ----------------------------------------------------------------------------
+#  Command generic::GetDropState / generic::RestoreDropState
+#
+#  Snapshot & restore the in-flight drop state (the subset of variables that
+#  HandleLeave resets). Used by platform layers to survive a spurious
+#  <<Leave>> that gets processed while waiting on a blocking data fetch
+#  during a drop (e.g. the XWayland race in issue #77).
+# ----------------------------------------------------------------------------
+proc generic::GetDropState { } {
+  variable _types
+  variable _typelist
+  variable _actionlist
+  variable _action
+  variable _common_drag_source_types
+  variable _common_drop_target_types
+  variable _drag_source
+  variable _drop_target
+  return [dict create \
+    types                    $_types \
+    typelist                 $_typelist \
+    actionlist               $_actionlist \
+    action                   $_action \
+    common_drag_source_types $_common_drag_source_types \
+    common_drop_target_types $_common_drop_target_types \
+    drag_source              $_drag_source \
+    drop_target              $_drop_target \
+  ]
+};# generic::GetDropState
+
+proc generic::RestoreDropState { state } {
+  variable _types
+  variable _typelist
+  variable _actionlist
+  variable _action
+  variable _common_drag_source_types
+  variable _common_drop_target_types
+  variable _drag_source
+  variable _drop_target
+  set _types                    [dict get $state types]
+  set _typelist                 [dict get $state typelist]
+  set _actionlist               [dict get $state actionlist]
+  set _action                   [dict get $state action]
+  set _common_drag_source_types [dict get $state common_drag_source_types]
+  set _common_drop_target_types [dict get $state common_drop_target_types]
+  set _drag_source              [dict get $state drag_source]
+  set _drop_target              [dict get $state drop_target]
+};# generic::RestoreDropState
+
 # ----------------------------------------------------------------------------
 #  Command generic::platform_specific_types
 # ----------------------------------------------------------------------------

{tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64 → tkinterdnd2-0.6.1/tkinterdnd2/tkdnd/linux-arm64}/tkdnd_unix.tcl

@@ -134,10 +134,20 @@ proc xdnd::HandleXdndDrop { time } {
   variable _last_mouse_root_y
   set _pressedkeys [GetPressedKeys [::tkdnd::generic::GetDropTarget]]
   #DBG debug "xdnd::HandleXdndDrop: $time"
+  ## Snapshot the in-flight drop state before GetDroppedData below: it pumps
+  ## the Tk event queue while waiting for the SelectionNotify round-trip, and
+  ## a queued XdndLeave processed during that wait resets this state via
+  ## ::tkdnd::generic::HandleLeave before HandleDrop gets to use it -- a race
+  ## commonly hit under XWayland (issue #77). Restore the snapshot if that
+  ## happened so the drop can still be delivered.
+  set dropstate [::tkdnd::generic::GetDropState]
   ## Get the dropped data...
   ::tkdnd::generic::SetDroppedData [GetDroppedData \
     [::tkdnd::generic::GetDragSource] [::tkdnd::generic::GetDropTarget] \
     [::tkdnd::generic::GetDragSourceCommonTypes] $time]
+  if {![string length [::tkdnd::generic::GetDropTarget]]} {
+    ::tkdnd::generic::RestoreDropState $dropstate
+  }
   ::tkdnd::generic::HandleDrop {} {} $_pressedkeys \
                                $_last_mouse_root_x $_last_mouse_root_y $time
 };# xdnd::HandleXdndDrop
@@ -355,9 +365,19 @@ proc xdnd::_dodragdrop { source actions types data button { cursor_map {} } } {
                 -selection XdndSelection $source
   set _dragging 1
 
-  ## Grab the mouse pointer...
-  #DBG debug "xdnd::_dodragdrop: _grab_pointer $source [_get_mapped_cursor $_dodragdrop_default_action]"
-  _grab_pointer $source [_get_mapped_cursor $_dodragdrop_default_action]
+  ## Grab the mouse pointer on a dedicated offscreen window rather than the
+  ## source widget itself: X automatically drops a grab when its window
+  ## becomes unviewable, which breaks the whole drag if the source widget
+  ## (or an ancestor) gets unmapped mid-drag, e.g. by switching virtual
+  ## desktops via a pager (issue #6).
+  set _dodragdrop_grab_window [_create_grab_window]
+  #DBG debug "xdnd::_dodragdrop: _grab_pointer $_dodragdrop_grab_window [_get_mapped_cursor $_dodragdrop_default_action]"
+  _grab_pointer $_dodragdrop_grab_window [_get_mapped_cursor $_dodragdrop_default_action]
+
+  ## If the source widget is destroyed mid-drag (e.g. its toplevel is closed
+  ## with Alt+F4), make sure we don't hang forever on tkwait below.
+  set _dodragdrop_source_destroy_binding [bind $source <Destroy>]
+  bind $source <Destroy> {+ set ::tkdnd::xdnd::_dragging 0}
 
   ## Register our generic event handler...
   #  The generic event callback will report events by modifying variable
@@ -372,19 +392,41 @@ proc xdnd::_dodragdrop { source actions types data button { cursor_map {} } } {
   #DBG debug "xdnd::_dodragdrop: waiting drag action to finish..."
   tkwait variable ::tkdnd::xdnd::_dragging
   #DBG debug "xdnd::_dodragdrop: drag action finished!"
-  _SendXdndLeave
+  catch {_SendXdndLeave}
 
   set _dragging 0
-  #DBG debug "xdnd::_dodragdrop: _ungrab_pointer $source"
-  _ungrab_pointer $source
+  catch {bind $source <Destroy> $_dodragdrop_source_destroy_binding}
+  #DBG debug "xdnd::_dodragdrop: _ungrab_pointer $_dodragdrop_grab_window"
+  _ungrab_pointer $_dodragdrop_grab_window
   #DBG debug "xdnd::_dodragdrop: _unregister_generic_event_handler"
   _unregister_generic_event_handler
   catch {selection clear -selection XdndSelection}
   #DBG debug "xdnd::_dodragdrop: unregisterSelectionHandler $source $types"
-  unregisterSelectionHandler $source $types
+  catch {unregisterSelectionHandler $source $types}
   return $_dodragdrop_drop_target_accepts_action
 };# xdnd::_dodragdrop
 
+# ----------------------------------------------------------------------------
+#  Command xdnd::_create_grab_window
+#
+#  Returns a small, offscreen, override-redirect helper toplevel used solely
+#  as the target of the pointer grab during a drag. Created lazily once and
+#  reused for subsequent drags (only one drag can be in progress at a time).
+# ----------------------------------------------------------------------------
+proc xdnd::_create_grab_window { } {
+  set w .___tkdnd___grab___window___
+  if {![winfo exists $w]} {
+    toplevel $w -class TkDndGrab
+    wm overrideredirect $w 1
+    wm geometry $w 1x1+-32000+-32000
+    ## Force the toplevel to actually be mapped now: XGrabPointer requires
+    ## a viewable grab window, and the map request otherwise happens lazily
+    ## on the next idle pass.
+    update idletasks
+  }
+  return $w
+};# xdnd::_create_grab_window
+
 # ----------------------------------------------------------------------------
 #  Command xdnd::_process_drag_events
 # ----------------------------------------------------------------------------
@@ -727,7 +769,6 @@ proc xdnd::getFormatForType {type} {
     string                    -
     text                      -
     compound_text             {set format STRING}
-    text/uri-list*            {set format UTF8_STRING}
     application/x-color       {set format $type}
     default                   {set format $type}
   }

{tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64-tcl9 → tkinterdnd2-0.6.1/tkinterdnd2/tkdnd/linux-arm64-tcl9}/pkgIndex.tcl

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.10.0 \
+package ifneeded tkdnd 2.10.1 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtcl9tkdnd2.10.0.so tkdnd"
+   tkdnd::initialise \{$dir\} libtcl9tkdnd2.10.1.so tkdnd"
 
-package ifneeded tkdnd::utils 2.10.0 \
+package ifneeded tkdnd::utils 2.10.1 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.10.0"
+   package provide tkdnd::utils 2.10.1"

{tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-arm64 → tkinterdnd2-0.6.1/tkinterdnd2/tkdnd/linux-arm64-tcl9}/tkdnd_generic.tcl

@@ -520,6 +520,54 @@ proc generic::GetDropTargetCommonTypes { } {
   return  $_common_drag_source_types
 };# generic::GetDropTargetCommonTypes
 
+# ----------------------------------------------------------------------------
+#  Command generic::GetDropState / generic::RestoreDropState
+#
+#  Snapshot & restore the in-flight drop state (the subset of variables that
+#  HandleLeave resets). Used by platform layers to survive a spurious
+#  <<Leave>> that gets processed while waiting on a blocking data fetch
+#  during a drop (e.g. the XWayland race in issue #77).
+# ----------------------------------------------------------------------------
+proc generic::GetDropState { } {
+  variable _types
+  variable _typelist
+  variable _actionlist
+  variable _action
+  variable _common_drag_source_types
+  variable _common_drop_target_types
+  variable _drag_source
+  variable _drop_target
+  return [dict create \
+    types                    $_types \
+    typelist                 $_typelist \
+    actionlist               $_actionlist \
+    action                   $_action \
+    common_drag_source_types $_common_drag_source_types \
+    common_drop_target_types $_common_drop_target_types \
+    drag_source              $_drag_source \
+    drop_target              $_drop_target \
+  ]
+};# generic::GetDropState
+
+proc generic::RestoreDropState { state } {
+  variable _types
+  variable _typelist
+  variable _actionlist
+  variable _action
+  variable _common_drag_source_types
+  variable _common_drop_target_types
+  variable _drag_source
+  variable _drop_target
+  set _types                    [dict get $state types]
+  set _typelist                 [dict get $state typelist]
+  set _actionlist               [dict get $state actionlist]
+  set _action                   [dict get $state action]
+  set _common_drag_source_types [dict get $state common_drag_source_types]
+  set _common_drop_target_types [dict get $state common_drop_target_types]
+  set _drag_source              [dict get $state drag_source]
+  set _drop_target              [dict get $state drop_target]
+};# generic::RestoreDropState
+
 # ----------------------------------------------------------------------------
 #  Command generic::platform_specific_types
 # ----------------------------------------------------------------------------

{tkinterdnd2-0.6.0/tkinterdnd2/tkdnd/linux-x64-tcl9 → tkinterdnd2-0.6.1/tkinterdnd2/tkdnd/linux-arm64-tcl9}/tkdnd_unix.tcl

@@ -134,10 +134,20 @@ proc xdnd::HandleXdndDrop { time } {
   variable _last_mouse_root_y
   set _pressedkeys [GetPressedKeys [::tkdnd::generic::GetDropTarget]]
   #DBG debug "xdnd::HandleXdndDrop: $time"
+  ## Snapshot the in-flight drop state before GetDroppedData below: it pumps
+  ## the Tk event queue while waiting for the SelectionNotify round-trip, and
+  ## a queued XdndLeave processed during that wait resets this state via
+  ## ::tkdnd::generic::HandleLeave before HandleDrop gets to use it -- a race
+  ## commonly hit under XWayland (issue #77). Restore the snapshot if that
+  ## happened so the drop can still be delivered.
+  set dropstate [::tkdnd::generic::GetDropState]
   ## Get the dropped data...
   ::tkdnd::generic::SetDroppedData [GetDroppedData \
     [::tkdnd::generic::GetDragSource] [::tkdnd::generic::GetDropTarget] \
     [::tkdnd::generic::GetDragSourceCommonTypes] $time]
+  if {![string length [::tkdnd::generic::GetDropTarget]]} {
+    ::tkdnd::generic::RestoreDropState $dropstate
+  }
   ::tkdnd::generic::HandleDrop {} {} $_pressedkeys \
                                $_last_mouse_root_x $_last_mouse_root_y $time
 };# xdnd::HandleXdndDrop
@@ -355,9 +365,19 @@ proc xdnd::_dodragdrop { source actions types data button { cursor_map {} } } {
                 -selection XdndSelection $source
   set _dragging 1
 
-  ## Grab the mouse pointer...
-  #DBG debug "xdnd::_dodragdrop: _grab_pointer $source [_get_mapped_cursor $_dodragdrop_default_action]"
-  _grab_pointer $source [_get_mapped_cursor $_dodragdrop_default_action]
+  ## Grab the mouse pointer on a dedicated offscreen window rather than the
+  ## source widget itself: X automatically drops a grab when its window
+  ## becomes unviewable, which breaks the whole drag if the source widget
+  ## (or an ancestor) gets unmapped mid-drag, e.g. by switching virtual
+  ## desktops via a pager (issue #6).
+  set _dodragdrop_grab_window [_create_grab_window]
+  #DBG debug "xdnd::_dodragdrop: _grab_pointer $_dodragdrop_grab_window [_get_mapped_cursor $_dodragdrop_default_action]"
+  _grab_pointer $_dodragdrop_grab_window [_get_mapped_cursor $_dodragdrop_default_action]
+
+  ## If the source widget is destroyed mid-drag (e.g. its toplevel is closed
+  ## with Alt+F4), make sure we don't hang forever on tkwait below.
+  set _dodragdrop_source_destroy_binding [bind $source <Destroy>]
+  bind $source <Destroy> {+ set ::tkdnd::xdnd::_dragging 0}
 
   ## Register our generic event handler...
   #  The generic event callback will report events by modifying variable
@@ -372,19 +392,41 @@ proc xdnd::_dodragdrop { source actions types data button { cursor_map {} } } {
   #DBG debug "xdnd::_dodragdrop: waiting drag action to finish..."
   tkwait variable ::tkdnd::xdnd::_dragging
   #DBG debug "xdnd::_dodragdrop: drag action finished!"
-  _SendXdndLeave
+  catch {_SendXdndLeave}
 
   set _dragging 0
-  #DBG debug "xdnd::_dodragdrop: _ungrab_pointer $source"
-  _ungrab_pointer $source
+  catch {bind $source <Destroy> $_dodragdrop_source_destroy_binding}
+  #DBG debug "xdnd::_dodragdrop: _ungrab_pointer $_dodragdrop_grab_window"
+  _ungrab_pointer $_dodragdrop_grab_window
   #DBG debug "xdnd::_dodragdrop: _unregister_generic_event_handler"
   _unregister_generic_event_handler
   catch {selection clear -selection XdndSelection}
   #DBG debug "xdnd::_dodragdrop: unregisterSelectionHandler $source $types"
-  unregisterSelectionHandler $source $types
+  catch {unregisterSelectionHandler $source $types}
   return $_dodragdrop_drop_target_accepts_action
 };# xdnd::_dodragdrop
 
+# ----------------------------------------------------------------------------
+#  Command xdnd::_create_grab_window
+#
+#  Returns a small, offscreen, override-redirect helper toplevel used solely
+#  as the target of the pointer grab during a drag. Created lazily once and
+#  reused for subsequent drags (only one drag can be in progress at a time).
+# ----------------------------------------------------------------------------
+proc xdnd::_create_grab_window { } {
+  set w .___tkdnd___grab___window___
+  if {![winfo exists $w]} {
+    toplevel $w -class TkDndGrab
+    wm overrideredirect $w 1
+    wm geometry $w 1x1+-32000+-32000
+    ## Force the toplevel to actually be mapped now: XGrabPointer requires
+    ## a viewable grab window, and the map request otherwise happens lazily
+    ## on the next idle pass.
+    update idletasks
+  }
+  return $w
+};# xdnd::_create_grab_window
+
 # ----------------------------------------------------------------------------
 #  Command xdnd::_process_drag_events
 # ----------------------------------------------------------------------------
@@ -727,7 +769,6 @@ proc xdnd::getFormatForType {type} {
     string                    -
     text                      -
     compound_text             {set format STRING}
-    text/uri-list*            {set format UTF8_STRING}
     application/x-color       {set format $type}
     default                   {set format $type}
   }

{tkinterdnd2-0.6.0 → tkinterdnd2-0.6.1}/tkinterdnd2/tkdnd/linux-x64/pkgIndex.tcl

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.10.0 \
+package ifneeded tkdnd 2.10.1 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtkdnd2.10.0.so tkdnd"
+   tkdnd::initialise \{$dir\} libtkdnd2.10.1.so tkdnd"
 
-package ifneeded tkdnd::utils 2.10.0 \
+package ifneeded tkdnd::utils 2.10.1 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.10.0"
+   package provide tkdnd::utils 2.10.1"