Commit 0552ea2e authored by dscho's avatar dscho

support for OS X is better now

parent 722577d8
...@@ -74,6 +74,7 @@ AC_C_INLINE ...@@ -74,6 +74,7 @@ AC_C_INLINE
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
AC_HEADER_TIME AC_HEADER_TIME
AC_HEADER_SYS_WAIT
AC_TYPE_SOCKLEN_T AC_TYPE_SOCKLEN_T
AC_CREATE_STDINT_H(include/rfbint.h) AC_CREATE_STDINT_H(include/rfbint.h)
......
...@@ -4,6 +4,7 @@ endif ...@@ -4,6 +4,7 @@ endif
if OSX if OSX
MAC=mac MAC=mac
mac_LDFLAGS=-framework ApplicationServices -framework Carbon -framework IOKit
endif endif
noinst_HEADERS=radon.h noinst_HEADERS=radon.h
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
* *
*/ */
#define LOCAL_CONTROL
#ifdef LOCAL_CONTROL #ifdef LOCAL_CONTROL
#include "1instance.c" #include "1instance.c"
#endif #endif
......
CONSOLE_SRCS=VNConsole.c CONSOLE_SRCS=VNConsole.c
noinst_HEADERS=VNConsole.h noinst_HEADERS=VNConsole.h vga.h
LDADD=-L.. -lvncserver LDADD=-L.. -lvncserver
INCLUDES=-I. -I../include INCLUDES=-I. -I../include
......
#include <stdio.h> #include "VNConsole.h"
#include <stdlib.h> #include "vga.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <errno.h> #include <errno.h>
#include "VNConsole.h"
#include "vga.h"
int main(int argc, char **argv) int main(int argc, char **argv)
...@@ -45,7 +52,7 @@ int main(int argc, char **argv) ...@@ -45,7 +52,7 @@ int main(int argc, char **argv)
char buffer[1024]; char buffer[1024];
fd_set fs,fs1/*,ifs,ifs1*/; fd_set fs,fs1/*,ifs,ifs1*/;
struct timeval tv,tv1; struct timeval tv,tv1;
int i,c=1,num_fds,max_fd=out[0]; int i,c=1,num_fds,max_fd=out[0],status;
FILE *input_pipe; FILE *input_pipe;
vncConsolePtr console=vcGetConsole(&serverArgc,argv,80,25,&vgaFont,FALSE); vncConsolePtr console=vcGetConsole(&serverArgc,argv,80,25,&vgaFont,FALSE);
if(interactive) if(interactive)
...@@ -61,7 +68,7 @@ int main(int argc, char **argv) ...@@ -61,7 +68,7 @@ int main(int argc, char **argv)
input_pipe=fdopen(in[1],"w"); input_pipe=fdopen(in[1],"w");
setbuf(input_pipe,NULL); setbuf(input_pipe,NULL);
while(c || getpgid(pid)>=0) { while(c || waitpid(pid,&status,WNOHANG)==0) {
/* event loop */ /* event loop */
vcProcessEvents(console); vcProcessEvents(console);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment