release 0.1 rc 1

svn path=/trunk/kdenetwork/krfb/; revision=128292

Makefile.am

@@ -1,7 +1,7 @@
 
 SUBDIRS = krfb po doc include 
 
-EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO krfb.lsm 
+EXTRA_DIST = admin AUTHORS COPYING ChangeLog INSTALL README TODO NOTES krfb.lsm 
 
 # not a GNU package. You can remove this line, if 
 # have all needed files, that a GNU package needs

README

@@ -1 +1,15 @@
+KRfb
+====
+
+KRfb is a small server for the RFB protocol, better known as VNC. It is based 
+on x0rfbserver, available from http://www.hexonet.de/software/x0rfbserver/.
+Unlike most other Unix/Linux RFB servers, KRfb (and x0rfbserver) allows you 
+to share your X11 session instead of creating a new X11 session. 
+
+For more information about KRfb visit http://www.tjansen.de/krfb
+
+Read the NOTES file for various notes on KRfb.
+
+
+
 

TODO

@@ -1,4 +1,8 @@
 Todo:
-- i18n (0.2)
+- i18n
+- do something against potential denial-of-service attacks by repeatedly
+  trying to connect to users until they agree. Maybe a message box
+  after the third attempt offering the user to stop KRfb, block the IP or 
+  something like this
 
 

configure.in.in

@@ -5,3 +5,8 @@ AM_INIT_AUTOMAKE(krfb,0.1)
 AC_CHECK_HEADER(X11/extensions/XTest.h, 
 	[],
 	AC_MSG_ERROR([XTest extension header not found]))
+
+AC_CHECK_HEADER(zlib.h, 
+	[],
+	AC_MSG_ERROR([ZLib header not found]))
+

krfb/Makefile.am

@@ -1,22 +1,16 @@
 METASOURCES = AUTO
-KDE_ICON = AUTO
-POFILES=AUTO
 
 bin_PROGRAMS = krfb
 krfb_SOURCES = rfbcontroller.cc configuration.cc trayicon.cpp XUpdateScanner.cc rfbconnection.cc main.cpp configurationdialog.ui newconnectiondialog.ui
-krfb_LDADD   = ./lib/liblib.a  $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)  $(LIBSOCKET)
+krfb_LDADD   = ./lib/librfbserver.a  $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)  $(LIBSOCKET)
 
 SUBDIRS = lib 
 
-EXTRA_DIST = krfb.desktop lo32-app-krfb.png lo16-app-krfb.png rfbcontroller.h rfbconnection.h eyes-closed24.png eyes-open24.png XUpdateScanner.h trayicon.h configuration.h
+EXTRA_DIST = $(krfb_SOURCES) krfb.desktop lo32-app-krfb.png lo16-app-krfb.png rfbcontroller.h rfbconnection.h eyes-closed24.png eyes-open24.png XUpdateScanner.h trayicon.h configuration.h
 
 install-data-local:
 	$(mkinstalldirs) $(kde_appsdir)/Applications/
 	$(INSTALL_DATA) $(srcdir)/krfb.desktop $(kde_appsdir)/Applications/krfb.desktop
-	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
-	$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(kde_icondir)/locolor/32x32/apps/krfb.png
-	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
-	$(INSTALL_DATA) $(srcdir)/lo16-app-krfb.png $(kde_icondir)/locolor/16x16/apps/krfb.png
 	$(mkinstalldirs) $(kde_datadir)/krfb/pics
 	$(INSTALL_DATA) $(srcdir)/eyes-closed24.png $(kde_datadir)/krfb/pics/eyes-closed24.png
 	$(INSTALL_DATA) $(srcdir)/eyes-open24.png $(kde_datadir)/krfb/pics/eyes-open24.png
@@ -24,11 +18,11 @@ install-data-local:
 
 uninstall-local:
 	-rm -f $(kde_appsdir)/Applications/krfb.desktop
-	-rm -f $(kde_icondir)/locolor/32x32/apps/krfb.png
-	-rm -f $(kde_icondir)/locolor/16x16/apps/krfb.png
 	-rm -f $(kde_datadir)/krfb/pics/eyes-open24.png
 	-rm -f $(kde_datadir)/krfb/pics/eyes-closed24.png
 
+KDE_ICON = krfb
+
 # this 10 paths are KDE specific. Use them:
 # kde_htmldir       Where your docs should go to. (contains lang subdirs)
 # kde_appsdir       Where your application file (.kdelnk) should go to. 
@@ -46,7 +40,9 @@ uninstall-local:
 INCLUDES= $(all_includes) -I../include
 
 # the library search path. 
-krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lXtst
+krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lXtst -lz
+
+CXXFLAGS = -DUSE_ZLIB_WARREN
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE´s XML GUI builing

krfb/configurationdialog.ui

@@ -11,20 +11,20 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>318</width>
+            <width>321</width>
             <height>257</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
-            <hsizetype>5</hsizetype>
+            <hsizetype>0</hsizetype>
-            <vsizetype>5</vsizetype>
+            <vsizetype>0</vsizetype>
         </sizepolicy>
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>KRfb configuration</string>
+        <string>KRfb: Configuration</string>
     </property>
     <vbox>
         <property stdset="1">
@@ -76,7 +76,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>ask &amp;before remote client connects</string>
+                        <string>Ask &amp;before remote client connects</string>
                     </property>
                     <property>
                         <name>whatsThis</name>
@@ -91,7 +91,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>allow &amp;remote client to control the desktop</string>
+                        <string>Allow &amp;remote client to control the desktop</string>
                     </property>
                     <property>
                         <name>whatsThis</name>

krfb/newconnectiondialog.ui

@@ -17,7 +17,7 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>New RFB Connection</string>
+        <string>KRfb: New Connection</string>
     </property>
     <grid>
         <property stdset="1">
@@ -145,7 +145,7 @@
                             <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>TextLabel3</cstring>
+                                <cstring>mainTextLabel</cstring>
                             </property>
                             <property stdset="1">
                                 <name>sizePolicy</name>
@@ -168,12 +168,12 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>A user on the computer x.x.x.x requests a RFB connection to your computer. 
+                                <string>Somebody requests a RFB connection to your computer. 
-This means that he can see everything on your screen and, if the box below is enabled, he can also control it. Refuse the connection unless you trust the person.</string>
+This means that she can see everything on your screen and, if the option below is enabled, she can also control it. Refuse the connection unless you trust the person.</string>
                             </property>
                             <property stdset="1">
                                 <name>textFormat</name>
-                                <enum>PlainText</enum>
+                                <enum>AutoText</enum>
                             </property>
                             <property stdset="1">
                                 <name>alignment</name>
@@ -189,6 +189,78 @@ This means that he can see everything on your screen and, if the box below is en
                         </widget>
                     </vbox>
                 </widget>
+                <widget>
+                    <class>QFrame</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Frame6</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShape</name>
+                        <enum>NoFrame</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>frameShadow</name>
+                        <enum>Plain</enum>
+                    </property>
+                    <property>
+                        <name>layoutMargin</name>
+                    </property>
+                    <property>
+                        <name>layoutSpacing</name>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>1</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>TextLabel1</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>font</name>
+                                <font>
+                                    <bold>1</bold>
+                                </font>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Remote system:</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>ipLabel</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>font</name>
+                                <font>
+                                    <bold>1</bold>
+                                </font>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>123.234.123.234</string>
+                            </property>
+                        </widget>
+                    </hbox>
+                </widget>
                 <widget>
                     <class>QCheckBox</class>
                     <property stdset="1">
@@ -204,7 +276,7 @@ This means that he can see everything on your screen and, if the box below is en
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Allow remote user to control keyboard and mouse</string>
+                        <string>Allow remote user to control &amp;keyboard and mouse</string>
                     </property>
                     <property>
                         <name>whatsThis</name>
@@ -278,7 +350,7 @@ This means that he can see everything on your screen and, if the box below is en
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Accept connection</string>
+                        <string>&amp;Accept Connection</string>
                     </property>
                     <property>
                         <name>whatsThis</name>
@@ -293,7 +365,11 @@ This means that he can see everything on your screen and, if the box below is en
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Refuse connection</string>
+                        <string>&amp;Refuse Connection</string>
+                    </property>
+                    <property stdset="1">
+                        <name>accel</name>
+                        <number>276824146</number>
                     </property>
                     <property stdset="1">
                         <name>default</name>

krfb/rfbcontroller.cc

@@ -29,11 +29,13 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
+#include <kextsock.h>
 #include <qwindowdefs.h>
 #include <qtimer.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qglobal.h>
+#include <qlabel.h>
 
 RFBController::RFBController(Configuration *c) :
 	configuration(c),
@@ -107,8 +109,13 @@ void RFBController::accepted(KSocket *s) {
 	socket = s;
 
 	if (configuration->askOnConnect()) {
+		QString host, port;
+		KExtendedSocket::resolve(KExtendedSocket::peerAddress(sockFd),
+					 host, port);
+		dialog.ipLabel->setText(host);
 		dialog.allowRemoteControlCB->setChecked(
 			configuration->allowDesktopControl());
+		dialog.setFixedSize(dialog.sizeHint());
 		dialog.show();
 	}
 	else {

krfb/trayicon.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "trayicon.h"
+#include <kstdaction.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdialog.h>
@@ -32,7 +33,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	trayIconClosed = loader->loadIcon("eyes-closed24", KIcon::User);
 	setPixmap(trayIconClosed);
 
-	configureAction = new KAction(i18n("&Configure KRfb...")); 	
+	configureAction = KStdAction::preferences();
 	if (!c->preconfigured()) 
 		configureAction->plug(contextMenu());
 
@@ -41,8 +42,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	closeConnectionAction->setEnabled(false);
 
 	contextMenu()->insertSeparator();
-	aboutAction = new KAction(i18n("&About KRfb"), 
+	aboutAction = KStdAction::aboutApp();
-				  KApplication::kApplication()->instanceName()); 	
 	aboutAction->plug(contextMenu());
 	connect(configureAction, SIGNAL(activated()), SIGNAL(showConfigure()));
 	connect(aboutAction, SIGNAL(activated()), SLOT(showAbout()));