tkinterdnd2 0.5.0__tar.gz → 0.6.1__tar.gz

{tkinterdnd2-0.5.0/tkinterdnd2.egg-info → tkinterdnd2-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tkinterdnd2
-Version: 0.5.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
@@ -28,17 +28,11 @@ This repo was originally forked and edited for the purpose of publishing to pypi
 This repository is being maintained to ensure availability of `tkinterdnd2` into the future, providing Tkinter native drag and drop support for windows, unix and Mac OSX.
 
 
-### What is TkDnD2
+### What is TkDnD
 
 [tkDnD2](https://github.com/petasis/tkdnd) is a tcl/Tk extension adding native drag and drop support.
 
-### What this repository is about
-
-This repo package TkinterDnD2 and tkdnd2 into a standard python module.
-
-When the extension is imported in python its location will be automatically added to the Tk search path.
-
-This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.4. In order to provide support on ARM, we include built binaries from the now defunct [tkinterdnd2-universal](https://pypi.org/project/tkinterdnd2-universal/#files) which added ARM support.
+This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.5 and my own compiled binaries for full Tcl 9 support: https://github.com/Squiblydoo/tkdnd.
 
 
 ## Install

{tkinterdnd2-0.5.0 → tkinterdnd2-0.6.1}/README.md

@@ -7,17 +7,11 @@ This repo was originally forked and edited for the purpose of publishing to pypi
 This repository is being maintained to ensure availability of `tkinterdnd2` into the future, providing Tkinter native drag and drop support for windows, unix and Mac OSX.
 
 
-### What is TkDnD2
+### What is TkDnD
 
 [tkDnD2](https://github.com/petasis/tkdnd) is a tcl/Tk extension adding native drag and drop support.
 
-### What this repository is about
-
-This repo package TkinterDnD2 and tkdnd2 into a standard python module.
-
-When the extension is imported in python its location will be automatically added to the Tk search path.
-
-This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.4. In order to provide support on ARM, we include built binaries from the now defunct [tkinterdnd2-universal](https://pypi.org/project/tkinterdnd2-universal/#files) which added ARM support.
+This repository contains the compiled binaries from https://github.com/petasis/tkdnd/releases/tag/tkdnd-release-test-v2.9.5 and my own compiled binaries for full Tcl 9 support: https://github.com/Squiblydoo/tkdnd.
 
 
 ## Install

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

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tkinterdnd2",
-    version="0.5.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,
@@ -15,7 +15,14 @@ setuptools.setup(
     include_package_data=True,
     package_data={
         # Include tkdnd extension files.
-        "tkinterdnd2": ["tkdnd/linux-x64/*.*", "tkdnd/linux-arm64/*.*", "tkdnd/osx-x64/*.*", "tkdnd/osx-arm64/*.*", "tkdnd/win-x64/*.*", "tkdnd/win-x86/*.*", "tkdnd/win-arm64/*.*"],
+        "tkinterdnd2": [
+            "tkdnd/linux-x64/*.*", "tkdnd/linux-x64-tcl9/*.*",
+            "tkdnd/linux-arm64/*.*", "tkdnd/linux-arm64-tcl9/*.*",
+            "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/*.*",
+        ],
     },
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",

tkinterdnd2-0.6.1/tests/test_tkinterdnd2.py

@@ -0,0 +1,81 @@
+import os
+import platform
+import unittest
+import tkinterdnd2
+
+
+class TestTkinterDnD2(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.root = tkinterdnd2.Tk()
+        cls.root.withdraw()
+
+        cls.tcl_version_str = cls.root.tk.call('info', 'tclversion')
+        cls.tcl_major = int(cls.tcl_version_str.split('.')[0])
+
+        system = platform.system()
+        if system == "Windows":
+            machine = os.environ.get('PROCESSOR_ARCHITECTURE', platform.machine())
+        else:
+            machine = platform.machine()
+
+        platform_map = {
+            ("Darwin",  "arm64"):   "osx-arm64",
+            ("Darwin",  "x86_64"):  "osx-x64",
+            ("Linux",   "aarch64"): "linux-arm64",
+            ("Linux",   "x86_64"):  "linux-x64",
+            ("Windows", "ARM64"):   "win-arm64",
+            ("Windows", "AMD64"):   "win-x64",
+            ("Windows", "x86"):     "win-x86",
+        }
+        cls.base_dir = platform_map.get((system, machine), "unknown")
+        cls.tkdnd_root = os.path.join(os.path.dirname(tkinterdnd2.__file__), 'tkdnd')
+        tcl9_path = os.path.join(cls.tkdnd_root, cls.base_dir + '-tcl9')
+        cls.chosen_dir = (
+            cls.base_dir + '-tcl9'
+            if cls.tcl_major >= 9 and os.path.isdir(tcl9_path)
+            else cls.base_dir
+        )
+
+        print(
+            f"\nPlatform: {system}/{machine}  "
+            f"Tcl: {cls.tcl_version_str}  "
+            f"dir: {cls.chosen_dir}  "
+            f"tkdnd: {tkinterdnd2.TkinterDnD.TkdndVersion}"
+        )
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.root.destroy()
+
+    def test_version_is_set(self):
+        """Binary loaded and TkdndVersion is populated."""
+        self.assertIsNotNone(tkinterdnd2.TkinterDnD.TkdndVersion)
+
+    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)
+        self.assertTrue(os.path.isdir(path), f"tkdnd directory not found: {path}")
+
+    def test_tcl9_routing(self):
+        """When Tcl 9 is active and a -tcl9 directory is present, it must be chosen."""
+        tcl9_dir = os.path.join(self.tkdnd_root, self.base_dir + '-tcl9')
+        if self.tcl_major >= 9 and os.path.isdir(tcl9_dir):
+            self.assertTrue(
+                self.chosen_dir.endswith('-tcl9'),
+                f"Tcl {self.tcl_major} active but -tcl9 directory not chosen; got '{self.chosen_dir}'"
+            )
+
+    def test_tcl8_fallback(self):
+        """When Tcl 8 is active (or no -tcl9 directory exists), base directory must be chosen."""
+        tcl9_dir = os.path.join(self.tkdnd_root, self.base_dir + '-tcl9')
+        if self.tcl_major < 9 or not os.path.isdir(tcl9_dir):
+            self.assertFalse(
+                self.chosen_dir.endswith('-tcl9'),
+                f"Expected base directory but got '{self.chosen_dir}'"
+            )
+
+
+if __name__ == '__main__':
+    unittest.main()

{tkinterdnd2-0.5.0 → tkinterdnd2-0.6.1}/tkinterdnd2/TkinterDnD.py

@@ -64,7 +64,12 @@ def _require(tkroot):
         else:
             raise RuntimeError('Plaform not supported.')
 
-        module_path = os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep)
+        tcl_major = int(tkroot.tk.call('info', 'tclversion').split('.')[0])
+        if tcl_major >= 9:
+            tcl9_path = os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep + '-tcl9')
+            module_path = tcl9_path if os.path.isdir(tcl9_path) else os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep)
+        else:
+            module_path = os.path.join(os.path.dirname(__file__), 'tkdnd', tkdnd_platform_rep)
         tkroot.tk.call('lappend', 'auto_path', module_path)
         TkdndVersion = tkroot.tk.call('package', 'require', 'tkdnd')
     except tkinter.TclError:

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

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

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/win-x64 → 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.5.0/tkinterdnd2/tkdnd/osx-arm64 → 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
@@ -231,7 +241,7 @@ proc xdnd::normalise_data { type data } {
     STRING - UTF8_STRING - TEXT - COMPOUND_TEXT {return $data}
     text/html {
       if {[catch {
-            ::tkdnd::from_encoding unicode $data
+            ::tkdnd::from_encoding utf-16 $data
            } string]} {
         set string $data
       }
@@ -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}
   }
@@ -838,7 +879,7 @@ proc xdnd::_SendData {type offset bytes args} {
       }
       default {
         set format 32
-        binary scan $typed_data c* _dodragdrop_transfer_data
+        binary scan [encoding convertto utf-8 $typed_data] c* _dodragdrop_transfer_data
       }
     }
   }

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

@@ -53,10 +53,10 @@ namespace eval ::tkdnd {
 
 }; # namespace ::tkdnd
 
-package ifneeded tkdnd 2.9.3 \
+package ifneeded tkdnd 2.10.1 \
   "tkdnd::source \{$dir/tkdnd.tcl\} ; \
-   tkdnd::initialise \{$dir\} libtkdnd2.9.3[info sharedlibextension] tkdnd"
+   tkdnd::initialise \{$dir\} libtcl9tkdnd2.10.1.so tkdnd"
 
-package ifneeded tkdnd::utils 2.9.3 \
+package ifneeded tkdnd::utils 2.10.1 \
   "tkdnd::source \{$dir/tkdnd_utils.tcl\} ; \
-   package provide tkdnd::utils 2.9.3"
+   package provide tkdnd::utils 2.10.1"

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/osx-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.5.0/tkinterdnd2/tkdnd/linux-x64 → 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
@@ -231,7 +241,7 @@ proc xdnd::normalise_data { type data } {
     STRING - UTF8_STRING - TEXT - COMPOUND_TEXT {return $data}
     text/html {
       if {[catch {
-            ::tkdnd::from_encoding unicode $data
+            ::tkdnd::from_encoding utf-16 $data
            } string]} {
         set string $data
       }
@@ -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}
   }
@@ -838,7 +879,7 @@ proc xdnd::_SendData {type offset bytes args} {
       }
       default {
         set format 32
-        binary scan $typed_data c* _dodragdrop_transfer_data
+        binary scan [encoding convertto utf-8 $typed_data] c* _dodragdrop_transfer_data
       }
     }
   }

{tkinterdnd2-0.5.0/tkinterdnd2/tkdnd/osx-arm64 → tkinterdnd2-0.6.1/tkinterdnd2/tkdnd/linux-x64}/pkgIndex.tcl

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