ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix offered mimes only being sent once

Browse source
This commit is contained in:
Kovid Goyal 2026-03-10 20:57:35 +05:30
parent bdd35ba84f
commit 59cb8eb201
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kitty/dnd.c
View file

@ -17,6 +17,7 @@ drop_free_offered_mimes(Window *w) {
free(w->drop.offerred_mimes); w->drop.offerred_mimes = NULL;
}
w->drop.num_offerred_mimes = 0;
w->drop.offered_mimes_total_size = 0;
}
static void
@ -192,14 +193,14 @@ drop_move_on_child(Window *w, const char** mimes, size_t num_mimes, bool is_drop
w->drop.hovered = true;
}
if (is_drop) { w->drop.dropped = true; w->drop.hovered = false; }
size_t mimes_total_size = 0;
if (mimes && (w->drop.offerred_mimes == NULL || string_arrays_cmp(mimes, num_mimes, w->drop.offerred_mimes, w->drop.num_offerred_mimes) != 0)) {
drop_free_offered_mimes(w);
w->drop.offerred_mimes = malloc(num_mimes * sizeof(char*));
if (w->drop.offerred_mimes) {
w->drop.offered_mimes_total_size = 0;
for (size_t i = 0; i < num_mimes; i++) {
size_t l = strlen(mimes[i]);
mimes_total_size += 1 + l;
w->drop.offered_mimes_total_size += 1 + l;
char *p = malloc(l + 1);
if (!p) fatal("Out of memory");
memcpy(p, mimes[i], l); p[l] = 0;
@ -214,8 +215,8 @@ drop_move_on_child(Window *w, const char** mimes, size_t num_mimes, bool is_drop
int header_size = snprintf(buf, sizeof(buf), "\x1b]%d;t=%c:x=%u:y=%u:X=%d:Y=%d", DND_CODE,
is_drop ? 'M' : 'm', w->mouse_pos.cell_x, w->mouse_pos.cell_y,
(int)w->mouse_pos.global_x, (int)w->mouse_pos.global_y);
if (mimes_total_size) {
mimes_total_size += 1;
if (w->drop.offered_mimes_total_size) {
const size_t mimes_total_size = 1 + w->drop.offered_mimes_total_size;
RAII_ALLOC(char, mbuf, malloc(mimes_total_size));
if (mbuf) {
size_t pos = 0;

2
kitty/state.h
View file

@ -253,7 +253,7 @@ typedef struct Window {
char *registered_mimes;
PendingData pending;
const char **offerred_mimes; size_t num_offerred_mimes;
const char **offerred_mimes; size_t num_offerred_mimes, offered_mimes_total_size;
char *accepted_mimes; size_t accepted_mimes_sz;
int accepted_operation; bool accept_in_progress;