lyx_mirror/development/Win32/win32_kludge.diff

Index: src/DepTable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/DepTable.C,v
retrieving revision 1.41
diff -u -a -u -r1.41 DepTable.C
--- src/DepTable.C	13 Oct 2003 01:01:33 -0000	1.41
+++ src/DepTable.C	18 Apr 2005 17:37:02 -0000
@@ -26,7 +26,9 @@
 #include <fstream>
 
 #ifndef CXX_GLOBAL_CSTD
+# ifndef _WIN32
 using std::time;
+# endif
 #endif
 
 using lyx::support::ltrim;
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.615
diff -u -a -u -r1.615 buffer.C
--- src/buffer.C	18 Apr 2005 17:43:08 -0000	1.615
+++ src/buffer.C	18 Apr 2005 17:37:02 -0000
@@ -78,7 +78,11 @@
 #include <boost/bind.hpp>
 #include <boost/filesystem/operations.hpp>
 
-#include <utime.h>
+#ifdef _WIN32
+# include <windows.h>
+#else
+# include <utime.h>
+#endif
 
 #include <iomanip>
 #include <stack>
Index: src/cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/cursor.C,v
retrieving revision 1.123
diff -u -a -u -r1.123 cursor.C
--- src/cursor.C	25 Feb 2005 11:55:31 -0000	1.123
+++ src/cursor.C	18 Apr 2005 17:37:02 -0000
@@ -58,7 +58,9 @@
 using std::vector;
 using std::endl;
 #ifndef CXX_GLOBAL_CSTD
+# ifndef _WIN32
 using std::isalpha;
+# endif
 #endif
 using std::min;
 using std::swap;
Index: src/ispell.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ispell.C,v
retrieving revision 1.25
diff -u -a -u -r1.25 ispell.C
--- src/ispell.C	20 Jan 2005 16:17:36 -0000	1.25
+++ src/ispell.C	18 Apr 2005 17:37:02 -0000
@@ -24,11 +24,17 @@
 
 #include "support/forkedcall.h"
 
+#ifdef _WIN32
+# include "support/os_win32.h"
+#endif
+
 // HP-UX 11.x doesn't have this header
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#include <sys/time.h>
+#ifndef _WIN32
+# include <sys/time.h>
+#endif
 
 using boost::shared_ptr;
 
@@ -88,6 +94,7 @@
 	}
 
 	// child process
+#ifndef _WIN32
 	dup2(pipein[0], STDIN_FILENO);
 	dup2(pipeout[1], STDOUT_FILENO);
 	dup2(pipeerr[1], STDERR_FILENO);
@@ -180,6 +187,7 @@
 
 	lyxerr << "LyX: Failed to start ispell!" << endl;
 	_exit(0);
+#endif
 }
 
 
@@ -191,6 +199,7 @@
 {
 	lyxerr[Debug::GUI] << "Created ispell" << endl;
 
+#ifndef _WIN32
 	// static due to the setvbuf. Ugly.
 	static char o_buf[BUFSIZ];
 
@@ -275,6 +284,7 @@
 	close(pipeerr[1]);
 	child_->kill();
 	child_.reset(0);
+#endif
 }
 
 
@@ -295,18 +305,23 @@
 		fclose(out);
 	}
 
+#ifndef _WIN32
 	close(pipein[0]);
 	close(pipein[1]);
 	close(pipeout[0]);
 	close(pipeout[1]);
 	close(pipeerr[0]);
 	close(pipeerr[1]);
+#endif
 	delete [] str;
 }
 
 
 bool ISpell::select(bool & err_read)
 {
+#ifdef _WIN32
+	return false;
+#else
 	fd_set infds;
 	struct timeval tv;
 	int retval = 0;
@@ -316,11 +331,15 @@
 	tv.tv_sec = 2;
 	tv.tv_usec = 0;
 
+#ifdef HAVE_SELECT
 	retval = ::select(SELECT_TYPE_ARG1 (max(pipeout[0], pipeerr[0]) + 1),
 			SELECT_TYPE_ARG234 (&infds),
 			0,
 			0,
 			SELECT_TYPE_ARG5 (&tv));
+#else
+	retval = -1;
+#endif
 
 	// error
 	if (retval <= 0)
@@ -335,6 +354,7 @@
 	fgets(buf, BUFSIZ, in);
 	err_read = false;
 	return false;
+#endif
 }
 
 
Index: src/lyx_cb.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v
retrieving revision 1.247
diff -u -a -u -r1.247 lyx_cb.C
--- src/lyx_cb.C	31 Jan 2005 10:42:18 -0000	1.247
+++ src/lyx_cb.C	18 Apr 2005 17:37:02 -0000
@@ -44,6 +44,10 @@
 #include "support/path.h"
 #include "support/systemcall.h"
 
+#ifdef _WIN32
+# include "support/os_win32.h" // fork()
+#endif
+
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem/operations.hpp>
 
Index: src/lyxserver.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxserver.C,v
retrieving revision 1.60
diff -u -a -u -r1.60 lyxserver.C
--- src/lyxserver.C	15 Feb 2005 11:04:40 -0000	1.60
+++ src/lyxserver.C	18 Apr 2005 17:37:02 -0000
@@ -54,6 +54,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifdef _WIN32
+# include "support/os_win32.h" // F_SETFL, O_NONBLOCK, fcntl
+#endif
+
 #ifdef __EMX__
 #include <cstdlib>
 #include <io.h>
@@ -180,6 +184,8 @@
 	// Imported handles can be used both with OS/2 APIs and emx
 	// library functions.
 	int const fd = _imphandle(os2fd);
+#elif defined(_WIN32)
+	int fd = -1;
 #else
 	if (::access(filename.c_str(), F_OK) == 0) {
 		lyxerr << "LyXComm: Pipe " << filename << " already exists.\n"
@@ -235,10 +241,12 @@
 	}
 #endif
 
+#ifndef _WIN32
 	if (::close(fd) < 0) {
 		lyxerr << "LyXComm: Could not close pipe " << filename
 		       << '\n' << strerror(errno) << endl;
 	}
+#endif
 
 // OS/2 pipes are deleted automatically
 #ifndef __EMX__
@@ -274,7 +282,13 @@
 	errno = 0;
 	int status;
 	// the single = is intended here.
-	while ((status = ::read(infd, charbuf, charbuf_size - 1))) {
+	while ((status = 
+#ifndef _WIN32
+		::read(infd, charbuf, charbuf_size - 1)
+#else
+		-1
+#endif
+		)) {
 
 		if (status > 0) {
 			charbuf[status] = '\0'; // turn it into a c string
@@ -331,6 +345,9 @@
 
 	if (pipename.empty()) return;
 
+#ifdef _WIN32
+	return;
+#else
 	if (!ready) {
 		lyxerr << "LyXComm: Pipes are closed. Could not send "
 		       << msg << endl;
@@ -341,6 +358,7 @@
 		closeConnection();
 		openConnection();
 	}
+#endif
 #ifdef __EMX__
 	APIRET rc;
 	int errnum;
Index: src/lyxsocket.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxsocket.C,v
retrieving revision 1.7
diff -u -a -u -r1.7 lyxsocket.C
--- src/lyxsocket.C	15 Feb 2005 13:45:40 -0000	1.7
+++ src/lyxsocket.C	18 Apr 2005 17:37:02 -0000
@@ -69,7 +69,9 @@
 LyXServerSocket::~LyXServerSocket()
 {
 	lyx_gui::unregister_socket_callback(fd_);
+#ifndef _WIN32
 	::close(fd_);
+#endif
 	lyx::support::unlink(address_);
 	lyxerr[Debug::LYXSERVER] << "lyx: Server socket quitting" << endl;
 }
@@ -156,7 +158,11 @@
 {
 	string const linen(line + '\n');
 	int const size = linen.size();
+#ifndef _WIN32
 	int const written = ::write(fd_, linen.c_str(), size);
+#else
+	int const written = -1;
+#endif
 	if (written < size) { // Allways mean end of connection.
 		if ((written == -1) && (errno == EPIPE)) {
 			// The program will also receive a SIGPIPE
@@ -195,7 +201,9 @@
 
 LyXDataSocket::~LyXDataSocket()
 {
+#ifndef _WIN32
 	::close(fd_);
+#endif
 
 	lyx_gui::unregister_socket_callback(fd_);
 	lyxerr[Debug::LYXSERVER] << "lyx: Data socket " << fd_ << " quitting."
@@ -217,7 +225,13 @@
 	int count;
 
 	// read and store characters in buffer
-	while ((count = ::read(fd_, charbuf, charbuf_size - 1)) > 0) {
+	while ((count = 
+#ifndef _WIN32
+		::read(fd_, charbuf, charbuf_size - 1)
+#else
+		0
+#endif
+		) > 0) {
 		buffer_.append(charbuf, charbuf + count);
 	}
 
@@ -251,7 +265,11 @@
 {
 	string const linen(line + '\n');
 	int const size = linen.size();
+#ifndef _WIN32
 	int const written = ::write(fd_, linen.c_str(), size);
+#else
+	int const written = -1;
+#endif
 	if (written < size) { // Allways mean end of connection.
 		if ((written == -1) && (errno == EPIPE)) {
 			// The program will also receive a SIGPIPE
Index: src/client/client.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/client.C,v
retrieving revision 1.7
diff -u -a -u -r1.7 client.C
--- src/client/client.C	20 Jan 2005 15:38:13 -0000	1.7
+++ src/client/client.C	18 Apr 2005 17:37:02 -0000
@@ -25,12 +25,14 @@
 # include <unistd.h>
 #endif
 
+#ifndef _WIN32
 // select()
-#include <sys/select.h>
+# include <sys/select.h>
 
 // socket(), connect()
-#include <sys/socket.h>
-#include <sys/un.h>
+# include <sys/socket.h>
+# include <sys/un.h>
+#endif
 
 // fcntl()
 #include <fcntl.h>
Index: src/frontends/LyXView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/LyXView.C,v
retrieving revision 1.51
diff -u -a -u -r1.51 LyXView.C
--- src/frontends/LyXView.C	13 Apr 2005 09:43:57 -0000	1.51
+++ src/frontends/LyXView.C	18 Apr 2005 17:37:02 -0000
@@ -39,7 +39,9 @@
 
 #include <boost/bind.hpp>
 
-#include <sys/time.h>
+#ifndef _WIN32
+# include <sys/time.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
Index: src/frontends/qt2/QLyXKeySym.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QLyXKeySym.C,v
retrieving revision 1.32
diff -u -a -u -r1.32 QLyXKeySym.C
--- src/frontends/qt2/QLyXKeySym.C	7 Jul 2004 09:32:19 -0000	1.32
+++ src/frontends/qt2/QLyXKeySym.C	18 Apr 2005 17:37:02 -0000
@@ -74,7 +74,7 @@
 void initEncodings()
 {
 	// when no document open
-	encoding_map[""] = QTextCodec::codecForLocale();
+	encoding_map[std::string()] = QTextCodec::codecForLocale();
 
 	encoding_map["iso8859-1"] = QTextCodec::codecForName("ISO 8859-1");
 	encoding_map["iso8859-2"] = QTextCodec::codecForName("ISO 8859-2");
Index: src/support/filetools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/filetools.C,v
retrieving revision 1.207
diff -u -a -u -r1.207 filetools.C
--- src/support/filetools.C	18 Apr 2005 17:43:11 -0000	1.207
+++ src/support/filetools.C	19 Apr 2005 10:11:54 -0000
@@ -1052,6 +1051,11 @@
 
 cmd_ret const RunCommand(string const & cmd)
 {
+#ifdef _WIN32
+	// TODO: Implement this, or merge it into forkedcall.
+	// Used for lyx2lyx in buffer.C, echo in math_extern and kpse in this file
+	return make_pair(-1, string());
+#else
 	// FIXME: replace all calls to RunCommand with ForkedCall
 	// (if the output is not needed) or the code in ispell.C
 	// (if the output is needed).
@@ -1092,6 +1096,7 @@
 	sigprocmask(SIG_SETMASK, &oldMask, 0);
 
 	return make_pair(pret, ret);
+#endif
 }
 
 
Index: src/support/globbing.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/globbing.C,v
retrieving revision 1.11
diff -u -a -u -r1.11 globbing.C
--- src/support/globbing.C	26 Nov 2004 14:37:40 -0000	1.11
+++ src/support/globbing.C	19 Apr 2005 08:09:32 -0000
@@ -10,6 +10,8 @@
 
 #include <config.h>
 
+#if !defined (_WIN32)
+
 #include "support/globbing.h"
 #include "support/path.h"
 
@@ -42,3 +44,5 @@
 
 } // namespace support
 } // namespace lyx
+
+#endif
Index: src/support/os_win32.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/support/os_win32.C,v
retrieving revision 1.27
diff -u -r1.27 os_win32.C
--- src/support/os_win32.C	2005/01/21 22:08:59	1.27
+++ src/support/os_win32.C	2005/02/17 18:19:25
@@ -89,12 +89,14 @@
 	// Close the console when run (probably)
 	// not run from command prompt
 	char WindowTitle[1024];
-	HWND hwndFound;
-	GetConsoleTitle(WindowTitle,1024);
+	if (GetConsoleTitle(WindowTitle, sizeof(WindowTitle)) == 0) {
+		// Could not get the title, so we just leave things as they are
+		return;
+	}
 	if ((strcmp(WindowTitle, argv[0]) == 0) ||
-		(strcmp(WindowTitle,"LyX") == 0)) {
+		(strcmp(WindowTitle, "LyX") == 0)) {
 		// format a "unique" newWindowTitle
-		wsprintf(WindowTitle,"%d/%d",
+		wsprintf(WindowTitle, "%d/%d",
 			GetTickCount(),
 			GetCurrentProcessId());
 		// change current window title
@@ -102,10 +104,11 @@
 		// ensure window title has been updated
 		Sleep(40);
 		// look for newWindowTitle
-		hwndFound=FindWindow(NULL, WindowTitle);
+		HWND hwndFound = FindWindow(NULL, WindowTitle);
 		// If found, hide it
-		if ( hwndFound != NULL)
+		if ( hwndFound != NULL) {
 			ShowWindow( hwndFound, SW_HIDE);
+		}
 	}
 }
 
Index: src/support/socktools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/socktools.C,v
retrieving revision 1.6
diff -u -a -u -r1.6 socktools.C
--- src/support/socktools.C	20 Jan 2005 15:38:14 -0000	1.6
+++ src/support/socktools.C	19 Apr 2005 08:09:40 -0000
@@ -15,8 +15,10 @@
 
 #include "debug.h"
 
+#ifndef _WIN32
 #include <sys/socket.h>
 #include <sys/un.h>
+#endif
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
@@ -48,6 +50,7 @@
 // special file 'name' will be created in the filesystem.
 int listen(string const & name, int queue)
 {
+#ifndef _WIN32
 	int fd; // File descriptor for the socket
 	sockaddr_un addr; // Structure that hold the socket address
 
@@ -105,14 +108,17 @@
 		lyx::support::unlink(name);
 		return -1;
 	}
-
 	return fd;
+#else
+	return -1;
+#endif
 }
 
 // Returns a file descriptor for a new connection from the socket
 // descriptor 'sd' (or -1 in case of error)
 int accept(int sd)
 {
+#ifndef _WIN32
 	int fd;
 
 	// Returns the new file descriptor or -1 in case of error
@@ -132,6 +138,9 @@
 		return -1;
 	}
 	return fd;
+#else
+	return -1;
+#endif
 }
 
 } // namespace socktools
Index: src/support/tempname.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/tempname.C,v
retrieving revision 1.25
diff -u -a -u -r1.25 tempname.C
--- src/support/tempname.C	20 Jan 2005 15:38:14 -0000	1.25
+++ src/support/tempname.C	19 Apr 2005 08:09:40 -0000
@@ -30,6 +30,10 @@
 # include <sys/stat.h>
 #endif
 
+#ifdef _WIN32
+# include <io.h>
+#endif
+
 using boost::scoped_array;
 
 using std::string;
@@ -42,6 +46,9 @@
 {
 #if defined(HAVE_MKSTEMP)
 	return ::mkstemp(templ);
+#elif defined(_WIN32)
+	::_mktemp(templ);
+	return (int) ::fopen(templ, "w");
 #elif defined(HAVE_MKTEMP)
 	// This probably just barely works...
 	::mktemp(templ);
@@ -58,7 +65,9 @@
 {
 	string const tmpdir(dir.empty() ? package().temp_dir() : dir);
 	string tmpfl(AddName(tmpdir, mask));
+#ifndef _WIN32
 	tmpfl += convert<string>(getpid());
+#endif
 	tmpfl += "XXXXXX";
 
 	// The supposedly safe mkstemp version
@@ -69,7 +78,11 @@
 	int const tmpf = make_tempfile(tmpl.get());
 	if (tmpf != -1) {
 		string const t(tmpl.get());
+#ifdef _WIN32
+		::fclose((FILE *) tmpf);
+#else
 		::close(tmpf);
+#endif
 		lyxerr[Debug::FILES] << "Temporary file `" << t
 				     << "' created." << endl;
 		return t;