X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.h;h=5203bc4fcd62338098f481f240fb8e7283953e34;hb=823e44822e6638824900eee2f7e2e7165af97f8d;hp=ce2d452764c82948c0369da90f70ff639ea58c21;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/LyXAction.h b/src/LyXAction.h
index ce2d452764..5203bc4fcd 100644
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -13,44 +13,63 @@
 #ifndef LYXACTION_H
 #define LYXACTION_H
 
-#include "lfuns.h"
-
-#include <boost/utility.hpp>
+#include "FuncCode.h"
 
 #include <map>
 #include <string>
 
+
+namespace lyx {
+
 class FuncRequest;
+class LyXErr;
 
 /**
- * This class is a container for LyX actions. It also
- * stores and managers "pseudo-actions". Pseudo-actions
- * are not part of the kb_action enum, but are created
- * dynamically, for encapsulating a real action and an
- * argument. They are used for things like the menus.
+ * This class is a container for LyX actions. It associates a name to
+ * most of them and describes some of their properties.
  */
-class LyXAction : boost::noncopyable {
+class LyXAction {
+public:
+	/// category of an action, used in the Shortcuts dialog
+	enum func_type {
+		Hidden,  //< Not listed for configuration
+		Edit,    //< Cursor and mouse movement, copy/paste etc
+		Math,    //< Mathematics
+		Buffer,  //< Buffer and window related
+		Layout,  //< Font, Layout and textclass related
+		System,  //< Lyx preference, server etc
+	};
+
 private:
 	/// information for an action
-	struct func_info {
+	struct FuncInfo {
 		/// the action name
 		std::string name;
 		/// the func_attrib values set
 		unsigned int attrib;
+		/// the category of this func
+		func_type type;
 	};
 
 public:
+	/// noncopyable
+	LyXAction(LyXAction const &);
+	void operator=(LyXAction const &);
+
 	/// type for map between a function name and its action
-	typedef std::map<std::string, kb_action> func_map;
+	typedef std::map<std::string, FuncCode> func_map;
 	/// type for map between an action and its info
-	typedef std::map<kb_action, func_info> info_map;
+	typedef std::map<FuncCode, FuncInfo> info_map;
 
 	/// possible "permissions" for an action
 	enum func_attrib {
-		Noop = 0, //< nothing special about this func
-		ReadOnly = 1, //< can be used in RO mode (perhaps this should change)
+		Noop = 0, //< Nothing special about this func
+		ReadOnly = 1, //< Can be used in RO mode (perhaps this should change); no automatic markDirty
 		NoBuffer = 2, //< Can be used when there is no document open
-		Argument = 4 //< Requires argument
+		Argument = 4, //< Requires argument
+		NoUpdate = 8, //< Does not (usually) require update
+		SingleParUpdate = 16, //< Usually only requires this par updated
+		AtPoint = 32, //< dispatch first to inset at cursor if there is one
 	};
 
 	LyXAction();
@@ -63,10 +82,12 @@ public:
 	FuncRequest lookupFunc(std::string const & func_name) const;
 
 	/// Return the name (and argument) associated with the given (pseudo) action
-	std::string const getActionName(kb_action action) const;
+	std::string const getActionName(FuncCode action) const;
+
+        func_type getActionType(FuncCode action) const;
 
 	/// True if the command has `flag' set
-	bool funcHasFlag(kb_action action, func_attrib flag) const;
+	bool funcHasFlag(FuncCode action, func_attrib flag) const;
 
 	/// iterator across all real actions
 	typedef func_map::const_iterator const_func_iterator;
@@ -81,7 +102,7 @@ private:
 	/// populate the action container with our actions
 	void init();
 	/// add the given action
-	void newFunc(kb_action, std::string const & name, unsigned int attrib);
+	void newFunc(FuncCode, std::string const & name, unsigned int attrib, func_type type);
 
 	/**
 	 * This is a list of all the LyXFunc names with the
@@ -98,7 +119,12 @@ private:
 	info_map lyx_info_map;
 };
 
+LyXErr & operator<<(LyXErr &, FuncCode);
+
 /// singleton instance
 extern LyXAction lyxaction;
 
+
+} // namespace lyx
+
 #endif // LYXACTION_H