From 32228e486ca6b287d67b9326fe1d1f221b57ff53 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 5 Nov 2012 19:53:33 +0000 Subject: [PATCH] CtrlCore: GetClipFiles git-svn-id: svn://ultimatepp.org/upp/trunk@5520 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/CtrlCore.h | 1 + uppsrc/CtrlCore/Win32Clip.cpp | 10 ++++++++-- uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tpp | 8 +++++++- uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tppi | 13 +++++++------ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h index e222d4609..636e944c1 100644 --- a/uppsrc/CtrlCore/CtrlCore.h +++ b/uppsrc/CtrlCore/CtrlCore.h @@ -274,6 +274,7 @@ void Append(VectorMap& data, const Image& img); bool IsAvailableFiles(PasteClip& clip); bool AcceptFiles(PasteClip& clip); +Vector GetClipFiles(const String& data); Vector GetFiles(PasteClip& clip); template diff --git a/uppsrc/CtrlCore/Win32Clip.cpp b/uppsrc/CtrlCore/Win32Clip.cpp index c067a8c1b..779b626fd 100644 --- a/uppsrc/CtrlCore/Win32Clip.cpp +++ b/uppsrc/CtrlCore/Win32Clip.cpp @@ -464,11 +464,10 @@ struct sDROPFILES { BOOL unicode; }; -Vector GetFiles(PasteClip& clip) +Vector GetClipFiles(const String& data) { GuiLock __; Vector f; - String data = clip; if((unsigned)data.GetCount() < sizeof(sDROPFILES) + 2) return f; const sDROPFILES *df = (const sDROPFILES *)~data; @@ -494,6 +493,13 @@ Vector GetFiles(PasteClip& clip) return f; } +Vector GetFiles(PasteClip& clip) +{ + GuiLock __; + Vector f; + return GetClipFiles(clip); +} + bool Has(UDropTarget *dt, const char *fmt); String Get(UDropTarget *dt, const char *fmt); diff --git a/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tpp b/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tpp index d9dd5d94b..8409d0352 100644 --- a/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tpp +++ b/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tpp @@ -87,6 +87,12 @@ asteClip][@(0.0.255) `&]_[*@3 clip])&] [s2;%% Accepts [%-*@3 clip].if it contains a list of OS shell files.&] [s3;%% &] [s4; &] +[s5;:GetClipFiles`(const String`&`): [_^Vector^ Vector]<[_^String^ String]>_[* GetClipFiles +]([@(0.0.255) const]_[_^String^ String][@(0.0.255) `&]_[*@3 data])&] +[s2;%% Extracts a list of OS shell files from raw Clipboard [%-*@3 data] +(result of ClipData`::Get call).&] +[s3;%% &] +[s4; &] [s5;:GetFiles`(PasteClip`&`): [_^Vector^ Vector]<[_^String^ String]>_[* GetFiles]([_^PasteClip^ P asteClip][@(0.0.255) `&]_[*@3 clip])&] [s2;%% Extracts a list of OS shell files from [%-*@3 clip].&] @@ -129,4 +135,4 @@ onst]_[*@4 T][@(0.0.255) `&]_[* GetInternal]([_^PasteClip^ PasteClip][@(0.0.255) &] [s2;%% Returns a reference to variable of internal clip.&] [s3;%% &] -[s0;%% ] \ No newline at end of file +[s0;%% ]] \ No newline at end of file diff --git a/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tppi b/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tppi index e779a2d67..017b05147 100644 --- a/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tppi +++ b/uppsrc/CtrlCore/src.tpp/PasteClipUtil$en-us.tppi @@ -1,9 +1,10 @@ TITLE("") COMPRESSED -120,156,205,88,107,111,219,54,20,253,43,68,210,135,147,122,6,73,73,150,108,119,69,138,118,221,138,97,232,208,199,242,65,144,45,90,166,19,174,178,164,137,116,30,40,218,223,190,75,189,44,197,178,227,36,238,214,32,176,108,137,247,113,206,189,60,151,182,75,209,163,71,184,139,15,241,45,127,195,215,124,206,150,161,242,92,97,154,206,136,81,107,244,249,247,119,131,145,182,39,96,111,216,196,112,44,131,152,180,15,47,196,32,212,162,134,73,28,58,48,29,195,112,240,48,8,153,148,158,27,82,199,201,140,104,151,30,82,219,162,196,54,29,211,33,134,237,80,176,165,24,83,108,83,139,152,134,67,173,225,140,203,192,115,49,44,55,32,198,160,111,12,48,193,216,38,4,27,212,198,134,101,18,98,80,112,65,109,74,176,53,228,209,204,115,127,235,143,180,129,169,65,89,125,72,189,15,222,76,19,131,119,109,102,26,196,192,212,176,200,192,234,15,167,252,76,68,109,144,172,91,33,217,120,40,20,95,20,136,152,57,58,62,177,70,4,76,251,221,254,161,13,97,77,11,130, -13,52,34,3,204,40,237,91,3,98,153,144,146,137,233,48,229,255,44,69,202,23,60,82,133,7,65,8,37,163,41,177,71,144,194,183,111,223,122,196,196,57,83,54,228,66,48,228,77,9,220,3,28,54,177,6,120,96,57,196,193,134,109,82,203,6,232,9,75,217,162,64,50,53,233,168,192,225,116,157,195,62,233,3,163,216,129,252,173,1,56,192,0,2,174,64,164,5,255,134,51,84,133,177,182,211,70,131,238,224,16,72,50,44,108,15,176,109,218,150,9,72,40,233,19,32,18,107,252,80,134,97,20,167,11,22,122,238,151,201,87,228,162,47,95,136,238,146,147,14,20,164,103,210,30,62,66,174,196,163,199,143,145,123,124,98,143,76,244,39,147,138,191,10,69,130,166,76,138,0,205,181,185,146,72,46,147,36,78,21,154,47,163,64,137,56,146,61,207,251,250,245,137,231,74,99,132,244,197,26,13,181,217,155,133,146,31,249,149,242,59,254,209,16,185,39,29,220,195,61,0,116,132,2,48,82,222,164,113,235,156,165,222,196,63,118,143,81,221,214,235,28,105,143,84,167, -245,158,171,101,26,73,196,80,40,164,66,241,188,200,8,137,25,220,148,50,14,4,83,124,134,46,133,58,71,73,200,68,132,20,184,64,29,22,168,37,11,195,235,46,74,11,23,254,129,126,50,186,212,175,254,193,81,175,150,188,89,97,120,25,4,60,81,57,130,138,11,255,201,77,48,211,56,14,1,203,49,90,173,247,58,238,100,92,153,140,87,76,122,117,67,255,137,54,59,49,80,160,159,172,112,230,126,36,114,31,255,84,61,69,98,142,4,32,149,5,164,18,136,74,151,92,211,128,102,105,156,148,56,192,71,19,201,175,92,125,80,169,136,206,214,129,76,198,249,147,49,202,175,25,146,106,253,189,129,228,65,79,55,71,61,45,195,158,54,227,158,62,48,112,198,32,248,41,136,154,167,241,162,65,228,22,138,116,229,178,28,59,89,127,22,132,64,198,221,27,159,183,241,86,58,1,0,45,13,191,102,213,138,70,103,238,117,91,119,204,110,14,230,11,85,47,195,77,96,167,223,5,217,90,69,191,51,182,172,210,175,82,158,237,121,157,216,107,166,24,154,138,136,165,215,104, -166,223,235,125,81,212,62,11,171,117,12,214,198,81,121,87,251,218,212,16,47,147,4,102,147,223,249,139,7,42,78,255,96,137,255,188,160,169,91,6,243,95,108,160,176,150,247,69,44,102,185,58,100,254,178,190,174,92,142,81,245,214,123,190,142,191,171,139,81,6,27,87,24,61,8,155,115,161,81,62,136,204,140,150,163,251,33,62,253,241,32,223,161,5,107,114,155,101,41,155,157,194,202,25,225,31,32,22,205,224,67,49,43,170,41,168,226,210,34,75,105,83,27,149,195,236,237,130,157,241,251,78,194,204,184,109,20,158,199,80,8,24,117,74,103,133,100,194,3,49,135,73,45,249,66,4,113,8,141,46,185,62,40,232,29,178,195,204,76,181,200,166,72,232,104,114,219,76,44,192,236,62,20,11,0,223,105,42,2,137,10,166,61,0,138,26,24,238,49,38,55,32,155,140,179,7,99,148,3,41,20,113,15,168,126,185,82,41,28,79,100,238,248,78,227,42,179,168,203,122,158,251,221,68,189,114,178,73,213,27,184,91,17,45,246,41,231,218,54,93,106,66,10,33,215,44, -20,106,94,227,102,225,213,90,121,255,98,94,50,249,195,8,219,237,85,16,139,179,22,77,91,151,134,198,254,40,181,12,184,44,72,212,110,118,149,182,183,242,229,5,19,33,155,134,252,141,8,185,220,77,16,110,90,61,108,255,188,175,111,112,49,111,238,157,149,46,84,234,247,238,3,146,231,60,12,209,92,199,70,157,89,202,206,80,156,112,208,72,248,38,147,247,88,99,77,102,8,132,124,242,159,249,207,16,75,146,80,4,217,218,141,42,146,11,213,29,24,169,25,236,95,34,123,55,37,114,3,21,91,132,102,3,148,178,247,203,198,111,235,250,23,133,204,236,1,92,165,148,27,139,185,179,120,22,99,117,125,26,43,190,208,59,6,4,254,121,99,31,102,191,131,232,172,76,244,81,99,106,85,211,194,107,125,76,215,228,140,229,91,144,133,185,162,85,83,120,117,38,85,215,9,239,161,79,146,207,151,33,186,60,231,112,39,101,145,156,243,84,135,200,53,112,202,213,37,135,39,107,221,40,183,76,235,173,93,184,43,228,205,141,187,247,158,69,222,90,207,182,208,85,208,189, -81,156,34,144,185,136,133,245,1,249,113,165,240,250,144,229,31,223,191,254,15,150,253,76,10,107,57,182,207,223,60,98,43,143,87,27,134,69,235,73,82,43,59,140,46,255,231,137,127,224,31,220,252,250,4,103,221,167,162,200,197,127,90,53,40,186,96,169,208,58,93,22,231,202,235,85,57,103,171,96,114,68,225,53,186,140,211,207,217,9,82,192,129,19,80,131,69,146,198,1,151,250,136,137,212,57,191,70,44,229,104,169,159,193,2,224,24,22,196,89,196,236,28,29,79,255,6,14,101,111,21,7,45,150,80,36,126,5,27,61,243,1,71,217,51,125,205,82,19,112,171,28,33,59,204,166,50,227,230,54,216,75,31,220,50,223,202,200,119,220,33,179,125,84,246,230,96,132,42,64,9,128,58,81,47,32,124,170,70,253,230,195,83,126,132,255,111,105,108,6,253,63,24,44,149,169,65,216,182,243,120,43,65,15,167,228,54,45,64,181,216,119,230,169,237,215,213,148,195,204,225,81,192,245,222,172,52,0,230,237,22,38,178,223,141,189,127,1,250,173,161,47, +120,156,205,88,107,111,219,54,20,253,43,68,210,135,147,122,6,73,73,150,108,119,69,138,118,221,138,97,232,208,199,242,193,144,35,90,166,19,174,178,164,137,116,30,40,218,223,190,75,234,17,41,150,29,39,113,183,22,69,156,72,186,143,115,46,121,14,229,49,69,143,30,225,46,222,199,183,252,27,190,230,115,182,140,148,63,22,182,237,141,24,117,70,159,127,127,55,24,233,120,2,241,150,75,44,207,177,136,77,251,240,131,88,132,58,212,178,137,71,7,182,103,89,30,30,134,17,147,210,31,71,212,243,76,16,237,210,125,234,58,148,184,182,103,123,196,114,61,10,177,20,99,138,93,234,16,219,242,168,51,156,113,25,250,99,12,143,91,80,99,208,183,6,152,96,236,18,130,45,234,98,203,177,9,177,40,164,160,46,37,216,25,242,120,230,143,127,235,143,116,128,173,65,57,125,104,189,15,217,108,27,67,118,29,102,91,196,194,212,114,200,192,233,15,167,252,84,196,109,144,156,91,33,185,120,40,20,95,20,136,152,61,58,60,114,70,4,66,251,221,254,190,11,101,109,7, +138,13,52,34,11,194,40,237,59,3,226,216,208,146,141,233,48,227,255,44,69,198,23,60,86,69,6,65,8,37,163,41,113,71,208,194,183,111,223,122,196,198,57,83,46,244,66,48,244,77,9,92,3,28,46,113,6,120,224,120,196,195,150,107,83,199,5,232,41,203,216,162,64,50,181,233,168,192,225,117,189,253,62,233,3,163,216,131,254,157,1,36,192,0,2,62,129,72,7,254,91,222,80,21,193,58,78,7,13,186,131,125,32,201,114,176,59,192,174,237,58,54,32,161,164,79,128,72,172,241,195,24,134,113,146,45,88,228,143,191,156,124,69,99,244,229,11,209,171,228,168,3,3,233,217,180,135,15,208,88,226,209,227,199,104,124,120,228,142,108,244,39,147,138,191,138,68,138,166,76,138,16,205,117,184,146,72,46,211,52,201,20,154,47,227,80,137,36,150,61,223,255,250,245,137,63,150,214,8,233,15,103,52,212,97,111,22,74,126,228,151,42,232,4,7,67,52,62,234,224,30,238,1,160,3,20,66,144,242,79,26,151,206,88,230,159,4,135,227,67,84,143,245,59,7,58, +35,213,109,189,231,106,153,197,18,49,20,9,169,80,50,47,58,66,98,6,23,165,76,66,193,20,159,161,11,161,206,80,26,49,17,35,5,41,80,135,133,106,201,162,232,170,139,178,34,69,176,167,239,140,46,244,207,96,239,160,87,107,222,174,48,188,12,67,158,170,28,65,197,69,240,228,38,152,105,146,68,128,229,16,93,63,239,119,198,39,147,42,100,114,205,164,95,15,12,158,232,176,35,11,133,250,206,53,206,60,143,68,227,199,63,85,119,145,152,35,1,72,101,1,169,4,162,178,37,215,52,160,89,150,164,37,14,200,209,68,242,43,87,31,84,38,226,211,85,32,39,147,252,206,4,229,159,6,73,245,252,189,129,228,69,143,215,87,61,46,203,30,55,235,30,63,176,176,97,16,242,20,68,205,179,100,209,32,114,3,69,122,114,166,199,142,89,159,5,33,208,113,247,198,223,155,120,43,147,0,128,150,5,191,18,213,138,70,119,238,119,91,119,204,118,9,230,11,85,31,195,77,96,199,223,5,217,202,68,191,51,54,51,233,87,25,55,123,94,55,246,154,41,134,166,34, +102,217,21,154,233,223,245,190,40,102,111,202,106,29,131,103,147,184,188,170,115,173,91,16,47,211,20,188,41,232,252,197,67,149,100,127,176,52,120,94,208,212,45,139,5,47,214,80,88,235,251,60,17,179,92,29,76,62,179,174,171,148,19,84,253,234,63,95,197,223,213,195,40,139,77,42,140,62,148,205,185,208,40,31,68,166,161,229,224,126,136,143,127,60,200,119,88,130,53,185,53,93,202,230,74,97,165,71,4,123,136,197,51,248,163,240,138,202,5,85,82,70,152,150,214,45,163,210,204,222,46,216,41,191,175,19,154,224,54,43,60,75,96,16,96,117,74,119,133,100,202,67,49,7,167,150,124,33,194,36,130,133,46,185,62,40,232,29,178,133,103,102,90,100,51,36,116,53,185,201,19,11,48,219,155,98,1,224,59,185,34,144,168,192,237,1,80,220,192,112,15,155,92,131,236,100,98,110,76,80,14,164,80,196,29,160,250,229,82,101,112,60,145,121,226,59,217,149,137,168,203,122,222,251,221,68,189,74,178,78,213,27,184,91,17,45,118,41,231,58,54,91,106,66,10,33, +215,44,20,106,94,227,102,225,215,150,242,238,197,188,100,242,135,17,182,219,167,32,22,167,45,154,182,42,13,141,253,81,106,25,112,89,144,168,211,108,43,109,111,229,203,115,38,34,54,141,248,27,17,113,185,157,32,220,140,122,216,254,121,95,223,224,98,222,220,59,215,186,80,169,223,187,15,72,158,241,40,66,115,93,27,117,102,25,59,69,73,202,65,35,225,77,38,95,99,141,103,76,32,16,242,41,120,22,60,67,44,77,35,17,154,103,215,170,72,46,84,119,96,164,22,176,123,137,236,221,148,200,53,84,108,16,26,227,66,57,156,86,101,201,215,125,185,254,219,22,255,139,66,109,170,76,15,57,29,155,53,217,162,160,107,135,108,134,154,177,11,179,233,166,9,203,102,141,229,173,93,66,46,35,19,89,137,193,80,3,71,33,188,53,110,114,139,53,67,190,11,37,59,24,251,150,12,108,99,43,197,129,99,245,156,162,248,66,107,9,88,223,243,198,228,204,55,68,186,43,27,125,212,152,90,125,166,200,90,63,192,212,132,158,229,226,196,162,92,235,171,243,201,245,105,93, +93,165,188,135,62,73,62,95,70,232,226,140,195,149,140,197,114,206,51,93,34,119,135,41,87,23,28,238,172,236,83,185,225,28,179,113,127,110,11,121,253,150,222,249,110,70,254,202,110,110,161,171,160,123,173,108,199,96,0,49,139,234,71,135,143,215,222,167,143,159,193,225,253,231,255,96,67,52,38,81,235,177,93,43,242,138,173,60,94,174,177,209,214,51,182,246,60,48,245,224,231,147,96,47,216,187,249,98,9,111,1,79,69,209,75,240,180,90,160,232,156,101,66,59,88,57,156,75,191,87,245,108,158,2,79,141,163,43,116,145,100,159,205,217,90,192,81,28,80,67,68,154,37,33,151,250,240,141,212,25,191,66,44,227,104,169,239,193,3,192,49,60,144,152,138,230,13,35,153,254,13,28,202,222,117,29,180,88,194,144,248,37,108,116,147,3,14,249,167,250,211,180,38,224,82,105,174,91,184,118,217,113,115,27,236,100,29,220,226,252,101,229,59,238,144,217,46,38,123,243,200,0,83,128,17,0,117,162,62,64,248,171,114,137,245,199,202,252,229,230,191,165,177,89,244,255, +96,176,84,166,6,97,155,222,84,90,9,122,56,37,183,105,1,170,213,190,51,79,109,223,59,103,28,60,135,199,33,215,123,179,210,0,240,219,13,76,152,111,212,125,255,95,121,130,253,161,