Do not let cursor overlap with inserted graphics.

[lyx.git] / src / Server.cpp

diff --git a/src/Server.cpp b/src/Server.cpp
index 79340492c6d62254beb78fcc8d03471b3ff5d3d2..522060e91b6a70682b7ad0163ae9449cafbb240e 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -55,13 +55,16 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/os.h"
-#include "support/signals.h"
 
 #include <iostream>
 
 #ifdef _WIN32
-#include <io.h>
-#include <QCoreApplication>
+# include <io.h>
+# include <QCoreApplication>
+#else
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
 #endif
 #include <QThread>
 
@@ -172,7 +175,7 @@ bool LyXComm::pipeServer()
 
                pipe_[i].overlap.hEvent = event_[i];
                pipe_[i].iobuf.erase();
-               pipe_[i].handle = CreateNamedPipe(pipename.c_str(),
+               pipe_[i].handle = CreateNamedPipeA(pipename.c_str(),
                                open_mode | FILE_FLAG_OVERLAPPED, PIPE_WAIT,
                                MAX_CLIENTS, PIPE_BUFSIZE, PIPE_BUFSIZE,
                                PIPE_TIMEOUT, NULL);
@@ -486,7 +489,7 @@ bool LyXComm::resetPipe(DWORD index, bool close_handle)
                CloseHandle(pipe_[index].handle);
 
                pipe_[index].iobuf.erase();
-               pipe_[index].handle = CreateNamedPipe(name.c_str(),
+               pipe_[index].handle = CreateNamedPipeA(name.c_str(),
                                open_mode | FILE_FLAG_OVERLAPPED, PIPE_WAIT,
                                MAX_CLIENTS, PIPE_BUFSIZE, PIPE_BUFSIZE,
                                PIPE_TIMEOUT, NULL);
@@ -524,7 +527,7 @@ void LyXComm::openConnection()
        }
 
        // Check whether the pipe name is being used by some other instance.
-       if (!stopserver_ && WaitNamedPipe(inPipeName().c_str(), 0)) {
+       if (!stopserver_ && WaitNamedPipeA(inPipeName().c_str(), 0)) {
                // Tell the running instance to load the files
                if (run_mode == USE_REMOTE && loadFilesInOtherInstance()) {
                        deferred_loading_ = true;
@@ -863,7 +866,7 @@ int LyXComm::startPipe(string const & file, bool write)
        if (!write) {
                // Make sure not to call read_ready after destruction.
                weak_ptr<void> tracker = tracker_.p();
-               theApp()->registerSocketCallback(fd, [=](){
+               theApp()->registerSocketCallback(fd, [this, tracker](){
                                if (!tracker.expired())
                                        read_ready();
                        });