Removed the Custom action.

parasol-framework · May 13, 2024 · 43bd904 · 43bd904
1 parent b8661f3
commit 43bd904
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 82 deletions.
diff --git a/docs/html/modules/document.html b/docs/html/modules/document.html
diff --git a/docs/xml/modules/classes/compressedstream.xml b/docs/xml/modules/classes/compressedstream.xml
@@ -81,7 +81,6 @@
       <const name="Clear"/>
       <const name="Clipboard"/>
       <const name="CopyData"/>
-      <const name="Custom"/>
       <const name="DataFeed"/>
       <const name="Deactivate"/>
       <const name="Disable"/>

diff --git a/docs/xml/modules/core.xml b/docs/xml/modules/core.xml
@@ -2302,7 +2302,6 @@ SetField(Object, FID_Statement|TSTR, "string");
       <const name="Clear"/>
       <const name="Clipboard"/>
       <const name="CopyData"/>
-      <const name="Custom"/>
       <const name="DataFeed"/>
       <const name="Deactivate"/>
       <const name="Disable"/>

diff --git a/include/parasol/modules/core.h b/include/parasol/modules/core.h
@@ -176,8 +176,7 @@ DEFINE_ENUM_FLAG_OPERATORS(CCF)
 #define AC_Redimension 49
 #define AC_MoveToPoint 50
 #define AC_ScrollToPoint 51
-#define AC_Custom 52
-#define AC_END 53
+#define AC_END 52
 
 // Permission flags
 
@@ -1474,7 +1473,6 @@ struct Edges {
 #define AHASH_REDIMENSION 0x08a67fa2
 #define AHASH_MOVETOPOINT 0x48467e29
 #define AHASH_SCROLLTOPOINT 0xe3665f41
-#define AHASH_CUSTOM 0xf753f9c0
 #define AHASH_SORT 0x7c9e066d
 #define AHASH_SAVESETTINGS 0x475f7165
 #define AHASH_SELECTAREA 0xf55e615e
@@ -3034,7 +3032,6 @@ inline APTR SetResourcePtr(RES Res, APTR Value) { return (APTR)(MAXINT)(SetResou
 
 struct acClipboard     { CLIPMODE Mode; };
 struct acCopyData      { OBJECTPTR Dest; };
-struct acCustom        { LONG Number; CSTRING String; };
 struct acDataFeed      { OBJECTPTR Object; DATA Datatype; const void *Buffer; LONG Size; };
 struct acDragDrop      { OBJECTPTR Source; LONG Item; CSTRING Datatype; };
 struct acDraw          { LONG X; LONG Y; LONG Width; LONG Height; };
@@ -4683,11 +4680,6 @@ class objCompressedStream : public Object {
 #define acDataXML(a,b)      acDataFeed((a),0,DATA::XML,(b),0)
 #define acDataText(a,b)     acDataFeed((a),0,DATA::TEXT,(b),0)
 
-inline ERR acCustom(OBJECTID ObjectID, LONG Number, CSTRING String) {
-   struct acCustom args = { Number, String };
-   return ActionMsg(AC_Custom, ObjectID, &args);
-}
-
 inline ERR acDataFeed(OBJECTID ObjectID, OBJECTPTR Sender, DATA Datatype, const APTR Data, LONG Size) {
    struct acDataFeed channel = { Sender, Datatype, Data, Size };
    return ActionMsg(AC_DataFeed, ObjectID, &channel);

diff --git a/scripts/dev/idl/common.fdl b/scripts/dev/idl/common.fdl
@@ -54,7 +54,7 @@ enum("AC", { weak=true, start=1, comment="Action identifiers.", module="Core" },
     "Read",         "Rename",         "Reset",        "Resize",   "SaveImage",    "SaveToObject", "Scroll",
     "Seek",         "SetVar",         "Show",         "Undo",     "Unlock",       "Next",         "Prev",
     "Write",        "SetField",       "Clipboard",    "Refresh",  "Disable",      "Enable",       "Redimension",
-    "MoveToPoint",  "ScrollToPoint",  "Custom",
+    "MoveToPoint",  "ScrollToPoint",
     "END")
 
 flags("PERMIT", { comment="Permission flags", module="Core" },

diff --git a/scripts/dev/idl/idl-doc.fluid b/scripts/dev/idl/idl-doc.fluid
@@ -23,7 +23,6 @@ glActionComments[AC_Activate]       = 'Performs the native action of the object.
 glActionComments[AC_Clear]          = 'Clears an object\'s data.'
 glActionComments[AC_Clipboard]      = 'Copy and paste information to and from clipboard objects.'
 glActionComments[AC_CopyData]       = 'Copies one object\'s data to another.'
-glActionComments[AC_Custom]         = 'Allows customised messages to be passed through the action system.'
 glActionComments[AC_DataFeed]       = 'Provides a mechanism for feeding data to objects.'
 glActionComments[AC_Deactivate]     = 'Stops an object from performing its native activities.'
 glActionComments[AC_Disable]        = 'Disables an object.'

diff --git a/src/core/data_actionlist.cpp b/src/core/data_actionlist.cpp
@@ -5,7 +5,6 @@
 
 FDEF argsClipboard[]     = { { "Mode", FD_LONG }, { 0, 0 } };
 FDEF argsCopyData[]      = { { "Dest", FD_OBJECTPTR  }, { 0, 0 } };
-FDEF argsCustom[]        = { { "Number", FD_LONG }, { "String", FD_STR }, { 0, 0 } };
 FDEF argsDataFeed[]      = { { "Object", FD_OBJECTPTR }, { "Datatype", FD_LONG }, { "Buffer", FD_PTR }, { "Size", FD_LONG|FD_PTRSIZE }, { 0, 0 } };
 FDEF argsDragDrop[]      = { { "Source", FD_OBJECTPTR }, { "Item", FD_LONG }, { "Datatype", FD_STR }, { 0, 0 } };
 FDEF argsDraw[]          = { { "X", FD_LONG }, { "Y", FD_LONG }, { "Width", FD_LONG }, { "Height", FD_LONG }, { 0, 0 } };
@@ -82,6 +81,5 @@ extern "C" const struct ActionTable ActionTable[] = { // Sorted by action ID.
    { AHASH_REDIMENSION,    sizeof(struct acRedimension), "Redimension", argsRedimension },
    { AHASH_MOVETOPOINT,    sizeof(struct acMoveToPoint), "MoveToPoint", argsMoveToPoint },
    { AHASH_SCROLLTOPOINT,  sizeof(struct acScrollToPoint), "ScrollToPoint", argsScrollToPoint },
-   { AHASH_CUSTOM,         sizeof(struct acCustom), "Custom", argsCustom },
    { 0, 0, 0, 0 }
 };
diff --git a/src/core/defs/core.fdl b/src/core/defs/core.fdl
@@ -88,7 +88,7 @@ inline ENUMTYPE &operator &= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((_
     "READ",         "RENAME",        "RESET",     "RESIZE",      "SAVEIMAGE",    "SAVETOOBJECT", "SCROLL",
     "SEEK",         "SETVAR",        "SHOW",      "TIMER",       "UNLOCK",       "NEXT",         "PREV",
     "WRITE",        "SETFIELD",      "CLIPBOARD", "REFRESH",     "DISABLE",      "ENABLE",       "REDIMENSION",
-    "MOVETOPOINT",  "SCROLLTOPOINT", "CUSTOM",    "SORT",        "SAVESETTINGS", "SELECTAREA",   "SIGNAL",
+    "MOVETOPOINT",  "SCROLLTOPOINT", "SORT",        "SAVESETTINGS", "SELECTAREA",   "SIGNAL",
     "UNDO")
 
   flags("MHF", { comment="Internal options for requesting function tables from modules." },
@@ -1874,7 +1874,6 @@ inline APTR SetResourcePtr(RES Res, APTR Value) { return (APTR)(MAXINT)(SetResou
 
 struct acClipboard     { CLIPMODE Mode; };
 struct acCopyData      { OBJECTPTR Dest; };
-struct acCustom        { LONG Number; CSTRING String; };
 struct acDataFeed      { OBJECTPTR Object; DATA Datatype; const void *Buffer; LONG Size; };
 struct acDragDrop      { OBJECTPTR Source; LONG Item; CSTRING Datatype; };
 struct acDraw          { LONG X; LONG Y; LONG Width; LONG Height; };
@@ -2422,11 +2421,6 @@ inline ERR scCall(const FUNCTION &Function, ERR &Result) noexcept {
 #define acDataXML(a,b)      acDataFeed((a),0,DATA::XML,(b),0)
 #define acDataText(a,b)     acDataFeed((a),0,DATA::TEXT,(b),0)
 
-inline ERR acCustom(OBJECTID ObjectID, LONG Number, CSTRING String) {
-   struct acCustom args = { Number, String };
-   return ActionMsg(AC_Custom, ObjectID, &args);
-}
-
 inline ERR acDataFeed(OBJECTID ObjectID, OBJECTPTR Sender, DATA Datatype, const APTR Data, LONG Size) {
    struct acDataFeed channel = { Sender, Datatype, Data, Size };
    return ActionMsg(AC_DataFeed, ObjectID, &channel);

diff --git a/src/fluid/fluid_object_actions.cpp b/src/fluid/fluid_object_actions.cpp
@@ -114,7 +114,6 @@ static int obj_jump_enable(lua_State *Lua, const obj_read &Handle, object *def)
 static int obj_jump_redimension(lua_State *Lua, const obj_read &Handle, object *def) { lua_pushvalue(Lua, 1); lua_pushinteger(Lua, AC_Redimension); lua_pushcclosure(Lua, object_action_call_args, 2); return 1; }
 static int obj_jump_movetopoint(lua_State *Lua, const obj_read &Handle, object *def) { lua_pushvalue(Lua, 1); lua_pushinteger(Lua, AC_MoveToPoint); lua_pushcclosure(Lua, object_action_call_args, 2); return 1; }
 static int obj_jump_scrolltopoint(lua_State *Lua, const obj_read &Handle, object *def) { lua_pushvalue(Lua, 1); lua_pushinteger(Lua, AC_ScrollToPoint); lua_pushcclosure(Lua, object_action_call_args, 2); return 1; }
-static int obj_jump_custom(lua_State *Lua, const obj_read &Handle, object *def) { lua_pushvalue(Lua, 1); lua_pushinteger(Lua, AC_Custom); lua_pushcclosure(Lua, object_action_call_args, 2); return 1; }
 
 static std::array<obj_read::JUMP *, AC_END> glJumpActions = {
    obj_jump_empty,
@@ -168,6 +167,5 @@ static std::array<obj_read::JUMP *, AC_END> glJumpActions = {
    obj_jump_enable,
    obj_jump_redimension,
    obj_jump_movetopoint,
-   obj_jump_scrolltopoint,
-   obj_jump_custom
+   obj_jump_scrolltopoint
 };