mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-06 09:15:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

More work on DnD kitten

Browse Source
This commit is contained in:
Kovid Goyal
2026-05-02 08:06:44 +05:30
parent 7e1a97795f
commit 511ef6db31
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kittens/dnd/drag.go
View File

@@ -67,12 +67,12 @@ func (dnd *dnd) reset_drag() {
dnd.drag_status = drag_status{}
}
func (dnd *dnd) on_drag_event(x, y int) (err error) {
func (dnd *dnd) on_drag_event(x, y, operation int) (err error) {
switch x {
case 1:
dnd.drag_status.accepted_mime = y
case 2:
dnd.drag_status.accepted_operation = y
dnd.drag_status.accepted_operation = operation
case 3:
dnd.drag_status.dropped = true
case 4:

6
kittens/dnd/main.go
View File

@@ -222,6 +222,10 @@ func (dnd *dnd) run_loop() (err error) {
dnd.send_test_response(strings.Join(dnd.drop_status.uri_list, "|"))
case "DRAG_ACTIVE":
dnd.send_test_response(utils.IfElse(dnd.drag_status.active, "DRAG_ACTIVE", "DRAG_INACTIVE"))
case "DRAG_OK":
dnd.send_test_response(utils.IfElse(dnd.drag_status.terminal_accepted_drag, "DRAG_OK", "DRAG_NOT_OK"))
case "DRAG_STATUS":
dnd.send_test_response(fmt.Sprintf("%s:%d:%v", dnd.drag_status.offered_mimes[dnd.drag_status.accepted_mime], dnd.drag_status.accepted_operation, dnd.drag_status.dropped))
default:
dnd.send_test_response("UNKNOWN TEST COMMAND: " + string(cmd.Payload))
}
@@ -249,7 +253,7 @@ func (dnd *dnd) run_loop() (err error) {
case 'E':
return dnd.on_drag_error(cmd)
case 'e':
return dnd.on_drag_event(cmd.X, cmd.Y)
return dnd.on_drag_event(cmd.X, cmd.Y, cmd.Operation)
}
return nil
}

4
kitty/dnd.c
View File

@@ -2125,10 +2125,6 @@ dnd_test_force_drag_dropped(PyObject *self UNUSED, PyObject *args) {
if (!PyArg_ParseTuple(args, "K", &window_id)) return NULL;
Window *w = window_for_window_id((id_type)window_id);
if (!w) { PyErr_SetString(PyExc_ValueError, "Window not found"); return NULL; }
if (w->drag_source.state != DRAG_SOURCE_BEING_BUILT) {
PyErr_SetString(PyExc_ValueError, "Drag source state is not BEING_BUILT");
return NULL;
}
// Simulate what drag_start does on success, without calling start_window_drag
for (size_t i = 0; i < w->drag_source.num_mimes; i++) {
free(w->drag_source.items[i].optional_data);

17
kitty_tests/dnd_kitten.py
View File

@@ -22,8 +22,10 @@ from kitty.fast_data_types import (
dnd_test_cleanup_fake_window,
dnd_test_create_fake_window,
dnd_test_drag_finish,
dnd_test_drag_notify,
dnd_test_fake_drop_data,
dnd_test_fake_drop_event,
dnd_test_force_drag_dropped,
dnd_test_probe_state,
dnd_test_start_drag_offer,
)
@@ -340,6 +342,9 @@ class TestDnDKitten(BaseTest):
def wait_for_drag_active(active=True):
self.send_dnd_command_to_kitten('DRAG_ACTIVE')
self.wait_for_responses('DRAG_ACTIVE' if active else 'DRAG_INACTIVE')
if active:
self.send_dnd_command_to_kitten('DRAG_OK')
self.wait_for_responses('DRAG_OK')
def start_drag(x, y, expected):
dnd_test_start_drag_offer(self.capture.window_id, x, y)
wait_for_drag_active()
@@ -348,10 +353,16 @@ class TestDnDKitten(BaseTest):
dnd_test_drag_finish(self.capture.window_id, canceled)
wait_for_drag_active(False)
self.wait_for_state('drag_operations', 0)
start_drag(1, 1, 3)
start_drag(move[0] + 1, move[1] + 1, 2)
self.assertEqual(set(self.probe_state('drag_mimes')), {'image/png', 'text/uri-list'})
end_drag()
start_drag(copy[0] + 1, copy[1] + 1, 1)
end_drag()
start_drag(move[0] + 1, move[1] + 1, 2)
end_drag()
start_drag(1, 1, 3)
dnd_test_drag_notify(self.capture.window_id, 0, 'text/uri-list')
dnd_test_drag_notify(self.capture.window_id, 1, '', GLFW_DRAG_OPERATION_MOVE)
dnd_test_force_drag_dropped(self.capture.window_id)
dnd_test_drag_notify(self.capture.window_id, 2)
self.send_dnd_command_to_kitten('DRAG_STATUS')
self.wait_for_responses('text/uri-list:2:true')
end_drag(False)