Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / Session.h

diff --git a/src/Session.h b/src/Session.h
index 2b1e216570481b3258708fafcf349c4d818bb2cd..04299b2569286e4947edca102e27feaa8758d201 100644 (file)
--- a/src/Session.h
+++ b/src/Session.h
@@ -16,13 +16,9 @@
 #include "support/FileName.h"
 #include "support/types.h"
 
+#include <map>
 #include <string>
-#include <deque>
 #include <vector>
-#include <map>
-
-// used by at least frontends/qt4/GuiPref.cpp
-const long maxlastfiles = 20;
 
 /** This session file maintains
   1. the latest documents loaded (lastfiles)
@@ -30,6 +26,7 @@ const long maxlastfiles = 20;
   3. opened files when a lyx session is closed (lastopened)
   4. bookmarks
   5. general purpose session info in the form of key/value pairs
+  6. the latest commands entered in the command buffer (lastcommands)
  */
 namespace lyx {
 
@@ -60,7 +57,7 @@ class LastFilesSection : SessionSection
 {
 public:
        ///
-       typedef std::deque<support::FileName> LastFiles;
+       typedef std::vector<support::FileName> LastFiles;
 
 public:
        ///
@@ -72,10 +69,10 @@ public:
        ///
        void write(std::ostream & os) const;
 
-       /// Return lastfiles container (deque)
+       /// Return lastfiles container (vector)
        LastFiles const lastFiles() const { return lastfiles; }
 
-       /** Insert #file# into the lastfile dequeue.
+       /** Insert #file# into the lastfile vector.
            This funtion inserts #file# into the last files list. If the file
            already exists it is moved to the top of the list, else exist it
            is placed on the top of the list. If the list is full the last
@@ -108,7 +105,17 @@ class LastOpenedSection : SessionSection
 {
 public:
        ///
-       typedef std::vector<support::FileName> LastOpened;
+       struct LastOpenedFile {
+               LastOpenedFile() : file_name(), active(false) {}
+
+               LastOpenedFile(support::FileName file_name_, bool active_)
+                       : file_name(file_name_), active(active_) {}
+
+               support::FileName file_name;
+               bool active;
+       };
+       ///
+       typedef std::vector<LastOpenedFile> LastOpened;
 
 public:
        ///
@@ -123,7 +130,7 @@ public:
        /** add file to lastopened file list
            @param file filename to add
        */
-       void add(support::FileName const & file);
+       void add(support::FileName const & file, bool active = false);
 
        /** clear lastopened file list
         */
@@ -160,7 +167,7 @@ public:
 
        /** add cursor position to the fname entry in the filepos map
            @param fname file entry for which to save position information
-           @param pos position of the cursor when the file is closed.
+           @param pos position of the cursor when the BufferView is closed.
        */
        void save(support::FileName const & fname, FilePos const & pos);
 
@@ -236,6 +243,9 @@ public:
        /// does the given bookmark have a saved position ?
        bool isValid(unsigned int i) const;
 
+       /// is there at least one bookmark that has a saved position ?
+       bool hasValid() const;
+
        ///
        unsigned int size() const { return max_bookmarks; }
 
@@ -263,11 +273,59 @@ private:
 };
 
 
+class LastCommandsSection : SessionSection
+{
+public:
+       ///
+       typedef std::vector<std::string> LastCommands;
+
+public:
+       ///
+       LastCommandsSection(unsigned int num);
+       ///
+       void read(std::istream & is);
+
+       ///
+       void write(std::ostream & os) const;
+
+       /// Return lastcommands container (vector)
+       LastCommands const getcommands() const { return lastcommands; }
+
+       /** add command to lastcommands list
+           @param command command to add
+       */
+       void add(std::string const & command);
+
+       /** clear lastcommands list
+        */
+       void clear();
+
+private:
+       /// number of commands in the lastcommands list.
+       unsigned int num_lastcommands;
+
+       /** Used by the constructor to set the number of stored last commands.
+           @param num the number of lastcommands to set.
+       */
+       void setNumberOfLastCommands(unsigned int num);
+
+       /// a list of lastopened commands
+       LastCommands lastcommands;
+
+       /// Default number of lastcommands.
+       unsigned int const default_num_last_commands;
+
+       /// Max number of lastcommands.
+       unsigned int const absolute_max_last_commands;
+};
+
+
 class Session
 {
 public:
        /// Read the session file.  @param num length of lastfiles
-       explicit Session(unsigned int num = 4);
+       explicit Session(unsigned int num_last_files = 4,
+               unsigned int num_last_commands = 30);
        /// Write the session file.
        void writeFile() const;
        ///
@@ -286,6 +344,10 @@ public:
        BookmarksSection & bookmarks() { return bookmarks_; }
        ///
        BookmarksSection const & bookmarks() const { return bookmarks_; }
+       ///
+       LastCommandsSection & lastCommands() { return last_commands; }
+       ///
+       LastCommandsSection const & lastCommands() const { return last_commands; }
 
 private:
        friend class LyX;
@@ -311,6 +373,8 @@ private:
        LastFilePosSection last_file_pos;
        ///
        BookmarksSection bookmarks_;
+       ///
+       LastCommandsSection last_commands;
 };
 
 /// This is a singleton class. Get the instance.