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

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 8f6738de34..6942650e19 100644
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -6,12 +6,17 @@
 #pragma interface
 #endif
 
-#include "commandtags.h"
-#include "kbmap.h"
-#include "insets/lyxinset.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 "LString.h"
 
 class LyXView;
+class LyXText;
+
 
 /** This class encapsulates all the LyX command operations. 
     This is the class of the LyX's "high level event handler".
@@ -19,43 +24,47 @@ class LyXView;
     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 {
-		OK = 0, // No problem
-		Unknown = 1,
-		Disabled = 2, // Command cannot be executed
-		ToggleOn = 4,
-		ToggleOff = 8
-	};
 	///
+	explicit
 	LyXFunc(LyXView *);
     
-	/// LyX distpatcher, executes lyx actions.
-	string Dispatch(int action, char const * arg = 0);
+	/// LyX dispatcher, executes lyx actions.
+	string const dispatch(int action, string const & arg = string());
 			 
 	/// The same but uses the name of a lyx command.
-	string Dispatch(string const & cmd);
+	string const dispatch(string const & cmd);
 
-	/// A keyboard event is processed to execute a lyx action. 
-	int  processKeyEvent(XEvent * ev);
+	///
+	void miniDispatch(string const & cmd);
 
 	///
-	func_status getStatus(int ac) const;
+	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::value_type getStatus(int ac, 
+					  string const & not_to_use_arg) const;
 	
 	/// The last key was meta
 	bool wasMetaKey() const;
 
-	// These can't be global because are part of the internat state (ale970227)
+	// These can't be global because are part of the
+	// internal state (ale970227)
 	/// Get the current keyseq string
-	string keyseqStr(int l = 190) const;
+	string const keyseqStr() const;
 
 	/// Is the key sequence uncomplete?
 	bool keyseqUncomplete() const;
 
 	/// get options for the current keyseq
-	string keyseqOptions(int l = 190) const;
+	string const keyseqOptions() const;
 
         /// True if lyxfunc reports an error
         bool errorStat() const { return errorstat; }
@@ -64,13 +73,11 @@ public:
         /// Buffer to store result messages
         void setErrorMessage(string const &) const; 
         /// Buffer to store result messages
-        string getMessage() const { return dispatch_buffer; }
-        /// Get next inset of this class from current cursor position  
-        Inset * getInsetByCode(Inset::Code);
-	
+        string const getMessage() const { return dispatch_buffer; }
+	/// Handle a accented char keysequenze
+	void handleKeyFunc(kb_action action);
 	/// Should a hint message be displayed?
 	void setHintMessage(bool);
-
 private:
 	///
 	LyXView * owner;
@@ -83,7 +90,7 @@ private:
 	///
 	unsigned meta_fake_bit;
 	///
-	void moveCursorUpdate(bool selecting = false);
+	void moveCursorUpdate(bool flag = true, bool selecting = false);
 	///
 	void setupLocalKeymap();
         ///
@@ -94,8 +101,8 @@ private:
         mutable bool errorstat;
 
         /** Buffer to store messages and result data. Is there a
-	  good reason to have this one as static in Dispatch? (Ale)
-         */
+	    good reason to have this one as static in Dispatch? (Ale)
+	*/
         mutable string dispatch_buffer;
 	/// Command name and shortcut information
 	string commandshortcut;
@@ -103,25 +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 doImportLaTeX(bool);
+	void doImport(string const &);
 
 	///
-	void doImportASCII(bool);
-
+	void closeBuffer();
 	///
-	void MenuInsertLyXFile(string const &);
-
+	void reloadBuffer();
 	///
-	void CloseBuffer();
+	//  This return or directly text (default) of getLyXText()
 	///
-	void reloadBuffer();
-	/// This is the same for all lyxfunc objects
+	LyXText * TEXT(bool) const;
+	///
+	//  This is the same for all lyxfunc objects
 	static bool show_sc;
 };
      
@@ -136,22 +142,22 @@ bool LyXFunc::wasMetaKey() const
      
 
 inline
-string LyXFunc::keyseqStr(int l) const
+string const LyXFunc::keyseqStr() const
 {
-	char text[200];
-	keyseq.print(text, l, true);
-	string tmp(text);
-	return tmp;
+	// Why not just remove this function
+	string text;
+	keyseq.print(text, true);
+	return text;
 } 
 
 
 inline
-string LyXFunc::keyseqOptions(int l) const
+string const LyXFunc::keyseqOptions() const
 {
-	char text[200];
-	keyseq.printOptions(text, l);
-	string tmp(text);
-	return tmp;
+	// Why not just remove this function
+	string text;
+	keyseq.printOptions(text);
+	return text;
 } 
 
 
@@ -161,16 +167,11 @@ bool LyXFunc::keyseqUncomplete() const
 	return (keyseq.length > 0);
 }
 
+
 inline
 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