RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-05-11 12:48:36 +00:00
Code Issues Releases Wiki Activity

win32: add support for drag-and-drop option

Browse Source
This commit is contained in:
Dudemanguy 2023-06-12 18:42:49 -05:00
parent 6625a94608
commit f76c441ba2
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/man/options.rst
View File

@ -3086,7 +3086,7 @@ Window
(Windows only) Snap the player window to screen edges. (Windows only) Snap the player window to screen edges.
``--drag-and-drop=<no|auto|replace|append>`` ``--drag-and-drop=<no|auto|replace|append>``
(X11 and Wayland only) (X11, Wayland and Windows only)
Controls the default behavior of drag and drop on platforms that support this. Controls the default behavior of drag and drop on platforms that support this.
``auto`` will obey what the underlying os/platform gives mpv. Typically, holding ``auto`` will obey what the underlying os/platform gives mpv. Typically, holding
shift during the drag and drop will append the item to the playlist. Otherwise, shift during the drag and drop will append the item to the playlist. Otherwise,

2
video/out/w32_common.c
View File

@ -1594,7 +1594,7 @@ static void *gui_thread(void *ptr)
if (SUCCEEDED(OleInitialize(NULL))) { if (SUCCEEDED(OleInitialize(NULL))) {
ole_ok = true; ole_ok = true;
IDropTarget *dt = mp_w32_droptarget_create(w32->log, w32->input_ctx); IDropTarget *dt = mp_w32_droptarget_create(w32->log, w32->opts, w32->input_ctx);
RegisterDragDrop(w32->window, dt); RegisterDragDrop(w32->window, dt);
// ITaskbarList2 has the MarkFullscreenWindow method, which is used to // ITaskbarList2 has the MarkFullscreenWindow method, which is used to

15
video/out/win32/droptarget.c
View File

@ -35,6 +35,7 @@ struct droptarget {
atomic_int ref_cnt; atomic_int ref_cnt;
struct mp_log *log; struct mp_log *log;
struct input_ctx *input_ctx; struct input_ctx *input_ctx;
struct mp_vo_opts *opts;
DWORD last_effect; DWORD last_effect;
IDataObject *data_obj; IDataObject *data_obj;
}; };
@ -129,12 +130,20 @@ static STDMETHODIMP DropTarget_Drop(IDropTarget *self, IDataObject *pDataObj,
DWORD *pdwEffect) DWORD *pdwEffect)
{ {
struct droptarget *t = (struct droptarget *)self; struct droptarget *t = (struct droptarget *)self;
enum mp_dnd_action action = (grfKeyState & MK_SHIFT) ? DND_APPEND : DND_REPLACE;
enum mp_dnd_action action;
if (t->opts->drag_and_drop >= 0) {
action = t->opts->drag_and_drop;
} else {
action = (grfKeyState & MK_SHIFT) ? DND_APPEND : DND_REPLACE;
}
SAFE_RELEASE(t->data_obj); SAFE_RELEASE(t->data_obj);
STGMEDIUM medium; STGMEDIUM medium;
if (SUCCEEDED(IDataObject_GetData(pDataObj, &fmtetc_file, &medium))) { if (t->opts->drag_and_drop == -2) {
t->last_effect = DROPEFFECT_NONE;
} else if (SUCCEEDED(IDataObject_GetData(pDataObj, &fmtetc_file, &medium))) {
if (GlobalLock(medium.hGlobal)) { if (GlobalLock(medium.hGlobal)) {
HDROP drop = medium.hGlobal; HDROP drop = medium.hGlobal;
@ -200,6 +209,7 @@ static IDropTargetVtbl idroptarget_vtbl = {
}; };
IDropTarget *mp_w32_droptarget_create(struct mp_log *log, IDropTarget *mp_w32_droptarget_create(struct mp_log *log,
struct mp_vo_opts *opts,
struct input_ctx *input_ctx) struct input_ctx *input_ctx)
{ {
fmtetc_url.cfFormat = RegisterClipboardFormatW(L"UniformResourceLocatorW"); fmtetc_url.cfFormat = RegisterClipboardFormatW(L"UniformResourceLocatorW");
@ -210,6 +220,7 @@ IDropTarget *mp_w32_droptarget_create(struct mp_log *log,
dt->last_effect = 0; dt->last_effect = 0;
dt->data_obj = NULL; dt->data_obj = NULL;
dt->log = mp_log_new(dt, log, "droptarget"); dt->log = mp_log_new(dt, log, "droptarget");
dt->opts = opts;
dt->input_ctx = input_ctx; dt->input_ctx = input_ctx;
return &dt->iface; return &dt->iface;

2
video/out/win32/droptarget.h
View File

@ -25,9 +25,11 @@
#include "input/input.h" #include "input/input.h"
#include "common/msg.h" #include "common/msg.h"
#include "common/common.h" #include "common/common.h"
#include "options/options.h"
// Create a IDropTarget implementation that sends dropped files to input_ctx // Create a IDropTarget implementation that sends dropped files to input_ctx
IDropTarget *mp_w32_droptarget_create(struct mp_log *log, IDropTarget *mp_w32_droptarget_create(struct mp_log *log,
struct mp_vo_opts *opts,
struct input_ctx *input_ctx); struct input_ctx *input_ctx);
#endif #endif