cleanup

diff --git a/libvnc/libvncclient/listen.c b/libvnc/libvncclient/listen.c
index d5f6704..9f9c779 100644 (file)
--- a/libvnc/libvncclient/listen.c
+++ b/libvnc/libvncclient/listen.c
@@ -58,10 +58,10 @@ listenForIncomingConnections(rfbClient* client)
   if ((listenSocket < 0))
     return;
 
-  rfbClientLog("%s -listen: Listening on port %d\n",
-         client->programName,client->listenPort);
-  rfbClientLog("%s -listen: Command line errors are not reported until "
-         "a connection comes in.\n", client->programName);
+  rfbClientLog("Listening on port %d\n",
+         client->listenPort);
+  rfbClientLog("Command line errors are not reported until "
+         "a connection comes in.\n");
 
   while (TRUE) {
 
@@ -86,6 +86,7 @@ listenForIncomingConnections(rfbClient* client)
 
        //modified to accept only a single connection
        //if something goes wrong, we can always create another listening socket
+       rfbClientLog("Accepted connection.\n");
        close(listenSocket);
        return;
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1deb762..7940a25 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -36,17 +36,15 @@ MainWindow::MainWindow(QString url, int quality):
        QMainWindow(0),
        vnc_view(0),
        scroll_area(new ScrollArea(0)),
-       key_menu(0)
+       key_menu(new KeyMenu(this))
 {
        setWindowTitle("Presence VNC");
-
-       migrateConfiguration();
-       QSettings settings;
-
 #ifdef Q_WS_MAEMO_5
        setAttribute(Qt::WA_Maemo5StackedWindow);
 #endif
 
+       migrateConfiguration();
+
        //set up toolbar
        toolbar = new QToolBar(0);
        toolbar->addAction(QChar(0x2026), this, SLOT(showKeyMenu())); //"..." button
@@ -66,6 +64,7 @@ MainWindow::MainWindow(QString url, int quality):
        toolbar->addWidget(spacer);
        */
 
+       QSettings settings;
        zoom_slider = new QSlider(Qt::Horizontal, 0);
        zoom_slider->setRange(0, 100);
        connect(zoom_slider, SIGNAL(valueChanged(int)),
@@ -137,7 +136,6 @@ MainWindow::MainWindow(QString url, int quality):
                        this, SLOT(statusChanged(RemoteView::RemoteStatus)));
                scroll_area->setWidget(vnc_view);
                vnc_view->start();
-               key_menu = new KeyMenu(this);
        }
 }
 
@@ -197,11 +195,12 @@ void MainWindow::connectToHost(QString url, int quality, int listen_port)
                this, SLOT(statusChanged(RemoteView::RemoteStatus)));
        scroll_area->setWidget(vnc_view);
        vnc_view->start();
+
        disconnect_action->setEnabled(true);
        toolbar->setEnabled(true);
 
-       if(key_menu) //reset
-               delete key_menu;
+       //reset key menu
+       delete key_menu;
        key_menu = new KeyMenu(this);
 }
 

diff --git a/src/vncview.cpp b/src/vncview.cpp
index adfb2f2..1d4932e 100644 (file)
--- a/src/vncview.cpp
+++ b/src/vncview.cpp
@@ -53,7 +53,11 @@ critical(parent, caption, message)
 #define KMOD_Shift_L   0x10
 
 //local cursor width/height in px, should be an odd number
-const int cursor_size = 7;
+const int CURSOR_SIZE = 7;
+
+const int TAP_PRESS_TIME = 180;
+const int DOUBLE_TAP_UP_TIME = 500;
+
 
 VncView::VncView(QWidget *parent, const KUrl &url, RemoteView::Quality quality, int listen_port)
         : RemoteView(parent),
@@ -277,44 +281,11 @@ void VncView::updateImage(int x, int y, int w, int h)
 
      //kDebug(5011) << "got update" << width() << height();
 
-     /*
-     static unsigned int frames = 0;
-     static unsigned int updates = 0;
-     static QTime time = QTime::currentTime();
-     updates++;
-     if(updates % 100 == 0)
-            kDebug(5011) << "u/s: " << updates/double(time.elapsed()) * 1000.0;
-if(x == 0 and y == 0) {
-       frames++;
-     if(frames % 100 == 0)
-            kDebug(5011) << "f/s: " << frames/double(time.elapsed()) * 1000.0;
-}
-*/
-
     m_x = x;
     m_y = y;
     m_w = w;
     m_h = h;
 
-
-       //with scaled view, artefacts occur because of rounding errors
-       //we'll try to only update chunks of screen space that correspond to integer pixel sizes in m_frame
-       //put this into paintEvent
-       /*
-       int frame_x = x/m_horizontalFactor;
-       int frame_w = w/m_horizontalFactor;
-       int frame_y = y/m_verticalFactor;
-       int frame_h = h/m_verticalFactor;
-       
-       m_x = frame_x*m_horizontalFactor;
-       m_y = frame_y*m_verticalFactor;
-
-       m_w = (frame_w+2)*m_horizontalFactor;
-       m_h = (frame_h+2)*m_verticalFactor;
-       kDebug(5011)<< "update);
-       */
-
-
     if (m_horizontalFactor != 1.0 || m_verticalFactor != 1.0) {
         // If the view is scaled, grow the update rectangle to avoid artifacts
         int x_extrapixels = 1.0/m_horizontalFactor + 1;
@@ -379,11 +350,6 @@ void VncView::showDotCursor(DotCursorState state)
     setCursor(state == CursorOn ? localDotCursor() : Qt::BlankCursor);
 }
 
-void VncView::enableScaling(bool scale)
-{
-    RemoteView::enableScaling(scale);
-}
-
 //level should be in [0, 100]
 void VncView::setZoomLevel(int level)
 {
@@ -394,32 +360,26 @@ void VncView::setZoomLevel(int level)
                return;
        }
 
-       double factor; //actual magnification
+       double magnification;
        if(level == 100) {
-               factor = 2.0;
+               magnification = 2.0;
        } else if(level >= 90) {
-               factor = 1.0;
+               magnification = 1.0;
        } else {
-               const double min_horiz_factor = double(parentWidget()->width())/m_frame.width();
-               const double min_vert_factor = double(parentWidget()->height())/m_frame.height();
-               const double fit_screen_factor = qMin(min_horiz_factor, min_vert_factor);
+               const double min_horiz_magnification = double(parentWidget()->width())/m_frame.width();
+               const double min_vert_magnification = double(parentWidget()->height())/m_frame.height();
+               const double fit_screen_magnification = qMin(min_horiz_magnification, min_vert_magnification);
 
-               //level=90 => factor=1.0, level=0 => factor=fit_screen_factor
-               factor = (level)/90.0*(1.0 - fit_screen_factor) + fit_screen_factor;
+               //level=90 => magnification=1.0, level=0 => magnification=fit_screen_magnification
+               magnification = (level)/90.0*(1.0 - fit_screen_magnification) + fit_screen_magnification;
        }
 
-       if(factor < 0) {
-               //remote display smaller than local?
-               kDebug(5011) << "remote display smaller than local?";
-               factor = 1.0;
-       }
-       if(factor != factor) //nan
-               factor = 1.0;
+       if(magnification < 0                    //remote display smaller than local?
+       or magnification != magnification)      //nan
+               magnification = 1.0;
        
-       kDebug(5011) << "factor" << factor;
-
-       m_verticalFactor = m_horizontalFactor = factor;
-       resize(m_frame.width()*factor, m_frame.height()*factor);
+       m_verticalFactor = m_horizontalFactor = magnification;
+       resize(m_frame.width()*magnification, m_frame.height()*magnification);
 }
 
 void VncView::setCut(const QString &text)
@@ -481,7 +441,7 @@ void VncView::paintEvent(QPaintEvent *event)
                painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
 #endif
                //rectangle size includes 1px pen width
-               painter.drawRect(cursor_x*m_horizontalFactor - cursor_size/2, cursor_y*m_verticalFactor - cursor_size/2, cursor_size-1, cursor_size-1);
+               painter.drawRect(cursor_x*m_horizontalFactor - CURSOR_SIZE/2, cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE-1, CURSOR_SIZE-1);
        }
 
     RemoteView::paintEvent(event);
@@ -532,9 +492,6 @@ void VncView::mouseEventHandler(QMouseEvent *e)
        static QTime press_time;
        static QTime up_time; //used for double clicks/tap&drag, for time after first tap
 
-       const int TAP_PRESS_TIME = 180;
-       const int DOUBLE_TAP_UP_TIME = 500;
-
        if(!e) { //flush held taps
                if(tap_detected) {
                        m_buttonMask |= 0x01;
@@ -614,9 +571,9 @@ void VncView::mouseEventHandler(QMouseEvent *e)
        if(((m_dotCursorState == CursorOn) || m_forceLocalCursor)
        and (cursor_x != old_cursor_x or cursor_y != old_cursor_y)) {
                //clear last position
-               repaint(old_cursor_x*m_horizontalFactor - cursor_size/2, old_cursor_y*m_verticalFactor - cursor_size/2, cursor_size, cursor_size);
+               repaint(old_cursor_x*m_horizontalFactor - CURSOR_SIZE/2, old_cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE, CURSOR_SIZE);
                //and refresh new one
-               repaint(cursor_x*m_horizontalFactor - cursor_size/2, cursor_y*m_verticalFactor - cursor_size/2, cursor_size, cursor_size);
+               repaint(cursor_x*m_horizontalFactor - CURSOR_SIZE/2, cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE, CURSOR_SIZE);
 
                old_cursor_x = cursor_x; old_cursor_y = cursor_y;
        }

diff --git a/src/vncview.h b/src/vncview.h
index 6979f3e..fe043f2 100644 (file)
--- a/src/vncview.h
+++ b/src/vncview.h
@@ -59,7 +59,6 @@ public:
     void showDotCursor(DotCursorState state);
     
 public slots:
-    void enableScaling(bool scale); //TODO: i may want to remove this
     void setZoomLevel(int level = -1); //'level' doesn't correspond to actual magnification, though mapping is done here
     void sendKey(Qt::Key key);
     void sendKeySequence(QKeySequence keys);