-SRCS = TXWindow.cxx TXScrollbar.cxx TXViewport.cxx TXImage.cxx TXMenu.cxx \
- Timer.cxx
+SRCS = TXWindow.cxx TXScrollbar.cxx TXViewport.cxx TXImage.cxx TXMenu.cxx
OBJS = $(SRCS:.cxx=.o)
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
text.buf = rfb::strDup(text_);
int textWidth = XTextWidth(defaultFS, text.buf, strlen(text.buf));
int textHeight = (defaultFS->ascent + defaultFS->descent);
- int newWidth = vncmax(width(), textWidth + xPad*2 + bevel*2);
- int newHeight = vncmax(height(), textHeight + yPad*2 + bevel*2);
+ int newWidth = __rfbmax(width(), textWidth + xPad*2 + bevel*2);
+ int newHeight = __rfbmax(height(), textHeight + yPad*2 + bevel*2);
if (width() < newWidth || height() < newHeight) {
resize(newWidth, newHeight);
}
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
text = strdup(text_);
int textWidth = XTextWidth(defaultFS, text, strlen(text));
int textHeight = (defaultFS->ascent + defaultFS->descent);
- int newWidth = vncmax(width(), textWidth + xPad*2 + boxPad*2 + boxSize);
- int newHeight = vncmax(height(), textHeight + yPad*2);
+ int newWidth = __rfbmax(width(), textWidth + xPad*2 + boxPad*2 + boxSize);
+ int newHeight = __rfbmax(height(), textHeight + yPad*2);
if (width() < newWidth || height() < newHeight) {
resize(newWidth, newHeight);
}
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
: TXWindow(dpy, width, height), done(false), ok(false), modal(modal_)
{
toplevel(name, this);
- int dpyWidth = WidthOfScreen(DefaultScreenOfDisplay(dpy));
- int dpyHeight = HeightOfScreen(DefaultScreenOfDisplay(dpy));
- setUSPosition((dpyWidth - width - 10) / 2, (dpyHeight - height - 30) / 2);
+ resize(width, height);
}
virtual ~TXDialog() {}
// to make sure that checkboxes have the right state, etc.
virtual void initDialog() {}
+ // resize() is overidden here to re-center the dialog
+ void resize(int w, int h) {
+ TXWindow::resize(w,h);
+ int dpyWidth = WidthOfScreen(DefaultScreenOfDisplay(dpy));
+ int dpyHeight = HeightOfScreen(DefaultScreenOfDisplay(dpy));
+ setUSPosition((dpyWidth - width() - 10) / 2, (dpyHeight - height() - 30) / 2);
+ }
+
protected:
virtual void deleteWindow(TXWindow* w) {
ok = false;
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
| ButtonPressMask);
text[0] = 0;
int textHeight = (defaultFS->ascent + defaultFS->descent);
- int newHeight = vncmax(height(), textHeight + yPad*2 + bevel*2);
+ int newHeight = __rfbmax(height(), textHeight + yPad*2 + bevel*2);
if (height() < newHeight) {
resize(width(), newHeight);
}
-/* Copyright (C) 2002-2004 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
if (w == width() && h == height()) return;
int oldStrideBytes = getStride() * (format.bpp/8);
- int rowsToCopy = vncmin(h, height());
- int bytesPerRow = vncmin(w, width()) * (format.bpp/8);
+ int rowsToCopy = __rfbmin(h, height());
+ int bytesPerRow = __rfbmin(w, width()) * (format.bpp/8);
rdr::U8* oldData = 0;
bool allocData = false;
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
} while (text.buf[i] != 0);
int textHeight = ((defaultFS->ascent + defaultFS->descent + lineSpacing)
* lines);
-
- int newWidth = vncmax(width(), textWidth + xPad*2);
- int newHeight = vncmax(height(), textHeight + yPad*2);
+ int newWidth = __rfbmax(width(), textWidth + xPad*2);
+ int newHeight = __rfbmax(height(), textHeight + yPad*2);
if (width() < newWidth || height() < newHeight) {
resize(newWidth, newHeight);
}
+ invalidate();
}
private:
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
-/* Copyright (C) 2002-2004 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
class TXMsgBox : public TXDialog, public TXButtonCallback {
public:
TXMsgBox(Display* dpy, const char* text, unsigned int flags, const char* title=0)
- : TXDialog(dpy, 1, 1, "Message"),
+ : TXDialog(dpy, 1, 1, "Message", true),
textLabel(dpy, "", this),
okButton(dpy, "OK", this, this, 60),
cancelButton(dpy, "Cancel", this, this, 60)
}
virtual void buttonActivate(TXButton* b) {
- ok = (b == &okButton);
+ ok = (b == &okButton);
+ done = true;
unmap();
}
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
else if (ev->y_root == 0) bumpScrollY = bumpScrollPixels;
if (bumpScrollX || bumpScrollY) {
- if (bumpScrollTimer.isSet()) return true;
+ if (bumpScrollTimer.isStarted()) return true;
if (setOffset(xOff + bumpScrollX, yOff + bumpScrollY)) {
- bumpScrollTimer.reset(25);
+ bumpScrollTimer.start(25);
return true;
}
}
- bumpScrollTimer.cancel();
+ bumpScrollTimer.stop();
return false;
}
-void TXViewport::timerCallback(Timer* timer)
-{
- if (setOffset(xOff + bumpScrollX, yOff + bumpScrollY))
- bumpScrollTimer.reset(25);
+bool TXViewport::handleTimeout(rfb::Timer* timer) {
+ return setOffset(xOff + bumpScrollX, yOff + bumpScrollY);
}
void TXViewport::resizeNotify()
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
#ifndef __TXVIEWPORT_H__
#define __TXVIEWPORT_H__
+#include <rfb/Timer.h>
#include "TXWindow.h"
#include "TXScrollbar.h"
-#include "Timer.h"
class TXViewport : public TXWindow, public TXScrollbarCallback,
- public TimerCallback {
+ public rfb::Timer::Callback {
public:
TXViewport(Display* dpy_, int width, int height, TXWindow* parent_=0);
virtual ~TXViewport();
private:
virtual void resizeNotify();
virtual void scrollbarPos(int x, int y, TXScrollbar* sb);
- virtual void timerCallback(Timer* timer);
+ virtual bool handleTimeout(rfb::Timer* timer);
TXWindow* clipper;
TXWindow* child;
TXScrollbar* hScrollbar;
TXScrollbar* vScrollbar;
const int scrollbarSize;
int xOff, yOff;
- Timer bumpScrollTimer;
+ rfb::Timer bumpScrollTimer;
bool bumpScroll;
bool needScrollbars;
int bumpScrollX, bumpScrollY;
-/* Copyright (C) 2002-2004 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
white = enabledBg = cols[5].pixel;
defaultGC = XCreateGC(dpy, DefaultRootWindow(dpy), 0, 0);
defaultFS
- = XLoadQueryFont(dpy, "-*-helvetica-medium-r-*-*-12-*-*-*-*-*-iso8859-*");
+ = XLoadQueryFont(dpy, "-*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*");
if (!defaultFS) {
defaultFS = XLoadQueryFont(dpy, "fixed");
if (!defaultFS) {
-/* Copyright (C) 2002-2004 RealVNC Ltd. All Rights Reserved.
- *
+/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved.
+ *
* This 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 of the License, or
void resize(int w, int h);
void raise() { XRaiseWindow(dpy, win()); }
void setBorderWidth(int bw);
+ void invalidate(int x=0, int y=0, int w=0, int h=0) { XClearArea(dpy, win(), x, y, w, h, True); }
// ownSelection requests that the window owns the given selection from the
// given time (the time should be taken from an X event).
+++ /dev/null
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
- * This 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 of the License, or
- * (at your option) any later version.
- *
- * This software 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 software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-//
-// Timer.cxx
-//
-
-// XXX Lynx/OS 2.3: get proto for gettimeofday()
-#ifdef Lynx
-#include <sys/proto.h>
-#endif
-
-#include "Timer.h"
-
-static Timer* timers;
-
-void Timer::callTimers()
-{
- struct timeval now;
- gettimeofday(&now, 0);
- while (timers) {
- Timer* timer = timers;
- if (timer->before(now)) {
- timers = timers->next;
- timer->cb->timerCallback(timer);
- } else {
- break;
- }
- }
-}
-
-bool Timer::getTimeout(struct timeval* timeout)
-{
- if (!timers) return false;
- Timer* timer = timers;
- struct timeval now;
- gettimeofday(&now, 0);
- if (timer->before(now)) {
- timeout->tv_sec = 0;
- timeout->tv_usec = 0;
- return true;
- }
- timeout->tv_sec = timer->tv.tv_sec - now.tv_sec;
- if (timer->tv.tv_usec < now.tv_usec) {
- timeout->tv_usec = timer->tv.tv_usec + 1000000 - now.tv_usec;
- timeout->tv_sec--;
- } else {
- timeout->tv_usec = timer->tv.tv_usec - now.tv_usec;
- }
- return true;
-}
-
-Timer::Timer(TimerCallback* cb_) : cb(cb_) {}
-Timer::~Timer()
-{
- cancel();
-}
-
-void Timer::reset(int ms) {
- cancel();
- gettimeofday(&tv, 0);
- tv.tv_sec += ms / 1000;
- tv.tv_usec += (ms % 1000) * 1000;
- if (tv.tv_usec > 1000000) {
- tv.tv_sec += 1;
- tv.tv_usec -= 1000000;
- }
-
- Timer** timerPtr;
- for (timerPtr = &timers; *timerPtr; timerPtr = &(*timerPtr)->next) {
- if (before((*timerPtr)->tv)) {
- next = *timerPtr;
- *timerPtr = this;
- break;
- }
- }
- if (!*timerPtr) {
- next = 0;
- *timerPtr = this;
- }
-}
-
-void Timer::cancel() {
- for (Timer** timerPtr = &timers; *timerPtr; timerPtr = &(*timerPtr)->next) {
- if (*timerPtr == this) {
- *timerPtr = (*timerPtr)->next;
- break;
- }
- }
-}
-
-bool Timer::isSet() {
- for (Timer* timer = timers; timer; timer = timer->next)
- if (timer == this) return true;
- return false;
-}
+++ /dev/null
-/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved.
- *
- * This 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 of the License, or
- * (at your option) any later version.
- *
- * This software 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 software; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
-#ifndef __TIMER_H__
-#define __TIMER_H__
-
-#include <sys/time.h>
-#include <unistd.h>
-
-class TimerCallback;
-
-class Timer {
-public:
- static void callTimers();
- static bool getTimeout(struct timeval* timeout);
-
- Timer(TimerCallback* cb_);
- ~Timer();
- void reset(int ms);
- void cancel();
- bool isSet();
- bool before(struct timeval other) {
- return (tv.tv_sec < other.tv_sec ||
- (tv.tv_sec == other.tv_sec && tv.tv_usec < other.tv_usec));
- }
-private:
- struct timeval tv;
- TimerCallback* cb;
- Timer* next;
-};
-
-class TimerCallback {
-public:
- virtual void timerCallback(Timer* timer) = 0;
-};
-
-#endif
projects / tigervnc.git / commitdiff