API change: Bool, KeySym, Pixel get prefix "rfb"; constants in rfbconfig.h get prefix "LIBVNCSERVER_"

pull/1/head
dscho 21 years ago
parent 964aa1628f
commit eeb2061dfb

@ -22,7 +22,7 @@ Occasional important patches were sent by (in order I found the names in my
archives and please don't beat me, if I forgot you, but just send me an archives and please don't beat me, if I forgot you, but just send me an
email!): Akira Hatakeyama, Karl J. Runge, Justin "Zippy" Dearing, email!): Akira Hatakeyama, Karl J. Runge, Justin "Zippy" Dearing,
Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli, Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli,
Glenn Mabutt, Paul Kreiner. Glenn Mabutt, Paul Kreiner, Erik Kunze.
Probably I forgot quite a few people sending a patch here and there, which Probably I forgot quite a few people sending a patch here and there, which
really made a difference. Without those, some obscure bugs still would really made a difference. Without those, some obscure bugs still would

@ -1,3 +1,8 @@
use AX_PREFIX_CONFIG_H to prefix constants in config.h to avoid
name clashes (also suggested by Erik)
transformed Bool, KeySym, Pixel to rfbBool, rfbKeySym, rfbPixel
(as suggested by Erik)
purged exit() calls (suggested by Erik)
fixed bug with maxRectsPerUpdate and Tight Encoding (these are incompatible) fixed bug with maxRectsPerUpdate and Tight Encoding (these are incompatible)
checked sync with TightVNC 1.2.8: checked sync with TightVNC 1.2.8:
viewonly/full passwords; if given a list, only the first is a full one viewonly/full passwords; if given a list, only the first is a full one

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -42,13 +42,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -58,23 +54,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
includedir = $(prefix)/include/rfb
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -83,6 +74,9 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
includedir = $(prefix)/include/rfb
CFLAGS = -g CFLAGS = -g
SUBDIRS = . examples contrib vncterm classes libvncclient test SUBDIRS = . examples contrib vncterm classes libvncclient test
@ -123,53 +117,59 @@ lib_LIBRARIES = libvncserver.a
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = libvncserver.spec libvncserver-config CONFIG_CLEAN_FILES = libvncserver.spec libvncserver-config
LIBRARIES = $(lib_LIBRARIES) LIBRARIES = $(lib_LIBRARIES)
libvncserver_a_AR = $(AR) cru libvncserver_a_AR = $(AR) cru
libvncserver_a_LIBADD = libvncserver_a_LIBADD =
am__objects_1 = main.$(OBJEXT) rfbserver.$(OBJEXT) rfbregion.$(OBJEXT) \ @HAVE_CXX_TRUE@am_libvncserver_a_OBJECTS = main.$(OBJEXT) \
auth.$(OBJEXT) sockets.$(OBJEXT) stats.$(OBJEXT) \ @HAVE_CXX_TRUE@ rfbserver.$(OBJEXT) rfbregion.$(OBJEXT) \
corre.$(OBJEXT) hextile.$(OBJEXT) rre.$(OBJEXT) \ @HAVE_CXX_TRUE@ auth.$(OBJEXT) sockets.$(OBJEXT) stats.$(OBJEXT) \
translate.$(OBJEXT) cutpaste.$(OBJEXT) zlib.$(OBJEXT) \ @HAVE_CXX_TRUE@ corre.$(OBJEXT) hextile.$(OBJEXT) rre.$(OBJEXT) \
tight.$(OBJEXT) httpd.$(OBJEXT) cursor.$(OBJEXT) font.$(OBJEXT) \ @HAVE_CXX_TRUE@ translate.$(OBJEXT) cutpaste.$(OBJEXT) \
draw.$(OBJEXT) selbox.$(OBJEXT) d3des.$(OBJEXT) \ @HAVE_CXX_TRUE@ zlib.$(OBJEXT) tight.$(OBJEXT) httpd.$(OBJEXT) \
vncauth.$(OBJEXT) cargs.$(OBJEXT) @HAVE_CXX_TRUE@ cursor.$(OBJEXT) font.$(OBJEXT) draw.$(OBJEXT) \
am__objects_2 = zrle.$(OBJEXT) FdInStream.$(OBJEXT) \ @HAVE_CXX_TRUE@ selbox.$(OBJEXT) d3des.$(OBJEXT) \
FdOutStream.$(OBJEXT) InStream.$(OBJEXT) \ @HAVE_CXX_TRUE@ vncauth.$(OBJEXT) cargs.$(OBJEXT) zrle.$(OBJEXT) \
NullOutStream.$(OBJEXT) ZlibInStream.$(OBJEXT) \ @HAVE_CXX_TRUE@ FdInStream.$(OBJEXT) FdOutStream.$(OBJEXT) \
ZlibOutStream.$(OBJEXT) @HAVE_CXX_TRUE@ InStream.$(OBJEXT) NullOutStream.$(OBJEXT) \
@HAVE_CXX_TRUE@am_libvncserver_a_OBJECTS = $(am__objects_1) \ @HAVE_CXX_TRUE@ ZlibInStream.$(OBJEXT) ZlibOutStream.$(OBJEXT)
@HAVE_CXX_TRUE@ $(am__objects_2) @HAVE_CXX_FALSE@am_libvncserver_a_OBJECTS = main.$(OBJEXT) \
@HAVE_CXX_FALSE@am_libvncserver_a_OBJECTS = $(am__objects_1) @HAVE_CXX_FALSE@ rfbserver.$(OBJEXT) rfbregion.$(OBJEXT) \
@HAVE_CXX_FALSE@ auth.$(OBJEXT) sockets.$(OBJEXT) \
@HAVE_CXX_FALSE@ stats.$(OBJEXT) corre.$(OBJEXT) \
@HAVE_CXX_FALSE@ hextile.$(OBJEXT) rre.$(OBJEXT) \
@HAVE_CXX_FALSE@ translate.$(OBJEXT) cutpaste.$(OBJEXT) \
@HAVE_CXX_FALSE@ zlib.$(OBJEXT) tight.$(OBJEXT) httpd.$(OBJEXT) \
@HAVE_CXX_FALSE@ cursor.$(OBJEXT) font.$(OBJEXT) draw.$(OBJEXT) \
@HAVE_CXX_FALSE@ selbox.$(OBJEXT) d3des.$(OBJEXT) \
@HAVE_CXX_FALSE@ vncauth.$(OBJEXT) cargs.$(OBJEXT)
libvncserver_a_OBJECTS = $(am_libvncserver_a_OBJECTS) libvncserver_a_OBJECTS = $(am_libvncserver_a_OBJECTS)
SCRIPTS = $(bin_SCRIPTS) SCRIPTS = $(bin_SCRIPTS)
DEFS = @DEFS@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/rfb DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/FdInStream.Po $(DEPDIR)/FdOutStream.Po \
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/FdInStream.Po \ @AMDEP_TRUE@ $(DEPDIR)/InStream.Po $(DEPDIR)/NullOutStream.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/FdOutStream.Po ./$(DEPDIR)/InStream.Po \ @AMDEP_TRUE@ $(DEPDIR)/ZlibInStream.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/NullOutStream.Po \ @AMDEP_TRUE@ $(DEPDIR)/ZlibOutStream.Po $(DEPDIR)/auth.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/ZlibInStream.Po \ @AMDEP_TRUE@ $(DEPDIR)/cargs.Po $(DEPDIR)/corre.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/ZlibOutStream.Po ./$(DEPDIR)/auth.Po \ @AMDEP_TRUE@ $(DEPDIR)/cursor.Po $(DEPDIR)/cutpaste.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/cargs.Po ./$(DEPDIR)/corre.Po \ @AMDEP_TRUE@ $(DEPDIR)/d3des.Po $(DEPDIR)/draw.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/cursor.Po ./$(DEPDIR)/cutpaste.Po \ @AMDEP_TRUE@ $(DEPDIR)/font.Po $(DEPDIR)/hextile.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/d3des.Po ./$(DEPDIR)/draw.Po \ @AMDEP_TRUE@ $(DEPDIR)/httpd.Po $(DEPDIR)/main.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/font.Po ./$(DEPDIR)/hextile.Po \ @AMDEP_TRUE@ $(DEPDIR)/rfbregion.Po $(DEPDIR)/rfbserver.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/httpd.Po ./$(DEPDIR)/main.Po \ @AMDEP_TRUE@ $(DEPDIR)/rre.Po $(DEPDIR)/selbox.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/rfbregion.Po ./$(DEPDIR)/rfbserver.Po \ @AMDEP_TRUE@ $(DEPDIR)/sockets.Po $(DEPDIR)/stats.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/rre.Po ./$(DEPDIR)/selbox.Po \ @AMDEP_TRUE@ $(DEPDIR)/tight.Po $(DEPDIR)/translate.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/sockets.Po ./$(DEPDIR)/stats.Po \ @AMDEP_TRUE@ $(DEPDIR)/vncauth.Po $(DEPDIR)/zlib.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/tight.Po ./$(DEPDIR)/translate.Po \ @AMDEP_TRUE@ $(DEPDIR)/zrle.Po
@AMDEP_TRUE@ ./$(DEPDIR)/vncauth.Po ./$(DEPDIR)/zlib.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/zrle.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -187,26 +187,25 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
uninstall-info-recursive all-recursive install-data-recursive \ uninstall-info-recursive all-recursive install-data-recursive \
install-exec-recursive installdirs-recursive install-recursive \ install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) \ DIST_COMMON = README $(include_HEADERS) $(noinst_HEADERS) ./stamp-h.in \
./rfb/rfbconfig.h.in AUTHORS COPYING ChangeLog INSTALL \ AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
Makefile.am Makefile.in NEWS TODO acinclude.m4 aclocal.m4 \ TODO acinclude.m4 aclocal.m4 config.h.in configure configure.ac \
configure configure.ac depcomp install-sh \ depcomp install-sh libvncserver-config.in libvncserver.spec.in \
libvncserver-config.in libvncserver.spec.in missing \ missing mkinstalldirs
mkinstalldirs
SOURCES = $(libvncserver_a_SOURCES) SOURCES = $(libvncserver_a_SOURCES)
all: all-recursive all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .cxx .o .obj .SUFFIXES: .c .cxx .o .obj
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile $(AUTOMAKE) --gnu Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$@ $(SHELL) ./config.status
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
@ -215,44 +214,49 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC
$(ACLOCAL_M4): configure.ac acinclude.m4 $(ACLOCAL_M4): configure.ac acinclude.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h
rfb/rfbconfig.h: rfb/stamp-h1
@if test ! -f $@; then \ @if test ! -f $@; then \
rm -f rfb/stamp-h1; \ rm -f stamp-h; \
$(MAKE) rfb/stamp-h1; \ $(MAKE) stamp-h; \
else :; fi else :; fi
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
rfb/stamp-h1: $(srcdir)/./rfb/rfbconfig.h.in $(top_builddir)/config.status @rm -f stamp-h stamp-hT
@rm -f rfb/stamp-h1 @echo timestamp > stamp-hT 2> /dev/null
cd $(top_builddir) && $(SHELL) ./config.status rfb/rfbconfig.h cd $(top_builddir) \
&& CONFIG_FILES= CONFIG_HEADERS=config.h \
$(srcdir)/./rfb/rfbconfig.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(SHELL) ./config.status
@mv stamp-hT stamp-h
$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/./stamp-h.in; \
$(MAKE) $(srcdir)/./stamp-h.in; \
else :; fi
$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
cd $(top_srcdir) && $(AUTOHEADER) cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/./rfb/rfbconfig.h.in @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
distclean-hdr: distclean-hdr:
-rm -f rfb/rfbconfig.h rfb/stamp-h1 -rm -f config.h
libvncserver.spec: $(top_builddir)/config.status libvncserver.spec.in libvncserver.spec: $(top_builddir)/config.status libvncserver.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
libvncserver-config: $(top_builddir)/config.status libvncserver-config.in libvncserver-config: $(top_builddir)/config.status libvncserver-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
AR = ar AR = ar
libLIBRARIES_INSTALL = $(INSTALL_DATA)
install-libLIBRARIES: $(lib_LIBRARIES) install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir) $(mkinstalldirs) $(DESTDIR)$(libdir)
@list='$(lib_LIBRARIES)'; for p in $$list; do \ @list='$(lib_LIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
$(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
else :; fi; \ else :; fi; \
done done
@$(POST_INSTALL) @$(POST_INSTALL)
@list='$(lib_LIBRARIES)'; for p in $$list; do \ @list='$(lib_LIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
p="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
$(RANLIB) $(DESTDIR)$(libdir)/$$p; \ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \ else :; fi; \
@ -261,7 +265,6 @@ install-libLIBRARIES: $(lib_LIBRARIES)
uninstall-libLIBRARIES: uninstall-libLIBRARIES:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(lib_LIBRARIES)'; for p in $$list; do \ @list='$(lib_LIBRARIES)'; for p in $$list; do \
p="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
rm -f $(DESTDIR)$(libdir)/$$p; \ rm -f $(DESTDIR)$(libdir)/$$p; \
done done
@ -278,23 +281,24 @@ libvncserver.a: $(libvncserver_a_OBJECTS) $(libvncserver_a_DEPENDENCIES)
-rm -f libvncserver.a -rm -f libvncserver.a
$(libvncserver_a_AR) libvncserver.a $(libvncserver_a_OBJECTS) $(libvncserver_a_LIBADD) $(libvncserver_a_AR) libvncserver.a $(libvncserver_a_OBJECTS) $(libvncserver_a_LIBADD)
$(RANLIB) libvncserver.a $(RANLIB) libvncserver.a
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
install-binSCRIPTS: $(bin_SCRIPTS) install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_SCRIPTS)'; for p in $$list; do \ @list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p|sed '$(transform)'`"; \
if test -f $$d$$p; then \ if test -f $$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \
echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \
$(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ elif test -f $(srcdir)/$$p; then \
echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \ else :; fi; \
done done
uninstall-binSCRIPTS: uninstall-binSCRIPTS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(bin_SCRIPTS)'; for p in $$list; do \ @list='$(bin_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ f="`echo $$p|sed '$(transform)'`"; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \ rm -f $(DESTDIR)$(bindir)/$$f; \
done done
@ -305,43 +309,43 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FdInStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/FdInStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FdOutStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/FdOutStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/InStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NullOutStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/NullOutStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibInStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ZlibInStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibOutStream.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ZlibOutStream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/auth.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cargs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cargs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/corre.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/corre.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cutpaste.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cutpaste.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/d3des.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/d3des.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/draw.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/draw.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/font.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hextile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/httpd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbregion.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rfbregion.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rfbserver.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rre.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rre.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selbox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/selbox.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sockets.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stats.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stats.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tight.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tight.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/translate.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/translate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vncauth.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vncauth.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/zlib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zrle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/zrle.Po@am__quote@
distclean-depend: distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf $(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -354,7 +358,7 @@ CCDEPMODE = @CCDEPMODE@
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
.cxx.obj: .cxx.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -366,7 +370,7 @@ FdInStream.o: rdr/FdInStream.cxx
@AMDEP_TRUE@ source='rdr/FdInStream.cxx' object='FdInStream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/FdInStream.cxx' object='FdInStream.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/FdInStream.Po' tmpdepfile='$(DEPDIR)/FdInStream.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/FdInStream.Po' tmpdepfile='$(DEPDIR)/FdInStream.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FdInStream.o `test -f 'rdr/FdInStream.cxx' || echo '$(srcdir)/'`rdr/FdInStream.cxx $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FdInStream.o `test -f rdr/FdInStream.cxx || echo '$(srcdir)/'`rdr/FdInStream.cxx
FdInStream.obj: rdr/FdInStream.cxx FdInStream.obj: rdr/FdInStream.cxx
@AMDEP_TRUE@ source='rdr/FdInStream.cxx' object='FdInStream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/FdInStream.cxx' object='FdInStream.obj' libtool=no @AMDEPBACKSLASH@
@ -378,7 +382,7 @@ FdOutStream.o: rdr/FdOutStream.cxx
@AMDEP_TRUE@ source='rdr/FdOutStream.cxx' object='FdOutStream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/FdOutStream.cxx' object='FdOutStream.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/FdOutStream.Po' tmpdepfile='$(DEPDIR)/FdOutStream.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/FdOutStream.Po' tmpdepfile='$(DEPDIR)/FdOutStream.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FdOutStream.o `test -f 'rdr/FdOutStream.cxx' || echo '$(srcdir)/'`rdr/FdOutStream.cxx $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FdOutStream.o `test -f rdr/FdOutStream.cxx || echo '$(srcdir)/'`rdr/FdOutStream.cxx
FdOutStream.obj: rdr/FdOutStream.cxx FdOutStream.obj: rdr/FdOutStream.cxx
@AMDEP_TRUE@ source='rdr/FdOutStream.cxx' object='FdOutStream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/FdOutStream.cxx' object='FdOutStream.obj' libtool=no @AMDEPBACKSLASH@
@ -390,7 +394,7 @@ InStream.o: rdr/InStream.cxx
@AMDEP_TRUE@ source='rdr/InStream.cxx' object='InStream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/InStream.cxx' object='InStream.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/InStream.Po' tmpdepfile='$(DEPDIR)/InStream.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/InStream.Po' tmpdepfile='$(DEPDIR)/InStream.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InStream.o `test -f 'rdr/InStream.cxx' || echo '$(srcdir)/'`rdr/InStream.cxx $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o InStream.o `test -f rdr/InStream.cxx || echo '$(srcdir)/'`rdr/InStream.cxx
InStream.obj: rdr/InStream.cxx InStream.obj: rdr/InStream.cxx
@AMDEP_TRUE@ source='rdr/InStream.cxx' object='InStream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/InStream.cxx' object='InStream.obj' libtool=no @AMDEPBACKSLASH@
@ -402,7 +406,7 @@ NullOutStream.o: rdr/NullOutStream.cxx
@AMDEP_TRUE@ source='rdr/NullOutStream.cxx' object='NullOutStream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/NullOutStream.cxx' object='NullOutStream.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/NullOutStream.Po' tmpdepfile='$(DEPDIR)/NullOutStream.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/NullOutStream.Po' tmpdepfile='$(DEPDIR)/NullOutStream.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o NullOutStream.o `test -f 'rdr/NullOutStream.cxx' || echo '$(srcdir)/'`rdr/NullOutStream.cxx $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o NullOutStream.o `test -f rdr/NullOutStream.cxx || echo '$(srcdir)/'`rdr/NullOutStream.cxx
NullOutStream.obj: rdr/NullOutStream.cxx NullOutStream.obj: rdr/NullOutStream.cxx
@AMDEP_TRUE@ source='rdr/NullOutStream.cxx' object='NullOutStream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/NullOutStream.cxx' object='NullOutStream.obj' libtool=no @AMDEPBACKSLASH@
@ -414,7 +418,7 @@ ZlibInStream.o: rdr/ZlibInStream.cxx
@AMDEP_TRUE@ source='rdr/ZlibInStream.cxx' object='ZlibInStream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/ZlibInStream.cxx' object='ZlibInStream.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/ZlibInStream.Po' tmpdepfile='$(DEPDIR)/ZlibInStream.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/ZlibInStream.Po' tmpdepfile='$(DEPDIR)/ZlibInStream.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ZlibInStream.o `test -f 'rdr/ZlibInStream.cxx' || echo '$(srcdir)/'`rdr/ZlibInStream.cxx $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ZlibInStream.o `test -f rdr/ZlibInStream.cxx || echo '$(srcdir)/'`rdr/ZlibInStream.cxx
ZlibInStream.obj: rdr/ZlibInStream.cxx ZlibInStream.obj: rdr/ZlibInStream.cxx
@AMDEP_TRUE@ source='rdr/ZlibInStream.cxx' object='ZlibInStream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/ZlibInStream.cxx' object='ZlibInStream.obj' libtool=no @AMDEPBACKSLASH@
@ -426,7 +430,7 @@ ZlibOutStream.o: rdr/ZlibOutStream.cxx
@AMDEP_TRUE@ source='rdr/ZlibOutStream.cxx' object='ZlibOutStream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/ZlibOutStream.cxx' object='ZlibOutStream.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/ZlibOutStream.Po' tmpdepfile='$(DEPDIR)/ZlibOutStream.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/ZlibOutStream.Po' tmpdepfile='$(DEPDIR)/ZlibOutStream.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ZlibOutStream.o `test -f 'rdr/ZlibOutStream.cxx' || echo '$(srcdir)/'`rdr/ZlibOutStream.cxx $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ZlibOutStream.o `test -f rdr/ZlibOutStream.cxx || echo '$(srcdir)/'`rdr/ZlibOutStream.cxx
ZlibOutStream.obj: rdr/ZlibOutStream.cxx ZlibOutStream.obj: rdr/ZlibOutStream.cxx
@AMDEP_TRUE@ source='rdr/ZlibOutStream.cxx' object='ZlibOutStream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='rdr/ZlibOutStream.cxx' object='ZlibOutStream.obj' libtool=no @AMDEPBACKSLASH@
@ -435,15 +439,14 @@ ZlibOutStream.obj: rdr/ZlibOutStream.cxx
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ZlibOutStream.obj `cygpath -w rdr/ZlibOutStream.cxx` $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ZlibOutStream.obj `cygpath -w rdr/ZlibOutStream.cxx`
CXXDEPMODE = @CXXDEPMODE@ CXXDEPMODE = @CXXDEPMODE@
uninstall-info-am: uninstall-info-am:
includeHEADERS_INSTALL = $(INSTALL_HEADER)
install-includeHEADERS: $(include_HEADERS) install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir) $(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \ @list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \ f="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \ echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
$(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \ $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \
done done
uninstall-includeHEADERS: uninstall-includeHEADERS:
@ -461,7 +464,7 @@ uninstall-includeHEADERS:
# (which will cause the Makefiles to be regenerated when you run `make'); # (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line. # (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS): $(RECURSIVE_TARGETS):
@set fnord $$MAKEFLAGS; amf=$$2; \ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \ dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \ target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \ list='$(SUBDIRS)'; for subdir in $$list; do \
@ -481,7 +484,7 @@ $(RECURSIVE_TARGETS):
mostlyclean-recursive clean-recursive distclean-recursive \ mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive: maintainer-clean-recursive:
@set fnord $$MAKEFLAGS; amf=$$2; \ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \ dot_seen=no; \
case "$@" in \ case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@ -509,21 +512,18 @@ tags-recursive:
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done done
ETAGS = etags
ETAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
mkid -fID $$unique mkid -fID $$unique $(LISP)
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
@ -532,61 +532,51 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \ fi; \
done; \ done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \ test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = . top_distdir = .
# Avoid unsightly `./'.
distdir = $(PACKAGE)-$(VERSION) distdir = $(PACKAGE)-$(VERSION)
am__remove_distdir = \
{ test ! -d $(distdir) \
|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr $(distdir); }; }
GZIP_ENV = --best GZIP_ENV = --best
distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
mkdir $(distdir) mkdir $(distdir)
$(mkinstalldirs) $(distdir)/. $(distdir)/./rfb $(distdir)/rdr $(distdir)/rfb $(mkinstalldirs) $(distdir)/. $(distdir)/rdr $(distdir)/rfb
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
|| exit 1; \ || exit 1; \
fi; \ fi; \
done done
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ for subdir in $(DIST_SUBDIRS); do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \ test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \
@ -604,28 +594,23 @@ distdir: $(DISTFILES)
! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir) || chmod -R a+r $(distdir)
dist-gzip: distdir dist: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir) -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
dist dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then # This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another # it guarantees that the distribution is self-contained by making another
# tarfile. # tarfile.
distcheck: dist distcheck: dist
$(am__remove_distdir) -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir) chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build mkdir $(distdir)/=build
mkdir $(distdir)/=inst mkdir $(distdir)/=inst
chmod a-w $(distdir) chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \ && cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \ && ../configure --srcdir=.. --prefix=$$dc_install_base \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) check \
@ -633,27 +618,20 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \ || (echo "Error: files left after uninstall" 1>&2; \
find $$dc_install_base -type f -print ; \ exit 1) ) \
exit 1; } >&2 ) \ && $(MAKE) $(AM_MAKEFLAGS) dist \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ && $(MAKE) $(AM_MAKEFLAGS) distclean \
&& rm -f $(distdir).tar.gz \ && rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck && (test `find . -type f -print | wc -l` -eq 0 \
$(am__remove_distdir) || (echo "Error: files left after distclean" 1>&2; \
exit 1) )
-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \ @echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x' sed 'h;s/./=/g;p;x;p;x'
distcleancheck: distclean
if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am check-am: all-am
check: check-recursive check: check-recursive
all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(HEADERS) all-am: Makefile $(LIBRARIES) $(SCRIPTS) $(HEADERS) config.h
installdirs: installdirs-recursive installdirs: installdirs-recursive
installdirs-am: installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
@ -669,7 +647,6 @@ install-am: all-am
installcheck: installcheck-recursive installcheck: installcheck-recursive
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -677,7 +654,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@ -686,8 +663,11 @@ clean: clean-recursive
clean-am: clean-generic clean-libLIBRARIES mostlyclean-am clean-am: clean-generic clean-libLIBRARIES mostlyclean-am
dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
distclean: distclean-recursive distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f config.status config.cache config.log
distclean-am: clean-am distclean-compile distclean-depend \ distclean-am: clean-am distclean-compile distclean-depend \
distclean-generic distclean-hdr distclean-tags distclean-generic distclean-hdr distclean-tags
@ -710,8 +690,7 @@ install-man:
installcheck-am: installcheck-am:
maintainer-clean: maintainer-clean-recursive maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive mostlyclean: mostlyclean-recursive
@ -725,17 +704,17 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
clean-generic clean-libLIBRARIES clean-recursive dist dist-all \ clean-generic clean-libLIBRARIES clean-recursive dist dist-all \
dist-gzip distcheck distclean distclean-compile \ distcheck distclean distclean-compile distclean-depend \
distclean-depend distclean-generic distclean-hdr \ distclean-generic distclean-hdr distclean-recursive \
distclean-recursive distclean-tags distcleancheck distdir dvi \ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
dvi-am dvi-recursive info info-am info-recursive install \ info-recursive install install-am install-binSCRIPTS \
install-am install-binSCRIPTS install-data install-data-am \ install-data install-data-am install-data-recursive \
install-data-recursive install-exec install-exec-am \ install-exec install-exec-am install-exec-recursive \
install-exec-recursive install-includeHEADERS install-info \ install-includeHEADERS install-info install-info-am \
install-info-am install-info-recursive install-libLIBRARIES \ install-info-recursive install-libLIBRARIES install-man \
install-man install-recursive install-strip installcheck \ install-recursive install-strip installcheck installcheck-am \
installcheck-am installdirs installdirs-am \ installdirs installdirs-am installdirs-recursive \
installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \ maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-recursive tags tags-recursive \ mostlyclean-generic mostlyclean-recursive tags tags-recursive \
uninstall uninstall-am uninstall-binSCRIPTS \ uninstall uninstall-am uninstall-binSCRIPTS \

26
NEWS

@ -1,4 +1,28 @@
Upcoming 0.5 release! Question: Why the *&!"/(§ did you change so many things in the API?
Answer: It was necessary to make this library slightly less
painful to use with other libraries.
Anyway, most changes are just search-and-replace:
#include "rfb.h" -> #include <rfb/rfb.h>
CARD8 -> uint8_t
CARD16 -> uint16_t
CARD32 -> uint32_t
Pixel -> rfbPixel
KeySym -> rfbKeySym
Bool -> rfbBool
also, rfbUsage doesn't exit any longer, but returns FALSE
If you used some constants defined in rfbconfig.h, you now
have to prefix LIBVNCSERVER_ to the constants.
Upcoming 0.6 release!
lots of bugs fixed.
Version 5.0:
The library just got autoconf && automake support as well as a real install The library just got autoconf && automake support as well as a real install
target! target!

@ -152,7 +152,7 @@ Hooks and IO functions
There exist the following IO functions as members of rfbScreen: There exist the following IO functions as members of rfbScreen:
kbdAddEvent, kbdReleaseAllKeys, ptrAddEvent and setXCutText kbdAddEvent, kbdReleaseAllKeys, ptrAddEvent and setXCutText
kbdAddEvent(Bool down,KeySym key,rfbClientPtr cl) kbdAddEvent(rfbBool down,rfbKeySym key,rfbClientPtr cl)
is called when a key is pressed. is called when a key is pressed.
kbdReleaseAllKeys(rfbClientPtr cl) kbdReleaseAllKeys(rfbClientPtr cl)
is not called at all (maybe in the future). is not called at all (maybe in the future).

@ -512,4 +512,92 @@ dnl discussed. The probability that the "fast" types may be removed before
dnl the standard is finalized is high enough that they are not currently dnl the standard is finalized is high enough that they are not currently
dnl implemented. dnl implemented.
dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ax_prefix_config_h.html
dnl
AC_DEFUN([AX_PREFIX_CONFIG_H],[AC_REQUIRE([AC_CONFIG_HEADER])
AC_CONFIG_COMMANDS([ifelse($1,,$PACKAGE-config.h,$1)],[dnl
AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl
AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl
AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl
AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl
AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl
AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl
m4_pushdef([_script],[conftest.prefix])dnl
m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
_OUT=`echo ifelse($1, , $PACKAGE-config.h, $1)`
_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
_PKG=`echo ifelse($2, , $PACKAGE, $2)`
_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:" -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`
_INP=`echo ifelse($3, , _, $3)`
if test "$ac_prefix_conf_INP" = "_"; then
for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
test -f "$ac_prefix_conf_INP" && continue
case $ac_file in
*.h) test -f $ac_file && _INP=$ac_file ;;
*)
esac
done
fi
if test "$_INP" = "_"; then
case "$_OUT" in
*/*) _INP=`basename "$_OUT"`
;;
*-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"`
;;
*) _INP=config.h
;;
esac
fi
if test -z "$_PKG" ; then
AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H])
else
if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then
_INP="$srcdir/$_INP"
fi fi
AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
if test -f $_INP ; then
echo "s/@%:@undef *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/" > _script
echo "s/@%:@undef *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/" >> _script
echo "s/@%:@def[]ine *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1 \\" >> _script
echo "@%:@def[]ine $_UPP""_\\1 \\2 \\" >> _script
echo "@%:@endif/" >>_script
echo "s/@%:@def[]ine *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1 \\" >> _script
echo "@%:@define $_LOW""_\\1 \\2 \\" >> _script
echo "@%:@endif/" >> _script
# now executing _script on _DEF input to create _OUT output file
echo "@%:@ifndef $_DEF" >$tmp/pconfig.h
echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h
echo ' ' >>$tmp/pconfig.h
echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
sed -f _script $_INP >>$tmp/pconfig.h
echo ' ' >>$tmp/pconfig.h
echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h
echo "@%:@endif" >>$tmp/pconfig.h
if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then
AC_MSG_NOTICE([$_OUT is unchanged])
else
ac_dir=`AS_DIRNAME(["$_OUT"])`
AS_MKDIR_P(["$ac_dir"])
rm -f "$_OUT"
mv $tmp/pconfig.h "$_OUT"
fi
cp _script _configs.sed
else
AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT])
fi
rm -f conftest.*
fi
m4_popdef([_symbol])dnl
m4_popdef([_script])dnl
AS_VAR_POPDEF([_INP])dnl
AS_VAR_POPDEF([_UPP])dnl
AS_VAR_POPDEF([_LOW])dnl
AS_VAR_POPDEF([_PKG])dnl
AS_VAR_POPDEF([_DEF])dnl
AS_VAR_POPDEF([_OUT])dnl
],[PACKAGE="$PACKAGE"])])

674
aclocal.m4 vendored

@ -1,6 +1,6 @@
# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # aclocal.m4 generated automatically by aclocal 1.5
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -525,32 +525,101 @@ dnl discussed. The probability that the "fast" types may be removed before
dnl the standard is finalized is high enough that they are not currently dnl the standard is finalized is high enough that they are not currently
dnl implemented. dnl implemented.
dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ax_prefix_config_h.html
dnl
AC_DEFUN([AX_PREFIX_CONFIG_H],[AC_REQUIRE([AC_CONFIG_HEADER])
AC_CONFIG_COMMANDS([ifelse($1,,$PACKAGE-config.h,$1)],[dnl
AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl
AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl
AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl
AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl
AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl
AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl
m4_pushdef([_script],[conftest.prefix])dnl
m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl
_OUT=`echo ifelse($1, , $PACKAGE-config.h, $1)`
_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"`
_PKG=`echo ifelse($2, , $PACKAGE, $2)`
_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"`
_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:" -e "/^@<:@m4_cr_digits@:>@/s/^/_/"`
_INP=`echo ifelse($3, , _, $3)`
if test "$ac_prefix_conf_INP" = "_"; then
for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
test -f "$ac_prefix_conf_INP" && continue
case $ac_file in
*.h) test -f $ac_file && _INP=$ac_file ;;
*)
esac
done
fi
if test "$_INP" = "_"; then
case "$_OUT" in
*/*) _INP=`basename "$_OUT"`
;;
*-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"`
;;
*) _INP=config.h
;;
esac
fi
if test -z "$_PKG" ; then
AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H])
else
if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then
_INP="$srcdir/$_INP"
fi fi
AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
if test -f $_INP ; then
echo "s/@%:@undef *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/" > _script
echo "s/@%:@undef *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/" >> _script
echo "s/@%:@def[]ine *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1 \\" >> _script
echo "@%:@def[]ine $_UPP""_\\1 \\2 \\" >> _script
echo "@%:@endif/" >>_script
echo "s/@%:@def[]ine *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1 \\" >> _script
echo "@%:@define $_LOW""_\\1 \\2 \\" >> _script
echo "@%:@endif/" >> _script
# now executing _script on _DEF input to create _OUT output file
echo "@%:@ifndef $_DEF" >$tmp/pconfig.h
echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h
echo ' ' >>$tmp/pconfig.h
echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
sed -f _script $_INP >>$tmp/pconfig.h
echo ' ' >>$tmp/pconfig.h
echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h
echo "@%:@endif" >>$tmp/pconfig.h
if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then
AC_MSG_NOTICE([$_OUT is unchanged])
else
ac_dir=`AS_DIRNAME(["$_OUT"])`
AS_MKDIR_P(["$ac_dir"])
rm -f "$_OUT"
mv $tmp/pconfig.h "$_OUT"
fi
cp _script _configs.sed
else
AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT])
fi
rm -f conftest.*
fi
m4_popdef([_symbol])dnl
m4_popdef([_script])dnl
AS_VAR_POPDEF([_INP])dnl
AS_VAR_POPDEF([_UPP])dnl
AS_VAR_POPDEF([_LOW])dnl
AS_VAR_POPDEF([_PKG])dnl
AS_VAR_POPDEF([_DEF])dnl
AS_VAR_POPDEF([_OUT])dnl
],[PACKAGE="$PACKAGE"])])
# Do all the work for Automake. -*- Autoconf -*-
# This macro actually does too much some checks are only needed if
# your package does certain things. But this isn't really a big deal.
# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # Do all the work for Automake. This macro actually does too much --
# along with this program; if not, write to the Free Software # some checks are only needed if your package does certain things.
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # But this isn't really a big deal.
# 02111-1307, USA.
# serial 8 # serial 5
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4, # written in clear, in which case automake, when reading aclocal.m4,
@ -559,52 +628,62 @@ dnl implemented.
# CC etc. in the Makefile, will ask for an AC_PROG_CC use... # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
AC_PREREQ([2.52]) # We require 2.13 because we rely on SHELL being computed by configure.
AC_PREREQ([2.13])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
# the ones we care about. # -----------------------------------------------------------
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
# The purpose of this macro is to provide the user with a means to
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # check macros which are provided without letting her know how the
# AM_INIT_AUTOMAKE([OPTIONS]) # information is coded.
# ----------------------------------------------- # If this macro is not defined by Autoconf, define it here.
# The call with PACKAGE and VERSION arguments is the old style ifdef([AC_PROVIDE_IFELSE],
# call (pre autoconf-2.50), which is being phased out. PACKAGE [],
# and VERSION should now be passed to AC_INIT and removed from [define([AC_PROVIDE_IFELSE],
# the call to AM_INIT_AUTOMAKE. [ifdef([AC_PROVIDE_$1],
# We support both call styles for the transition. After [$2], [$3])])])
# the next Automake release, Autoconf can make the AC_INIT
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support. # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
# ----------------------------------------------
AC_DEFUN([AM_INIT_AUTOMAKE], AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl [AC_REQUIRE([AC_PROG_INSTALL])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
# test to see if srcdir already configured # test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" && if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
fi fi
# Define the identity of the package. # Define the identity of the package.
dnl Distinguish between old-style and new-style calls. PACKAGE=$1
m4_ifval([$2], AC_SUBST(PACKAGE)dnl
[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl VERSION=$2
AC_SUBST([PACKAGE], [$1])dnl AC_SUBST(VERSION)dnl
AC_SUBST([VERSION], [$2])], ifelse([$3],,
[_AM_SET_OPTIONS([$1])dnl
AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
_AM_IF_OPTION([no-define],,
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.
ifdef([m4_pattern_allow],
[m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
# Autoconf 2.50 always computes EXEEXT. However we need to be
# compatible with 2.13, for now. So we always define EXEEXT, but we
# don't compute it.
AC_SUBST(EXEEXT)
# Similar for OBJEXT -- only we only use OBJEXT if the user actually
# requests that it be used. This is a bit dumb.
: ${OBJEXT=o}
AC_SUBST(OBJEXT)
# Some tools Automake needs. # Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(ACLOCAL, aclocal)
AM_MISSING_PROG(AUTOCONF, autoconf) AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOMAKE, automake)
AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(MAKEINFO, makeinfo)
AM_MISSING_PROG(AMTAR, tar) AM_MISSING_PROG(AMTAR, tar)
@ -614,9 +693,9 @@ AM_PROG_INSTALL_STRIP
# some platforms. # some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
_AM_IF_OPTION([no-dependencies],, AC_REQUIRE([AM_SET_DEPDIR])dnl
[AC_PROVIDE_IFELSE([AC_PROG_][CC], AC_PROVIDE_IFELSE([AC_PROG_][CC],
[_AM_DEPENDENCIES(CC)], [_AM_DEPENDENCIES(CC)],
[define([AC_PROG_][CC], [define([AC_PROG_][CC],
defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
@ -625,102 +704,11 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
[define([AC_PROG_][CXX], [define([AC_PROG_][CXX],
defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
]) ])
])
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.6.3])])
# Helper functions for option handling. -*- Autoconf -*-
# Copyright 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
# ------------------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# #
# Check to make sure that the build environment is sane. # Check to make sure that the build environment is sane.
# #
# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3 # serial 3
# AM_SANITY_CHECK # AM_SANITY_CHECK
@ -764,27 +752,8 @@ Check your system clock])
fi fi
AC_MSG_RESULT(yes)]) AC_MSG_RESULT(yes)])
# -*- Autoconf -*-
# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # serial 2
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 3
# AM_MISSING_PROG(NAME, PROGRAM) # AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------ # ------------------------------
@ -806,29 +775,13 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run " am_missing_run="$MISSING --run "
else else
am_missing_run= am_missing_run=
AC_MSG_WARN([`missing' script is too old or missing]) am_backtick='`'
AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
fi fi
]) ])
# AM_AUX_DIR_EXPAND # AM_AUX_DIR_EXPAND
# Copyright 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@ -867,59 +820,19 @@ fi
# absolute PATH. The drawback is that using absolute paths prevent a # absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration. # configured tree to be moved without reconfiguration.
# Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])
AC_DEFUN([AM_AUX_DIR_EXPAND], [ AC_DEFUN([AM_AUX_DIR_EXPAND], [
# expand $ac_aux_dir to an absolute path # expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd` am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
]) ])
# AM_PROG_INSTALL_SH # AM_PROG_INSTALL_SH
# ------------------ # ------------------
# Define $install_sh. # Define $install_sh.
# Copyright 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_DEFUN([AM_PROG_INSTALL_SH], AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"} install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)]) AC_SUBST(install_sh)])
# AM_PROG_INSTALL_STRIP
# Copyright 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# One issue with vendor `install' (even GNU) is that you can't # One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially # specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip # annoying in cross-compiling environments, where the build's strip
@ -929,35 +842,11 @@ AC_SUBST(install_sh)])
# STRIPPROG with the value of the STRIP variable (set by the user). # STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP], AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
# will honor the `STRIP' environment variable to overrule this program.
dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_SUBST([INSTALL_STRIP_PROGRAM])])
# serial 4 -*- Autoconf -*- # serial 4 -*- Autoconf -*-
# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
@ -969,9 +858,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_DEPENDENCIES(NAME) # _AM_DEPENDENCIES(NAME)
# ---------------------- # ---------------------
# See how the compiler implements dependency checking. # See how the compiler implements dependency checking.
# NAME is "CC", "CXX", "GCJ", or "OBJC". # NAME is "CC", "CXX" or "OBJC".
# We try a few techniques and use that to set a single cache variable. # We try a few techniques and use that to set a single cache variable.
# #
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@ -986,7 +875,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=]) [depcc="$$1" am_compiler_list=])
@ -1048,7 +937,8 @@ else
am_cv_$1_dependencies_compiler_type=none am_cv_$1_dependencies_compiler_type=none
fi fi
]) ])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) $1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
AC_SUBST([$1DEPMODE])
]) ])
@ -1066,7 +956,7 @@ else
DEPDIR=_deps DEPDIR=_deps
fi fi
rmdir .deps 2>/dev/null rmdir .deps 2>/dev/null
AC_SUBST([DEPDIR]) AC_SUBST(DEPDIR)
]) ])
@ -1081,48 +971,30 @@ if test "x$enable_dependency_tracking" != xno; then
AMDEPBACKSLASH='\' AMDEPBACKSLASH='\'
fi fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH]) pushdef([subst], defn([AC_SUBST]))
subst(AMDEPBACKSLASH)
popdef([subst])
]) ])
# Generate code to set up dependency tracking. -*- Autoconf -*- # Generate code to set up dependency tracking.
# This macro should only be invoked once -- use via AC_REQUIRE.
# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. # Usage:
# AM_OUTPUT_DEPENDENCY_COMMANDS
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
#serial 2
# _AM_OUTPUT_DEPENDENCY_COMMANDS #
# ------------------------------ # This code is only required when automatic dependency tracking
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # is enabled. FIXME. This creates each `.P' file that we will
[for mf in $CONFIG_FILES; do # need in order to bootstrap the dependency handling code.
# Strip MF so we end up with the name of the file. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
mf=`echo "$mf" | sed -e 's/:.*$//'` AC_OUTPUT_COMMANDS([
# Check whether this is an Automake generated Makefile or not. test x"$AMDEP_TRUE" != x"" ||
# We used to match only the files named `Makefile.in', but for mf in $CONFIG_FILES; do
# some people rename them; so instead we look at the file content. case "$mf" in
# Grep'ing the first line is not enough: some people post-process Makefile) dirpart=.;;
# each Makefile.in and add a new line on top of each file to say so. */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
# So let's grep whole file. *) continue;;
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then esac
dirpart=`AS_DIRNAME("$mf")` grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
else
continue
fi
grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
# Extract the definition of DEP_FILES from the Makefile without # Extract the definition of DEP_FILES from the Makefile without
# running `make'. # running `make'.
DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
@ -1146,46 +1018,14 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists. # Make sure the directory exists.
test -f "$dirpart/$file" && continue test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])` fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
AS_MKDIR_P([$dirpart/$fdir]) $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
# echo "creating $dirpart/$file" # echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file" echo '# dummy' > "$dirpart/$file"
done done
done done
])# _AM_OUTPUT_DEPENDENCY_COMMANDS ], [AMDEP_TRUE="$AMDEP_TRUE"
ac_aux_dir="$ac_aux_dir"])])
# AM_OUTPUT_DEPENDENCY_COMMANDS
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each `.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 2
# AM_MAKE_INCLUDE() # AM_MAKE_INCLUDE()
# ----------------- # -----------------
@ -1198,7 +1038,7 @@ doit:
END END
# If we don't find an include directive, just comment out the code. # If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make]) AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#" am__include='#'
am__quote= am__quote=
_am_result=none _am_result=none
# First try GNU make style include. # First try GNU make style include.
@ -1218,7 +1058,7 @@ if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf echo '.include "confinc"' > confmf
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
am__include=.include am__include=.include
am__quote="\"" am__quote='"'
_am_result=BSD _am_result=BSD
fi fi
fi fi
@ -1228,35 +1068,23 @@ AC_MSG_RESULT($_am_result)
rm -f confinc confmf rm -f confinc confmf
]) ])
# AM_CONDITIONAL -*- Autoconf -*- # serial 3
# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# serial 5
AC_PREREQ(2.52)
# AM_CONDITIONAL(NAME, SHELL-CONDITION) # AM_CONDITIONAL(NAME, SHELL-CONDITION)
# ------------------------------------- # -------------------------------------
# Define a conditional. # Define a conditional.
#
# FIXME: Once using 2.50, use this:
# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_DEFUN([AM_CONDITIONAL], AC_DEFUN([AM_CONDITIONAL],
[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [ifelse([$1], [TRUE],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl [errprint(__file__:__line__: [$0: invalid condition: $1
])dnl
m4exit(1)])dnl
ifelse([$1], [FALSE],
[errprint(__file__:__line__: [$0: invalid condition: $1
])dnl
m4exit(1)])dnl
AC_SUBST([$1_TRUE]) AC_SUBST([$1_TRUE])
AC_SUBST([$1_FALSE]) AC_SUBST([$1_FALSE])
if $2; then if $2; then
@ -1265,88 +1093,72 @@ if $2; then
else else
$1_TRUE='#' $1_TRUE='#'
$1_FALSE= $1_FALSE=
fi fi])
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
AC_MSG_ERROR([conditional \"$1\" was never defined.
Usually this means the macro was only invoked conditionally.])
fi])])
# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- # Like AC_CONFIG_HEADER, but automatically create stamp file.
# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. # serial 3
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_PREREQ([2.52])
# serial 6
# When config.status generates a header, we must update the stamp-h file. # When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header # This file resides in the same directory as the config header
# that is generated. We must strip everything past the first ":", # that is generated. We must strip everything past the first ":",
# and everything past the last "/". # and everything past the last "/".
AC_PREREQ([2.12])
AC_DEFUN([AM_CONFIG_HEADER],
[ifdef([AC_FOREACH],dnl
[dnl init our file count if it isn't already
m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
dnl prepare to store our destination file list for use in config.status
AC_FOREACH([_AM_File], [$1],
[m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
dnl and add it to the list of files AC keeps track of, along
dnl with our hook
AC_CONFIG_HEADERS(_AM_File,
dnl COMMANDS, [, INIT-CMDS]
[# update the timestamp
echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
m4_popdef([_AM_Dest])])],dnl
[AC_CONFIG_HEADER([$1])
AC_OUTPUT_COMMANDS(
ifelse(patsubst([$1], [[^ ]], []),
[],
[test -z "$CONFIG_HEADERS" || echo timestamp >dnl
patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
[am_indx=1
for am_file in $1; do
case " \$CONFIG_HEADERS " in
*" \$am_file "*)
am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
if test -n "\$am_dir"; then
am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
am_tmpdir=\$am_tmpdir\$am_subdir/
if test ! -d \$am_tmpdir; then
mkdir \$am_tmpdir
fi
done
fi
echo timestamp > "\$am_dir"stamp-h\$am_indx
;;
esac
am_indx=\`expr \$am_indx + 1\`
done])
])]) # AM_CONFIG_HEADER
# _AM_DIRNAME(PATH) # _AM_DIRNAME(PATH)
# ----------------- # -----------------
# Like AS_DIRNAME, only do it during macro expansion # Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME], AC_DEFUN([_AM_DIRNAME],
[m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
m4_if(regexp([$1], [^/.*]), -1, m4_if(m4_regexp([$1], [^/.*]), -1,
[.], [.],
patsubst([$1], [^\(/\).*], [\1])), m4_patsubst([$1], [^\(/\).*], [\1])),
patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
])# _AM_DIRNAME ]) # _AM_DIRNAME
# The stamp files are numbered to have different names.
# We could number them on a directory basis, but that's additional
# complications, let's have a unique counter.
m4_define([_AM_STAMP_Count], [0])
# _AM_STAMP(HEADER)
# -----------------
# The name of the stamp file for HEADER.
AC_DEFUN([_AM_STAMP],
[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
[:.*])))/stamp-h[]_AM_STAMP_Count])
# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
# ------------------------------------------------------------
# We used to try to get a real timestamp in stamp-h. But the fear is that
# that will cause unnecessary cvs conflicts.
AC_DEFUN([_AM_CONFIG_HEADER],
[# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
AC_CONFIG_HEADERS([$1],
[# update the timestamp
echo 'timestamp for $1' >"_AM_STAMP([$1])"
$2],
[$3])
])# _AM_CONFIG_HEADER
# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
])# AM_CONFIG_HEADER

@ -26,7 +26,7 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
/* /*
* rfbAuthNewClient is called when we reach the point of authenticating * rfbAuthNewClient is called when we reach the point of authenticating

@ -12,7 +12,7 @@
* see GPL (latest version) for full details * see GPL (latest version) for full details
*/ */
#include "rfb.h" #include <rfb/rfb.h>
void void
rfbUsage(void) rfbUsage(void)
@ -35,8 +35,6 @@ rfbUsage(void)
fprintf(stderr, "-httpdir dir-path enable http server using dir-path home\n"); fprintf(stderr, "-httpdir dir-path enable http server using dir-path home\n");
fprintf(stderr, "-httpport portnum use portnum for http connection\n"); fprintf(stderr, "-httpport portnum use portnum for http connection\n");
fprintf(stderr, "-enablehttpproxy enable http proxy support\n"); fprintf(stderr, "-enablehttpproxy enable http proxy support\n");
exit(1);
} }
/* purges COUNT arguments from ARGV at POSITION and decrements ARGC. /* purges COUNT arguments from ARGV at POSITION and decrements ARGC.
@ -50,7 +48,7 @@ void rfbPurgeArguments(int* argc,int* position,int count,char *argv[])
(*position)--; (*position)--;
} }
void rfbBool
rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[]) rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
{ {
int i,i1; int i,i1;
@ -60,28 +58,46 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
for (i = i1 = 1; i < *argc;) { for (i = i1 = 1; i < *argc;) {
if (strcmp(argv[i], "-help") == 0) { if (strcmp(argv[i], "-help") == 0) {
rfbUsage(); rfbUsage();
exit(1); return FALSE;
} else if (strcmp(argv[i], "-rfbport") == 0) { /* -rfbport port */ } else if (strcmp(argv[i], "-rfbport") == 0) { /* -rfbport port */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbScreen->rfbPort = atoi(argv[++i]); rfbUsage();
return FALSE;
}
rfbScreen->rfbPort = atoi(argv[++i]);
} else if (strcmp(argv[i], "-rfbwait") == 0) { /* -rfbwait ms */ } else if (strcmp(argv[i], "-rfbwait") == 0) { /* -rfbwait ms */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbScreen->rfbMaxClientWait = atoi(argv[++i]); rfbUsage();
return FALSE;
}
rfbScreen->rfbMaxClientWait = atoi(argv[++i]);
} else if (strcmp(argv[i], "-rfbauth") == 0) { /* -rfbauth passwd-file */ } else if (strcmp(argv[i], "-rfbauth") == 0) { /* -rfbauth passwd-file */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbUsage();
return FALSE;
}
rfbScreen->rfbAuthPasswdData = argv[++i]; rfbScreen->rfbAuthPasswdData = argv[++i];
} else if (strcmp(argv[i], "-passwd") == 0) { /* -passwd password */ } else if (strcmp(argv[i], "-passwd") == 0) { /* -passwd password */
char **passwds = malloc(sizeof(char**)*2); char **passwds = malloc(sizeof(char**)*2);
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbUsage();
return FALSE;
}
passwds[0] = argv[++i]; passwds[0] = argv[++i];
passwds[1] = 0; passwds[1] = 0;
rfbScreen->rfbAuthPasswdData = (void*)passwds; rfbScreen->rfbAuthPasswdData = (void*)passwds;
rfbScreen->passwordCheck = rfbCheckPasswordByList; rfbScreen->passwordCheck = rfbCheckPasswordByList;
} else if (strcmp(argv[i], "-deferupdate") == 0) { /* -deferupdate milliseconds */ } else if (strcmp(argv[i], "-deferupdate") == 0) { /* -deferupdate milliseconds */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbUsage();
return FALSE;
}
rfbScreen->rfbDeferUpdateTime = atoi(argv[++i]); rfbScreen->rfbDeferUpdateTime = atoi(argv[++i]);
} else if (strcmp(argv[i], "-desktop") == 0) { /* -desktop desktop-name */ } else if (strcmp(argv[i], "-desktop") == 0) { /* -desktop desktop-name */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbUsage();
return FALSE;
}
rfbScreen->desktopName = argv[++i]; rfbScreen->desktopName = argv[++i];
} else if (strcmp(argv[i], "-alwaysshared") == 0) { } else if (strcmp(argv[i], "-alwaysshared") == 0) {
rfbScreen->rfbAlwaysShared = TRUE; rfbScreen->rfbAlwaysShared = TRUE;
@ -90,10 +106,16 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
} else if (strcmp(argv[i], "-dontdisconnect") == 0) { } else if (strcmp(argv[i], "-dontdisconnect") == 0) {
rfbScreen->rfbDontDisconnect = TRUE; rfbScreen->rfbDontDisconnect = TRUE;
} else if (strcmp(argv[i], "-httpdir") == 0) { /* -httpdir directory-path */ } else if (strcmp(argv[i], "-httpdir") == 0) { /* -httpdir directory-path */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbUsage();
return FALSE;
}
rfbScreen->httpDir = argv[++i]; rfbScreen->httpDir = argv[++i];
} else if (strcmp(argv[i], "-httpport") == 0) { /* -httpport portnum */ } else if (strcmp(argv[i], "-httpport") == 0) { /* -httpport portnum */
if (i + 1 >= *argc) rfbUsage(); if (i + 1 >= *argc) {
rfbUsage();
return FALSE;
}
rfbScreen->httpPort = atoi(argv[++i]); rfbScreen->httpPort = atoi(argv[++i]);
} else if (strcmp(argv[i], "-enablehttpproxy") == 0) { } else if (strcmp(argv[i], "-enablehttpproxy") == 0) {
rfbScreen->httpEnableProxyConnect = TRUE; rfbScreen->httpEnableProxyConnect = TRUE;
@ -105,21 +127,21 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
i1++; i1++;
i=i1; i=i1;
} }
return TRUE;
} }
void rfbSizeUsage() void rfbSizeUsage()
{ {
fprintf(stderr, "-width sets the width of the framebuffer\n"); fprintf(stderr, "-width sets the width of the framebuffer\n");
fprintf(stderr, "-height sets the height of the framebuffer\n"); fprintf(stderr, "-height sets the height of the framebuffer\n");
exit(1);
} }
void rfbBool
rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[]) rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[])
{ {
int i,i1; int i,i1;
if(!argc) return; if(!argc) return TRUE;
for (i = i1 = 1; i < *argc-1;) { for (i = i1 = 1; i < *argc-1;) {
if (strcmp(argv[i], "-bpp") == 0) { if (strcmp(argv[i], "-bpp") == 0) {
*bpp = atoi(argv[++i]); *bpp = atoi(argv[++i]);
@ -136,5 +158,6 @@ rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[])
i1++; i1++;
i=i1; i=i1;
} }
return TRUE;
} }

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -59,21 +55,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -82,10 +75,11 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
EXTRA_DIST = VncViewer.jar index.vnc javaviewer.pseudo_proxy.patch EXTRA_DIST = VncViewer.jar index.vnc javaviewer.pseudo_proxy.patch
subdir = classes subdir = classes
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
DIST_SOURCES = DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in DIST_COMMON = Makefile.am Makefile.in
@ -96,31 +90,29 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu classes/Makefile $(AUTOMAKE) --gnu classes/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
uninstall-info-am: uninstall-info-am:
tags: TAGS tags: TAGS
TAGS: TAGS:
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .. top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
@ -144,7 +136,6 @@ install-am: all-am
installcheck: installcheck-am installcheck: installcheck-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -152,7 +143,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"

4578
configure vendored

File diff suppressed because it is too large Load Diff

@ -1,7 +1,8 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT(LibVNCServer, 0.6pre, http://sourceforge.net/projects/libvncserver) AC_INIT(LibVNCServer, 0.6pre, http://sourceforge.net/projects/libvncserver)
AM_INIT_AUTOMAKE(LibVNCServer, 0.6pre) AM_INIT_AUTOMAKE(LibVNCServer, 0.6pre)
AM_CONFIG_HEADER([rfb/rfbconfig.h]) AM_CONFIG_HEADER([config.h])
AX_PREFIX_CONFIG_H([rfb/rfbconfig.h])
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -59,21 +55,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -82,6 +75,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
CFLAGS = -I .. CFLAGS = -I ..
LDADD = ../libvncserver.a LDADD = ../libvncserver.a
@ -95,7 +89,7 @@ noinst_PROGRAMS = zippy
zippy_SOURCES = zippy.c zippy_SOURCES = zippy.c
subdir = contrib subdir = contrib
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
@HAVE_X_TRUE@bin_PROGRAMS = x11vnc$(EXEEXT) @HAVE_X_TRUE@bin_PROGRAMS = x11vnc$(EXEEXT)
@HAVE_X_FALSE@bin_PROGRAMS = @HAVE_X_FALSE@bin_PROGRAMS =
@ -103,6 +97,7 @@ noinst_PROGRAMS = zippy$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@HAVE_X_TRUE@am_x11vnc_OBJECTS = x11vnc.$(OBJEXT) @HAVE_X_TRUE@am_x11vnc_OBJECTS = x11vnc.$(OBJEXT)
@HAVE_X_FALSE@am_x11vnc_OBJECTS =
x11vnc_OBJECTS = $(am_x11vnc_OBJECTS) x11vnc_OBJECTS = $(am_x11vnc_OBJECTS)
@HAVE_X_TRUE@x11vnc_DEPENDENCIES = ../libvncserver.a @HAVE_X_TRUE@x11vnc_DEPENDENCIES = ../libvncserver.a
@HAVE_X_FALSE@x11vnc_DEPENDENCIES = @HAVE_X_FALSE@x11vnc_DEPENDENCIES =
@ -114,13 +109,12 @@ zippy_DEPENDENCIES = ../libvncserver.a
zippy_LDFLAGS = zippy_LDFLAGS =
DEFS = @DEFS@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/rfb DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/x11vnc.Po $(DEPDIR)/zippy.Po
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/x11vnc.Po ./$(DEPDIR)/zippy.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -136,8 +130,9 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu contrib/Makefile $(AUTOMAKE) --gnu contrib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cd $(top_builddir) && \
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-binPROGRAMS: $(bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
@ -145,16 +140,16 @@ install-binPROGRAMS: $(bin_PROGRAMS)
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \ if test -f $$p \
; then \ ; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \ else :; fi; \
done done
uninstall-binPROGRAMS: uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \ rm -f $(DESTDIR)$(bindir)/$$f; \
done done
@ -177,17 +172,17 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11vnc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/x11vnc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zippy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/zippy.Po@am__quote@
distclean-depend: distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf $(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -197,61 +192,53 @@ distclean-depend:
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am: uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
mkid -fID $$unique mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .. top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
@ -276,7 +263,6 @@ install-am: all-am
installcheck: installcheck-am installcheck: installcheck-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -284,7 +270,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"

@ -99,24 +99,6 @@
#include <X11/extensions/XTest.h> #include <X11/extensions/XTest.h>
#include <X11/keysym.h> #include <X11/keysym.h>
/*
* Work around Bool and KeySym same names in X and rfb.
* Bool is #define int in <X11/Xlib.h>
* KeySym is typedef XID in <X11/X.h>
* (note that X and rfb KeySym types are the same so a bit silly to worry...
* the Bool types are different though)
*/
typedef Bool X_Bool;
typedef KeySym X_KeySym;
/* the #define Bool can be removed: */
#ifdef Bool
#undef Bool
#endif
/* the KeySym typedef cannot be removed, so use an alias for rest of file: */
#define KeySym RFBKeySym
#include <rfb/rfb.h> #include <rfb/rfb.h>
/* X and rfb framebuffer */ /* X and rfb framebuffer */
@ -224,7 +206,7 @@ int cursor_x, cursor_y; /* x and y from the viewer(s) */
int got_user_input = 0; int got_user_input = 0;
int shut_down = 0; int shut_down = 0;
#if defined(HAVE_LIBPTHREAD) && defined(X11VNC_THREADED) #if defined(LIBVNCSERVER_HAVE_LIBPTHREAD) && defined(LIBVNCSERVER_X11VNC_THREADED)
int use_threads = 1; int use_threads = 1;
#else #else
int use_threads = 0; int use_threads = 0;
@ -365,7 +347,7 @@ char modifiers[0x100];
KeyCode keycodes[0x100], left_shift_code, right_shift_code, altgr_code; KeyCode keycodes[0x100], left_shift_code, right_shift_code, altgr_code;
void initialize_keycodes() { void initialize_keycodes() {
X_KeySym key, *keymap; KeySym key, *keymap;
int i, j, minkey, maxkey, syms_per_keycode; int i, j, minkey, maxkey, syms_per_keycode;
memset(modifiers, -1, sizeof(modifiers)); memset(modifiers, -1, sizeof(modifiers));
@ -377,7 +359,7 @@ void initialize_keycodes() {
/* handle alphabetic char with only one keysym (no upper + lower) */ /* handle alphabetic char with only one keysym (no upper + lower) */
for (i = minkey; i <= maxkey; i++) { for (i = minkey; i <= maxkey; i++) {
X_KeySym lower, upper; KeySym lower, upper;
/* 2nd one */ /* 2nd one */
key = keymap[(i - minkey) * syms_per_keycode + 1]; key = keymap[(i - minkey) * syms_per_keycode + 1];
if (key != NoSymbol) { if (key != NoSymbol) {
@ -422,9 +404,9 @@ void DebugXTestFakeKeyEvent(Display* dpy, KeyCode keysym, Bool down, time_t cur_
/* #define XTestFakeKeyEvent DebugXTestFakeKeyEvent */ /* #define XTestFakeKeyEvent DebugXTestFakeKeyEvent */
void tweak_mod(signed char mod, Bool down) { void tweak_mod(signed char mod, rfbBool down) {
Bool is_shift = mod_state & (LEFTSHIFT|RIGHTSHIFT); rfbBool is_shift = mod_state & (LEFTSHIFT|RIGHTSHIFT);
X_Bool dn = (X_Bool) down; Bool dn = (Bool) down;
if (mod < 0) { if (mod < 0) {
return; return;
@ -451,7 +433,7 @@ void tweak_mod(signed char mod, Bool down) {
X_UNLOCK; X_UNLOCK;
} }
static void modifier_tweak_keyboard(Bool down, KeySym keysym, rfbClientPtr client) { static void modifier_tweak_keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
KeyCode k; KeyCode k;
int tweak = 0; int tweak = 0;
@ -478,12 +460,12 @@ static void modifier_tweak_keyboard(Bool down, KeySym keysym, rfbClientPtr clien
k = keycodes[keysym]; k = keycodes[keysym];
} else { } else {
X_LOCK; X_LOCK;
k = XKeysymToKeycode(dpy, (X_KeySym) keysym); k = XKeysymToKeycode(dpy, (KeySym) keysym);
X_UNLOCK; X_UNLOCK;
} }
if ( k != NoSymbol ) { if ( k != NoSymbol ) {
X_LOCK; X_LOCK;
XTestFakeKeyEvent(dpy, k, (X_Bool) down, CurrentTime); XTestFakeKeyEvent(dpy, k, (Bool) down, CurrentTime);
X_UNLOCK; X_UNLOCK;
} }
@ -495,7 +477,7 @@ static void modifier_tweak_keyboard(Bool down, KeySym keysym, rfbClientPtr clien
/* /*
* key event handler * key event handler
*/ */
static void keyboard(Bool down, KeySym keysym, rfbClientPtr client) { static void keyboard(rfbBool down, rfbKeySym keysym, rfbClientPtr client) {
KeyCode k; KeyCode k;
if (0) { if (0) {
@ -516,10 +498,10 @@ static void keyboard(Bool down, KeySym keysym, rfbClientPtr client) {
X_LOCK; X_LOCK;
k = XKeysymToKeycode(dpy, (X_KeySym) keysym); k = XKeysymToKeycode(dpy, (KeySym) keysym);
if ( k != NoSymbol ) { if ( k != NoSymbol ) {
XTestFakeKeyEvent(dpy, k, (X_Bool) down, CurrentTime); XTestFakeKeyEvent(dpy, k, (Bool) down, CurrentTime);
XFlush(dpy); XFlush(dpy);
last_event = last_input = time(0); last_event = last_input = time(0);
@ -902,7 +884,7 @@ void redraw_mouse(void) {
void update_mouse(void) { void update_mouse(void) {
Window root_w, child_w; Window root_w, child_w;
Bool ret; rfbBool ret;
int root_x, root_y, win_x, win_y, which = 0; int root_x, root_y, win_x, win_y, which = 0;
unsigned int mask; unsigned int mask;
@ -2168,7 +2150,7 @@ void print_help() {
" to cut down on load (default %d).\n" " to cut down on load (default %d).\n"
"-nap monitor activity and if low take longer naps between\n" "-nap monitor activity and if low take longer naps between\n"
" polls to really cut down load when idle (default %s).\n" " polls to really cut down load when idle (default %s).\n"
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
"-threads whether or not to use the threaded libvncserver\n" "-threads whether or not to use the threaded libvncserver\n"
"-nothreads algorithm [rfbRunEventLoop] (default %s).\n" "-nothreads algorithm [rfbRunEventLoop] (default %s).\n"
#endif #endif
@ -2196,7 +2178,7 @@ void print_help() {
defer_update, defer_update,
waitms, waitms,
take_naps ? "on":"off", take_naps ? "on":"off",
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
use_threads ? "on":"off", use_threads ? "on":"off",
#endif #endif
fs_frac, fs_frac,
@ -2295,7 +2277,7 @@ int main(int argc, char** argv) {
waitms = atoi(argv[++i]); waitms = atoi(argv[++i]);
} else if (!strcmp(argv[i], "-nap")) { } else if (!strcmp(argv[i], "-nap")) {
take_naps = 1; take_naps = 1;
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
} else if (!strcmp(argv[i], "-threads")) { } else if (!strcmp(argv[i], "-threads")) {
use_threads = 1; use_threads = 1;
} else if (!strcmp(argv[i], "-nothreads")) { } else if (!strcmp(argv[i], "-nothreads")) {

@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <rfb/rfb.h> #include <rfb/rfb.h>
#include <rfb/keysym.h> #include <rfb/keysym.h>
#include "default8x16.h" #include <rfb/default8x16.h>
int maxx=400, maxy=400, bpp=4; int maxx=400, maxy=400, bpp=4;
/* odd maxx doesn't work (vncviewer bug) */ /* odd maxx doesn't work (vncviewer bug) */
@ -17,13 +17,14 @@ void linecount (char* frame_buffer);
/* handles mouse events */ /* handles mouse events */
void on_mouse_event (int buttonMask,int x,int y,rfbClientPtr cl); void on_mouse_event (int buttonMask,int x,int y,rfbClientPtr cl);
/* handles keyboard events */ /* handles keyboard events */
void on_key_press (Bool down,KeySym key,rfbClientPtr cl); void on_key_press (rfbBool down,rfbKeySym key,rfbClientPtr cl);
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
rfbScreenInfoPtr server; rfbScreenInfoPtr server;
rfbProcessSizeArguments(&maxx,&maxy,&bpp,&argc,argv); if(!rfbProcessSizeArguments(&maxx,&maxy,&bpp,&argc,argv))
return 1;
server = rfbGetScreen (&argc, argv, maxx, maxy, 8, 3, bpp); server = rfbGetScreen (&argc, argv, maxx, maxy, 8, 3, bpp);
server->desktopName = "Zippy das wundersquirrel\'s VNC server"; server->desktopName = "Zippy das wundersquirrel\'s VNC server";
@ -137,7 +138,7 @@ void linecount (char* frame_buffer)
} }
void on_key_press (Bool down,KeySym key,rfbClientPtr cl) void on_key_press (rfbBool down,rfbKeySym key,rfbClientPtr cl)
{ {
if (down) /* or else the action occurs on both the press and depress */ if (down) /* or else the action occurs on both the press and depress */
switch (key) { switch (key) {

@ -27,7 +27,7 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
/* /*
* rreBeforeBuf contains pixel data in the client's format. * rreBeforeBuf contains pixel data in the client's format.
@ -47,7 +47,7 @@ static int subrectEncode8(uint8_t *data, int w, int h);
static int subrectEncode16(uint16_t *data, int w, int h); static int subrectEncode16(uint16_t *data, int w, int h);
static int subrectEncode32(uint32_t *data, int w, int h); static int subrectEncode32(uint32_t *data, int w, int h);
static uint32_t getBgColour(char *data, int size, int bpp); static uint32_t getBgColour(char *data, int size, int bpp);
static Bool rfbSendSmallRectEncodingCoRRE(rfbClientPtr cl, int x, int y, static rfbBool rfbSendSmallRectEncodingCoRRE(rfbClientPtr cl, int x, int y,
int w, int h); int w, int h);
@ -56,7 +56,7 @@ static Bool rfbSendSmallRectEncodingCoRRE(rfbClientPtr cl, int x, int y,
* encoding. * encoding.
*/ */
Bool rfbBool
rfbSendRectEncodingCoRRE(cl, x, y, w, h) rfbSendRectEncodingCoRRE(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -84,7 +84,7 @@ rfbSendRectEncodingCoRRE(cl, x, y, w, h)
* rectangle using CoRRE encoding. * rectangle using CoRRE encoding.
*/ */
static Bool static rfbBool
rfbSendSmallRectEncodingCoRRE(cl, x, y, w, h) rfbSendSmallRectEncodingCoRRE(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -131,7 +131,7 @@ rfbSendSmallRectEncodingCoRRE(cl, x, y, w, h)
break; break;
default: default:
rfbLog("getBgColour: bpp %d?\n",cl->format.bitsPerPixel); rfbLog("getBgColour: bpp %d?\n",cl->format.bitsPerPixel);
exit(1); return FALSE;
} }
if (nSubrects < 0) { if (nSubrects < 0) {
@ -327,7 +327,7 @@ getBgColour(data,size,bpp)
return ((uint32_t *)data)[0]; return ((uint32_t *)data)[0];
} else { } else {
rfbLog("getBgColour: bpp %d?\n",bpp); rfbLog("getBgColour: bpp %d?\n",bpp);
exit(1); return 0;
} }
} }
@ -339,7 +339,7 @@ getBgColour(data,size,bpp)
k = (int)(((uint8_t *)data)[j]); k = (int)(((uint8_t *)data)[j]);
if (k >= NUMCLRS) { if (k >= NUMCLRS) {
rfbLog("getBgColour: unusual colour = %d\n", k); rfbLog("getBgColour: unusual colour = %d\n", k);
exit(1); return 0;
} }
counts[k] += 1; counts[k] += 1;
if (counts[k] > maxcount) { if (counts[k] > maxcount) {

@ -22,13 +22,13 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
/* /*
* Send cursor shape either in X-style format or in client pixel format. * Send cursor shape either in X-style format or in client pixel format.
*/ */
Bool rfbBool
rfbSendCursorShape(cl) rfbSendCursorShape(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
@ -176,7 +176,7 @@ rfbSendCursorShape(cl)
* Send cursor position (PointerPos pseudo-encoding). * Send cursor position (PointerPos pseudo-encoding).
*/ */
Bool rfbBool
rfbSendCursorPos(rfbClientPtr cl) rfbSendCursorPos(rfbClientPtr cl)
{ {
rfbFramebufferUpdateRectHeader rect; rfbFramebufferUpdateRectHeader rect;
@ -502,7 +502,7 @@ void rfbPrintXCursor(rfbCursorPtr cursor)
} }
} }
void rfbSetCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr c,Bool freeOld) void rfbSetCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr c,rfbBool freeOld)
{ {
LOCK(rfbScreen->cursorMutex); LOCK(rfbScreen->cursorMutex);
while(rfbScreen->cursorIsDrawn) { while(rfbScreen->cursorIsDrawn) {

@ -23,7 +23,7 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
/* /*

@ -1,6 +1,6 @@
#include "rfb.h" #include <rfb/rfb.h>
void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col) void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col)
{ {
int rowstride = s->paddedWidthInBytes, bpp = s->bitsPerPixel>>3; int rowstride = s->paddedWidthInBytes, bpp = s->bitsPerPixel>>3;
int i,j; int i,j;
@ -17,7 +17,7 @@ void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col)
#define SETPIXEL(x,y) \ #define SETPIXEL(x,y) \
memcpy(s->frameBuffer+(y)*rowstride+(x)*bpp,colour,bpp) memcpy(s->frameBuffer+(y)*rowstride+(x)*bpp,colour,bpp)
void rfbDrawPixel(rfbScreenInfoPtr s,int x,int y,Pixel col) void rfbDrawPixel(rfbScreenInfoPtr s,int x,int y,rfbPixel col)
{ {
int rowstride = s->paddedWidthInBytes, bpp = s->bitsPerPixel>>3; int rowstride = s->paddedWidthInBytes, bpp = s->bitsPerPixel>>3;
char* colour=(char*)&col; char* colour=(char*)&col;
@ -28,7 +28,7 @@ void rfbDrawPixel(rfbScreenInfoPtr s,int x,int y,Pixel col)
rfbMarkRectAsModified(s,x,y,x+1,y+1); rfbMarkRectAsModified(s,x,y,x+1,y+1);
} }
void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col) void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col)
{ {
int rowstride = s->paddedWidthInBytes, bpp = s->bitsPerPixel>>3; int rowstride = s->paddedWidthInBytes, bpp = s->bitsPerPixel>>3;
int i; int i;

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -59,21 +55,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -82,6 +75,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
CFLAGS = -I.. -g -Wall CFLAGS = -I.. -g -Wall
@HAVE_LIBPTHREAD_TRUE@BACKGROUND_TEST = blooptest @HAVE_LIBPTHREAD_TRUE@BACKGROUND_TEST = blooptest
@ -98,7 +92,7 @@ noinst_PROGRAMS = example pnmshow regiontest pnmshow24 fontsel \
LDADD = ../libvncserver.a LDADD = ../libvncserver.a
subdir = examples subdir = examples
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
@HAVE_LIBPTHREAD_FALSE@@OSX_TRUE@noinst_PROGRAMS = example$(EXEEXT) \ @HAVE_LIBPTHREAD_FALSE@@OSX_TRUE@noinst_PROGRAMS = example$(EXEEXT) \
@HAVE_LIBPTHREAD_FALSE@@OSX_TRUE@ pnmshow$(EXEEXT) \ @HAVE_LIBPTHREAD_FALSE@@OSX_TRUE@ pnmshow$(EXEEXT) \
@ -204,19 +198,18 @@ vncev_DEPENDENCIES = ../libvncserver.a
vncev_LDFLAGS = vncev_LDFLAGS =
DEFS = @DEFS@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/rfb DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/blooptest.Po \
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/blooptest.Po \ @AMDEP_TRUE@ $(DEPDIR)/colourmaptest.Po $(DEPDIR)/example.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/colourmaptest.Po ./$(DEPDIR)/example.Po \ @AMDEP_TRUE@ $(DEPDIR)/fontsel.Po $(DEPDIR)/mac.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/fontsel.Po ./$(DEPDIR)/mac.Po \ @AMDEP_TRUE@ $(DEPDIR)/pnmshow.Po $(DEPDIR)/pnmshow24.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/pnmshow.Po ./$(DEPDIR)/pnmshow24.Po \ @AMDEP_TRUE@ $(DEPDIR)/regiontest.Po $(DEPDIR)/simple.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/regiontest.Po ./$(DEPDIR)/simple.Po \ @AMDEP_TRUE@ $(DEPDIR)/simple15.Po $(DEPDIR)/storepasswd.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/simple15.Po ./$(DEPDIR)/storepasswd.Po \ @AMDEP_TRUE@ $(DEPDIR)/vncev.Po
@AMDEP_TRUE@ ./$(DEPDIR)/vncev.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -236,7 +229,9 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu examples/Makefile $(AUTOMAKE) --gnu examples/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
clean-noinstPROGRAMS: clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
@ -283,27 +278,27 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blooptest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/blooptest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colourmaptest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/colourmaptest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/example.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontsel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fontsel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mac.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mac.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pnmshow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pnmshow.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pnmshow24.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pnmshow24.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regiontest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regiontest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/simple.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple15.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/simple15.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/storepasswd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/storepasswd.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vncev.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vncev.Po@am__quote@
distclean-depend: distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf $(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -313,61 +308,53 @@ distclean-depend:
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am: uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
mkid -fID $$unique mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .. top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
@ -391,7 +378,6 @@ install-am: all-am
installcheck: installcheck-am installcheck: installcheck-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -399,7 +385,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"

@ -59,7 +59,7 @@ void initBuffer(unsigned char* buffer)
/* Here we create a structure so that every client has it's own pointer */ /* Here we create a structure so that every client has it's own pointer */
typedef struct ClientData { typedef struct ClientData {
Bool oldButton; rfbBool oldButton;
int oldx,oldy; int oldx,oldy;
} ClientData; } ClientData;
@ -166,7 +166,7 @@ void doptr(int buttonMask,int x,int y,rfbClientPtr cl)
/* Here the key events are handled */ /* Here the key events are handled */
void dokey(Bool down,KeySym key,rfbClientPtr cl) void dokey(rfbBool down,rfbKeySym key,rfbClientPtr cl)
{ {
if(down) { if(down) {
if(key==XK_Escape) if(key==XK_Escape)
@ -312,7 +312,7 @@ int main(int argc,char** argv)
rfbRunEventLoop(rfbScreen,40000,FALSE); rfbRunEventLoop(rfbScreen,40000,FALSE);
#endif /* OWN LOOP */ #endif /* OWN LOOP */
#else #else
#if !defined(HAVE_LIBPTHREAD) #if !defined(LIBVNCSERVER_HAVE_LIBPTHREAD)
#error "I need pthreads for that." #error "I need pthreads for that."
#endif #endif

@ -12,8 +12,8 @@
* It includes the keyboard functions: * It includes the keyboard functions:
* *
void KbdAddEvent(down, keySym, cl) void KbdAddEvent(down, keySym, cl)
Bool down; rfbBool down;
KeySym keySym; rfbKeySym keySym;
rfbClientPtr cl; rfbClientPtr cl;
void KbdReleaseAllKeys() void KbdReleaseAllKeys()
* *
@ -37,7 +37,7 @@
/* zlib doesn't like Byte already defined */ /* zlib doesn't like Byte already defined */
#undef Byte #undef Byte
#undef TRUE #undef TRUE
#undef Bool #undef rfbBool
#include <rfb/rfb.h> #include <rfb/rfb.h>
#include <rfb/keysym.h> #include <rfb/keysym.h>
@ -47,17 +47,17 @@
#include <signal.h> #include <signal.h>
#include <pthread.h> #include <pthread.h>
Bool rfbNoDimming = FALSE; rfbBool rfbNoDimming = FALSE;
Bool rfbNoSleep = TRUE; rfbBool rfbNoSleep = TRUE;
static pthread_mutex_t dimming_mutex; static pthread_mutex_t dimming_mutex;
static unsigned long dim_time; static unsigned long dim_time;
static unsigned long sleep_time; static unsigned long sleep_time;
static mach_port_t master_dev_port; static mach_port_t master_dev_port;
static io_connect_t power_mgt; static io_connect_t power_mgt;
static Bool initialized = FALSE; static rfbBool initialized = FALSE;
static Bool dim_time_saved = FALSE; static rfbBool dim_time_saved = FALSE;
static Bool sleep_time_saved = FALSE; static rfbBool sleep_time_saved = FALSE;
static int static int
saveDimSettings(void) saveDimSettings(void)
@ -213,7 +213,7 @@ void rfbShutdown(rfbClientPtr cl);
/* some variables to enable special behaviour */ /* some variables to enable special behaviour */
int startTime = -1, maxSecsToConnect = 0; int startTime = -1, maxSecsToConnect = 0;
Bool disconnectAfterFirstClient = TRUE; rfbBool disconnectAfterFirstClient = TRUE;
/* Where do I get the "official" list of Mac key codes? /* Where do I get the "official" list of Mac key codes?
Ripped these out of a Mac II emulator called Basilisk II Ripped these out of a Mac II emulator called Basilisk II
@ -391,7 +391,7 @@ static int keyTable[] = {
}; };
void void
KbdAddEvent(Bool down, KeySym keySym, struct _rfbClientRec* cl) KbdAddEvent(rfbBool down, rfbKeySym keySym, struct _rfbClientRec* cl)
{ {
int i; int i;
CGKeyCode keyCode = -1; CGKeyCode keyCode = -1;
@ -446,7 +446,7 @@ PtrAddEvent(buttonMask, x, y, cl)
(buttonMask & (1 << 7)) ? TRUE : FALSE); (buttonMask & (1 << 7)) ? TRUE : FALSE);
} }
Bool viewOnly = FALSE, sharedMode = FALSE; rfbBool viewOnly = FALSE, sharedMode = FALSE;
void void
ScreenInit(int argc, char**argv) ScreenInit(int argc, char**argv)
@ -502,7 +502,7 @@ refreshCallback(CGRectCount count, const CGRect *rectArray, void *ignore)
break; break;
} }
} }
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
else if(message[0]=='b') else if(message[0]=='b')
rfbSendBackChannel(rfbScreen,message+1,strlen(message+1)); rfbSendBackChannel(rfbScreen,message+1,strlen(message+1));
#endif #endif
@ -560,7 +560,7 @@ int main(int argc,char *argv[])
send_message(&single_instance,"l"); send_message(&single_instance,"l");
exit(0); exit(0);
} else } else
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
if(i<argc-1 && !strcmp(argv[i],"-backchannel")) { if(i<argc-1 && !strcmp(argv[i],"-backchannel")) {
if(strlen(argv[i+1])>1022) if(strlen(argv[i+1])>1022)
argv[i+1][1022]=0; argv[i+1][1022]=0;

@ -2,7 +2,7 @@
#include <rfb/rfb.h> #include <rfb/rfb.h>
#include <rfb/keysym.h> #include <rfb/keysym.h>
void HandleKey(Bool down,KeySym key,rfbClientPtr cl) void HandleKey(rfbBool down,rfbKeySym key,rfbClientPtr cl)
{ {
if(down && (key==XK_Escape || key=='q' || key=='Q')) if(down && (key==XK_Escape || key=='q' || key=='Q'))
rfbCloseClient(cl); rfbCloseClient(cl);

@ -2,11 +2,11 @@
#include <rfb/rfb.h> #include <rfb/rfb.h>
#include <rfb/keysym.h> #include <rfb/keysym.h>
#ifndef ALLOW24BPP #ifndef LIBVNCSERVER_ALLOW24BPP
#error "I need the ALLOW24BPP flag to work" #error "I need the ALLOW24BPP flag to work"
#endif #endif
void HandleKey(Bool down,KeySym key,rfbClientPtr cl) void HandleKey(rfbBool down,rfbKeySym key,rfbClientPtr cl)
{ {
if(down && (key==XK_Escape || key=='q' || key=='Q')) if(down && (key==XK_Escape || key=='q' || key=='Q'))
rfbCloseClient(cl); rfbCloseClient(cl);

@ -4,7 +4,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <rfb/rfb.h> #include <rfb/rfb.h>
#include "default8x16.h" #include <rfb/default8x16.h>
char f[640*480]; char f[640*480];
char* keys[0x400]; char* keys[0x400];
@ -66,7 +66,7 @@ void output(rfbScreenInfoPtr s,char* line)
rfbLog("%s\n",line); rfbLog("%s\n",line);
} }
void dokey(Bool down,KeySym k,rfbClientPtr cl) void dokey(rfbBool down,rfbKeySym k,rfbClientPtr cl)
{ {
char buffer[1024+32]; char buffer[1024+32];

@ -1,7 +1,7 @@
#include "rfb.h" #include <rfb/rfb.h>
int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,unsigned char c,Pixel col) int x,int y,unsigned char c,rfbPixel col)
{ {
int i,j,width,height; int i,j,width,height;
unsigned char* data=font->data+font->metaData[c*5]; unsigned char* data=font->data+font->metaData[c*5];
@ -34,7 +34,7 @@ int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
} }
void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,const char* string,Pixel colour) int x,int y,const char* string,rfbPixel colour)
{ {
while(*string) { while(*string) {
x+=rfbDrawChar(rfbScreen,font,x,y,*string,colour); x+=rfbDrawChar(rfbScreen,font,x,y,*string,colour);
@ -46,7 +46,7 @@ void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,unsigned char c, int x,int y,unsigned char c,
int x1,int y1,int x2,int y2, int x1,int y1,int x2,int y2,
Pixel col,Pixel bcol) rfbPixel col,rfbPixel bcol)
{ {
int i,j,width,height; int i,j,width,height;
unsigned char* data=font->data+font->metaData[c*5]; unsigned char* data=font->data+font->metaData[c*5];
@ -102,7 +102,7 @@ int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,const char* string, int x,int y,const char* string,
int x1,int y1,int x2,int y2, int x1,int y1,int x2,int y2,
Pixel colour,Pixel backColour) rfbPixel colour,rfbPixel backColour)
{ {
while(*string) { while(*string) {
x+=rfbDrawCharWithClip(rfbScreen,font,x,y,*string,x1,y1,x2,y2, x+=rfbDrawCharWithClip(rfbScreen,font,x,y,*string,x1,y1,x2,y2,

@ -25,18 +25,18 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
static Bool sendHextiles8(rfbClientPtr cl, int x, int y, int w, int h); static rfbBool sendHextiles8(rfbClientPtr cl, int x, int y, int w, int h);
static Bool sendHextiles16(rfbClientPtr cl, int x, int y, int w, int h); static rfbBool sendHextiles16(rfbClientPtr cl, int x, int y, int w, int h);
static Bool sendHextiles32(rfbClientPtr cl, int x, int y, int w, int h); static rfbBool sendHextiles32(rfbClientPtr cl, int x, int y, int w, int h);
/* /*
* rfbSendRectEncodingHextile - send a rectangle using hextile encoding. * rfbSendRectEncodingHextile - send a rectangle using hextile encoding.
*/ */
Bool rfbBool
rfbSendRectEncodingHextile(cl, x, y, w, h) rfbSendRectEncodingHextile(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -89,17 +89,17 @@ rfbSendRectEncodingHextile(cl, x, y, w, h)
#define DEFINE_SEND_HEXTILES(bpp) \ #define DEFINE_SEND_HEXTILES(bpp) \
\ \
\ \
static Bool subrectEncode##bpp(rfbClientPtr cli, uint##bpp##_t *data, int w, int h, \ static rfbBool subrectEncode##bpp(rfbClientPtr cli, uint##bpp##_t *data, int w, int h, \
uint##bpp##_t bg, uint##bpp##_t fg, Bool mono); \ uint##bpp##_t bg, uint##bpp##_t fg, rfbBool mono); \
static void testColours##bpp(uint##bpp##_t *data, int size, Bool *mono, \ static void testColours##bpp(uint##bpp##_t *data, int size, rfbBool *mono, \
Bool *solid, uint##bpp##_t *bg, uint##bpp##_t *fg); \ rfbBool *solid, uint##bpp##_t *bg, uint##bpp##_t *fg); \
\ \
\ \
/* \ /* \
* rfbSendHextiles \ * rfbSendHextiles \
*/ \ */ \
\ \
static Bool \ static rfbBool \
sendHextiles##bpp(cl, rx, ry, rw, rh) \ sendHextiles##bpp(cl, rx, ry, rw, rh) \
rfbClientPtr cl; \ rfbClientPtr cl; \
int rx, ry, rw, rh; \ int rx, ry, rw, rh; \
@ -108,9 +108,9 @@ sendHextiles##bpp(cl, rx, ry, rw, rh)
int startUblen; \ int startUblen; \
char *fbptr; \ char *fbptr; \
uint##bpp##_t bg = 0, fg = 0, newBg, newFg; \ uint##bpp##_t bg = 0, fg = 0, newBg, newFg; \
Bool mono, solid; \ rfbBool mono, solid; \
Bool validBg = FALSE; \ rfbBool validBg = FALSE; \
Bool validFg = FALSE; \ rfbBool validFg = FALSE; \
uint##bpp##_t clientPixelData[16*16*(bpp/8)]; \ uint##bpp##_t clientPixelData[16*16*(bpp/8)]; \
\ \
for (y = ry; y < ry+rh; y += 16) { \ for (y = ry; y < ry+rh; y += 16) { \
@ -192,9 +192,9 @@ sendHextiles##bpp(cl, rx, ry, rw, rh)
} \ } \
\ \
\ \
static Bool \ static rfbBool \
subrectEncode##bpp(rfbClientPtr cl, uint##bpp##_t *data, int w, int h, \ subrectEncode##bpp(rfbClientPtr cl, uint##bpp##_t *data, int w, int h, \
uint##bpp##_t bg, uint##bpp##_t fg, Bool mono) \ uint##bpp##_t bg, uint##bpp##_t fg, rfbBool mono) \
{ \ { \
uint##bpp##_t cl2; \ uint##bpp##_t cl2; \
int x,y; \ int x,y; \
@ -298,8 +298,8 @@ static void
testColours##bpp(data,size,mono,solid,bg,fg) \ testColours##bpp(data,size,mono,solid,bg,fg) \
uint##bpp##_t *data; \ uint##bpp##_t *data; \
int size; \ int size; \
Bool *mono; \ rfbBool *mono; \
Bool *solid; \ rfbBool *solid; \
uint##bpp##_t *bg; \ uint##bpp##_t *bg; \
uint##bpp##_t *fg; \ uint##bpp##_t *fg; \
{ \ { \

@ -22,16 +22,16 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_UNISTD_H #ifdef LIBVNCSERVER_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#ifdef HAVE_FCNTL_H #ifdef LIBVNCSERVER_HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <errno.h> #include <errno.h>
@ -40,13 +40,13 @@
#include <winsock.h> #include <winsock.h>
#define close closesocket #define close closesocket
#else #else
#ifdef HAVE_SYS_TIME_H #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifdef HAVE_SYS_SOCKET_H #ifdef LIBVNCSERVER_HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef HAVE_NETINET_IN_H #ifdef LIBVNCSERVER_HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netdb.h> #include <netdb.h>
@ -70,9 +70,9 @@
#define OK_STR "HTTP/1.0 200 OK\nContent-Type: text/html\r\n\r\n" #define OK_STR "HTTP/1.0 200 OK\nContent-Type: text/html\r\n\r\n"
static void httpProcessInput(); static void httpProcessInput();
static Bool compareAndSkip(char **ptr, const char *str); static rfbBool compareAndSkip(char **ptr, const char *str);
static Bool parseParams(const char *request, char *result, int max_bytes); static rfbBool parseParams(const char *request, char *result, int max_bytes);
static Bool validateString(char *str); static rfbBool validateString(char *str);
#define BUF_SIZE 32768 #define BUF_SIZE 32768
@ -104,7 +104,7 @@ httpInitSockets(rfbScreenInfoPtr rfbScreen)
if ((rfbScreen->httpListenSock = ListenOnTCPPort(rfbScreen->httpPort)) < 0) { if ((rfbScreen->httpListenSock = ListenOnTCPPort(rfbScreen->httpPort)) < 0) {
rfbLogPerror("ListenOnTCPPort"); rfbLogPerror("ListenOnTCPPort");
exit(1); return;
} }
/*AddEnabledDevice(httpListenSock);*/ /*AddEnabledDevice(httpListenSock);*/
@ -214,7 +214,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
char *fname; char *fname;
unsigned int maxFnameLen; unsigned int maxFnameLen;
FILE* fd; FILE* fd;
Bool performSubstitutions = FALSE; rfbBool performSubstitutions = FALSE;
char str[256+32]; char str[256+32];
#ifndef WIN32 #ifndef WIN32
struct passwd *user = getpwuid(getuid()); struct passwd *user = getpwuid(getuid());
@ -473,7 +473,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
} }
static Bool static rfbBool
compareAndSkip(char **ptr, const char *str) compareAndSkip(char **ptr, const char *str)
{ {
if (strncmp(*ptr, str, strlen(str)) == 0) { if (strncmp(*ptr, str, strlen(str)) == 0) {
@ -489,7 +489,7 @@ compareAndSkip(char **ptr, const char *str)
* of <param> tags for inclusion into an HTML page with embedded applet. * of <param> tags for inclusion into an HTML page with embedded applet.
*/ */
static Bool static rfbBool
parseParams(const char *request, char *result, int max_bytes) parseParams(const char *request, char *result, int max_bytes)
{ {
char param_request[128]; char param_request[128];
@ -559,7 +559,7 @@ parseParams(const char *request, char *result, int max_bytes)
* signs, underscores, and dots. Replace all '+' signs with spaces. * signs, underscores, and dots. Replace all '+' signs with spaces.
*/ */
static Bool static rfbBool
validateString(char *str) validateString(char *str)
{ {
char *ptr; char *ptr;

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -59,21 +55,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -82,6 +75,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
CFLAGS = -g -I.. -I. -Wall CFLAGS = -g -I.. -I. -Wall
libvncclient_a_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c libvncclient_a_SOURCES = cursor.c listen.c rfbproto.c sockets.c vncviewer.c
@ -98,7 +92,7 @@ noinst_PROGRAMS = client_test
client_test_LDADD = libvncclient.a client_test_LDADD = libvncclient.a
subdir = libvncclient subdir = libvncclient
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
LIBRARIES = $(lib_LIBRARIES) LIBRARIES = $(lib_LIBRARIES)
@ -116,15 +110,14 @@ client_test_DEPENDENCIES = libvncclient.a
client_test_LDFLAGS = client_test_LDFLAGS =
DEFS = @DEFS@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/rfb DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/client_test.Po $(DEPDIR)/cursor.Po \
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/client_test.Po ./$(DEPDIR)/cursor.Po \ @AMDEP_TRUE@ $(DEPDIR)/listen.Po $(DEPDIR)/rfbproto.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/listen.Po ./$(DEPDIR)/rfbproto.Po \ @AMDEP_TRUE@ $(DEPDIR)/sockets.Po $(DEPDIR)/vncviewer.Po
@AMDEP_TRUE@ ./$(DEPDIR)/sockets.Po ./$(DEPDIR)/vncviewer.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -140,24 +133,23 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu libvncclient/Makefile $(AUTOMAKE) --gnu libvncclient/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
AR = ar AR = ar
libLIBRARIES_INSTALL = $(INSTALL_DATA)
install-libLIBRARIES: $(lib_LIBRARIES) install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir) $(mkinstalldirs) $(DESTDIR)$(libdir)
@list='$(lib_LIBRARIES)'; for p in $$list; do \ @list='$(lib_LIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \ $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
$(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
else :; fi; \ else :; fi; \
done done
@$(POST_INSTALL) @$(POST_INSTALL)
@list='$(lib_LIBRARIES)'; for p in $$list; do \ @list='$(lib_LIBRARIES)'; for p in $$list; do \
if test -f $$p; then \ if test -f $$p; then \
p="`echo $$p | sed -e 's|^.*/||'`"; \
echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
$(RANLIB) $(DESTDIR)$(libdir)/$$p; \ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \ else :; fi; \
@ -166,7 +158,6 @@ install-libLIBRARIES: $(lib_LIBRARIES)
uninstall-libLIBRARIES: uninstall-libLIBRARIES:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(lib_LIBRARIES)'; for p in $$list; do \ @list='$(lib_LIBRARIES)'; for p in $$list; do \
p="`echo $$p | sed -e 's|^.*/||'`"; \
echo " rm -f $(DESTDIR)$(libdir)/$$p"; \ echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
rm -f $(DESTDIR)$(libdir)/$$p; \ rm -f $(DESTDIR)$(libdir)/$$p; \
done done
@ -190,21 +181,21 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client_test.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cursor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/listen.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfbproto.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rfbproto.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sockets.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vncviewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vncviewer.Po@am__quote@
distclean-depend: distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf $(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -214,61 +205,53 @@ distclean-depend:
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am: uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
mkid -fID $$unique mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .. top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
@ -293,7 +276,6 @@ install-am: all-am
installcheck: installcheck-am installcheck: installcheck-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -301,7 +283,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"

@ -29,7 +29,7 @@
#define HandleCoRREBPP CONCAT2E(HandleCoRRE,BPP) #define HandleCoRREBPP CONCAT2E(HandleCoRRE,BPP)
#define CARDBPP CONCAT3E(uint,BPP,_t) #define CARDBPP CONCAT3E(uint,BPP,_t)
static Bool static rfbBool
HandleCoRREBPP (rfbClient* client, int rx, int ry, int rw, int rh) HandleCoRREBPP (rfbClient* client, int rx, int ry, int rw, int rh)
{ {
rfbRREHeader hdr; rfbRREHeader hdr;

@ -43,7 +43,7 @@
* why we call it "software cursor"). * why we call it "software cursor").
********************************************************************/ ********************************************************************/
Bool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc) rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc)
{ {
int bytesPerPixel; int bytesPerPixel;
size_t bytesPerRow, bytesMaskData; size_t bytesPerRow, bytesMaskData;

@ -30,7 +30,7 @@
#define CARDBPP CONCAT3E(uint,BPP,_t) #define CARDBPP CONCAT3E(uint,BPP,_t)
#define GET_PIXEL CONCAT2E(GET_PIXEL,BPP) #define GET_PIXEL CONCAT2E(GET_PIXEL,BPP)
static Bool static rfbBool
HandleHextileBPP (rfbClient* client, int rx, int ry, int rw, int rh) HandleHextileBPP (rfbClient* client, int rx, int ry, int rw, int rh)
{ {
CARDBPP bg, fg; CARDBPP bg, fg;

@ -43,7 +43,8 @@ listenForIncomingConnections(rfbClient* client)
listenSocket = ListenAtTcpPort(client->listenPort); listenSocket = ListenAtTcpPort(client->listenPort);
if ((listenSocket < 0)) exit(1); if ((listenSocket < 0))
return;
rfbClientLog("%s -listen: Listening on port %d\n", rfbClientLog("%s -listen: Listening on port %d\n",
client->programName,client->listenPort); client->programName,client->listenPort);
@ -66,8 +67,10 @@ listenForIncomingConnections(rfbClient* client)
if (FD_ISSET(listenSocket, &fds)) { if (FD_ISSET(listenSocket, &fds)) {
client->sock = AcceptTcpConnection(listenSocket); client->sock = AcceptTcpConnection(listenSocket);
if (client->sock < 0) exit(1); if (client->sock < 0)
if (!SetNonBlocking(client->sock)) exit(1); return;
if (!SetNonBlocking(client->sock))
return;
/* Now fork off a new process to deal with it... */ /* Now fork off a new process to deal with it... */
@ -75,7 +78,7 @@ listenForIncomingConnections(rfbClient* client)
case -1: case -1:
perror("fork"); perror("fork");
exit(1); return;
case 0: case 0:
/* child - return to caller */ /* child - return to caller */

@ -27,10 +27,10 @@
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>
#include <rfb/rfbclient.h> #include <rfb/rfbclient.h>
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
#include <zlib.h> #include <zlib.h>
#endif #endif
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
#include <jpeglib.h> #include <jpeglib.h>
#endif #endif
#include <stdarg.h> #include <stdarg.h>
@ -40,7 +40,7 @@
* rfbClientLog prints a time-stamped message to the log file (stderr). * rfbClientLog prints a time-stamped message to the log file (stderr).
*/ */
Bool rfbEnableClientLogging=TRUE; rfbBool rfbEnableClientLogging=TRUE;
void void
rfbClientLog(const char *format, ...) rfbClientLog(const char *format, ...)
@ -124,21 +124,21 @@ void CopyRectangleFromRectangle(rfbClient* client, int src_x, int src_y, int w,
} }
} }
static Bool HandleRRE8(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleRRE8(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleRRE16(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleRRE16(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleRRE32(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleRRE32(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleCoRRE8(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleCoRRE8(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleCoRRE16(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleCoRRE16(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleCoRRE32(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleCoRRE32(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleHextile8(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleHextile8(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleHextile16(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleHextile16(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleHextile32(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleHextile32(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleZlib8(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleZlib8(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleZlib16(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleZlib16(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleZlib32(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleZlib32(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleTight8(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleTight8(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleTight16(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleTight16(rfbClient* client, int rx, int ry, int rw, int rh);
static Bool HandleTight32(rfbClient* client, int rx, int ry, int rw, int rh); static rfbBool HandleTight32(rfbClient* client, int rx, int ry, int rw, int rh);
static long ReadCompactLen (rfbClient* client); static long ReadCompactLen (rfbClient* client);
@ -159,7 +159,7 @@ static int raw_buffer_size = -1;
static char *raw_buffer; static char *raw_buffer;
static z_stream decompStream; static z_stream decompStream;
static Bool decompStreamInited = FALSE; static rfbBool decompStreamInited = FALSE;
/* /*
@ -174,25 +174,25 @@ static char zlib_buffer[ZLIB_BUFFER_SIZE];
/* Four independent compression streams for zlib library. */ /* Four independent compression streams for zlib library. */
static z_stream zlibStream[4]; static z_stream zlibStream[4];
static Bool zlibStreamActive[4] = { static rfbBool zlibStreamActive[4] = {
FALSE, FALSE, FALSE, FALSE FALSE, FALSE, FALSE, FALSE
}; };
/* Filter stuff. Should be initialized by filter initialization code. */ /* Filter stuff. Should be initialized by filter initialization code. */
static Bool cutZeros; static rfbBool cutZeros;
static int rectWidth, rectColors; static int rectWidth, rectColors;
static char tightPalette[256*4]; static char tightPalette[256*4];
static uint8_t tightPrevRow[2048*3*sizeof(uint16_t)]; static uint8_t tightPrevRow[2048*3*sizeof(uint16_t)];
/* JPEG decoder state. */ /* JPEG decoder state. */
static Bool jpegError; static rfbBool jpegError;
/* /*
* ConnectToRFBServer. * ConnectToRFBServer.
*/ */
Bool rfbBool
ConnectToRFBServer(rfbClient* client,const char *hostname, int port) ConnectToRFBServer(rfbClient* client,const char *hostname, int port)
{ {
unsigned int host; unsigned int host;
@ -218,7 +218,7 @@ static void rfbEncryptBytes(unsigned char *bytes, char *passwd);
* InitialiseRFBConnection. * InitialiseRFBConnection.
*/ */
Bool rfbBool
InitialiseRFBConnection(rfbClient* client) InitialiseRFBConnection(rfbClient* client)
{ {
rfbProtocolVersionMsg pv; rfbProtocolVersionMsg pv;
@ -368,7 +368,7 @@ InitialiseRFBConnection(rfbClient* client)
* SetFormatAndEncodings. * SetFormatAndEncodings.
*/ */
Bool rfbBool
SetFormatAndEncodings(rfbClient* client) SetFormatAndEncodings(rfbClient* client)
{ {
rfbSetPixelFormatMsg spf; rfbSetPixelFormatMsg spf;
@ -376,9 +376,9 @@ SetFormatAndEncodings(rfbClient* client)
rfbSetEncodingsMsg *se = (rfbSetEncodingsMsg *)buf; rfbSetEncodingsMsg *se = (rfbSetEncodingsMsg *)buf;
uint32_t *encs = (uint32_t *)(&buf[sz_rfbSetEncodingsMsg]); uint32_t *encs = (uint32_t *)(&buf[sz_rfbSetEncodingsMsg]);
int len = 0; int len = 0;
Bool requestCompressLevel = FALSE; rfbBool requestCompressLevel = FALSE;
Bool requestQualityLevel = FALSE; rfbBool requestQualityLevel = FALSE;
Bool requestLastRectEncoding = FALSE; rfbBool requestLastRectEncoding = FALSE;
spf.type = rfbSetPixelFormat; spf.type = rfbSetPixelFormat;
spf.format = client->format; spf.format = client->format;
@ -519,7 +519,7 @@ SetFormatAndEncodings(rfbClient* client)
* SendIncrementalFramebufferUpdateRequest. * SendIncrementalFramebufferUpdateRequest.
*/ */
Bool rfbBool
SendIncrementalFramebufferUpdateRequest(rfbClient* client) SendIncrementalFramebufferUpdateRequest(rfbClient* client)
{ {
return SendFramebufferUpdateRequest(client, 0, 0, client->si.framebufferWidth, return SendFramebufferUpdateRequest(client, 0, 0, client->si.framebufferWidth,
@ -531,8 +531,8 @@ SendIncrementalFramebufferUpdateRequest(rfbClient* client)
* SendFramebufferUpdateRequest. * SendFramebufferUpdateRequest.
*/ */
Bool rfbBool
SendFramebufferUpdateRequest(rfbClient* client, int x, int y, int w, int h, Bool incremental) SendFramebufferUpdateRequest(rfbClient* client, int x, int y, int w, int h, rfbBool incremental)
{ {
rfbFramebufferUpdateRequestMsg fur; rfbFramebufferUpdateRequestMsg fur;
@ -554,7 +554,7 @@ SendFramebufferUpdateRequest(rfbClient* client, int x, int y, int w, int h, Bool
* SendPointerEvent. * SendPointerEvent.
*/ */
Bool rfbBool
SendPointerEvent(rfbClient* client,int x, int y, int buttonMask) SendPointerEvent(rfbClient* client,int x, int y, int buttonMask)
{ {
rfbPointerEventMsg pe; rfbPointerEventMsg pe;
@ -574,8 +574,8 @@ SendPointerEvent(rfbClient* client,int x, int y, int buttonMask)
* SendKeyEvent. * SendKeyEvent.
*/ */
Bool rfbBool
SendKeyEvent(rfbClient* client, uint32_t key, Bool down) SendKeyEvent(rfbClient* client, uint32_t key, rfbBool down)
{ {
rfbKeyEventMsg ke; rfbKeyEventMsg ke;
@ -590,7 +590,7 @@ SendKeyEvent(rfbClient* client, uint32_t key, Bool down)
* SendClientCutText. * SendClientCutText.
*/ */
Bool rfbBool
SendClientCutText(rfbClient* client, char *str, int len) SendClientCutText(rfbClient* client, char *str, int len)
{ {
rfbClientCutTextMsg cct; rfbClientCutTextMsg cct;
@ -611,7 +611,7 @@ SendClientCutText(rfbClient* client, char *str, int len)
* HandleRFBServerMessage. * HandleRFBServerMessage.
*/ */
Bool rfbBool
HandleRFBServerMessage(rfbClient* client) HandleRFBServerMessage(rfbClient* client)
{ {
rfbServerToClientMsg msg; rfbServerToClientMsg msg;

@ -29,7 +29,7 @@
#define HandleRREBPP CONCAT2E(HandleRRE,BPP) #define HandleRREBPP CONCAT2E(HandleRRE,BPP)
#define CARDBPP CONCAT3E(uint,BPP,_t) #define CARDBPP CONCAT3E(uint,BPP,_t)
static Bool static rfbBool
HandleRREBPP (rfbClient* client, int rx, int ry, int rw, int rh) HandleRREBPP (rfbClient* client, int rx, int ry, int rw, int rh)
{ {
rfbRREHeader hdr; rfbRREHeader hdr;

@ -34,7 +34,7 @@
void PrintInHex(char *buf, int len); void PrintInHex(char *buf, int len);
Bool errorMessageOnReadFailure = TRUE; rfbBool errorMessageOnReadFailure = TRUE;
#define BUF_SIZE 8192 #define BUF_SIZE 8192
static char buf[BUF_SIZE]; static char buf[BUF_SIZE];
@ -55,7 +55,7 @@ static int buffered = 0;
* events are processed, as there is no XtAppMainLoop in the program. * events are processed, as there is no XtAppMainLoop in the program.
*/ */
Bool rfbBool
ReadFromRFBServer(rfbClient* client, char *out, unsigned int n) ReadFromRFBServer(rfbClient* client, char *out, unsigned int n)
{ {
if (n <= buffered) { if (n <= buffered) {
@ -138,7 +138,7 @@ ReadFromRFBServer(rfbClient* client, char *out, unsigned int n)
* Write an exact number of bytes, and don't return until you've sent them. * Write an exact number of bytes, and don't return until you've sent them.
*/ */
Bool rfbBool
WriteToRFBServer(rfbClient* client, char *buf, int n) WriteToRFBServer(rfbClient* client, char *buf, int n)
{ {
fd_set fds; fd_set fds;
@ -322,7 +322,7 @@ AcceptTcpConnection(int listenSock)
* SetNonBlocking sets a socket into non-blocking mode. * SetNonBlocking sets a socket into non-blocking mode.
*/ */
Bool rfbBool
SetNonBlocking(int sock) SetNonBlocking(int sock)
{ {
if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
@ -337,7 +337,7 @@ SetNonBlocking(int sock)
* StringToIPAddr - convert a host string to an IP address. * StringToIPAddr - convert a host string to an IP address.
*/ */
Bool rfbBool
StringToIPAddr(const char *str, unsigned int *addr) StringToIPAddr(const char *str, unsigned int *addr)
{ {
struct hostent *hp; struct hostent *hp;
@ -367,7 +367,7 @@ StringToIPAddr(const char *str, unsigned int *addr)
* Test if the other end of a socket is on the same machine. * Test if the other end of a socket is on the same machine.
*/ */
Bool rfbBool
SameMachine(int sock) SameMachine(int sock)
{ {
struct sockaddr_in peeraddr, myaddr; struct sockaddr_in peeraddr, myaddr;

@ -80,12 +80,12 @@ static void FilterPaletteBPP (rfbClient* client, int numRows, CARDBPP *destBuffe
static void FilterGradientBPP (rfbClient* client, int numRows, CARDBPP *destBuffer); static void FilterGradientBPP (rfbClient* client, int numRows, CARDBPP *destBuffer);
#if BPP != 8 #if BPP != 8
static Bool DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h); static rfbBool DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h);
#endif #endif
/* Definitions */ /* Definitions */
static Bool static rfbBool
HandleTightBPP (rfbClient* client, int rx, int ry, int rw, int rh) HandleTightBPP (rfbClient* client, int rx, int ry, int rw, int rh)
{ {
CARDBPP fill_colour; CARDBPP fill_colour;
@ -297,7 +297,7 @@ HandleTightBPP (rfbClient* client, int rx, int ry, int rw, int rh)
/* /*
The following variables are defined in rfbproto.c: The following variables are defined in rfbproto.c:
static Bool cutZeros; static rfbBool cutZeros;
static int rectWidth, rectColors; static int rectWidth, rectColors;
static uint8_t tightPalette[256*4]; static uint8_t tightPalette[256*4];
static uint8_t tightPrevRow[2048*3*sizeof(CARD16)]; static uint8_t tightPrevRow[2048*3*sizeof(CARD16)];
@ -526,13 +526,13 @@ FilterPaletteBPP (rfbClient* client, int numRows, CARDBPP *dst)
/* /*
The following variables are defined in rfbproto.c: The following variables are defined in rfbproto.c:
static Bool jpegError; static rfbBool jpegError;
static struct jpeg_source_mgr jpegSrcManager; static struct jpeg_source_mgr jpegSrcManager;
static JOCTET *jpegBufferPtr; static JOCTET *jpegBufferPtr;
static size_t *jpegBufferLen; static size_t *jpegBufferLen;
*/ */
static Bool static rfbBool
DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h) DecompressJpegRectBPP(rfbClient* client, int x, int y, int w, int h)
{ {
struct jpeg_decompress_struct cinfo; struct jpeg_decompress_struct cinfo;

@ -28,7 +28,7 @@
static void Dummy(rfbClient* client) { static void Dummy(rfbClient* client) {
} }
static Bool DummyPoint(rfbClient* client, int x, int y) { static rfbBool DummyPoint(rfbClient* client, int x, int y) {
return TRUE; return TRUE;
} }
static void DummyRect(rfbClient* client, int x, int y, int w, int h) { static void DummyRect(rfbClient* client, int x, int y, int w, int h) {
@ -36,7 +36,7 @@ static void DummyRect(rfbClient* client, int x, int y, int w, int h) {
static char* NoPassword(rfbClient* client) { static char* NoPassword(rfbClient* client) {
return ""; return "";
} }
static Bool MallocFrameBuffer(rfbClient* client) { static rfbBool MallocFrameBuffer(rfbClient* client) {
if(client->frameBuffer) if(client->frameBuffer)
free(client->frameBuffer); free(client->frameBuffer);
client->frameBuffer=malloc(client->width*client->height*client->format.bitsPerPixel/8); client->frameBuffer=malloc(client->width*client->height*client->format.bitsPerPixel/8);
@ -94,7 +94,7 @@ rfbClient* rfbGetClient(int* argc,char** argv,
return client; return client;
} }
Bool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort) rfbBool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort)
{ {
/* Unless we accepted an incoming connection, make a TCP connection to the /* Unless we accepted an incoming connection, make a TCP connection to the
given VNC server */ given VNC server */

@ -30,7 +30,7 @@
#define HandleZlibBPP CONCAT2E(HandleZlib,BPP) #define HandleZlibBPP CONCAT2E(HandleZlib,BPP)
#define CARDBPP CONCAT2E(uint,BPP,_t) #define CARDBPP CONCAT2E(uint,BPP,_t)
static Bool static rfbBool
HandleZlibBPP (rfbClient* client, int rx, int ry, int rw, int rh) HandleZlibBPP (rfbClient* client, int rx, int ry, int rw, int rh)
{ {
rfbZlibHeader hdr; rfbZlibHeader hdr;

@ -10,8 +10,8 @@
* see GPL (latest version) for full details * see GPL (latest version) for full details
*/ */
#include "rfb.h" #include <rfb/rfb.h>
#include "rfbregion.h" #include <rfb/rfbregion.h>
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>
@ -21,7 +21,7 @@
#define true -1 #define true -1
#endif #endif
#ifdef HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
@ -34,7 +34,7 @@
#include <signal.h> #include <signal.h>
#include <time.h> #include <time.h>
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
MUTEX(logMutex); MUTEX(logMutex);
#endif #endif
@ -133,7 +133,7 @@ void rfbScheduleCopyRegion(rfbScreenInfoPtr rfbScreen,sraRegionPtr copyRegion,in
#if 0 #if 0
/* TODO: is this needed? Or does it mess up deferring? */ /* TODO: is this needed? Or does it mess up deferring? */
/* while(!sraRgnEmpty(cl->copyRegion)) */ { /* while(!sraRgnEmpty(cl->copyRegion)) */ {
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
if(!cl->screen->backgroundLoop) if(!cl->screen->backgroundLoop)
#endif #endif
{ {
@ -234,12 +234,12 @@ void rfbMarkRectAsModified(rfbScreenInfoPtr rfbScreen,int x1,int y1,int x2,int y
sraRgnDestroy(region); sraRgnDestroy(region);
} }
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
static void * static void *
clientOutput(void *data) clientOutput(void *data)
{ {
rfbClientPtr cl = (rfbClientPtr)data; rfbClientPtr cl = (rfbClientPtr)data;
Bool haveUpdate; rfbBool haveUpdate;
sraRegion* updateRegion; sraRegion* updateRegion;
while (1) { while (1) {
@ -360,7 +360,7 @@ rfbRefuseOnHoldClient(rfbClientPtr cl)
} }
static void static void
defaultKbdAddEvent(Bool down, KeySym keySym, rfbClientPtr cl) defaultKbdAddEvent(rfbBool down, rfbKeySym keySym, rfbClientPtr cl)
{ {
} }
@ -434,7 +434,7 @@ rfbCursorPtr defaultGetCursorPtr(rfbClientPtr cl)
} }
/* response is cl->authChallenge vncEncrypted with passwd */ /* response is cl->authChallenge vncEncrypted with passwd */
Bool defaultPasswordCheck(rfbClientPtr cl,const char* response,int len) rfbBool defaultPasswordCheck(rfbClientPtr cl,const char* response,int len)
{ {
int i; int i;
char *passwd=vncDecryptPasswdFromFile(cl->screen->rfbAuthPasswdData); char *passwd=vncDecryptPasswdFromFile(cl->screen->rfbAuthPasswdData);
@ -464,7 +464,7 @@ Bool defaultPasswordCheck(rfbClientPtr cl,const char* response,int len)
/* for this method, rfbAuthPasswdData is really a pointer to an array /* for this method, rfbAuthPasswdData is really a pointer to an array
of char*'s, where the last pointer is 0. */ of char*'s, where the last pointer is 0. */
Bool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len) rfbBool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len)
{ {
char **passwds; char **passwds;
int i=0; int i=0;
@ -586,7 +586,10 @@ rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,
rfbScreen->passwordCheck = defaultPasswordCheck; rfbScreen->passwordCheck = defaultPasswordCheck;
rfbProcessArguments(rfbScreen,argc,argv); if(!rfbProcessArguments(rfbScreen,argc,argv)) {
free(rfbScreen);
return 0;
}
#ifdef WIN32 #ifdef WIN32
{ {
@ -649,7 +652,7 @@ void rfbNewFramebuffer(rfbScreenInfoPtr rfbScreen, char *framebuffer,
int bytesPerPixel) int bytesPerPixel)
{ {
rfbPixelFormat old_format; rfbPixelFormat old_format;
Bool format_changed = FALSE; rfbBool format_changed = FALSE;
rfbClientIteratorPtr iterator; rfbClientIteratorPtr iterator;
rfbClientPtr cl; rfbClientPtr cl;
@ -747,7 +750,7 @@ void rfbInitServer(rfbScreenInfoPtr rfbScreen)
httpInitSockets(rfbScreen); httpInitSockets(rfbScreen);
} }
#ifndef HAVE_GETTIMEOFDAY #ifndef LIBVNCSERVER_HAVE_GETTIMEOFDAY
#include <fcntl.h> #include <fcntl.h>
#include <conio.h> #include <conio.h>
#include <sys/timeb.h> #include <sys/timeb.h>
@ -810,10 +813,10 @@ rfbProcessEvents(rfbScreenInfoPtr rfbScreen,long usec)
rfbReleaseClientIterator(i); rfbReleaseClientIterator(i);
} }
void rfbRunEventLoop(rfbScreenInfoPtr rfbScreen, long usec, Bool runInBackground) void rfbRunEventLoop(rfbScreenInfoPtr rfbScreen, long usec, rfbBool runInBackground)
{ {
if(runInBackground) { if(runInBackground) {
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
pthread_t listener_thread; pthread_t listener_thread;
rfbScreen->backgroundLoop = TRUE; rfbScreen->backgroundLoop = TRUE;
@ -822,7 +825,7 @@ void rfbRunEventLoop(rfbScreenInfoPtr rfbScreen, long usec, Bool runInBackground
return; return;
#else #else
rfbLog("Can't run in background, because I don't have PThreads!\n"); rfbLog("Can't run in background, because I don't have PThreads!\n");
exit(-1); return;
#endif #endif
} }

@ -37,11 +37,11 @@ extern "C"
#include <string.h> #include <string.h>
#include <rfb/rfbproto.h> #include <rfb/rfbproto.h>
#ifdef HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
#include <pthread.h> #include <pthread.h>
#if 0 /* debugging */ #if 0 /* debugging */
#define LOCK(mutex) (rfbLog("%s:%d LOCK(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex)), pthread_mutex_lock(&(mutex))) #define LOCK(mutex) (rfbLog("%s:%d LOCK(%s,0x%x)\n",__FILE__,__LINE__,#mutex,&(mutex)), pthread_mutex_lock(&(mutex)))
@ -84,18 +84,18 @@ extern "C"
/* end of stuff for autoconf */ /* end of stuff for autoconf */
/* if you use pthreads, but don't define HAVE_LIBPTHREAD, the structs /* if you use pthreads, but don't define LIBVNCSERVER_HAVE_LIBPTHREAD, the structs
get all mixed up. So this gives a linker error reminding you to compile get all mixed up. So this gives a linker error reminding you to compile
the library and your application (at least the parts including rfb.h) the library and your application (at least the parts including rfb.h)
with the same support for pthreads. */ with the same support for pthreads. */
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
#define rfbInitServer rfbInitServerWithPthreadsAndZRLE #define rfbInitServer rfbInitServerWithPthreadsAndZRLE
#else #else
#define rfbInitServer rfbInitServerWithPthreadsButWithoutZRLE #define rfbInitServer rfbInitServerWithPthreadsButWithoutZRLE
#endif #endif
#else #else
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
#define rfbInitServer rfbInitServerWithoutPthreadsButWithZRLE #define rfbInitServer rfbInitServerWithoutPthreadsButWithZRLE
#else #else
#define rfbInitServer rfbInitServerWithoutPthreadsAndZRLE #define rfbInitServer rfbInitServerWithoutPthreadsAndZRLE
@ -112,19 +112,19 @@ enum rfbNewClientAction {
RFB_CLIENT_REFUSE RFB_CLIENT_REFUSE
}; };
typedef void (*KbdAddEventProcPtr) (Bool down, KeySym keySym, struct _rfbClientRec* cl); typedef void (*KbdAddEventProcPtr) (rfbBool down, rfbKeySym keySym, struct _rfbClientRec* cl);
typedef void (*KbdReleaseAllKeysProcPtr) (struct _rfbClientRec* cl); typedef void (*KbdReleaseAllKeysProcPtr) (struct _rfbClientRec* cl);
typedef void (*PtrAddEventProcPtr) (int buttonMask, int x, int y, struct _rfbClientRec* cl); typedef void (*PtrAddEventProcPtr) (int buttonMask, int x, int y, struct _rfbClientRec* cl);
typedef void (*SetXCutTextProcPtr) (char* str,int len, struct _rfbClientRec* cl); typedef void (*SetXCutTextProcPtr) (char* str,int len, struct _rfbClientRec* cl);
typedef struct rfbCursor* (*GetCursorProcPtr) (struct _rfbClientRec* pScreen); typedef struct rfbCursor* (*GetCursorProcPtr) (struct _rfbClientRec* pScreen);
typedef Bool (*SetTranslateFunctionProcPtr)(struct _rfbClientRec* cl); typedef rfbBool (*SetTranslateFunctionProcPtr)(struct _rfbClientRec* cl);
typedef Bool (*PasswordCheckProcPtr)(struct _rfbClientRec* cl,const char* encryptedPassWord,int len); typedef rfbBool (*PasswordCheckProcPtr)(struct _rfbClientRec* cl,const char* encryptedPassWord,int len);
typedef enum rfbNewClientAction (*NewClientHookPtr)(struct _rfbClientRec* cl); typedef enum rfbNewClientAction (*NewClientHookPtr)(struct _rfbClientRec* cl);
typedef void (*DisplayHookPtr)(struct _rfbClientRec* cl); typedef void (*DisplayHookPtr)(struct _rfbClientRec* cl);
typedef struct { typedef struct {
uint32_t count; uint32_t count;
Bool is16; /* is the data format short? */ rfbBool is16; /* is the data format short? */
union { union {
uint8_t* bytes; uint8_t* bytes;
uint16_t* shorts; uint16_t* shorts;
@ -146,8 +146,8 @@ typedef struct _rfbScreenInfo
int bitsPerPixel; int bitsPerPixel;
int sizeInBytes; int sizeInBytes;
Pixel blackPixel; rfbPixel blackPixel;
Pixel whitePixel; rfbPixel whitePixel;
/* some screen specific data can be put into a struct where screenData /* some screen specific data can be put into a struct where screenData
* points to. You need this if you have more than one screen at the * points to. You need this if you have more than one screen at the
@ -192,8 +192,8 @@ typedef struct _rfbScreenInfo
dontSendFramebufferUpdate to TRUE, and all the drawing routines check dontSendFramebufferUpdate to TRUE, and all the drawing routines check
this before calling rfbSendFramebufferUpdate. */ this before calling rfbSendFramebufferUpdate. */
Bool cursorIsDrawn; /* TRUE if the cursor is currently drawn */ rfbBool cursorIsDrawn; /* TRUE if the cursor is currently drawn */
Bool dontSendFramebufferUpdate; /* TRUE while removing or drawing the rfbBool dontSendFramebufferUpdate; /* TRUE while removing or drawing the
cursor */ cursor */
/* additions by libvncserver */ /* additions by libvncserver */
@ -203,28 +203,28 @@ typedef struct _rfbScreenInfo
const char* desktopName; const char* desktopName;
char rfbThisHost[255]; char rfbThisHost[255];
Bool autoPort; rfbBool autoPort;
int rfbPort; int rfbPort;
SOCKET rfbListenSock; SOCKET rfbListenSock;
int maxSock; int maxSock;
int maxFd; int maxFd;
fd_set allFds; fd_set allFds;
Bool socketInitDone; rfbBool socketInitDone;
SOCKET inetdSock; SOCKET inetdSock;
Bool inetdInitDone; rfbBool inetdInitDone;
int udpPort; int udpPort;
SOCKET udpSock; SOCKET udpSock;
struct _rfbClientRec* udpClient; struct _rfbClientRec* udpClient;
Bool udpSockConnected; rfbBool udpSockConnected;
struct sockaddr_in udpRemoteAddr; struct sockaddr_in udpRemoteAddr;
int rfbMaxClientWait; int rfbMaxClientWait;
/* http stuff */ /* http stuff */
Bool httpInitDone; rfbBool httpInitDone;
Bool httpEnableProxyConnect; rfbBool httpEnableProxyConnect;
int httpPort; int httpPort;
char* httpDir; char* httpDir;
SOCKET httpListenSock; SOCKET httpListenSock;
@ -242,15 +242,15 @@ typedef struct _rfbScreenInfo
* an update. */ * an update. */
int rfbDeferUpdateTime; int rfbDeferUpdateTime;
char* rfbScreen; char* rfbScreen;
Bool rfbAlwaysShared; rfbBool rfbAlwaysShared;
Bool rfbNeverShared; rfbBool rfbNeverShared;
Bool rfbDontDisconnect; rfbBool rfbDontDisconnect;
struct _rfbClientRec* rfbClientHead; struct _rfbClientRec* rfbClientHead;
/* cursor */ /* cursor */
int cursorX, cursorY,underCursorBufferLen; int cursorX, cursorY,underCursorBufferLen;
char* underCursorBuffer; char* underCursorBuffer;
Bool dontConvertRichCursorToXCursor; rfbBool dontConvertRichCursorToXCursor;
struct rfbCursor* cursor; struct rfbCursor* cursor;
/* the frameBufferhas to be supplied by the serving process. /* the frameBufferhas to be supplied by the serving process.
@ -269,9 +269,9 @@ typedef struct _rfbScreenInfo
/* displayHook is called just before a frame buffer update */ /* displayHook is called just before a frame buffer update */
DisplayHookPtr displayHook; DisplayHookPtr displayHook;
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
MUTEX(cursorMutex); MUTEX(cursorMutex);
Bool backgroundLoop; rfbBool backgroundLoop;
#endif #endif
} rfbScreenInfo, *rfbScreenInfoPtr; } rfbScreenInfo, *rfbScreenInfoPtr;
@ -316,7 +316,7 @@ typedef struct _rfbClientRec {
SOCKET sock; SOCKET sock;
char *host; char *host;
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
pthread_t client_thread; pthread_t client_thread;
#endif #endif
/* Possible client states: */ /* Possible client states: */
@ -327,14 +327,14 @@ typedef struct _rfbClientRec {
RFB_NORMAL /* normal protocol messages */ RFB_NORMAL /* normal protocol messages */
} state; } state;
Bool reverseConnection; rfbBool reverseConnection;
Bool onHold; rfbBool onHold;
Bool readyForSetColourMapEntries; rfbBool readyForSetColourMapEntries;
Bool useCopyRect; rfbBool useCopyRect;
int preferredEncoding; int preferredEncoding;
int correMaxWidth, correMaxHeight; int correMaxWidth, correMaxHeight;
Bool viewOnly; rfbBool viewOnly;
/* The following member is only used during VNC authentication */ /* The following member is only used during VNC authentication */
uint8_t authChallenge[CHALLENGESIZE]; uint8_t authChallenge[CHALLENGESIZE];
@ -415,42 +415,42 @@ typedef struct _rfbClientRec {
int rfbKeyEventsRcvd; int rfbKeyEventsRcvd;
int rfbPointerEventsRcvd; int rfbPointerEventsRcvd;
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
/* zlib encoding -- necessary compression state info per client */ /* zlib encoding -- necessary compression state info per client */
struct z_stream_s compStream; struct z_stream_s compStream;
Bool compStreamInited; rfbBool compStreamInited;
uint32_t zlibCompressLevel; uint32_t zlibCompressLevel;
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
/* tight encoding -- preserve zlib streams' state for each client */ /* tight encoding -- preserve zlib streams' state for each client */
//#ifdef HAVE_LIBJPEG //#ifdef LIBVNCSERVER_HAVE_LIBJPEG
z_stream zsStruct[4]; z_stream zsStruct[4];
Bool zsActive[4]; rfbBool zsActive[4];
int zsLevel[4]; int zsLevel[4];
int tightCompressLevel; int tightCompressLevel;
int tightQualityLevel; int tightQualityLevel;
#endif #endif
#endif #endif
Bool enableLastRectEncoding; /* client supports LastRect encoding */ rfbBool enableLastRectEncoding; /* client supports LastRect encoding */
Bool enableCursorShapeUpdates; /* client supports cursor shape updates */ rfbBool enableCursorShapeUpdates; /* client supports cursor shape updates */
Bool enableCursorPosUpdates; /* client supports cursor position updates */ rfbBool enableCursorPosUpdates; /* client supports cursor position updates */
Bool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */ rfbBool useRichCursorEncoding; /* rfbEncodingRichCursor is preferred */
Bool cursorWasChanged; /* cursor shape update should be sent */ rfbBool cursorWasChanged; /* cursor shape update should be sent */
Bool cursorWasMoved; /* cursor position update should be sent */ rfbBool cursorWasMoved; /* cursor position update should be sent */
Bool useNewFBSize; /* client supports NewFBSize encoding */ rfbBool useNewFBSize; /* client supports NewFBSize encoding */
Bool newFBSizePending; /* framebuffer size was changed */ rfbBool newFBSizePending; /* framebuffer size was changed */
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
Bool enableBackChannel; /* custom channel for special clients */ rfbBool enableBackChannel; /* custom channel for special clients */
#endif #endif
struct _rfbClientRec *prev; struct _rfbClientRec *prev;
struct _rfbClientRec *next; struct _rfbClientRec *next;
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
/* whenever a client is referenced, the refCount has to be incremented /* whenever a client is referenced, the refCount has to be incremented
and afterwards decremented, so that the client is not cleaned up and afterwards decremented, so that the client is not cleaned up
while being referenced. while being referenced.
@ -465,7 +465,7 @@ typedef struct _rfbClientRec {
COND(updateCond); COND(updateCond);
#endif #endif
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
void* zrleData; void* zrleData;
#endif #endif
@ -543,33 +543,33 @@ extern void rfbProcessClientMessage(rfbClientPtr cl);
extern void rfbClientConnFailed(rfbClientPtr cl, char *reason); extern void rfbClientConnFailed(rfbClientPtr cl, char *reason);
extern void rfbNewUDPConnection(rfbScreenInfoPtr rfbScreen,int sock); extern void rfbNewUDPConnection(rfbScreenInfoPtr rfbScreen,int sock);
extern void rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen); extern void rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen);
extern Bool rfbSendFramebufferUpdate(rfbClientPtr cl, sraRegionPtr updateRegion); extern rfbBool rfbSendFramebufferUpdate(rfbClientPtr cl, sraRegionPtr updateRegion);
extern Bool rfbSendRectEncodingRaw(rfbClientPtr cl, int x,int y,int w,int h); extern rfbBool rfbSendRectEncodingRaw(rfbClientPtr cl, int x,int y,int w,int h);
extern Bool rfbSendUpdateBuf(rfbClientPtr cl); extern rfbBool rfbSendUpdateBuf(rfbClientPtr cl);
extern void rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len); extern void rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len);
extern Bool rfbSendCopyRegion(rfbClientPtr cl,sraRegionPtr reg,int dx,int dy); extern rfbBool rfbSendCopyRegion(rfbClientPtr cl,sraRegionPtr reg,int dx,int dy);
extern Bool rfbSendLastRectMarker(rfbClientPtr cl); extern rfbBool rfbSendLastRectMarker(rfbClientPtr cl);
extern Bool rfbSendNewFBSize(rfbClientPtr cl, int w, int h); extern rfbBool rfbSendNewFBSize(rfbClientPtr cl, int w, int h);
extern Bool rfbSendSetColourMapEntries(rfbClientPtr cl, int firstColour, int nColours); extern rfbBool rfbSendSetColourMapEntries(rfbClientPtr cl, int firstColour, int nColours);
extern void rfbSendBell(rfbScreenInfoPtr rfbScreen); extern void rfbSendBell(rfbScreenInfoPtr rfbScreen);
void rfbGotXCutText(rfbScreenInfoPtr rfbScreen, char *str, int len); void rfbGotXCutText(rfbScreenInfoPtr rfbScreen, char *str, int len);
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
extern void rfbSendBackChannel(rfbScreenInfoPtr s,char* message,int len); extern void rfbSendBackChannel(rfbScreenInfoPtr s,char* message,int len);
#endif #endif
/* translate.c */ /* translate.c */
extern Bool rfbEconomicTranslate; extern rfbBool rfbEconomicTranslate;
extern void rfbTranslateNone(char *table, rfbPixelFormat *in, extern void rfbTranslateNone(char *table, rfbPixelFormat *in,
rfbPixelFormat *out, rfbPixelFormat *out,
char *iptr, char *optr, char *iptr, char *optr,
int bytesBetweenInputLines, int bytesBetweenInputLines,
int width, int height); int width, int height);
extern Bool rfbSetTranslateFunction(rfbClientPtr cl); extern rfbBool rfbSetTranslateFunction(rfbClientPtr cl);
extern Bool rfbSetClientColourMap(rfbClientPtr cl, int firstColour, int nColours); extern rfbBool rfbSetClientColourMap(rfbClientPtr cl, int firstColour, int nColours);
extern void rfbSetClientColourMaps(rfbScreenInfoPtr rfbScreen, int firstColour, int nColours); extern void rfbSetClientColourMaps(rfbScreenInfoPtr rfbScreen, int firstColour, int nColours);
/* httpd.c */ /* httpd.c */
@ -587,21 +587,21 @@ extern void rfbAuthProcessClientMessage(rfbClientPtr cl);
/* rre.c */ /* rre.c */
extern Bool rfbSendRectEncodingRRE(rfbClientPtr cl, int x,int y,int w,int h); extern rfbBool rfbSendRectEncodingRRE(rfbClientPtr cl, int x,int y,int w,int h);
/* corre.c */ /* corre.c */
extern Bool rfbSendRectEncodingCoRRE(rfbClientPtr cl, int x,int y,int w,int h); extern rfbBool rfbSendRectEncodingCoRRE(rfbClientPtr cl, int x,int y,int w,int h);
/* hextile.c */ /* hextile.c */
extern Bool rfbSendRectEncodingHextile(rfbClientPtr cl, int x, int y, int w, extern rfbBool rfbSendRectEncodingHextile(rfbClientPtr cl, int x, int y, int w,
int h); int h);
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
/* zlib.c */ /* zlib.c */
/* Minimum zlib rectangle size in bytes. Anything smaller will /* Minimum zlib rectangle size in bytes. Anything smaller will
@ -616,18 +616,18 @@ extern Bool rfbSendRectEncodingHextile(rfbClientPtr cl, int x, int y, int w,
#define ZLIB_MAX_SIZE(min) ((( min * 2 ) > ZLIB_MAX_RECT_SIZE ) ? \ #define ZLIB_MAX_SIZE(min) ((( min * 2 ) > ZLIB_MAX_RECT_SIZE ) ? \
( min * 2 ) : ZLIB_MAX_RECT_SIZE ) ( min * 2 ) : ZLIB_MAX_RECT_SIZE )
extern Bool rfbSendRectEncodingZlib(rfbClientPtr cl, int x, int y, int w, extern rfbBool rfbSendRectEncodingZlib(rfbClientPtr cl, int x, int y, int w,
int h); int h);
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
/* tight.c */ /* tight.c */
#define TIGHT_DEFAULT_COMPRESSION 6 #define TIGHT_DEFAULT_COMPRESSION 6
extern Bool rfbTightDisableGradient; extern rfbBool rfbTightDisableGradient;
extern int rfbNumCodedRectsTight(rfbClientPtr cl, int x,int y,int w,int h); extern int rfbNumCodedRectsTight(rfbClientPtr cl, int x,int y,int w,int h);
extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h); extern rfbBool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h);
#endif #endif
#endif #endif
@ -636,7 +636,7 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h);
typedef struct rfbCursor { typedef struct rfbCursor {
/* set this to true if LibVNCServer has to free this cursor */ /* set this to true if LibVNCServer has to free this cursor */
Bool cleanup, cleanupSource, cleanupMask, cleanupRichSource; rfbBool cleanup, cleanupSource, cleanupMask, cleanupRichSource;
unsigned char *source; /* points to bits */ unsigned char *source; /* points to bits */
unsigned char *mask; /* points to bits */ unsigned char *mask; /* points to bits */
unsigned short width, height, xhot, yhot; /* metrics */ unsigned short width, height, xhot, yhot; /* metrics */
@ -646,8 +646,8 @@ typedef struct rfbCursor {
} rfbCursor, *rfbCursorPtr; } rfbCursor, *rfbCursorPtr;
extern unsigned char rfbReverseByte[0x100]; extern unsigned char rfbReverseByte[0x100];
extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/); extern rfbBool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);
extern Bool rfbSendCursorPos(rfbClientPtr cl); extern rfbBool rfbSendCursorPos(rfbClientPtr cl);
extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap); extern void rfbConvertLSBCursorBitmapOrMask(int width,int height,unsigned char* bitmap);
extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString); extern rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskString);
extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString); extern char* rfbMakeMaskForXCursor(int width,int height,char* cursorString);
@ -656,14 +656,14 @@ extern void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cu
extern void rfbFreeCursor(rfbCursorPtr cursor); extern void rfbFreeCursor(rfbCursorPtr cursor);
extern void rfbDrawCursor(rfbScreenInfoPtr rfbScreen); extern void rfbDrawCursor(rfbScreenInfoPtr rfbScreen);
extern void rfbUndrawCursor(rfbScreenInfoPtr rfbScreen); extern void rfbUndrawCursor(rfbScreenInfoPtr rfbScreen);
extern void rfbSetCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr c,Bool freeOld); extern void rfbSetCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr c,rfbBool freeOld);
/* cursor handling for the pointer */ /* cursor handling for the pointer */
extern void defaultPtrAddEvent(int buttonMask,int x,int y,rfbClientPtr cl); extern void defaultPtrAddEvent(int buttonMask,int x,int y,rfbClientPtr cl);
/* zrle.c */ /* zrle.c */
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
extern Bool rfbSendRectEncodingZRLE(rfbClientPtr cl, int x, int y, int w,int h); extern rfbBool rfbSendRectEncodingZRLE(rfbClientPtr cl, int x, int y, int w,int h);
extern void FreeZrleData(rfbClientPtr cl); extern void FreeZrleData(rfbClientPtr cl);
#endif #endif
@ -684,11 +684,11 @@ typedef struct rfbFontData {
int* metaData; int* metaData;
} rfbFontData,* rfbFontDataPtr; } rfbFontData,* rfbFontDataPtr;
int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,unsigned char c,Pixel colour); int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,unsigned char c,rfbPixel colour);
void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const char* string,Pixel colour); void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const char* string,rfbPixel colour);
/* if colour==backColour, background is transparent */ /* if colour==backColour, background is transparent */
int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,unsigned char c,int x1,int y1,int x2,int y2,Pixel colour,Pixel backColour); int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,unsigned char c,int x1,int y1,int x2,int y2,rfbPixel colour,rfbPixel backColour);
void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const char* string,int x1,int y1,int x2,int y2,Pixel colour,Pixel backColour); void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const char* string,int x1,int y1,int x2,int y2,rfbPixel colour,rfbPixel backColour);
int rfbWidthOfString(rfbFontDataPtr font,const char* string); int rfbWidthOfString(rfbFontDataPtr font,const char* string);
int rfbWidthOfChar(rfbFontDataPtr font,unsigned char c); int rfbWidthOfChar(rfbFontDataPtr font,unsigned char c);
void rfbFontBBox(rfbFontDataPtr font,unsigned char c,int* x1,int* y1,int* x2,int* y2); void rfbFontBBox(rfbFontDataPtr font,unsigned char c,int* x1,int* y1,int* x2,int* y2);
@ -703,9 +703,9 @@ void rfbFreeFont(rfbFontDataPtr font);
/* draw.c */ /* draw.c */
/* You have to call rfbUndrawCursor before using these functions */ /* You have to call rfbUndrawCursor before using these functions */
void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col); void rfbFillRect(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col);
void rfbDrawPixel(rfbScreenInfoPtr s,int x,int y,Pixel col); void rfbDrawPixel(rfbScreenInfoPtr s,int x,int y,rfbPixel col);
void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col); void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,rfbPixel col);
/* selbox.c */ /* selbox.c */
@ -717,15 +717,15 @@ typedef void (*SelectionChangedHookPtr)(int index);
extern int rfbSelectBox(rfbScreenInfoPtr rfbScreen, extern int rfbSelectBox(rfbScreenInfoPtr rfbScreen,
rfbFontDataPtr font, char** list, rfbFontDataPtr font, char** list,
int x1, int y1, int x2, int y2, int x1, int y1, int x2, int y2,
Pixel foreColour, Pixel backColour, rfbPixel foreColour, rfbPixel backColour,
int border,SelectionChangedHookPtr selChangedHook); int border,SelectionChangedHookPtr selChangedHook);
/* cargs.c */ /* cargs.c */
extern void rfbUsage(void); extern void rfbUsage(void);
extern void rfbPurgeArguments(int* argc,int* position,int count,char *argv[]); extern void rfbPurgeArguments(int* argc,int* position,int count,char *argv[]);
extern void rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[]); extern rfbBool rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[]);
extern void rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[]); extern rfbBool rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[]);
/* main.c */ /* main.c */
@ -745,7 +745,7 @@ void doNothingWithClient(rfbClientPtr cl);
enum rfbNewClientAction defaultNewClientHook(rfbClientPtr cl); enum rfbNewClientAction defaultNewClientHook(rfbClientPtr cl);
/* to check against plain passwords */ /* to check against plain passwords */
Bool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len); rfbBool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len);
/* functions to make a vnc server */ /* functions to make a vnc server */
extern rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv, extern rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,
@ -769,7 +769,7 @@ extern void rfbRefuseOnHoldClient(rfbClientPtr cl);
if you are using the event loop, set this to some value > 0, so the if you are using the event loop, set this to some value > 0, so the
server doesn't get a high load just by listening. */ server doesn't get a high load just by listening. */
extern void rfbRunEventLoop(rfbScreenInfoPtr screenInfo, long usec, Bool runInBackground); extern void rfbRunEventLoop(rfbScreenInfoPtr screenInfo, long usec, rfbBool runInBackground);
extern void rfbProcessEvents(rfbScreenInfoPtr screenInfo,long usec); extern void rfbProcessEvents(rfbScreenInfoPtr screenInfo,long usec);
#endif #endif

@ -53,27 +53,27 @@
typedef struct { typedef struct {
Bool shareDesktop; rfbBool shareDesktop;
Bool viewOnly; rfbBool viewOnly;
Bool fullScreen; rfbBool fullScreen;
Bool grabKeyboard; rfbBool grabKeyboard;
Bool raiseOnBeep; rfbBool raiseOnBeep;
const char* encodingsString; const char* encodingsString;
Bool useBGR233; rfbBool useBGR233;
int nColours; int nColours;
Bool useSharedColours; rfbBool useSharedColours;
Bool forceOwnCmap; rfbBool forceOwnCmap;
Bool forceTrueColour; rfbBool forceTrueColour;
int requestedDepth; int requestedDepth;
Bool useShm; rfbBool useShm;
int wmDecorationWidth; int wmDecorationWidth;
int wmDecorationHeight; int wmDecorationHeight;
Bool debug; rfbBool debug;
int popupButtonCount; int popupButtonCount;
@ -82,19 +82,19 @@ typedef struct {
int compressLevel; int compressLevel;
int qualityLevel; int qualityLevel;
Bool enableJPEG; rfbBool enableJPEG;
Bool useRemoteCursor; rfbBool useRemoteCursor;
} AppData; } AppData;
struct _rfbClient; struct _rfbClient;
typedef Bool (*HandleCursorPosProc)(struct _rfbClient* client, int x, int y); typedef rfbBool (*HandleCursorPosProc)(struct _rfbClient* client, int x, int y);
typedef void (*SoftCursorLockAreaProc)(struct _rfbClient* client, int x, int y, int w, int h); typedef void (*SoftCursorLockAreaProc)(struct _rfbClient* client, int x, int y, int w, int h);
typedef void (*SoftCursorUnlockScreenProc)(struct _rfbClient* client); typedef void (*SoftCursorUnlockScreenProc)(struct _rfbClient* client);
typedef void (*GotFrameBufferUpdateProc)(struct _rfbClient* client, int x, int y, int w, int h); typedef void (*GotFrameBufferUpdateProc)(struct _rfbClient* client, int x, int y, int w, int h);
typedef char* (*GetPasswordProc)(struct _rfbClient* client); typedef char* (*GetPasswordProc)(struct _rfbClient* client);
typedef Bool (*MallocFrameBufferProc)(struct _rfbClient* client); typedef rfbBool (*MallocFrameBufferProc)(struct _rfbClient* client);
typedef void (*BellProc)(struct _rfbClient* client); typedef void (*BellProc)(struct _rfbClient* client);
typedef struct _rfbClient { typedef struct _rfbClient {
@ -108,7 +108,7 @@ typedef struct _rfbClient {
const char* programName; const char* programName;
const char* serverHost; const char* serverHost;
int serverPort; int serverPort;
Bool listenSpecified; rfbBool listenSpecified;
int listenPort, flashPort; int listenPort, flashPort;
/* Note that the CoRRE encoding uses this buffer and assumes it is big enough /* Note that the CoRRE encoding uses this buffer and assumes it is big enough
@ -122,13 +122,13 @@ typedef struct _rfbClient {
/* rfbproto.c */ /* rfbproto.c */
int sock; int sock;
Bool canUseCoRRE; rfbBool canUseCoRRE;
Bool canUseHextile; rfbBool canUseHextile;
char *desktopName; char *desktopName;
rfbPixelFormat format; rfbPixelFormat format;
rfbServerInitMsg si; rfbServerInitMsg si;
char *serverCutText; char *serverCutText;
Bool newServerCutText; rfbBool newServerCutText;
/* cursor.c */ /* cursor.c */
uint8_t *rcSource, *rcMask; uint8_t *rcSource, *rcMask;
@ -147,7 +147,7 @@ typedef struct _rfbClient {
// TODO: make callback // TODO: make callback
extern Bool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc); extern rfbBool HandleCursorShape(rfbClient* client,int xhot, int yhot, int width, int height, uint32_t enc);
/* listen.c */ /* listen.c */
@ -155,38 +155,38 @@ extern void listenForIncomingConnections(rfbClient* viewer);
/* rfbproto.c */ /* rfbproto.c */
extern Bool rfbEnableClientLogging; extern rfbBool rfbEnableClientLogging;
extern void rfbClientLog(const char *format, ...); extern void rfbClientLog(const char *format, ...);
extern Bool ConnectToRFBServer(rfbClient* client,const char *hostname, int port); extern rfbBool ConnectToRFBServer(rfbClient* client,const char *hostname, int port);
extern Bool InitialiseRFBConnection(rfbClient* client); extern rfbBool InitialiseRFBConnection(rfbClient* client);
extern Bool SetFormatAndEncodings(rfbClient* client); extern rfbBool SetFormatAndEncodings(rfbClient* client);
extern Bool SendIncrementalFramebufferUpdateRequest(rfbClient* client); extern rfbBool SendIncrementalFramebufferUpdateRequest(rfbClient* client);
extern Bool SendFramebufferUpdateRequest(rfbClient* client, extern rfbBool SendFramebufferUpdateRequest(rfbClient* client,
int x, int y, int w, int h, int x, int y, int w, int h,
Bool incremental); rfbBool incremental);
extern Bool SendPointerEvent(rfbClient* client,int x, int y, int buttonMask); extern rfbBool SendPointerEvent(rfbClient* client,int x, int y, int buttonMask);
extern Bool SendKeyEvent(rfbClient* client,uint32_t key, Bool down); extern rfbBool SendKeyEvent(rfbClient* client,uint32_t key, rfbBool down);
extern Bool SendClientCutText(rfbClient* client,char *str, int len); extern rfbBool SendClientCutText(rfbClient* client,char *str, int len);
extern Bool HandleRFBServerMessage(rfbClient* client); extern rfbBool HandleRFBServerMessage(rfbClient* client);
extern void PrintPixelFormat(rfbPixelFormat *format); extern void PrintPixelFormat(rfbPixelFormat *format);
/* sockets.c */ /* sockets.c */
extern Bool errorMessageOnReadFailure; extern rfbBool errorMessageOnReadFailure;
extern Bool ReadFromRFBServer(rfbClient* client, char *out, unsigned int n); extern rfbBool ReadFromRFBServer(rfbClient* client, char *out, unsigned int n);
extern Bool WriteToRFBServer(rfbClient* client, char *buf, int n); extern rfbBool WriteToRFBServer(rfbClient* client, char *buf, int n);
extern int FindFreeTcpPort(void); extern int FindFreeTcpPort(void);
extern int ListenAtTcpPort(int port); extern int ListenAtTcpPort(int port);
extern int ConnectClientToTcpAddr(unsigned int host, int port); extern int ConnectClientToTcpAddr(unsigned int host, int port);
extern int AcceptTcpConnection(int listenSock); extern int AcceptTcpConnection(int listenSock);
extern Bool SetNonBlocking(int sock); extern rfbBool SetNonBlocking(int sock);
extern Bool StringToIPAddr(const char *str, unsigned int *addr); extern rfbBool StringToIPAddr(const char *str, unsigned int *addr);
extern Bool SameMachine(int sock); extern rfbBool SameMachine(int sock);
/* vncviewer.c */ /* vncviewer.c */
rfbClient* rfbGetClient(int* argc,char** argv,int bitsPerSample,int samplesPerPixel,int bytesPerPixel); rfbClient* rfbGetClient(int* argc,char** argv,int bitsPerSample,int samplesPerPixel,int bytesPerPixel);
Bool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort); rfbBool rfbInitClient(rfbClient* client,const char* vncServerHost,int vncServerPort);
void rfbClientCleanup(rfbClient* client); void rfbClientCleanup(rfbClient* client);

@ -1,4 +1,4 @@
/* rfb/rfbconfig.h.in. Generated from configure.ac by autoheader. */ /* rfb/rfbconfig.h.in. Generated automatically from configure.ac by autoheader. */
/* Enable 24 bit per pixel in native framebuffer */ /* Enable 24 bit per pixel in native framebuffer */
#undef ALLOW24BPP #undef ALLOW24BPP
@ -6,161 +6,146 @@
/* Enable BackChannel communication */ /* Enable BackChannel communication */
#undef BACKCHANNEL #undef BACKCHANNEL
/* Define to 1 if you have the <arpa/inet.h> header file. */ /* Define if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H #undef HAVE_ARPA_INET_H
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* Define if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT #undef HAVE_DOPRNT
/* Define to 1 if you have the <fcntl.h> header file. */ /* Define if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define to 1 if you have the `ftime' function. */ /* Define if you have the `ftime' function. */
#undef HAVE_FTIME #undef HAVE_FTIME
/* Define to 1 if you have the `gethostbyname' function. */ /* Define if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME #undef HAVE_GETHOSTBYNAME
/* Define to 1 if you have the `gethostname' function. */ /* Define if you have the `gethostname' function. */
#undef HAVE_GETHOSTNAME #undef HAVE_GETHOSTNAME
/* Define to 1 if you have the `gettimeofday' function. */ /* Define if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY #undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the `inet_ntoa' function. */ /* Define if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA #undef HAVE_INET_NTOA
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H #undef HAVE_INTTYPES_H
/* Define to 1 if you have the `jpeg' library (-ljpeg). */ /* Define if you have the `jpeg' library (-ljpeg). */
#undef HAVE_LIBJPEG #undef HAVE_LIBJPEG
/* Define to 1 if you have the `nsl' library (-lnsl). */ /* Define if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL #undef HAVE_LIBNSL
/* Define to 1 if you have the `pthread' library (-lpthread). */ /* Define if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD #undef HAVE_LIBPTHREAD
/* Define to 1 if you have the `socket' library (-lsocket). */ /* Define if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET #undef HAVE_LIBSOCKET
/* Define to 1 if you have the `z' library (-lz). */ /* Define if you have the `z' library (-lz). */
#undef HAVE_LIBZ #undef HAVE_LIBZ
/* Define to 1 if your system has a working `malloc' function. */ /* Define if your system has a working `malloc' function. */
#undef HAVE_MALLOC #undef HAVE_MALLOC
/* Define to 1 if you have the `memmove' function. */ /* Define if you have the `memmove' function. */
#undef HAVE_MEMMOVE #undef HAVE_MEMMOVE
/* Define to 1 if you have the <memory.h> header file. */ /* Define if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H #undef HAVE_MEMORY_H
/* Define to 1 if you have the `memset' function. */ /* Define if you have the `memset' function. */
#undef HAVE_MEMSET #undef HAVE_MEMSET
/* Define to 1 if you have the `mkfifo' function. */ /* Define if you have the `mkfifo' function. */
#undef HAVE_MKFIFO #undef HAVE_MKFIFO
/* Define to 1 if you have the <netdb.h> header file. */ /* Define if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H #undef HAVE_NETDB_H
/* Define to 1 if you have the <netinet/in.h> header file. */ /* Define if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H #undef HAVE_NETINET_IN_H
/* Define to 1 if you have the `select' function. */ /* Define if you have the `select' function. */
#undef HAVE_SELECT #undef HAVE_SELECT
/* Define to 1 if you have the `socket' function. */ /* Define if you have the `socket' function. */
#undef HAVE_SOCKET #undef HAVE_SOCKET
/* Define to 1 if `stat' has the bug that it succeeds when given the /* Define if `stat' has the bug that it succeeds when given the zero-length
zero-length file name argument. */ file name argument. */
#undef HAVE_STAT_EMPTY_STRING_BUG #undef HAVE_STAT_EMPTY_STRING_BUG
/* Define to 1 if you have the <stdint.h> header file. */ /* Define if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */ /* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* Define to 1 if you have the `strchr' function. */ /* Define if you have the `strchr' function. */
#undef HAVE_STRCHR #undef HAVE_STRCHR
/* Define to 1 if you have the `strcspn' function. */ /* Define if you have the `strcspn' function. */
#undef HAVE_STRCSPN #undef HAVE_STRCSPN
/* Define to 1 if you have the `strdup' function. */ /* Define if you have the `strdup' function. */
#undef HAVE_STRDUP #undef HAVE_STRDUP
/* Define to 1 if you have the `strerror' function. */ /* Define if you have the `strerror' function. */
#undef HAVE_STRERROR #undef HAVE_STRERROR
/* Define to 1 if you have the `strftime' function. */ /* Define if you have the `strftime' function. */
#undef HAVE_STRFTIME #undef HAVE_STRFTIME
/* Define to 1 if you have the <strings.h> header file. */ /* Define if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */ /* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H #undef HAVE_STRING_H
/* Define to 1 if you have the `strstr' function. */ /* Define if you have the `strstr' function. */
#undef HAVE_STRSTR #undef HAVE_STRSTR
/* Define to 1 if you have the <syslog.h> header file. */ /* Define if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H #undef HAVE_SYSLOG_H
/* Define to 1 if you have the <sys/socket.h> header file. */ /* Define if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H #undef HAVE_SYS_SOCKET_H
/* Define to 1 if you have the <sys/stat.h> header file. */ /* Define if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H #undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/timeb.h> header file. */ /* Define if you have the <sys/timeb.h> header file. */
#undef HAVE_SYS_TIMEB_H #undef HAVE_SYS_TIMEB_H
/* Define to 1 if you have the <sys/time.h> header file. */ /* Define if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H #undef HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H #undef HAVE_SYS_TYPES_H
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ /* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H #undef HAVE_SYS_WAIT_H
/* Define to 1 if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define to 1 if you have the `vprintf' function. */ /* Define if you have the `vprintf' function. */
#undef HAVE_VPRINTF #undef HAVE_VPRINTF
/* Use zrle compression; needs a c++ compiler */ /* Use zrle compression; needs a c++ compiler */
#undef HAVE_ZRLE #undef HAVE_ZRLE
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing /* Define if `lstat' dereferences a symlink specified with a trailing slash.
slash. */ */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The number of bytes in type char */ /* The number of bytes in type char */
#undef SIZEOF_CHAR #undef SIZEOF_CHAR
@ -176,20 +161,20 @@
/* The number of bytes in type void* */ /* The number of bytes in type void* */
#undef SIZEOF_VOIDP #undef SIZEOF_VOIDP
/* Define to 1 if you have the ANSI C header files. */ /* Define if you have the ANSI C header files. */
#undef STDC_HEADERS #undef STDC_HEADERS
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ /* Define if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME #undef TIME_WITH_SYS_TIME
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION
/* Define to 1 if your processor stores words with the most significant byte /* Define if your processor stores words with the most significant byte first
first (like Motorola and SPARC, unlike Intel and VAX). */ (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN #undef WORDS_BIGENDIAN
/* Define to 1 if the X Window System is missing or not being used. */ /* Define if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING #undef X_DISPLAY_MISSING
/* Define to empty if `const' does not conform to ANSI C. */ /* Define to empty if `const' does not conform to ANSI C. */

@ -52,39 +52,36 @@
#include <rfb/rfbint.h> #include <rfb/rfbint.h>
#include <rfb/keysym.h> #include <rfb/keysym.h>
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
#include <zlib.h> #include <zlib.h>
#endif #endif
#if defined(WIN32) #if defined(WIN32)
#define WORDS_BIGENDIAN #define WORDS_BIGENDIAN
#undef Bool #define rfbBool int
#define Bool int
#include <sys/timeb.h> #include <sys/timeb.h>
#include <winsock.h> #include <winsock.h>
#undef SOCKET #undef SOCKET
#define SOCKET int #define SOCKET int
#else #else
#define max(a,b) (((a)>(b))?(a):(b)) #define max(a,b) (((a)>(b))?(a):(b))
#ifdef HAVE_SYS_TIME_H #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifdef HAVE_NETINET_IN_H #ifdef LIBVNCSERVER_HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#define SOCKET int #define SOCKET int
#ifndef Bool typedef int8_t rfbBool;
typedef int8_t Bool;
#undef FALSE #undef FALSE
#define FALSE 0 #define FALSE 0
#undef TRUE #undef TRUE
#define TRUE -1 #define TRUE -1
#endif #endif
#endif
typedef uint32_t KeySym; typedef uint32_t rfbKeySym;
typedef uint32_t Pixel; typedef uint32_t rfbPixel;
#ifndef INADDR_NONE #ifndef INADDR_NONE
#define INADDR_NONE ((in_addr_t) 0xffffffff) #define INADDR_NONE ((in_addr_t) 0xffffffff)
@ -313,7 +310,7 @@ typedef struct {
#define rfbSetColourMapEntries 1 #define rfbSetColourMapEntries 1
#define rfbBell 2 #define rfbBell 2
#define rfbServerCutText 3 #define rfbServerCutText 3
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
#define rfbBackChannel 15 #define rfbBackChannel 15
#endif #endif
@ -341,15 +338,15 @@ typedef struct {
#define rfbEncodingRRE 2 #define rfbEncodingRRE 2
#define rfbEncodingCoRRE 4 #define rfbEncodingCoRRE 4
#define rfbEncodingHextile 5 #define rfbEncodingHextile 5
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
#define rfbEncodingZlib 6 #define rfbEncodingZlib 6
#define rfbEncodingTight 7 #define rfbEncodingTight 7
#define rfbEncodingZlibHex 8 #define rfbEncodingZlibHex 8
#endif #endif
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
#define rfbEncodingBackChannel 15 #define rfbEncodingBackChannel 15
#endif #endif
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
#define rfbEncodingZRLE 16 #define rfbEncodingZRLE 16
#endif #endif
@ -537,7 +534,7 @@ typedef struct {
#define rfbHextileExtractW(byte) (((byte) >> 4) + 1) #define rfbHextileExtractW(byte) (((byte) >> 4) + 1)
#define rfbHextileExtractH(byte) (((byte) & 0xf) + 1) #define rfbHextileExtractH(byte) (((byte) & 0xf) + 1)
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
* zlib - zlib compressed Encoding. We have an rfbZlibHeader structure * zlib - zlib compressed Encoding. We have an rfbZlibHeader structure
* giving the number of bytes following. Finally the data follows is * giving the number of bytes following. Finally the data follows is
@ -798,7 +795,7 @@ typedef struct {
#define sz_rfbServerCutTextMsg 8 #define sz_rfbServerCutTextMsg 8
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
typedef rfbServerCutTextMsg rfbBackChannelMsg; typedef rfbServerCutTextMsg rfbBackChannelMsg;
#define sz_rfbBackChannelMsg 8 #define sz_rfbBackChannelMsg 8
#endif #endif

@ -25,38 +25,38 @@ extern sraRegion *sraRgnCreateRgn(const sraRegion *src);
extern void sraRgnDestroy(sraRegion *rgn); extern void sraRgnDestroy(sraRegion *rgn);
extern void sraRgnMakeEmpty(sraRegion *rgn); extern void sraRgnMakeEmpty(sraRegion *rgn);
extern Bool sraRgnAnd(sraRegion *dst, const sraRegion *src); extern rfbBool sraRgnAnd(sraRegion *dst, const sraRegion *src);
extern void sraRgnOr(sraRegion *dst, const sraRegion *src); extern void sraRgnOr(sraRegion *dst, const sraRegion *src);
extern Bool sraRgnSubtract(sraRegion *dst, const sraRegion *src); extern rfbBool sraRgnSubtract(sraRegion *dst, const sraRegion *src);
extern void sraRgnOffset(sraRegion *dst, int dx, int dy); extern void sraRgnOffset(sraRegion *dst, int dx, int dy);
extern Bool sraRgnPopRect(sraRegion *region, sraRect *rect, extern rfbBool sraRgnPopRect(sraRegion *region, sraRect *rect,
unsigned long flags); unsigned long flags);
extern unsigned long sraRgnCountRects(const sraRegion *rgn); extern unsigned long sraRgnCountRects(const sraRegion *rgn);
extern Bool sraRgnEmpty(const sraRegion *rgn); extern rfbBool sraRgnEmpty(const sraRegion *rgn);
extern sraRegion *sraRgnBBox(const sraRegion *src); extern sraRegion *sraRgnBBox(const sraRegion *src);
/* -=- rectangle iterator */ /* -=- rectangle iterator */
typedef struct sraRectangleIterator { typedef struct sraRectangleIterator {
Bool reverseX,reverseY; rfbBool reverseX,reverseY;
int ptrSize,ptrPos; int ptrSize,ptrPos;
struct sraSpan** sPtrs; struct sraSpan** sPtrs;
} sraRectangleIterator; } sraRectangleIterator;
extern sraRectangleIterator *sraRgnGetIterator(sraRegion *s); extern sraRectangleIterator *sraRgnGetIterator(sraRegion *s);
extern sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,Bool reverseX,Bool reverseY); extern sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,rfbBool reverseX,rfbBool reverseY);
extern Bool sraRgnIteratorNext(sraRectangleIterator *i,sraRect *r); extern rfbBool sraRgnIteratorNext(sraRectangleIterator *i,sraRect *r);
extern void sraRgnReleaseIterator(sraRectangleIterator *i); extern void sraRgnReleaseIterator(sraRectangleIterator *i);
void sraRgnPrint(const sraRegion *s); void sraRgnPrint(const sraRegion *s);
/* -=- Rectangle clipper (for speed) */ /* -=- Rectangle clipper (for speed) */
extern Bool sraClipRect(int *x, int *y, int *w, int *h, extern rfbBool sraClipRect(int *x, int *y, int *w, int *h,
int cx, int cy, int cw, int ch); int cx, int cy, int cw, int ch);
#endif #endif

@ -5,8 +5,8 @@
* Only deals with rectangular regions, though. * Only deals with rectangular regions, though.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
#include "rfbregion.h" #include <rfb/rfbregion.h>
/* -=- Internal Span structure */ /* -=- Internal Span structure */
@ -82,7 +82,6 @@ sraSpanCheck(const sraSpan *span, const char *text) {
if (span->start == span->end) { if (span->start == span->end) {
printf(text); printf(text);
printf(":%d-%d\n", span->start, span->end); printf(":%d-%d\n", span->start, span->end);
exit(0);
} }
} }
@ -169,7 +168,7 @@ sraSpanListMakeEmpty(sraSpanList *list) {
list->back._next = NULL; list->back._next = NULL;
} }
Bool rfbBool
sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) { sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) {
sraSpan *sp1, *sp2; sraSpan *sp1, *sp2;
@ -178,7 +177,7 @@ sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) {
return 1; return 1;
} else { } else {
printf("sraSpanListEqual:incompatible spans (only one NULL!)\n"); printf("sraSpanListEqual:incompatible spans (only one NULL!)\n");
exit(1); return FALSE;
} }
} }
@ -202,7 +201,7 @@ sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) {
} }
} }
Bool rfbBool
sraSpanListEmpty(const sraSpanList *list) { sraSpanListEmpty(const sraSpanList *list) {
return (list->front._next == &(list->back)); return (list->front._next == &(list->back));
} }
@ -272,7 +271,7 @@ sraSpanListOr(sraSpanList *dest, const sraSpanList *src) {
return; return;
} else { } else {
printf("sraSpanListOr:incompatible spans (only one NULL!)\n"); printf("sraSpanListOr:incompatible spans (only one NULL!)\n");
exit(1); return;
} }
} }
@ -352,7 +351,7 @@ sraSpanListOr(sraSpanList *dest, const sraSpanList *src) {
} }
} }
Bool rfbBool
sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) { sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) {
sraSpan *d_curr, *s_curr, *d_next; sraSpan *d_curr, *s_curr, *d_next;
@ -361,7 +360,7 @@ sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) {
return 1; return 1;
} else { } else {
printf("sraSpanListAnd:incompatible spans (only one NULL!)\n"); printf("sraSpanListAnd:incompatible spans (only one NULL!)\n");
exit(1); return FALSE;
} }
} }
@ -432,7 +431,7 @@ sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) {
return !sraSpanListEmpty(dest); return !sraSpanListEmpty(dest);
} }
Bool rfbBool
sraSpanListSubtract(sraSpanList *dest, const sraSpanList *src) { sraSpanListSubtract(sraSpanList *dest, const sraSpanList *src) {
sraSpan *d_curr, *s_curr; sraSpan *d_curr, *s_curr;
@ -441,7 +440,7 @@ sraSpanListSubtract(sraSpanList *dest, const sraSpanList *src) {
return 1; return 1;
} else { } else {
printf("sraSpanListSubtract:incompatible spans (only one NULL!)\n"); printf("sraSpanListSubtract:incompatible spans (only one NULL!)\n");
exit(1); return FALSE;
} }
} }
@ -547,7 +546,7 @@ sraRgnMakeEmpty(sraRegion *rgn) {
/* -=- Boolean Region ops */ /* -=- Boolean Region ops */
Bool rfbBool
sraRgnAnd(sraRegion *dst, const sraRegion *src) { sraRgnAnd(sraRegion *dst, const sraRegion *src) {
return sraSpanListAnd((sraSpanList*)dst, (sraSpanList*)src); return sraSpanListAnd((sraSpanList*)dst, (sraSpanList*)src);
} }
@ -557,7 +556,7 @@ sraRgnOr(sraRegion *dst, const sraRegion *src) {
sraSpanListOr((sraSpanList*)dst, (sraSpanList*)src); sraSpanListOr((sraSpanList*)dst, (sraSpanList*)src);
} }
Bool rfbBool
sraRgnSubtract(sraRegion *dst, const sraRegion *src) { sraRgnSubtract(sraRegion *dst, const sraRegion *src) {
return sraSpanListSubtract((sraSpanList*)dst, (sraSpanList*)src); return sraSpanListSubtract((sraSpanList*)dst, (sraSpanList*)src);
} }
@ -614,12 +613,12 @@ sraRegion *sraRgnBBox(const sraRegion *src) {
return sraRgnCreateRect(xmin,ymin,xmax,ymax); return sraRgnCreateRect(xmin,ymin,xmax,ymax);
} }
Bool rfbBool
sraRgnPopRect(sraRegion *rgn, sraRect *rect, unsigned long flags) { sraRgnPopRect(sraRegion *rgn, sraRect *rect, unsigned long flags) {
sraSpan *vcurr, *hcurr; sraSpan *vcurr, *hcurr;
sraSpan *vend, *hend; sraSpan *vend, *hend;
Bool right2left = flags & 2; rfbBool right2left = flags & 2;
Bool bottom2top = flags & 1; rfbBool bottom2top = flags & 1;
/* - Pick correct order */ /* - Pick correct order */
if (bottom2top) { if (bottom2top) {
@ -672,7 +671,7 @@ sraRgnCountRects(const sraRegion *rgn) {
return count; return count;
} }
Bool rfbBool
sraRgnEmpty(const sraRegion *rgn) { sraRgnEmpty(const sraRegion *rgn) {
return sraSpanListEmpty((sraSpanList*)rgn); return sraSpanListEmpty((sraSpanList*)rgn);
} }
@ -706,7 +705,7 @@ sraRectangleIterator *sraRgnGetIterator(sraRegion *s)
return(i); return(i);
} }
sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,Bool reverseX,Bool reverseY) sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,rfbBool reverseX,rfbBool reverseY)
{ {
sraRectangleIterator *i = sraRgnGetIterator(s); sraRectangleIterator *i = sraRgnGetIterator(s);
if(reverseY) { if(reverseY) {
@ -718,7 +717,7 @@ sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,Bool reverseX,Bool r
return(i); return(i);
} }
Bool sraReverse(sraRectangleIterator *i) rfbBool sraReverse(sraRectangleIterator *i)
{ {
return( ((i->ptrPos&2) && i->reverseX) || return( ((i->ptrPos&2) && i->reverseX) ||
(!(i->ptrPos&2) && i->reverseY)); (!(i->ptrPos&2) && i->reverseY));
@ -732,7 +731,7 @@ sraSpan* sraNextSpan(sraRectangleIterator *i)
return(i->sPtrs[i->ptrPos]->_next); return(i->sPtrs[i->ptrPos]->_next);
} }
Bool sraRgnIteratorNext(sraRectangleIterator* i,sraRect* r) rfbBool sraRgnIteratorNext(sraRectangleIterator* i,sraRect* r)
{ {
/* is the subspan finished? */ /* is the subspan finished? */
while(sraNextSpan(i) == i->sPtrs[i->ptrPos+1]) { while(sraNextSpan(i) == i->sPtrs[i->ptrPos+1]) {
@ -761,7 +760,7 @@ Bool sraRgnIteratorNext(sraRectangleIterator* i,sraRect* r)
if((i->ptrPos%4)!=2) { if((i->ptrPos%4)!=2) {
rfbLog("sraRgnIteratorNext: offset is wrong (%d%%4!=2)\n",i->ptrPos); rfbLog("sraRgnIteratorNext: offset is wrong (%d%%4!=2)\n",i->ptrPos);
exit(-1); return FALSE;
} }
r->y1 = i->sPtrs[i->ptrPos-2]->start; r->y1 = i->sPtrs[i->ptrPos-2]->start;
@ -783,7 +782,7 @@ sraRgnPrint(const sraRegion *rgn) {
sraSpanListPrint((sraSpanList*)rgn); sraSpanListPrint((sraSpanList*)rgn);
} }
Bool rfbBool
sraClipRect(int *x, int *y, int *w, int *h, sraClipRect(int *x, int *y, int *w, int *h,
int cx, int cy, int cw, int ch) { int cx, int cy, int cw, int ch) {
if (*x < cx) { if (*x < cx) {
@ -812,7 +811,7 @@ int main(int argc, char** argv)
sraRegionPtr region, region1, region2; sraRegionPtr region, region1, region2;
sraRectangleIterator* i; sraRectangleIterator* i;
sraRect rect; sraRect rect;
Bool b; rfbBool b;
region = sraRgnCreateRect(10, 10, 600, 300); region = sraRgnCreateRect(10, 10, 600, 300);
region1 = sraRgnCreateRect(40, 50, 350, 200); region1 = sraRgnCreateRect(40, 50, 350, 200);

@ -25,24 +25,24 @@
*/ */
#include <string.h> #include <string.h>
#include "rfb.h" #include <rfb/rfb.h>
#include "rfbregion.h" #include <rfb/rfbregion.h>
#ifdef HAVE_FCNTL_H #ifdef LIBVNCSERVER_HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef WIN32 #ifdef WIN32
#define write(sock,buf,len) send(sock,buf,len,0) #define write(sock,buf,len) send(sock,buf,len,0)
#else #else
#ifdef HAVE_UNISTD_H #ifdef LIBVNCSERVER_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <pwd.h> #include <pwd.h>
#ifdef HAVE_SYS_SOCKET_H #ifdef LIBVNCSERVER_HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef HAVE_NETINET_IN_H #ifdef LIBVNCSERVER_HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@ -66,7 +66,7 @@ static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
static void rfbProcessClientNormalMessage(rfbClientPtr cl); static void rfbProcessClientNormalMessage(rfbClientPtr cl);
static void rfbProcessClientInitMessage(rfbClientPtr cl); static void rfbProcessClientInitMessage(rfbClientPtr cl);
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
void rfbIncrClientRef(rfbClientPtr cl) void rfbIncrClientRef(rfbClientPtr cl)
{ {
LOCK(cl->refCountMutex); LOCK(cl->refCountMutex);
@ -87,7 +87,7 @@ void rfbIncrClientRef(rfbClientPtr cl) {}
void rfbDecrClientRef(rfbClientPtr cl) {} void rfbDecrClientRef(rfbClientPtr cl) {}
#endif #endif
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
MUTEX(rfbClientListMutex); MUTEX(rfbClientListMutex);
#endif #endif
@ -99,9 +99,10 @@ struct rfbClientIterator {
void void
rfbClientListInit(rfbScreenInfoPtr rfbScreen) rfbClientListInit(rfbScreenInfoPtr rfbScreen)
{ {
if(sizeof(Bool)!=1) { if(sizeof(rfbBool)!=1) {
/* a sanity check */ /* a sanity check */
fprintf(stderr,"Bool's size is not 1 (%d)!\n",sizeof(Bool)); fprintf(stderr,"rfbBool's size is not 1 (%d)!\n",sizeof(rfbBool));
/* we cannot continue, because rfbBool is supposed to be char everywhere */
exit(1); exit(1);
} }
rfbScreen->rfbClientHead = NULL; rfbScreen->rfbClientHead = NULL;
@ -121,7 +122,7 @@ rfbGetClientIterator(rfbScreenInfoPtr rfbScreen)
rfbClientPtr rfbClientPtr
rfbClientIteratorHead(rfbClientIteratorPtr i) rfbClientIteratorHead(rfbClientIteratorPtr i)
{ {
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
if(i->next != 0) { if(i->next != 0) {
rfbDecrClientRef(i->next); rfbDecrClientRef(i->next);
rfbIncrClientRef(i->screen->rfbClientHead); rfbIncrClientRef(i->screen->rfbClientHead);
@ -146,7 +147,7 @@ rfbClientIteratorNext(rfbClientIteratorPtr i)
IF_PTHREADS(rfbDecrClientRef(cl)); IF_PTHREADS(rfbDecrClientRef(cl));
} }
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
while(i->next && i->next->sock<0) while(i->next && i->next->sock<0)
i->next = i->next->next; i->next = i->next->next;
if(i->next) if(i->next)
@ -220,7 +221,7 @@ rfbClientPtr
rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP) rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
rfbScreenInfoPtr rfbScreen; rfbScreenInfoPtr rfbScreen;
int sock; int sock;
Bool isUDP; rfbBool isUDP;
{ {
rfbProtocolVersionMsg pv; rfbProtocolVersionMsg pv;
rfbClientIteratorPtr iterator; rfbClientIteratorPtr iterator;
@ -282,7 +283,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
cl->preferredEncoding = rfbEncodingRaw; cl->preferredEncoding = rfbEncodingRaw;
cl->correMaxWidth = 48; cl->correMaxWidth = 48;
cl->correMaxHeight = 48; cl->correMaxHeight = 48;
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
cl->zrleData = 0; cl->zrleData = 0;
#endif #endif
@ -313,7 +314,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
rfbScreen->rfbClientHead = cl; rfbScreen->rfbClientHead = cl;
UNLOCK(rfbClientListMutex); UNLOCK(rfbClientListMutex);
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
cl->tightCompressLevel = TIGHT_DEFAULT_COMPRESSION; cl->tightCompressLevel = TIGHT_DEFAULT_COMPRESSION;
cl->tightQualityLevel = -1; cl->tightQualityLevel = -1;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
@ -326,7 +327,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
cl->enableLastRectEncoding = FALSE; cl->enableLastRectEncoding = FALSE;
cl->useNewFBSize = FALSE; cl->useNewFBSize = FALSE;
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
cl->compStreamInited = FALSE; cl->compStreamInited = FALSE;
cl->compStream.total_in = 0; cl->compStream.total_in = 0;
cl->compStream.total_out = 0; cl->compStream.total_out = 0;
@ -405,11 +406,11 @@ rfbClientConnectionGone(cl)
if (cl->next) if (cl->next)
cl->next->prev = cl->prev; cl->next->prev = cl->prev;
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
FreeZrleData(cl); FreeZrleData(cl);
#endif #endif
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
if(cl->screen->backgroundLoop != FALSE) if(cl->screen->backgroundLoop != FALSE)
do { do {
LOCK(cl->refCountMutex); LOCK(cl->refCountMutex);
@ -428,13 +429,13 @@ rfbClientConnectionGone(cl)
rfbLog("Client %s gone\n",cl->host); rfbLog("Client %s gone\n",cl->host);
free(cl->host); free(cl->host);
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
/* Release the compression state structures if any. */ /* Release the compression state structures if any. */
if ( cl->compStreamInited ) { if ( cl->compStreamInited ) {
deflateEnd( &(cl->compStream) ); deflateEnd( &(cl->compStream) );
} }
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (cl->zsActive[i]) if (cl->zsActive[i])
deflateEnd(&cl->zsStruct[i]); deflateEnd(&cl->zsStruct[i]);
@ -778,7 +779,7 @@ rfbProcessClientNormalMessage(cl)
cl->host); cl->host);
} }
break; break;
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
case rfbEncodingZlib: case rfbEncodingZlib:
if (cl->preferredEncoding == -1) { if (cl->preferredEncoding == -1) {
cl->preferredEncoding = enc; cl->preferredEncoding = enc;
@ -786,7 +787,7 @@ rfbProcessClientNormalMessage(cl)
cl->host); cl->host);
} }
break; break;
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
case rfbEncodingTight: case rfbEncodingTight:
if (cl->preferredEncoding == -1) { if (cl->preferredEncoding == -1) {
cl->preferredEncoding = enc; cl->preferredEncoding = enc;
@ -833,7 +834,7 @@ rfbProcessClientNormalMessage(cl)
cl->useNewFBSize = TRUE; cl->useNewFBSize = TRUE;
} }
break; break;
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
case rfbEncodingBackChannel: case rfbEncodingBackChannel:
if (!cl->enableBackChannel) { if (!cl->enableBackChannel) {
rfbLog("Enabling BackChannel protocol extension for " rfbLog("Enabling BackChannel protocol extension for "
@ -842,7 +843,7 @@ rfbProcessClientNormalMessage(cl)
} }
break; break;
#endif #endif
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
case rfbEncodingZRLE: case rfbEncodingZRLE:
if (cl->preferredEncoding == -1) { if (cl->preferredEncoding == -1) {
cl->preferredEncoding = enc; cl->preferredEncoding = enc;
@ -852,11 +853,11 @@ rfbProcessClientNormalMessage(cl)
break; break;
#endif #endif
default: default:
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
if ( enc >= (uint32_t)rfbEncodingCompressLevel0 && if ( enc >= (uint32_t)rfbEncodingCompressLevel0 &&
enc <= (uint32_t)rfbEncodingCompressLevel9 ) { enc <= (uint32_t)rfbEncodingCompressLevel9 ) {
cl->zlibCompressLevel = enc & 0x0F; cl->zlibCompressLevel = enc & 0x0F;
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
cl->tightCompressLevel = enc & 0x0F; cl->tightCompressLevel = enc & 0x0F;
rfbLog("Using compression level %d for client %s\n", rfbLog("Using compression level %d for client %s\n",
cl->tightCompressLevel, cl->host); cl->tightCompressLevel, cl->host);
@ -945,7 +946,7 @@ rfbProcessClientNormalMessage(cl)
} }
if(!cl->viewOnly) { if(!cl->viewOnly) {
cl->screen->kbdAddEvent(msg.ke.down, (KeySym)Swap32IfLE(msg.ke.key), cl); cl->screen->kbdAddEvent(msg.ke.down, (rfbKeySym)Swap32IfLE(msg.ke.key), cl);
} }
return; return;
@ -1027,7 +1028,7 @@ rfbProcessClientNormalMessage(cl)
* givenUpdateRegion is not changed. * givenUpdateRegion is not changed.
*/ */
Bool rfbBool
rfbSendFramebufferUpdate(cl, givenUpdateRegion) rfbSendFramebufferUpdate(cl, givenUpdateRegion)
rfbClientPtr cl; rfbClientPtr cl;
sraRegionPtr givenUpdateRegion; sraRegionPtr givenUpdateRegion;
@ -1038,8 +1039,8 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf; rfbFramebufferUpdateMsg *fu = (rfbFramebufferUpdateMsg *)cl->updateBuf;
sraRegionPtr updateRegion,updateCopyRegion,tmpRegion; sraRegionPtr updateRegion,updateCopyRegion,tmpRegion;
int dx, dy; int dx, dy;
Bool sendCursorShape = FALSE; rfbBool sendCursorShape = FALSE;
Bool sendCursorPos = FALSE; rfbBool sendCursorPos = FALSE;
if(cl->screen->displayHook) if(cl->screen->displayHook)
cl->screen->displayHook(cl); cl->screen->displayHook(cl);
@ -1177,7 +1178,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
* ((h-1) / cl->correMaxHeight + 1)); * ((h-1) / cl->correMaxHeight + 1));
} }
sraRgnReleaseIterator(i); sraRgnReleaseIterator(i);
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
} else if (cl->preferredEncoding == rfbEncodingZlib) { } else if (cl->preferredEncoding == rfbEncodingZlib) {
nUpdateRegionRects = 0; nUpdateRegionRects = 0;
@ -1188,7 +1189,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
int h = rect.y2 - y; int h = rect.y2 - y;
nUpdateRegionRects += (((h-1) / (ZLIB_MAX_SIZE( w ) / w)) + 1); nUpdateRegionRects += (((h-1) / (ZLIB_MAX_SIZE( w ) / w)) + 1);
} }
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
} else if (cl->preferredEncoding == rfbEncodingTight) { } else if (cl->preferredEncoding == rfbEncodingTight) {
nUpdateRegionRects = 0; nUpdateRegionRects = 0;
@ -1290,14 +1291,14 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
return FALSE; return FALSE;
} }
break; break;
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
case rfbEncodingZlib: case rfbEncodingZlib:
if (!rfbSendRectEncodingZlib(cl, x, y, w, h)) { if (!rfbSendRectEncodingZlib(cl, x, y, w, h)) {
sraRgnDestroy(updateRegion); sraRgnDestroy(updateRegion);
return FALSE; return FALSE;
} }
break; break;
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
case rfbEncodingTight: case rfbEncodingTight:
if (!rfbSendRectEncodingTight(cl, x, y, w, h)) { if (!rfbSendRectEncodingTight(cl, x, y, w, h)) {
sraRgnDestroy(updateRegion); sraRgnDestroy(updateRegion);
@ -1306,7 +1307,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
break; break;
#endif #endif
#endif #endif
#ifdef HAVE_ZRLE #ifdef LIBVNCSERVER_HAVE_ZRLE
case rfbEncodingZRLE: case rfbEncodingZRLE:
if (!rfbSendRectEncodingZRLE(cl, x, y, w, h)) { if (!rfbSendRectEncodingZRLE(cl, x, y, w, h)) {
sraRgnDestroy(updateRegion); sraRgnDestroy(updateRegion);
@ -1341,7 +1342,7 @@ rfbSendFramebufferUpdate(cl, givenUpdateRegion)
* of a later one. * of a later one.
*/ */
Bool rfbBool
rfbSendCopyRegion(cl, reg, dx, dy) rfbSendCopyRegion(cl, reg, dx, dy)
rfbClientPtr cl; rfbClientPtr cl;
sraRegionPtr reg; sraRegionPtr reg;
@ -1391,7 +1392,7 @@ rfbSendCopyRegion(cl, reg, dx, dy)
* Send a given rectangle in raw encoding (rfbEncodingRaw). * Send a given rectangle in raw encoding (rfbEncodingRaw).
*/ */
Bool rfbBool
rfbSendRectEncodingRaw(cl, x, y, w, h) rfbSendRectEncodingRaw(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -1464,7 +1465,7 @@ rfbSendRectEncodingRaw(cl, x, y, w, h)
* protocol). * protocol).
*/ */
Bool rfbBool
rfbSendLastRectMarker(cl) rfbSendLastRectMarker(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
@ -1496,7 +1497,7 @@ rfbSendLastRectMarker(cl)
* its framebuffer size. * its framebuffer size.
*/ */
Bool rfbBool
rfbSendNewFBSize(cl, w, h) rfbSendNewFBSize(cl, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int w, h; int w, h;
@ -1530,7 +1531,7 @@ rfbSendNewFBSize(cl, w, h)
* not (errno should be set). * not (errno should be set).
*/ */
Bool rfbBool
rfbSendUpdateBuf(cl) rfbSendUpdateBuf(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
@ -1552,7 +1553,7 @@ rfbSendUpdateBuf(cl)
* client, using values from the currently installed colormap. * client, using values from the currently installed colormap.
*/ */
Bool rfbBool
rfbSendSetColourMapEntries(cl, firstColour, nColours) rfbSendSetColourMapEntries(cl, firstColour, nColours)
rfbClientPtr cl; rfbClientPtr cl;
int firstColour; int firstColour;
@ -1701,7 +1702,7 @@ rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen)
rfbDisconnectUDPSock(rfbScreen); rfbDisconnectUDPSock(rfbScreen);
return; return;
} }
cl->screen->kbdAddEvent(msg.ke.down, (KeySym)Swap32IfLE(msg.ke.key), cl); cl->screen->kbdAddEvent(msg.ke.down, (rfbKeySym)Swap32IfLE(msg.ke.key), cl);
break; break;
case rfbPointerEvent: case rfbPointerEvent:
@ -1721,7 +1722,7 @@ rfbProcessUDPInput(rfbScreenInfoPtr rfbScreen)
} }
} }
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
void rfbSendBackChannel(rfbScreenInfoPtr rfbScreen,char* str,int len) void rfbSendBackChannel(rfbScreenInfoPtr rfbScreen,char* str,int len)
{ {
rfbClientPtr cl; rfbClientPtr cl;

10
rre.c

@ -26,7 +26,7 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
/* /*
* rreBeforeBuf contains pixel data in the client's format. * rreBeforeBuf contains pixel data in the client's format.
@ -52,7 +52,7 @@ static uint32_t getBgColour(char *data, int size, int bpp);
* rfbSendRectEncodingRRE - send a given rectangle using RRE encoding. * rfbSendRectEncodingRRE - send a given rectangle using RRE encoding.
*/ */
Bool rfbBool
rfbSendRectEncodingRRE(cl, x, y, w, h) rfbSendRectEncodingRRE(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -100,7 +100,7 @@ rfbSendRectEncodingRRE(cl, x, y, w, h)
break; break;
default: default:
rfbLog("getBgColour: bpp %d?\n",cl->format.bitsPerPixel); rfbLog("getBgColour: bpp %d?\n",cl->format.bitsPerPixel);
exit(1); return FALSE;
} }
if (nSubrects < 0) { if (nSubrects < 0) {
@ -296,7 +296,7 @@ getBgColour(data,size,bpp)
return ((uint32_t *)data)[0]; return ((uint32_t *)data)[0];
} else { } else {
rfbLog("getBgColour: bpp %d?\n",bpp); rfbLog("getBgColour: bpp %d?\n",bpp);
exit(1); return 0;
} }
} }
@ -308,7 +308,7 @@ getBgColour(data,size,bpp)
k = (int)(((uint8_t *)data)[j]); k = (int)(((uint8_t *)data)[j]);
if (k >= NUMCLRS) { if (k >= NUMCLRS) {
rfbLog("getBgColour: unusual colour = %d\n", k); rfbLog("getBgColour: unusual colour = %d\n", k);
exit(1); return 0;
} }
counts[k] += 1; counts[k] += 1;
if (counts[k] > maxcount) { if (counts[k] > maxcount) {

@ -1,6 +1,6 @@
#include <ctype.h> #include <ctype.h>
#include "rfb.h" #include <rfb/rfb.h>
#include "keysym.h" #include <rfb/keysym.h>
typedef struct { typedef struct {
rfbScreenInfoPtr screen; rfbScreenInfoPtr screen;
@ -12,9 +12,9 @@ typedef struct {
int x1,y1,x2,y2,textH,pageH; int x1,y1,x2,y2,textH,pageH;
int xhot,yhot; int xhot,yhot;
int buttonWidth,okBX,cancelBX,okX,cancelX,okY; int buttonWidth,okBX,cancelBX,okX,cancelX,okY;
Bool okInverted,cancelInverted; rfbBool okInverted,cancelInverted;
int lastButtons; int lastButtons;
Pixel colour,backColour; rfbPixel colour,backColour;
SelectionChangedHookPtr selChangedHook; SelectionChangedHookPtr selChangedHook;
enum { SELECTING, OK, CANCEL } state; enum { SELECTING, OK, CANCEL } state;
} rfbSelectData; } rfbSelectData;
@ -22,11 +22,11 @@ typedef struct {
static const char* okStr="OK"; static const char* okStr="OK";
static const char* cancelStr="Cancel"; static const char* cancelStr="Cancel";
static void selPaintButtons(rfbSelectData* m,Bool invertOk,Bool invertCancel) static void selPaintButtons(rfbSelectData* m,rfbBool invertOk,rfbBool invertCancel)
{ {
rfbScreenInfoPtr s = m->screen; rfbScreenInfoPtr s = m->screen;
Pixel bcolour = m->backColour; rfbPixel bcolour = m->backColour;
Pixel colour = m->colour; rfbPixel colour = m->colour;
rfbFillRect(s,m->x1,m->okY-m->textH,m->x2,m->okY,bcolour); rfbFillRect(s,m->x1,m->okY-m->textH,m->x2,m->okY,bcolour);
@ -52,7 +52,7 @@ static void selPaintButtons(rfbSelectData* m,Bool invertOk,Bool invertCancel)
} }
/* line is relative to displayStart */ /* line is relative to displayStart */
static void selPaintLine(rfbSelectData* m,int line,Bool invert) static void selPaintLine(rfbSelectData* m,int line,rfbBool invert)
{ {
int y1 = m->y1+line*m->textH, y2 = y1+m->textH; int y1 = m->y1+line*m->textH, y2 = y1+m->textH;
if(y2>m->y2) if(y2>m->y2)
@ -122,7 +122,7 @@ static void selSelect(rfbSelectData* m,int _index)
/* todo: scrollbars */ /* todo: scrollbars */
} }
static void selKbdAddEvent(Bool down,KeySym keySym,rfbClientPtr cl) static void selKbdAddEvent(rfbBool down,rfbKeySym keySym,rfbClientPtr cl)
{ {
if(down) { if(down) {
if(keySym>' ' && keySym<0xff) { if(keySym>' ' && keySym<0xff) {
@ -203,7 +203,7 @@ static rfbCursorPtr selGetCursorPtr(rfbClientPtr cl)
int rfbSelectBox(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font, int rfbSelectBox(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
char** list, char** list,
int x1,int y1,int x2,int y2, int x1,int y1,int x2,int y2,
Pixel colour,Pixel backColour, rfbPixel colour,rfbPixel backColour,
int border,SelectionChangedHookPtr selChangedHook) int border,SelectionChangedHookPtr selChangedHook)
{ {
int bpp = rfbScreen->bitsPerPixel/8; int bpp = rfbScreen->bitsPerPixel/8;

@ -39,9 +39,9 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
#ifdef HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
@ -53,19 +53,19 @@
#define ETIMEDOUT WSAETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT
#define write(sock,buf,len) send(sock,buf,len,0) #define write(sock,buf,len) send(sock,buf,len,0)
#else #else
#ifdef HAVE_SYS_TIME_H #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifdef HAVE_SYS_SOCKET_H #ifdef LIBVNCSERVER_HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#ifdef HAVE_NETINET_IN_H #ifdef LIBVNCSERVER_HAVE_NETINET_IN_H
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif #endif
#ifdef HAVE_UNISTD_H #ifdef LIBVNCSERVER_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#endif #endif
@ -78,7 +78,7 @@ struct timeval
; ;
#endif #endif
#ifdef HAVE_FCNTL_H #ifdef LIBVNCSERVER_HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
@ -118,14 +118,14 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
#ifndef WIN32 #ifndef WIN32
if (fcntl(rfbScreen->inetdSock, F_SETFL, O_NONBLOCK) < 0) { if (fcntl(rfbScreen->inetdSock, F_SETFL, O_NONBLOCK) < 0) {
rfbLogPerror("fcntl"); rfbLogPerror("fcntl");
exit(1); return;
} }
#endif #endif
if (setsockopt(rfbScreen->inetdSock, IPPROTO_TCP, TCP_NODELAY, if (setsockopt(rfbScreen->inetdSock, IPPROTO_TCP, TCP_NODELAY,
(char *)&one, sizeof(one)) < 0) { (char *)&one, sizeof(one)) < 0) {
rfbLogPerror("setsockopt"); rfbLogPerror("setsockopt");
exit(1); return;
} }
FD_ZERO(&(rfbScreen->allFds)); FD_ZERO(&(rfbScreen->allFds));
@ -147,7 +147,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
if (i >= 6000) { if (i >= 6000) {
rfbLogPerror("Failure autoprobing"); rfbLogPerror("Failure autoprobing");
exit(1); return;
} }
rfbLog("Autoprobing selected port %d\n", rfbScreen->rfbPort); rfbLog("Autoprobing selected port %d\n", rfbScreen->rfbPort);
@ -160,7 +160,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
if ((rfbScreen->rfbListenSock = ListenOnTCPPort(rfbScreen->rfbPort)) < 0) { if ((rfbScreen->rfbListenSock = ListenOnTCPPort(rfbScreen->rfbPort)) < 0) {
rfbLogPerror("ListenOnTCPPort"); rfbLogPerror("ListenOnTCPPort");
exit(1); return;
} }
FD_ZERO(&(rfbScreen->allFds)); FD_ZERO(&(rfbScreen->allFds));
@ -173,7 +173,7 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen)
if ((rfbScreen->udpSock = ListenOnUDPPort(rfbScreen->udpPort)) < 0) { if ((rfbScreen->udpSock = ListenOnUDPPort(rfbScreen->udpPort)) < 0) {
rfbLogPerror("ListenOnUDPPort"); rfbLogPerror("ListenOnUDPPort");
exit(1); return;
} }
FD_SET(rfbScreen->udpSock, &(rfbScreen->allFds)); FD_SET(rfbScreen->udpSock, &(rfbScreen->allFds));
rfbScreen->maxFd = max((int)rfbScreen->udpSock,rfbScreen->maxFd); rfbScreen->maxFd = max((int)rfbScreen->udpSock,rfbScreen->maxFd);
@ -324,7 +324,7 @@ rfbCloseClient(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
LOCK(cl->updateMutex); LOCK(cl->updateMutex);
#ifdef HAVE_LIBPTHREAD #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
if (cl->sock != -1) if (cl->sock != -1)
#endif #endif
{ {
@ -472,7 +472,7 @@ WriteExact(cl, buf, len)
} else if (n == 0) { } else if (n == 0) {
rfbLog("WriteExact: write returned 0?\n"); rfbLog("WriteExact: write returned 0?\n");
exit(1); return 0;
} else { } else {
#ifdef WIN32 #ifdef WIN32

@ -24,13 +24,13 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
static const char* encNames[] = { static const char* encNames[] = {
"raw", "copyRect", "RRE", "[encoding 3]", "CoRRE", "hextile", "raw", "copyRect", "RRE", "[encoding 3]", "CoRRE", "hextile",
"zlib", "tight", "[encoding 8]", "[encoding 9]", "[encoding 10]", "zlib", "tight", "[encoding 8]", "[encoding 9]", "[encoding 10]",
"[encoding 11]", "[encoding 12]", "[encoding 13]", "[encoding 14]", "[encoding 11]", "[encoding 12]", "[encoding 13]", "[encoding 14]",
#ifdef BACKCHANNEL #ifdef LIBVNCSERVER_BACKCHANNEL
"BackChannel", "BackChannel",
#else #else
"[encoding 15]", "[encoding 15]",

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -59,21 +55,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -82,6 +75,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
CFLAGS = -I.. -g -Wall CFLAGS = -I.. -g -Wall
noinst_PROGRAMS = tight-1 noinst_PROGRAMS = tight-1
@ -89,7 +83,7 @@ noinst_PROGRAMS = tight-1
LDADD = ../libvncserver.a ../libvncclient/libvncclient.a LDADD = ../libvncserver.a ../libvncclient/libvncclient.a
subdir = test subdir = test
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
noinst_PROGRAMS = tight-1$(EXEEXT) noinst_PROGRAMS = tight-1$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS) PROGRAMS = $(noinst_PROGRAMS)
@ -101,13 +95,12 @@ tight_1_DEPENDENCIES = ../libvncserver.a ../libvncclient/libvncclient.a
tight_1_LDFLAGS = tight_1_LDFLAGS =
DEFS = @DEFS@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/rfb DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/tight-1.Po
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tight-1.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -123,7 +116,9 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu test/Makefile $(AUTOMAKE) --gnu test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
clean-noinstPROGRAMS: clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
@ -137,16 +132,16 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tight-1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tight-1.Po@am__quote@
distclean-depend: distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf $(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -156,61 +151,53 @@ distclean-depend:
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am: uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
mkid -fID $$unique mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .. top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
@ -234,7 +221,6 @@ install-am: all-am
installcheck: installcheck-am installcheck: installcheck-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -242,7 +228,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"

@ -25,10 +25,10 @@
*/ */
/*#include <stdio.h>*/ /*#include <stdio.h>*/
#include "rfb.h" #include <rfb/rfb.h>
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
#ifdef HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
#ifdef WIN32 #ifdef WIN32
#define XMD_H #define XMD_H
@ -47,10 +47,10 @@
#define MAX_SPLIT_TILE_SIZE 16 #define MAX_SPLIT_TILE_SIZE 16
/* May be set to TRUE with "-lazytight" Xvnc option. */ /* May be set to TRUE with "-lazytight" Xvnc option. */
Bool rfbTightDisableGradient = FALSE; rfbBool rfbTightDisableGradient = FALSE;
/* This variable is set on every rfbSendRectEncodingTight() call. */ /* This variable is set on every rfbSendRectEncodingTight() call. */
static Bool usePixelFormat24; static rfbBool usePixelFormat24;
/* Compression level stuff. The following array contains various /* Compression level stuff. The following array contains various
@ -134,28 +134,28 @@ static void FindBestSolidArea (rfbClientPtr cl, int x, int y, int w, int h,
static void ExtendSolidArea (rfbClientPtr cl, int x, int y, int w, int h, static void ExtendSolidArea (rfbClientPtr cl, int x, int y, int w, int h,
uint32_t colorValue, uint32_t colorValue,
int *x_ptr, int *y_ptr, int *w_ptr, int *h_ptr); int *x_ptr, int *y_ptr, int *w_ptr, int *h_ptr);
static Bool CheckSolidTile (rfbClientPtr cl, int x, int y, int w, int h, static rfbBool CheckSolidTile (rfbClientPtr cl, int x, int y, int w, int h,
uint32_t *colorPtr, Bool needSameColor); uint32_t *colorPtr, rfbBool needSameColor);
static Bool CheckSolidTile8 (rfbClientPtr cl, int x, int y, int w, int h, static rfbBool CheckSolidTile8 (rfbClientPtr cl, int x, int y, int w, int h,
uint32_t *colorPtr, Bool needSameColor); uint32_t *colorPtr, rfbBool needSameColor);
static Bool CheckSolidTile16 (rfbClientPtr cl, int x, int y, int w, int h, static rfbBool CheckSolidTile16 (rfbClientPtr cl, int x, int y, int w, int h,
uint32_t *colorPtr, Bool needSameColor); uint32_t *colorPtr, rfbBool needSameColor);
static Bool CheckSolidTile32 (rfbClientPtr cl, int x, int y, int w, int h, static rfbBool CheckSolidTile32 (rfbClientPtr cl, int x, int y, int w, int h,
uint32_t *colorPtr, Bool needSameColor); uint32_t *colorPtr, rfbBool needSameColor);
static Bool SendRectSimple (rfbClientPtr cl, int x, int y, int w, int h); static rfbBool SendRectSimple (rfbClientPtr cl, int x, int y, int w, int h);
static Bool SendSubrect (rfbClientPtr cl, int x, int y, int w, int h); static rfbBool SendSubrect (rfbClientPtr cl, int x, int y, int w, int h);
static Bool SendTightHeader (rfbClientPtr cl, int x, int y, int w, int h); static rfbBool SendTightHeader (rfbClientPtr cl, int x, int y, int w, int h);
static Bool SendSolidRect (rfbClientPtr cl); static rfbBool SendSolidRect (rfbClientPtr cl);
static Bool SendMonoRect (rfbClientPtr cl, int w, int h); static rfbBool SendMonoRect (rfbClientPtr cl, int w, int h);
static Bool SendIndexedRect (rfbClientPtr cl, int w, int h); static rfbBool SendIndexedRect (rfbClientPtr cl, int w, int h);
static Bool SendFullColorRect (rfbClientPtr cl, int w, int h); static rfbBool SendFullColorRect (rfbClientPtr cl, int w, int h);
static Bool SendGradientRect (rfbClientPtr cl, int w, int h); static rfbBool SendGradientRect (rfbClientPtr cl, int w, int h);
static Bool CompressData(rfbClientPtr cl, int streamId, int dataLen, static rfbBool CompressData(rfbClientPtr cl, int streamId, int dataLen,
int zlibLevel, int zlibStrategy); int zlibLevel, int zlibStrategy);
static Bool SendCompressedData(rfbClientPtr cl, int compressedLen); static rfbBool SendCompressedData(rfbClientPtr cl, int compressedLen);
static void FillPalette8(int count); static void FillPalette8(int count);
static void FillPalette16(int count); static void FillPalette16(int count);
@ -182,7 +182,7 @@ static unsigned long DetectSmoothImage24(rfbClientPtr cl, rfbPixelFormat *fmt, i
static unsigned long DetectSmoothImage16(rfbClientPtr cl, rfbPixelFormat *fmt, int w, int h); static unsigned long DetectSmoothImage16(rfbClientPtr cl, rfbPixelFormat *fmt, int w, int h);
static unsigned long DetectSmoothImage32(rfbClientPtr cl, rfbPixelFormat *fmt, int w, int h); static unsigned long DetectSmoothImage32(rfbClientPtr cl, rfbPixelFormat *fmt, int w, int h);
static Bool SendJpegRect(rfbClientPtr cl, int x, int y, int w, int h, static rfbBool SendJpegRect(rfbClientPtr cl, int x, int y, int w, int h,
int quality); int quality);
static void PrepareRowForJpeg(rfbClientPtr cl, uint8_t *dst, int x, int y, int count); static void PrepareRowForJpeg(rfbClientPtr cl, uint8_t *dst, int x, int y, int count);
static void PrepareRowForJpeg24(rfbClientPtr cl, uint8_t *dst, int x, int y, int count); static void PrepareRowForJpeg24(rfbClientPtr cl, uint8_t *dst, int x, int y, int count);
@ -225,7 +225,7 @@ rfbNumCodedRectsTight(cl, x, y, w, h)
} }
} }
Bool rfbBool
rfbSendRectEncodingTight(cl, x, y, w, h) rfbSendRectEncodingTight(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -452,7 +452,7 @@ ExtendSolidArea(cl, x, y, w, h, colorValue, x_ptr, y_ptr, w_ptr, h_ptr)
* that case new color will be stored in *colorPtr. * that case new color will be stored in *colorPtr.
*/ */
static Bool CheckSolidTile(rfbClientPtr cl, int x, int y, int w, int h, uint32_t* colorPtr, Bool needSameColor) static rfbBool CheckSolidTile(rfbClientPtr cl, int x, int y, int w, int h, uint32_t* colorPtr, rfbBool needSameColor)
{ {
switch(cl->screen->rfbServerFormat.bitsPerPixel) { switch(cl->screen->rfbServerFormat.bitsPerPixel) {
case 32: case 32:
@ -466,8 +466,8 @@ static Bool CheckSolidTile(rfbClientPtr cl, int x, int y, int w, int h, uint32_t
#define DEFINE_CHECK_SOLID_FUNCTION(bpp) \ #define DEFINE_CHECK_SOLID_FUNCTION(bpp) \
\ \
static Bool \ static rfbBool \
CheckSolidTile##bpp(rfbClientPtr cl, int x, int y, int w, int h, uint32_t* colorPtr, Bool needSameColor) \ CheckSolidTile##bpp(rfbClientPtr cl, int x, int y, int w, int h, uint32_t* colorPtr, rfbBool needSameColor) \
{ \ { \
uint##bpp##_t *fbptr; \ uint##bpp##_t *fbptr; \
uint##bpp##_t colorValue; \ uint##bpp##_t colorValue; \
@ -496,7 +496,7 @@ DEFINE_CHECK_SOLID_FUNCTION(8)
DEFINE_CHECK_SOLID_FUNCTION(16) DEFINE_CHECK_SOLID_FUNCTION(16)
DEFINE_CHECK_SOLID_FUNCTION(32) DEFINE_CHECK_SOLID_FUNCTION(32)
static Bool static rfbBool
SendRectSimple(cl, x, y, w, h) SendRectSimple(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -551,13 +551,13 @@ SendRectSimple(cl, x, y, w, h)
return TRUE; return TRUE;
} }
static Bool static rfbBool
SendSubrect(cl, x, y, w, h) SendSubrect(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
{ {
char *fbptr; char *fbptr;
Bool success = FALSE; rfbBool success = FALSE;
/* Send pending data if there is more than 128 bytes. */ /* Send pending data if there is more than 128 bytes. */
if (cl->ublen > 128) { if (cl->ublen > 128) {
@ -627,7 +627,7 @@ SendSubrect(cl, x, y, w, h)
return success; return success;
} }
static Bool static rfbBool
SendTightHeader(cl, x, y, w, h) SendTightHeader(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -659,7 +659,7 @@ SendTightHeader(cl, x, y, w, h)
* Subencoding implementations. * Subencoding implementations.
*/ */
static Bool static rfbBool
SendSolidRect(cl) SendSolidRect(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
@ -685,7 +685,7 @@ SendSolidRect(cl)
return TRUE; return TRUE;
} }
static Bool static rfbBool
SendMonoRect(cl, w, h) SendMonoRect(cl, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int w, h; int w, h;
@ -750,7 +750,7 @@ SendMonoRect(cl, w, h)
Z_DEFAULT_STRATEGY); Z_DEFAULT_STRATEGY);
} }
static Bool static rfbBool
SendIndexedRect(cl, w, h) SendIndexedRect(cl, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int w, h; int w, h;
@ -813,7 +813,7 @@ SendIndexedRect(cl, w, h)
Z_DEFAULT_STRATEGY); Z_DEFAULT_STRATEGY);
} }
static Bool static rfbBool
SendFullColorRect(cl, w, h) SendFullColorRect(cl, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int w, h; int w, h;
@ -840,7 +840,7 @@ SendFullColorRect(cl, w, h)
Z_DEFAULT_STRATEGY); Z_DEFAULT_STRATEGY);
} }
static Bool static rfbBool
SendGradientRect(cl, w, h) SendGradientRect(cl, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int w, h; int w, h;
@ -879,7 +879,7 @@ SendGradientRect(cl, w, h)
Z_FILTERED); Z_FILTERED);
} }
static Bool static rfbBool
CompressData(cl, streamId, dataLen, zlibLevel, zlibStrategy) CompressData(cl, streamId, dataLen, zlibLevel, zlibStrategy)
rfbClientPtr cl; rfbClientPtr cl;
int streamId, dataLen, zlibLevel, zlibStrategy; int streamId, dataLen, zlibLevel, zlibStrategy;
@ -934,7 +934,7 @@ CompressData(cl, streamId, dataLen, zlibLevel, zlibStrategy)
return SendCompressedData(cl, tightAfterBufSize - pz->avail_out); return SendCompressedData(cl, tightAfterBufSize - pz->avail_out);
} }
static Bool SendCompressedData(cl, compressedLen) static rfbBool SendCompressedData(cl, compressedLen)
rfbClientPtr cl; rfbClientPtr cl;
int compressedLen; int compressedLen;
{ {
@ -1378,7 +1378,7 @@ FilterGradient##bpp(cl, buf, fmt, w, h) \
int w, h; \ int w, h; \
{ \ { \
uint##bpp##_t pix, diff; \ uint##bpp##_t pix, diff; \
Bool endianMismatch; \ rfbBool endianMismatch; \
int *prevRowPtr; \ int *prevRowPtr; \
int maxColor[3], shiftBits[3]; \ int maxColor[3], shiftBits[3]; \
int pixHere[3], pixUpper[3], pixLeft[3], pixUpperLeft[3]; \ int pixHere[3], pixUpper[3], pixLeft[3], pixUpperLeft[3]; \
@ -1558,7 +1558,7 @@ DetectSmoothImage##bpp (cl, fmt, w, h)
rfbPixelFormat *fmt; \ rfbPixelFormat *fmt; \
int w, h; \ int w, h; \
{ \ { \
Bool endianMismatch; \ rfbBool endianMismatch; \
uint##bpp##_t pix; \ uint##bpp##_t pix; \
int maxColor[3], shiftBits[3]; \ int maxColor[3], shiftBits[3]; \
int x, y, d, dx, c; \ int x, y, d, dx, c; \
@ -1640,10 +1640,10 @@ DEFINE_DETECT_FUNCTION(32)
*/ */
static struct jpeg_destination_mgr jpegDstManager; static struct jpeg_destination_mgr jpegDstManager;
static Bool jpegError; static rfbBool jpegError;
static int jpegDstDataLen; static int jpegDstDataLen;
static Bool static rfbBool
SendJpegRect(cl, x, y, w, h, quality) SendJpegRect(cl, x, y, w, h, quality)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;

@ -23,13 +23,13 @@
* USA. * USA.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
#include "rfbregion.h" #include <rfb/rfbregion.h>
static void PrintPixelFormat(rfbPixelFormat *pf); static void PrintPixelFormat(rfbPixelFormat *pf);
static Bool rfbSetClientColourMapBGR233(rfbClientPtr cl); static rfbBool rfbSetClientColourMapBGR233(rfbClientPtr cl);
Bool rfbEconomicTranslate = FALSE; rfbBool rfbEconomicTranslate = FALSE;
/* /*
* Some standard pixel formats. * Some standard pixel formats.
@ -108,7 +108,7 @@ static const rfbPixelFormat BGR233Format = {
#undef IN #undef IN
#undef OUT #undef OUT
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
#define COUNT_OFFSETS 4 #define COUNT_OFFSETS 4
#define BPP2OFFSET(bpp) ((bpp)/8-1) #define BPP2OFFSET(bpp) ((bpp)/8-1)
#include "tableinit24.c" #include "tableinit24.c"
@ -137,7 +137,7 @@ typedef void (*rfbInitTableFnType)(char **table, rfbPixelFormat *in,
rfbInitCMTableFnType rfbInitColourMapSingleTableFns[COUNT_OFFSETS] = { rfbInitCMTableFnType rfbInitColourMapSingleTableFns[COUNT_OFFSETS] = {
rfbInitColourMapSingleTable8, rfbInitColourMapSingleTable8,
rfbInitColourMapSingleTable16, rfbInitColourMapSingleTable16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbInitColourMapSingleTable24, rfbInitColourMapSingleTable24,
#endif #endif
rfbInitColourMapSingleTable32 rfbInitColourMapSingleTable32
@ -146,7 +146,7 @@ rfbInitCMTableFnType rfbInitColourMapSingleTableFns[COUNT_OFFSETS] = {
rfbInitTableFnType rfbInitTrueColourSingleTableFns[COUNT_OFFSETS] = { rfbInitTableFnType rfbInitTrueColourSingleTableFns[COUNT_OFFSETS] = {
rfbInitTrueColourSingleTable8, rfbInitTrueColourSingleTable8,
rfbInitTrueColourSingleTable16, rfbInitTrueColourSingleTable16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbInitTrueColourSingleTable24, rfbInitTrueColourSingleTable24,
#endif #endif
rfbInitTrueColourSingleTable32 rfbInitTrueColourSingleTable32
@ -155,7 +155,7 @@ rfbInitTableFnType rfbInitTrueColourSingleTableFns[COUNT_OFFSETS] = {
rfbInitTableFnType rfbInitTrueColourRGBTablesFns[COUNT_OFFSETS] = { rfbInitTableFnType rfbInitTrueColourRGBTablesFns[COUNT_OFFSETS] = {
rfbInitTrueColourRGBTables8, rfbInitTrueColourRGBTables8,
rfbInitTrueColourRGBTables16, rfbInitTrueColourRGBTables16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbInitTrueColourRGBTables24, rfbInitTrueColourRGBTables24,
#endif #endif
rfbInitTrueColourRGBTables32 rfbInitTrueColourRGBTables32
@ -164,17 +164,17 @@ rfbInitTableFnType rfbInitTrueColourRGBTablesFns[COUNT_OFFSETS] = {
rfbTranslateFnType rfbTranslateWithSingleTableFns[COUNT_OFFSETS][COUNT_OFFSETS] = { rfbTranslateFnType rfbTranslateWithSingleTableFns[COUNT_OFFSETS][COUNT_OFFSETS] = {
{ rfbTranslateWithSingleTable8to8, { rfbTranslateWithSingleTable8to8,
rfbTranslateWithSingleTable8to16, rfbTranslateWithSingleTable8to16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbTranslateWithSingleTable8to24, rfbTranslateWithSingleTable8to24,
#endif #endif
rfbTranslateWithSingleTable8to32 }, rfbTranslateWithSingleTable8to32 },
{ rfbTranslateWithSingleTable16to8, { rfbTranslateWithSingleTable16to8,
rfbTranslateWithSingleTable16to16, rfbTranslateWithSingleTable16to16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbTranslateWithSingleTable16to24, rfbTranslateWithSingleTable16to24,
#endif #endif
rfbTranslateWithSingleTable16to32 }, rfbTranslateWithSingleTable16to32 },
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
{ rfbTranslateWithSingleTable24to8, { rfbTranslateWithSingleTable24to8,
rfbTranslateWithSingleTable24to16, rfbTranslateWithSingleTable24to16,
rfbTranslateWithSingleTable24to24, rfbTranslateWithSingleTable24to24,
@ -182,7 +182,7 @@ rfbTranslateFnType rfbTranslateWithSingleTableFns[COUNT_OFFSETS][COUNT_OFFSETS]
#endif #endif
{ rfbTranslateWithSingleTable32to8, { rfbTranslateWithSingleTable32to8,
rfbTranslateWithSingleTable32to16, rfbTranslateWithSingleTable32to16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbTranslateWithSingleTable32to24, rfbTranslateWithSingleTable32to24,
#endif #endif
rfbTranslateWithSingleTable32to32 } rfbTranslateWithSingleTable32to32 }
@ -191,17 +191,17 @@ rfbTranslateFnType rfbTranslateWithSingleTableFns[COUNT_OFFSETS][COUNT_OFFSETS]
rfbTranslateFnType rfbTranslateWithRGBTablesFns[COUNT_OFFSETS][COUNT_OFFSETS] = { rfbTranslateFnType rfbTranslateWithRGBTablesFns[COUNT_OFFSETS][COUNT_OFFSETS] = {
{ rfbTranslateWithRGBTables8to8, { rfbTranslateWithRGBTables8to8,
rfbTranslateWithRGBTables8to16, rfbTranslateWithRGBTables8to16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbTranslateWithRGBTables8to24, rfbTranslateWithRGBTables8to24,
#endif #endif
rfbTranslateWithRGBTables8to32 }, rfbTranslateWithRGBTables8to32 },
{ rfbTranslateWithRGBTables16to8, { rfbTranslateWithRGBTables16to8,
rfbTranslateWithRGBTables16to16, rfbTranslateWithRGBTables16to16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbTranslateWithRGBTables16to24, rfbTranslateWithRGBTables16to24,
#endif #endif
rfbTranslateWithRGBTables16to32 }, rfbTranslateWithRGBTables16to32 },
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
{ rfbTranslateWithRGBTables24to8, { rfbTranslateWithRGBTables24to8,
rfbTranslateWithRGBTables24to16, rfbTranslateWithRGBTables24to16,
rfbTranslateWithRGBTables24to24, rfbTranslateWithRGBTables24to24,
@ -209,7 +209,7 @@ rfbTranslateFnType rfbTranslateWithRGBTablesFns[COUNT_OFFSETS][COUNT_OFFSETS] =
#endif #endif
{ rfbTranslateWithRGBTables32to8, { rfbTranslateWithRGBTables32to8,
rfbTranslateWithRGBTables32to16, rfbTranslateWithRGBTables32to16,
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
rfbTranslateWithRGBTables32to24, rfbTranslateWithRGBTables32to24,
#endif #endif
rfbTranslateWithRGBTables32to32 } rfbTranslateWithRGBTables32to32 }
@ -241,7 +241,7 @@ rfbTranslateNone(char *table, rfbPixelFormat *in, rfbPixelFormat *out,
* rfbSetTranslateFunction sets the translation function. * rfbSetTranslateFunction sets the translation function.
*/ */
Bool rfbBool
rfbSetTranslateFunction(cl) rfbSetTranslateFunction(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
@ -254,7 +254,7 @@ rfbSetTranslateFunction(cl)
if ((cl->screen->rfbServerFormat.bitsPerPixel != 8) && if ((cl->screen->rfbServerFormat.bitsPerPixel != 8) &&
(cl->screen->rfbServerFormat.bitsPerPixel != 16) && (cl->screen->rfbServerFormat.bitsPerPixel != 16) &&
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
(cl->screen->rfbServerFormat.bitsPerPixel != 24) && (cl->screen->rfbServerFormat.bitsPerPixel != 24) &&
#endif #endif
(cl->screen->rfbServerFormat.bitsPerPixel != 32)) (cl->screen->rfbServerFormat.bitsPerPixel != 32))
@ -268,7 +268,7 @@ rfbSetTranslateFunction(cl)
if ((cl->format.bitsPerPixel != 8) && if ((cl->format.bitsPerPixel != 8) &&
(cl->format.bitsPerPixel != 16) && (cl->format.bitsPerPixel != 16) &&
#ifdef ALLOW24BPP #ifdef LIBVNCSERVER_ALLOW24BPP
(cl->format.bitsPerPixel != 24) && (cl->format.bitsPerPixel != 24) &&
#endif #endif
(cl->format.bitsPerPixel != 32)) (cl->format.bitsPerPixel != 32))
@ -358,7 +358,7 @@ rfbSetTranslateFunction(cl)
* just like an 8-bit BGR233 true colour client. * just like an 8-bit BGR233 true colour client.
*/ */
static Bool static rfbBool
rfbSetClientColourMapBGR233(cl) rfbSetClientColourMapBGR233(cl)
rfbClientPtr cl; rfbClientPtr cl;
{ {
@ -413,7 +413,7 @@ rfbSetClientColourMapBGR233(cl)
* and mark the whole screen as having been modified. * and mark the whole screen as having been modified.
*/ */
Bool rfbBool
rfbSetClientColourMap(cl, firstColour, nColours) rfbSetClientColourMap(cl, firstColour, nColours)
rfbClientPtr cl; rfbClientPtr cl;
int firstColour; int firstColour;

@ -28,10 +28,10 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#ifdef HAVE_SYS_TYPES_H #ifdef LIBVNCSERVER_HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#ifdef HAVE_SYS_STAT_H #ifdef LIBVNCSERVER_HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
@ -142,7 +142,7 @@ void
vncRandomBytes(unsigned char *bytes) vncRandomBytes(unsigned char *bytes)
{ {
int i; int i;
static Bool s_srandom_called = FALSE; static rfbBool s_srandom_called = FALSE;
if (!s_srandom_called) { if (!s_srandom_called) {
srandom((unsigned int)time(0) ^ (unsigned int)getpid()); srandom((unsigned int)time(0) ^ (unsigned int)getpid());

@ -6,7 +6,7 @@
static int tty=2; static int tty=2;
static int tty_inject_device; static int tty_inject_device;
void do_key(Bool down,KeySym keySym,rfbClientPtr cl) void do_key(rfbBool down,rfbKeySym keySym,rfbClientPtr cl)
{ {
static char isControl=0; static char isControl=0;

@ -1,7 +1,6 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am. # Makefile.in generated automatically by automake 1.5 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
@ -13,6 +12,7 @@
# PARTICULAR PURPOSE. # PARTICULAR PURPOSE.
@SET_MAKE@ @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
@ -43,13 +43,9 @@ AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA) INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@ transform = @program_transform_name@
@ -59,21 +55,18 @@ POST_INSTALL = :
NORMAL_UNINSTALL = : NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AWK = @AWK@ AWK = @AWK@
CC = @CC@ CC = @CC@
CCLD = @CCLD@ CCLD = @CCLD@
CXX = @CXX@ CXX = @CXX@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
EXEEXT = @EXEEXT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
RPMSOURCEDIR = @RPMSOURCEDIR@ RPMSOURCEDIR = @RPMSOURCEDIR@
STRIP = @STRIP@
VERSION = @VERSION@ VERSION = @VERSION@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
@ -82,6 +75,7 @@ X_PRE_LIBS = @X_PRE_LIBS@
am__include = @am__include@ am__include = @am__include@
am__quote = @am__quote@ am__quote = @am__quote@
install_sh = @install_sh@ install_sh = @install_sh@
CONSOLE_SRCS = VNConsole.c CONSOLE_SRCS = VNConsole.c
noinst_HEADERS = VNConsole.h vga.h noinst_HEADERS = VNConsole.h vga.h
@ -99,39 +93,38 @@ VNCommand_SOURCES = VNCommand.c $(CONSOLE_SRCS)
example_SOURCES = example.c $(CONSOLE_SRCS) example_SOURCES = example.c $(CONSOLE_SRCS)
subdir = vncterm subdir = vncterm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/rfb/rfbconfig.h CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = CONFIG_CLEAN_FILES =
@LINUX_TRUE@bin_PROGRAMS = LinuxVNC$(EXEEXT) @LINUX_TRUE@bin_PROGRAMS = LinuxVNC$(EXEEXT)
@LINUX_FALSE@bin_PROGRAMS = @LINUX_FALSE@bin_PROGRAMS =
noinst_PROGRAMS = VNCommand$(EXEEXT) example$(EXEEXT) noinst_PROGRAMS = VNCommand$(EXEEXT) example$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__objects_1 = VNConsole.$(OBJEXT) @LINUX_TRUE@am_LinuxVNC_OBJECTS = LinuxVNC.$(OBJEXT) VNConsole.$(OBJEXT)
@LINUX_TRUE@am_LinuxVNC_OBJECTS = LinuxVNC.$(OBJEXT) $(am__objects_1) @LINUX_FALSE@am_LinuxVNC_OBJECTS =
LinuxVNC_OBJECTS = $(am_LinuxVNC_OBJECTS) LinuxVNC_OBJECTS = $(am_LinuxVNC_OBJECTS)
LinuxVNC_LDADD = $(LDADD) LinuxVNC_LDADD = $(LDADD)
LinuxVNC_DEPENDENCIES = ../libvncserver.a LinuxVNC_DEPENDENCIES = ../libvncserver.a
LinuxVNC_LDFLAGS = LinuxVNC_LDFLAGS =
am_VNCommand_OBJECTS = VNCommand.$(OBJEXT) $(am__objects_1) am_VNCommand_OBJECTS = VNCommand.$(OBJEXT) VNConsole.$(OBJEXT)
VNCommand_OBJECTS = $(am_VNCommand_OBJECTS) VNCommand_OBJECTS = $(am_VNCommand_OBJECTS)
VNCommand_LDADD = $(LDADD) VNCommand_LDADD = $(LDADD)
VNCommand_DEPENDENCIES = ../libvncserver.a VNCommand_DEPENDENCIES = ../libvncserver.a
VNCommand_LDFLAGS = VNCommand_LDFLAGS =
am_example_OBJECTS = example.$(OBJEXT) $(am__objects_1) am_example_OBJECTS = example.$(OBJEXT) VNConsole.$(OBJEXT)
example_OBJECTS = $(am_example_OBJECTS) example_OBJECTS = $(am_example_OBJECTS)
example_LDADD = $(LDADD) example_LDADD = $(LDADD)
example_DEPENDENCIES = ../libvncserver.a example_DEPENDENCIES = ../libvncserver.a
example_LDFLAGS = example_LDFLAGS =
DEFS = @DEFS@ DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/rfb DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/LinuxVNC.Po $(DEPDIR)/VNCommand.Po \
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/LinuxVNC.Po ./$(DEPDIR)/VNCommand.Po \ @AMDEP_TRUE@ $(DEPDIR)/VNConsole.Po $(DEPDIR)/example.Po
@AMDEP_TRUE@ ./$(DEPDIR)/VNConsole.Po ./$(DEPDIR)/example.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@ -151,8 +144,9 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \ cd $(top_srcdir) && \
$(AUTOMAKE) --gnu vncterm/Makefile $(AUTOMAKE) --gnu vncterm/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) cd $(top_builddir) && \
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
install-binPROGRAMS: $(bin_PROGRAMS) install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
@ -160,16 +154,16 @@ install-binPROGRAMS: $(bin_PROGRAMS)
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \ if test -f $$p \
; then \ ; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \ else :; fi; \
done done
uninstall-binPROGRAMS: uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL) @$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \ @list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
rm -f $(DESTDIR)$(bindir)/$$f; \ rm -f $(DESTDIR)$(bindir)/$$f; \
done done
@ -195,19 +189,19 @@ mostlyclean-compile:
distclean-compile: distclean-compile:
-rm -f *.tab.c -rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LinuxVNC.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/LinuxVNC.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VNCommand.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/VNCommand.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VNConsole.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/VNConsole.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/example.Po@am__quote@
distclean-depend: distclean-depend:
-rm -rf ./$(DEPDIR) -rm -rf $(DEPDIR)
.c.o: .c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
.c.obj: .c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@ -217,61 +211,53 @@ distclean-depend:
CCDEPMODE = @CCDEPMODE@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am: uninstall-info-am:
ETAGS = etags
ETAGSFLAGS =
tags: TAGS tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
mkid -fID $$unique mkid -fID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP) $(TAGS_FILES) $(LISP)
tags=; \ tags=; \
here=`pwd`; \ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
unique=`for i in $$list; do \ unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \ done | \
$(AWK) ' { files[$$0] = 1; } \ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \ END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$tags$$unique" \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
$$tags $$unique
GTAGS: GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \ here=`CDPATH=: && cd $(top_builddir) && pwd` \
&& cd $(top_srcdir) \ && cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here && gtags -i $(GTAGS_ARGS) $$here
distclean-tags: distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .. top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES) distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \ @for file in $(DISTFILES); do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \ $(mkinstalldirs) "$(distdir)/$$dir"; \
$(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \ fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $$d/$$file $(distdir) \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ || exit 1; \
fi; \
cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| cp -p $$d/$$file $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \
@ -296,7 +282,6 @@ install-am: all-am
installcheck: installcheck-am installcheck: installcheck-am
install-strip: install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \ `test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic: mostlyclean-generic:
@ -304,7 +289,7 @@ mostlyclean-generic:
clean-generic: clean-generic:
distclean-generic: distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"

@ -1,15 +1,15 @@
#include "VNConsole.h" #include "VNConsole.h"
#include "vga.h" #include "vga.h"
#ifdef HAVE_FCNTL_H #ifdef LIBVNCSERVER_HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef HAVE_SYS_TIME_H #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#ifdef HAVE_UNISTD_H #ifdef LIBVNCSERVER_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef HAVE_SYS_WAIT_H #ifdef LIBVNCSERVER_HAVE_SYS_WAIT_H
#include <sys/wait.h> #include <sys/wait.h>
#endif #endif
#include <errno.h> #include <errno.h>
@ -17,7 +17,7 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
Bool interactive=FALSE,sendOnlyWholeLines=TRUE; rfbBool interactive=FALSE,sendOnlyWholeLines=TRUE;
int serverArgc,programArg0; int serverArgc,programArg0;
for(serverArgc=1;serverArgc<argc for(serverArgc=1;serverArgc<argc
&& argv[serverArgc][0]=='-' && argv[serverArgc][1]!='-';serverArgc++) && argv[serverArgc][0]=='-' && argv[serverArgc][1]!='-';serverArgc++)

@ -78,7 +78,7 @@ void vcMakeSureCursorIsDrawn(rfbClientPtr cl)
vncConsolePtr vcGetConsole(int *argc,char **argv, vncConsolePtr vcGetConsole(int *argc,char **argv,
int width,int height,rfbFontDataPtr font int width,int height,rfbFontDataPtr font
#ifdef USE_ATTRIBUTE_BUFFER #ifdef USE_ATTRIBUTE_BUFFER
,Bool withAttributes ,rfbBool withAttributes
#endif #endif
) )
{ {
@ -147,7 +147,7 @@ vncConsolePtr vcGetConsole(int *argc,char **argv,
return(c); return(c);
} }
#include "rfbregion.h" #include <rfb/rfbregion.h>
/* before using this function, hide the cursor */ /* before using this function, hide the cursor */
void vcScroll(vncConsolePtr c,int lineCount) void vcScroll(vncConsolePtr c,int lineCount)
@ -363,7 +363,7 @@ char *vcGetString(vncConsolePtr c,char *buffer,int bufferSize)
return(buffer); return(buffer);
} }
void vcKbdAddEventProc(Bool down,KeySym keySym,rfbClientPtr cl) void vcKbdAddEventProc(rfbBool down,rfbKeySym keySym,rfbClientPtr cl)
{ {
vncConsolePtr c=(vncConsolePtr)cl->screen->screenData; vncConsolePtr c=(vncConsolePtr)cl->screen->screenData;
if(down) { if(down) {

@ -20,7 +20,7 @@ typedef struct vncConsole {
#endif #endif
/* if this is set, the screen doesn't scroll. */ /* if this is set, the screen doesn't scroll. */
Bool wrapBottomToTop; rfbBool wrapBottomToTop;
/* height and width of one character */ /* height and width of one character */
int cWidth, cHeight; int cWidth, cHeight;
@ -36,20 +36,20 @@ typedef struct vncConsole {
int inputCount; int inputCount;
int inputSize; int inputSize;
long selectTimeOut; long selectTimeOut;
Bool doEcho; /* if reading input, do output directly? */ rfbBool doEcho; /* if reading input, do output directly? */
/* selection */ /* selection */
char *selection; char *selection;
/* mouse */ /* mouse */
Bool wasRightButtonDown; rfbBool wasRightButtonDown;
Bool currentlyMarking; rfbBool currentlyMarking;
int markStart,markEnd; int markStart,markEnd;
/* should text cursor be drawn? (an underscore at current position) */ /* should text cursor be drawn? (an underscore at current position) */
Bool cursorActive; rfbBool cursorActive;
Bool cursorIsDrawn; rfbBool cursorIsDrawn;
Bool dontDrawCursor; /* for example, while scrolling */ rfbBool dontDrawCursor; /* for example, while scrolling */
rfbFontDataPtr font; rfbFontDataPtr font;
rfbScreenInfoPtr rfbScreen; rfbScreenInfoPtr rfbScreen;
@ -58,7 +58,7 @@ typedef struct vncConsole {
#ifdef USE_ATTRIBUTE_BUFFER #ifdef USE_ATTRIBUTE_BUFFER
vncConsolePtr vcGetConsole(int *argc,char **argv, vncConsolePtr vcGetConsole(int *argc,char **argv,
int width,int height,rfbFontDataPtr font, int width,int height,rfbFontDataPtr font,
Bool withAttributes); rfbBool withAttributes);
#else #else
vncConsolePtr vcGetConsole(int argc,char **argv, vncConsolePtr vcGetConsole(int argc,char **argv,
int width,int height,rfbFontDataPtr font); int width,int height,rfbFontDataPtr font);
@ -82,7 +82,7 @@ char vcGetCh(vncConsolePtr c);
char vcGetChar(vncConsolePtr c); /* blocking */ char vcGetChar(vncConsolePtr c); /* blocking */
char *vcGetString(vncConsolePtr c,char *buffer,int maxLen); char *vcGetString(vncConsolePtr c,char *buffer,int maxLen);
void vcKbdAddEventProc(Bool down,KeySym keySym,rfbClientPtr cl); void vcKbdAddEventProc(rfbBool down,rfbKeySym keySym,rfbClientPtr cl);
void vcPtrAddEventProc(int buttonMask,int x,int y,rfbClientPtr cl); void vcPtrAddEventProc(int buttonMask,int x,int y,rfbClientPtr cl);
void vcSetXCutTextProc(char* str,int len, struct _rfbClientRec* cl); void vcSetXCutTextProc(char* str,int len, struct _rfbClientRec* cl);

@ -30,9 +30,9 @@
* or send email to feedback@developvnc.org. * or send email to feedback@developvnc.org.
*/ */
#include "rfb.h" #include <rfb/rfb.h>
#ifdef HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBZ
/* /*
* zlibBeforeBuf contains pixel data in the client's format. * zlibBeforeBuf contains pixel data in the client's format.
@ -54,7 +54,7 @@ static int zlibAfterBufLen;
* rectangle encoding. * rectangle encoding.
*/ */
Bool rfbBool
rfbSendOneRectEncodingZlib(cl, x, y, w, h) rfbSendOneRectEncodingZlib(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;
@ -231,7 +231,7 @@ rfbSendOneRectEncodingZlib(cl, x, y, w, h)
* Zlib encoding rectangles. * Zlib encoding rectangles.
*/ */
Bool rfbBool
rfbSendRectEncodingZlib(cl, x, y, w, h) rfbSendRectEncodingZlib(cl, x, y, w, h)
rfbClientPtr cl; rfbClientPtr cl;
int x, y, w, h; int x, y, w, h;

@ -24,7 +24,7 @@
// //
extern "C" { extern "C" {
#include "rfb.h" #include <rfb/rfb.h>
} }
#include <rdr/MemOutStream.h> #include <rdr/MemOutStream.h>
#include <rdr/ZlibOutStream.h> #include <rdr/ZlibOutStream.h>
@ -75,7 +75,7 @@ static rdr::MemOutStream mos;
*/ */
Bool rfbSendRectEncodingZRLE(rfbClientPtr cl, int x, int y, int w, int h) rfbBool rfbSendRectEncodingZRLE(rfbClientPtr cl, int x, int y, int w, int h)
{ {
if (!cl->zrleData) cl->zrleData = new rdr::ZlibOutStream; if (!cl->zrleData) cl->zrleData = new rdr::ZlibOutStream;
rdr::ZlibOutStream* zos = (rdr::ZlibOutStream*)cl->zrleData; rdr::ZlibOutStream* zos = (rdr::ZlibOutStream*)cl->zrleData;

Loading…
Cancel
Save