Menu
▾
▴
[clr-ci] SF.net SVN: colorer:[1953] trunk/far3colorer
|
From: <ct...@us...> - 2013-04-29 03:59:34
|
Revision: 1953
http://sourceforge.net/p/colorer/svn/1953
Author: ctapmex
Date: 2013-04-29 03:59:28 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Far3 3371 API
Modified Paths:
--------------
trunk/far3colorer/changelog
trunk/far3colorer/far3sdk/farcolor.hpp
trunk/far3colorer/far3sdk/plugin.hpp
trunk/far3colorer/history.ru.txt
trunk/far3colorer/src/FarEditor.cpp
trunk/far3colorer/src/pcolorer.cpp
trunk/far3colorer/src/version.h
Modified: trunk/far3colorer/changelog
===================================================================
--- trunk/far3colorer/changelog 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/changelog 2013-04-29 03:59:28 UTC (rev 1953)
@@ -1,5 +1,9 @@
$Revision$
$Author$ $Date$
+ 1. Far3 3371 API
+
+#Revision: 1926
+ Author: ctapmex Date: 2013-02-26 10:45:19 +0600 (Вт, 26 фев 2013)
1. изменения в нумерации версии плагина
#Revision: 1925
Modified: trunk/far3colorer/far3sdk/farcolor.hpp
===================================================================
--- trunk/far3colorer/far3sdk/farcolor.hpp 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/far3sdk/farcolor.hpp 2013-04-29 03:59:28 UTC (rev 1953)
@@ -4,7 +4,7 @@
/*
farcolor.hpp
- Colors Index for FAR Manager 3.0 build 2948
+ Colors Index for FAR Manager 3.0 build 3371
*/
/*
Modified: trunk/far3colorer/far3sdk/plugin.hpp
===================================================================
--- trunk/far3colorer/far3sdk/plugin.hpp 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/far3sdk/plugin.hpp 2013-04-29 03:59:28 UTC (rev 1953)
@@ -5,7 +5,7 @@
/*
plugin.hpp
- Plugin API for Far Manager 3.0 build 2948
+ Plugin API for Far Manager 3.0 build 3371
*/
/*
@@ -43,7 +43,7 @@
#define FARMANAGERVERSION_MAJOR 3
#define FARMANAGERVERSION_MINOR 0
#define FARMANAGERVERSION_REVISION 0
-#define FARMANAGERVERSION_BUILD 2948
+#define FARMANAGERVERSION_BUILD 3371
#define FARMANAGERVERSION_STAGE VS_RELEASE
#ifndef RC_INVOKED
@@ -186,6 +186,7 @@
DIF_HISTORY = 0x0000000000040000ULL,
DIF_BTNNOCLOSE = 0x0000000000040000ULL,
DIF_CENTERTEXT = 0x0000000000040000ULL,
+ DIF_SEPARATORUSER = 0x0000000000080000ULL,
DIF_SETSHIELD = 0x0000000000080000ULL,
DIF_EDITEXPAND = 0x0000000000080000ULL,
DIF_DROPDOWNLIST = 0x0000000000100000ULL,
@@ -207,6 +208,8 @@
DIF_DISABLE = 0x0000000080000000ULL,
DIF_DEFAULTBUTTON = 0x0000000100000000ULL,
DIF_FOCUS = 0x0000000200000000ULL,
+ DIF_RIGHTTEXT = 0x0000000400000000ULL,
+ DIF_WORDWRAP = 0x0000000800000000ULL,
DIF_NONE = 0;
enum FARMESSAGE
@@ -523,36 +526,6 @@
struct FarDialogItem* Item;
};
-#define Dlg_RedrawDialog(Info,hDlg) Info.SendDlgMessage(hDlg,DM_REDRAW,0,0)
-
-#define Dlg_GetDlgData(Info,hDlg) Info.SendDlgMessage(hDlg,DM_GETDLGDATA,0,0)
-#define Dlg_SetDlgData(Info,hDlg,Data) Info.SendDlgMessage(hDlg,DM_SETDLGDATA,0,(intptr_t)Data)
-
-#define Dlg_GetDlgItemData(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_GETITEMDATA,0,0)
-#define Dlg_SetDlgItemData(Info,hDlg,ID,Data) Info.SendDlgMessage(hDlg,DM_SETITEMDATA,0,(intptr_t)Data)
-
-#define DlgItem_GetFocus(Info,hDlg) Info.SendDlgMessage(hDlg,DM_GETFOCUS,0,0)
-#define DlgItem_SetFocus(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_SETFOCUS,ID,0)
-#define DlgItem_Enable(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_ENABLE,ID,TRUE)
-#define DlgItem_Disable(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_ENABLE,ID,FALSE)
-#define DlgItem_IsEnable(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_ENABLE,ID,-1)
-#define DlgItem_SetText(Info,hDlg,ID,Str) Info.SendDlgMessage(hDlg,DM_SETTEXTPTR,ID,(intptr_t)Str)
-
-#define DlgItem_GetCheck(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_GETCHECK,ID,0)
-#define DlgItem_SetCheck(Info,hDlg,ID,State) Info.SendDlgMessage(hDlg,DM_SETCHECK,ID,State)
-
-#define DlgEdit_AddHistory(Info,hDlg,ID,Str) Info.SendDlgMessage(hDlg,DM_ADDHISTORY,ID,(intptr_t)Str)
-
-#define DlgList_AddString(Info,hDlg,ID,Str) Info.SendDlgMessage(hDlg,DM_LISTADDSTR,ID,(intptr_t)Str)
-#define DlgList_GetCurPos(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_LISTGETCURPOS,ID,0)
-#define DlgList_SetCurPos(Info,hDlg,ID,NewPos) {struct FarListPos LPos={sizeof(FarListPos),NewPos,-1};Info.SendDlgMessage(hDlg,DM_LISTSETCURPOS,ID,(intptr_t)&LPos);}
-#define DlgList_ClearList(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_LISTDELETE,ID,0)
-#define DlgList_DeleteItem(Info,hDlg,ID,Index) {struct FarListDelete FLDItem={sizeof(FarListDelete),Index,1}; Info.SendDlgMessage(hDlg,DM_LISTDELETE,ID,(intptr_t)&FLDItem);}
-#define DlgList_SortUp(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_LISTSORT,ID,0)
-#define DlgList_SortDown(Info,hDlg,ID) Info.SendDlgMessage(hDlg,DM_LISTSORT,ID,1)
-#define DlgList_GetItemData(Info,hDlg,ID,Index) Info.SendDlgMessage(hDlg,DM_LISTGETDATA,ID,Index)
-#define DlgList_SetItemStrAsData(Info,hDlg,ID,Index,Str) {struct FarListItemData FLID{sizeof(FarListItemData),Index,0,Str,0}; Info.SendDlgMessage(hDlg,DM_LISTSETDATA,ID,(intptr_t)&FLID);}
-
typedef unsigned __int64 FARDIALOGFLAGS;
static const FARDIALOGFLAGS
FDLG_WARNING = 0x0000000000000001ULL,
@@ -672,6 +645,13 @@
typedef void (WINAPI *FARPANELITEMFREECALLBACK)(void* UserData, const struct FarPanelItemFreeInfo* Info);
+struct UserDataItem
+{
+ void* Data;
+ FARPANELITEMFREECALLBACK FreeData;
+};
+
+
struct PluginPanelItem
{
FILETIME CreationTime;
@@ -687,11 +667,7 @@
const wchar_t * const *CustomColumnData;
size_t CustomColumnNumber;
PLUGINPANELITEMFLAGS Flags;
- struct
- {
- void* Data;
- FARPANELITEMFREECALLBACK FreeData;
- } UserData;
+ struct UserDataItem UserData;
uintptr_t FileAttributes;
uintptr_t NumberOfLinks;
uintptr_t CRC32;
@@ -835,6 +811,7 @@
FCTL_GETPANELHOSTFILE = 32,
FCTL_SETCASESENSITIVESORT = 33,
FCTL_GETPANELPREFIX = 34,
+ FCTL_SETACTIVEPANEL = 35,
};
typedef void (WINAPI *FARAPITEXT)(
@@ -933,6 +910,7 @@
FHELP_FARHELP = 0x0000000000000001ULL,
FHELP_CUSTOMFILE = 0x0000000000000002ULL,
FHELP_CUSTOMPATH = 0x0000000000000004ULL,
+ FHELP_GUID = 0x0000000000000008ULL,
FHELP_USECONTENTS = 0x0000000040000000ULL,
FHELP_NONE = 0;
@@ -1077,6 +1055,7 @@
FMVT_DOUBLE = 3,
FMVT_BOOLEAN = 4,
FMVT_BINARY = 5,
+ FMVT_POINTER = 6,
};
struct FarMacroValue
@@ -1088,6 +1067,7 @@
__int64 Boolean;
double Double;
const wchar_t *String;
+ void *Pointer;
struct
{
void *Data;
@@ -1111,6 +1091,8 @@
MPRT_PLUGINMENU = 6,
MPRT_PLUGINCONFIG = 7,
MPRT_PLUGINCOMMAND = 8,
+ MPRT_USERMENU = 9,
+ MPRT_COMMONCASE = 100
};
struct MacroPluginReturn
@@ -1129,7 +1111,6 @@
void *CallbackData;
};
-
struct FarGetValue
{
size_t StructSize;
@@ -1375,6 +1356,8 @@
ECTL_UNDOREDO = 32,
ECTL_GETFILENAME = 33,
ECTL_DELCOLOR = 34,
+ ECTL_SUBSCRIBECHANGEEVENT = 36,
+ ECTL_UNSUBSCRIBECHANGEEVENT = 37,
};
enum EDITOR_SETPARAMETER_TYPES
@@ -1605,6 +1588,12 @@
intptr_t StringNumber;
};
+struct EditorSubscribeChangeEvent
+{
+ size_t StructSize;
+ GUID PluginId;
+};
+
typedef unsigned __int64 INPUTBOXFLAGS;
static const INPUTBOXFLAGS
FIB_ENABLEEMPTY = 0x0000000000000001ULL,
@@ -2137,6 +2126,18 @@
FARAPICREATEDIRECTORY CreateDirectory;
};
+struct NetBoxPrivateInfo
+{
+ size_t StructSize;
+ FARAPICREATEFILE CreateFile;
+ FARAPIGETFILEATTRIBUTES GetFileAttributes;
+ FARAPISETFILEATTRIBUTES SetFileAttributes;
+ FARAPIMOVEFILEEX MoveFileEx;
+ FARAPIDELETEFILE DeleteFile;
+ FARAPIREMOVEDIRECTORY RemoveDirectory;
+ FARAPICREATEDIRECTORY CreateDirectory;
+};
+
typedef intptr_t (WINAPI *FARAPICALLFAR)(intptr_t CheckCode, struct FarMacroCall* Data);
struct MacroPrivateInfo
@@ -2325,6 +2326,7 @@
const struct KeyBarTitles *KeyBar;
const wchar_t *ShortcutData;
unsigned __int64 FreeSize;
+ struct UserDataItem UserData;
};
struct AnalyseInfo
@@ -2392,6 +2394,13 @@
MCT_MACROSTEP = 1,
MCT_MACROFINAL = 2,
MCT_MACROPARSE = 3,
+ MCT_LOADMACROS = 4,
+ MCT_ENUMMACROS = 5,
+ MCT_WRITEMACROS = 6,
+ MCT_GETMACRO = 7,
+ MCT_PROCESSMACRO = 8,
+ MCT_DELMACRO = 9,
+ MCT_RUNSTARTMACRO = 10,
};
struct OpenMacroPluginInfo
@@ -2429,8 +2438,9 @@
size_t StructSize;
HANDLE hPanel;
const wchar_t *Dir;
- intptr_t UserData;
+ intptr_t Reserved;
OPERATION_MODES OpMode;
+ struct UserDataItem UserData;
};
struct SetFindListInfo
Modified: trunk/far3colorer/history.ru.txt
===================================================================
--- trunk/far3colorer/history.ru.txt 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/history.ru.txt 2013-04-29 03:59:28 UTC (rev 1953)
@@ -1,6 +1,9 @@
\xC8\xF1\xF2\xEE\xF0\xE8\xFF \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE9 FarColorer.
\xC8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFE, \xEE\xE1 \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xFF\xF5 \xE2 \xE1\xE8\xE1\xEB\xE8\xEE\xF2\xE5\xEA\xE5 \xF1\xF5\xE5\xEC (\xE1\xE0\xE7\xE0\xF5) \xF1\xEC\xEE\xF2\xF0\xE8\xF2\xE5 \xE2 \xF4\xE0\xE9\xEB\xE5 hrc\CHANGELOG
+\xC2\xE5\xF0\xF1\xE8\xFF 1.1.1.1 . 29.04.2013
+ 1. \xCF\xEB\xE0\xE3\xE8\xED \xE0\xE4\xE0\xEF\xF2\xE8\xF0\xEE\xE2\xE0\xED \xEF\xEE\xE4 Far3 build 3371 API
+
\xC2\xE5\xF0\xF1\xE8\xFF 1.1.1.0 . 26.02.2013
1. \xC2 \xF1\xE2\xFF\xE7\xE8 \xF1 \xE2\xEA\xEB\xFE\xF7\xE5\xED\xE8\xE5\xEC \xEF\xEB\xE0\xE3\xE8\xED\xE0 \xE2 \xE4\xE8\xF1\xF2\xF0\xE8\xE1\xF3\xF2\xE8\xE2 Far, \xEC\xE5\xED\xFF\xE5\xF2\xF1\xFF \xED\xF3\xEC\xE5\xF0\xE0\xF6\xE8\xFF \xE2\xE5\xF0\xF1\xE8\xE9. \xD2\xE5\xEA\xF3\xF9\xE0\xFF \xE2\xE5\xF0\xF1\xE8\xFF \xE1\xF3\xE4\xE5\xF2 1.1.1.0.
\xCF\xF0\xE8 \xEA\xE0\xE6\xE4\xEE\xEC \xE8\xE7\xEC\xE5\xED\xE5\xED\xE8\xE8 \xE2 \xEF\xEB\xE0\xE3\xE8\xED\xE5 \xE1\xF3\xE4\xE5\xF2 \xEC\xE5\xED\xFF\xF2\xFC\xF1\xFF Revision \xF7\xE0\xF1\xF2\xFC \xED\xEE\xEC\xE5\xF0\xE0 \xE2\xE5\xF0\xF1\xE8\xE8.
Modified: trunk/far3colorer/src/FarEditor.cpp
===================================================================
--- trunk/far3colorer/src/FarEditor.cpp 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/src/FarEditor.cpp 2013-04-29 03:59:28 UTC (rev 1953)
@@ -7,6 +7,8 @@
this->info = info;
ei.StructSize = sizeof(EditorInfo);
info->EditorControl(CurrentEditor, ECTL_GETINFO, NULL, &ei);
+ EditorSubscribeChangeEvent esce = { sizeof(EditorSubscribeChangeEvent), MainGuid };
+ info->EditorControl(CurrentEditor, ECTL_SUBSCRIBECHANGEEVENT, 0, &esce);
cursorRegion = NULL;
prevLinePosition = 0;
blockTopPosition = -1;
@@ -36,6 +38,8 @@
FarEditor::~FarEditor()
{
+ EditorSubscribeChangeEvent esce = { sizeof(EditorSubscribeChangeEvent), MainGuid };
+ info->EditorControl(ei.EditorID, ECTL_UNSUBSCRIBECHANGEEVENT, 0, &esce); //detroyed class might not be related to CurrentEditor
delete cursorRegion;
delete structOutliner;
delete errorOutliner;
Modified: trunk/far3colorer/src/pcolorer.cpp
===================================================================
--- trunk/far3colorer/src/pcolorer.cpp 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/src/pcolorer.cpp 2013-04-29 03:59:28 UTC (rev 1953)
@@ -47,7 +47,7 @@
void WINAPI GetGlobalInfoW(struct GlobalInfo *gInfo)
{
gInfo->StructSize = sizeof(GlobalInfo);
- gInfo->MinFarVersion = MAKEFARVERSION(3,0,0,2927,VS_RELEASE);
+ gInfo->MinFarVersion = MAKEFARVERSION(3,0,0,3371,VS_RELEASE);
gInfo->Version = MAKEFARVERSION(VER_FILEVERSION,VS_RELEASE);
gInfo->Guid = MainGuid;
gInfo->Title = L"FarColorer";
Modified: trunk/far3colorer/src/version.h
===================================================================
--- trunk/far3colorer/src/version.h 2013-04-23 06:16:44 UTC (rev 1952)
+++ trunk/far3colorer/src/version.h 2013-04-29 03:59:28 UTC (rev 1953)
@@ -1,5 +1,5 @@
-#define VER_FILEVERSION 1,1,1,0
-#define VER_FILEVERSION_STR "1.1.1.0"
+#define VER_FILEVERSION 1,1,1,1
+#define VER_FILEVERSION_STR "1.1.1.1"
#define VER_PRODUCTVERSION VER_FILEVERSION
#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
