X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.h;h=6942650e1906291412a33bab54609e0619353d68;hb=cb52251ccff29d6cbfa13ab90a96be566e3f41ac;hp=ae7a8683ec6ddff0100289de6ab14654675c043f;hpb=adaef99e60e28eba8c413a3472cc71e234718af0;p=lyx.git

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index ae7a8683ec..6942650e19 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -6,14 +6,17 @@
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
-#include "commandtags.h"
+#include <X11/Xlib.h>
+#include <sigc++/signal_system.h>
+
+#include "commandtags.h" // for kb_action enum
+#include "func_status.h"
 #include "kbsequence.h"
-#include "insets/lyxinset.h"
 #include "LString.h"
 
 class LyXView;
-class auto_mem_buffer;
+class LyXText;
+
 
 /** This class encapsulates all the LyX command operations. 
     This is the class of the LyX's "high level event handler".
@@ -21,39 +24,33 @@ class auto_mem_buffer;
     keyboard or from the GUI. All GUI objects, including buttons and
     menus should use this class and never call kernel functions directly.
 */
-class LyXFunc {
+class LyXFunc : public SigC::Object {
 public:
-	/// The status of a function.
-	enum func_status {
-		/// No problem
-		OK = 0,
-		///
-		Unknown = 1,
-		/// Command cannot be executed
-		Disabled = 2,
-		///
-		ToggleOn = 4,
-		///
-		ToggleOff = 8
-	};
 	///
 	explicit
 	LyXFunc(LyXView *);
     
 	/// LyX dispatcher, executes lyx actions.
-	string const Dispatch(int action, string const & arg = string());
+	string const dispatch(int action, string const & arg = string());
 			 
 	/// The same but uses the name of a lyx command.
-	string const Dispatch(string const & cmd);
+	string const dispatch(string const & cmd);
 
-	/// Same again but for xtl buffers.  Still looking for better idea.
-	bool Dispatch(int action, auto_mem_buffer &);
+	///
+	void miniDispatch(string const & cmd);
 
 	///
-	int processKeySym(KeySym k, unsigned int state);
+	void initMiniBuffer();
+		
+	///
+	void processKeySym(KeySym k, unsigned int state);
 
+	/// we need one internall which is called from inside LyXAction and
+	/// can contain the string argument.
+	func_status::value_type getStatus(int ac) const;
 	///
-	func_status getStatus(int ac) const;
+	func_status::value_type getStatus(int ac, 
+					  string const & not_to_use_arg) const;
 	
 	/// The last key was meta
 	bool wasMetaKey() const;
@@ -77,9 +74,8 @@ public:
         void setErrorMessage(string const &) const; 
         /// Buffer to store result messages
         string const getMessage() const { return dispatch_buffer; }
-        /// Get next inset of this class from current cursor position  
-        Inset * getInsetByCode(Inset::Code);
-	
+	/// Handle a accented char keysequenze
+	void handleKeyFunc(kb_action action);
 	/// Should a hint message be displayed?
 	void setHintMessage(bool);
 private:
@@ -94,7 +90,7 @@ private:
 	///
 	unsigned meta_fake_bit;
 	///
-	void moveCursorUpdate(bool selecting = false);
+	void moveCursorUpdate(bool flag = true, bool selecting = false);
 	///
 	void setupLocalKeymap();
         ///
@@ -114,21 +110,24 @@ private:
 	// I think the following should be moved to BufferView. (Asger)
 
 	///
-	void MenuNew(bool fromTemplate);
+	void menuNew(bool fromTemplate);
 
 	///
-	void MenuOpen();
+	void open(string const &);
 
 	///
 	void doImport(string const &);
-	///
-	void MenuInsertLyXFile(string const &);
 
 	///
-	void CloseBuffer();
+	void closeBuffer();
 	///
 	void reloadBuffer();
-	/// This is the same for all lyxfunc objects
+	///
+	//  This return or directly text (default) of getLyXText()
+	///
+	LyXText * TEXT(bool) const;
+	///
+	//  This is the same for all lyxfunc objects
 	static bool show_sc;
 };
      
@@ -175,11 +174,4 @@ void LyXFunc::setHintMessage(bool hm)
 	show_sc = hm;
 }
 
-///
-inline
-void operator|=(LyXFunc::func_status & fs, LyXFunc::func_status f)
-{
-	fs = static_cast<LyXFunc::func_status>(fs | f);
-}
-
 #endif