more cursor dispatch

[lyx.git] / src / format.C

diff --git a/src/format.C b/src/format.C
index 869bfb4d52ff02bf40a30f048cd054240236fcd6..e3a0b5a2af1656128070d07c6418e6c183b95d1c 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -12,27 +12,50 @@
 
 #include "format.h"
 #include "buffer.h"
-#include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "gettext.h"
-#include "LString.h"
+#include "lyxsocket.h"
 
 #include "frontends/Alert.h" //to be removed?
 
-#include "support/lstrings.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/systemcall.h"
-#include "support/lyxfunctional.h"
 
-using namespace lyx::support;
+using lyx::support::bformat;
+using lyx::support::compare_ascii_no_case;
+using lyx::support::contains;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+using lyx::support::subst;
+using lyx::support::Systemcall;
 
+using std::string;
+
+extern LyXServerSocket * lyxsocket;
 
 namespace {
 
 string const token_from("$$i");
 string const token_path("$$p");
+string const token_socket("$$a");
+
+
+class FormatNamesEqual : public std::unary_function<Format, bool> {
+public:
+       FormatNamesEqual(string const & name)
+               : name_(name) {}
+       bool operator()(Format const & f) const
+       {
+               return f.name() == name_;
+       }
+private:
+       string name_;
+};
 
 } //namespace anon
 
@@ -46,11 +69,8 @@ bool operator<(Format const & a, Format const & b)
 }
 
 Format::Format(string const & n, string const & e, string const & p,
-       string const & s, string const & v): name_(n),
-                                           extension_(e),
-                                           prettyname_(p),
-                                           shortcut_(s),
-                                           viewer_(v)
+              string const & s, string const & v)
+       : name_(n), extension_(e), prettyname_(p),shortcut_(s), viewer_(v)
 {}
 
 
@@ -80,7 +100,7 @@ Format const * Formats::getFormat(string const & name) const
 {
        FormatList::const_iterator cit =
                find_if(formatlist.begin(), formatlist.end(),
-                       lyx::compare_memfun(&Format::name, name));
+                       FormatNamesEqual(name));
        if (cit != formatlist.end())
                return &(*cit);
        else
@@ -92,9 +112,9 @@ int Formats::getNumber(string const & name) const
 {
        FormatList::const_iterator cit =
                find_if(formatlist.begin(), formatlist.end(),
-                       lyx::compare_memfun(&Format::name, name));
+                       FormatNamesEqual(name));
        if (cit != formatlist.end())
-               return cit - formatlist.begin();
+               return distance(formatlist.begin(), cit);
        else
                return -1;
 }
@@ -112,7 +132,7 @@ void Formats::add(string const & name, string const & extension,
 {
        FormatList::iterator it =
                find_if(formatlist.begin(), formatlist.end(),
-                       lyx::compare_memfun(&Format::name, name));
+                       FormatNamesEqual(name));
        if (it == formatlist.end())
                formatlist.push_back(Format(name, extension, prettyname,
                                            shortcut, ""));
@@ -127,7 +147,7 @@ void Formats::erase(string const & name)
 {
        FormatList::iterator it =
                find_if(formatlist.begin(), formatlist.end(),
-                       lyx::compare_memfun(&Format::name, name));
+                       FormatNamesEqual(name));
        if (it != formatlist.end())
                formatlist.erase(it);
 }
@@ -144,13 +164,13 @@ void Formats::setViewer(string const & name, string const & command)
        add(name);
        FormatList::iterator it =
                find_if(formatlist.begin(), formatlist.end(),
-                       lyx::compare_memfun(&Format::name, name));
+                       FormatNamesEqual(name));
        if (it != formatlist.end())
                it->setViewer(command);
 }
 
 
-bool Formats::view(Buffer const * buffer, string const & filename,
+bool Formats::view(Buffer const & buffer, string const & filename,
                   string const & format_name) const
 {
        if (filename.empty())
@@ -174,12 +194,11 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        if (format_name == "dvi" &&
            !lyxrc.view_dvi_paper_option.empty()) {
                command += ' ' + lyxrc.view_dvi_paper_option;
-               string paper_size = buffer->params.paperSizeName();
+               string paper_size = buffer.params().paperSizeName();
                if (paper_size == "letter")
                        paper_size = "us";
                command += ' ' + paper_size;
-               if (buffer->params.orientation
-                   == ORIENTATION_LANDSCAPE)
+               if (buffer.params().orientation == ORIENTATION_LANDSCAPE)
                        command += 'r';
        }
 
@@ -189,9 +208,9 @@ bool Formats::view(Buffer const * buffer, string const & filename,
        command = subst(command, token_from,
                        QuoteName(OnlyFilename(filename)));
        command = subst(command, token_path, QuoteName(OnlyPath(filename)));
-
+       command = subst(command, token_socket, QuoteName(lyxsocket->address()));
        lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-       buffer->message(_("Executing command: ") + command);
+       buffer.message(_("Executing command: ") + command);
 
        Path p(OnlyPath(filename));
        Systemcall one;