summaryrefslogtreecommitdiffstats
path: root/krdc/vnc
diff options
context:
space:
mode:
Diffstat (limited to 'krdc/vnc')
-rw-r--r--krdc/vnc/desktop.c18
-rw-r--r--krdc/vnc/kvncview.cpp6
-rw-r--r--krdc/vnc/kvncview.h2
-rw-r--r--krdc/vnc/rfbproto.c8
-rw-r--r--krdc/vnc/rfbproto.h12
5 files changed, 23 insertions, 23 deletions
diff --git a/krdc/vnc/desktop.c b/krdc/vnc/desktop.c
index 2975e731..003a7160 100644
--- a/krdc/vnc/desktop.c
+++ b/krdc/vnc/desktop.c
@@ -1380,10 +1380,10 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale,
UintXX *dst_row; \
UintXX c1, c2, c3, c4;\
Uint32 R, G, B, A=0; \
- UintXX Rtqmask = image->red_mask;\
- UintXX Gtqmask = image->green_mask;\
- UintXX Btqmask = image->blue_mask;\
- UintXX Atqmask = 0;\
+ UintXX Rmask = image->red_mask;\
+ UintXX Gmask = image->green_mask;\
+ UintXX Bmask = image->blue_mask;\
+ UintXX Amask = 0;\
Uint32 wx, wy;\
Uint32 p1, p2, p3, p4;\
\
@@ -1449,11 +1449,11 @@ static void _calcRect(Surface *src, Surface *dst, float xscale, float yscale,
c4 = *(src_row + (ry+1)*src_pitch + rx+1);\
\
/* Calculate the average */\
- R = ((p1*(c1 & Rtqmask) + p2*(c2 & Rtqmask) + p3*(c3 & Rtqmask) + p4*(c4 & Rtqmask))>>7) & Rtqmask;\
- G = ((p1*(c1 & Gtqmask) + p2*(c2 & Gtqmask) + p3*(c3 & Gtqmask) + p4*(c4 & Gtqmask))>>7) & Gtqmask;\
- B = ((p1*(c1 & Btqmask) + p2*(c2 & Btqmask) + p3*(c3 & Btqmask) + p4*(c4 & Btqmask))>>7) & Btqmask;\
- if(Atqmask)\
- A = ((p1*(c1 & Atqmask) + p2*(c2 & Atqmask) + p3*(c3 & Atqmask) + p4*(c4 & Atqmask))>>7) & Atqmask;\
+ R = ((p1*(c1 & Rmask) + p2*(c2 & Rmask) + p3*(c3 & Rmask) + p4*(c4 & Rmask))>>7) & Rmask;\
+ G = ((p1*(c1 & Gmask) + p2*(c2 & Gmask) + p3*(c3 & Gmask) + p4*(c4 & Gmask))>>7) & Gmask;\
+ B = ((p1*(c1 & Bmask) + p2*(c2 & Bmask) + p3*(c3 & Bmask) + p4*(c4 & Bmask))>>7) & Bmask;\
+ if(Amask)\
+ A = ((p1*(c1 & Amask) + p2*(c2 & Amask) + p3*(c3 & Amask) + p4*(c4 & Amask))>>7) & Amask;\
\
*(dst_row + x) = R | G | B | A;\
} \
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index 59ac4c9f..02cd3a78 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -64,7 +64,7 @@ static TQWaitCondition passwordWaiter;
const unsigned int MAX_SELECTION_LENGTH = 4096;
-KVncView::KVncView(TQWidget *tqparent,
+KVncView::KVncView(TQWidget *parent,
const char *name,
const TQString &_host,
int _port,
@@ -72,7 +72,7 @@ KVncView::KVncView(TQWidget *tqparent,
Quality quality,
DotCursorState dotCursorState,
const TQString &encodings) :
- KRemoteView(tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents),
+ KRemoteView(parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase | TQt::WStaticContents),
m_cthread(this, m_wthread, m_quitFlag),
m_wthread(this, m_quitFlag),
m_quitFlag(false),
@@ -100,7 +100,7 @@ KVncView::KVncView(TQWidget *tqparent,
TQBitmap cursorBitmap(dirs->findResource("appdata",
"pics/pointcursor.png"));
TQBitmap cursorMask(dirs->findResource("appdata",
- "pics/pointcursortqmask.png"));
+ "pics/pointcursormask.png"));
m_cursor = TQCursor(cursorBitmap, cursorMask);
if ((quality != TQUALITY_UNKNOWN) ||
diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h
index 3cd72a5c..7fdf402c 100644
--- a/krdc/vnc/kvncview.h
+++ b/krdc/vnc/kvncview.h
@@ -77,7 +77,7 @@ protected:
bool x11Event(XEvent*);
public:
- KVncView(TQWidget* tqparent=0, const char *name=0,
+ KVncView(TQWidget* parent=0, const char *name=0,
const TQString &host = TQString(""), int port = 5900,
const TQString &password = TQString(),
Quality quality = TQUALITY_UNKNOWN,
diff --git a/krdc/vnc/rfbproto.c b/krdc/vnc/rfbproto.c
index 371912a4..13676bb6 100644
--- a/krdc/vnc/rfbproto.c
+++ b/krdc/vnc/rfbproto.c
@@ -558,7 +558,7 @@ HandleSoftCursorSetImage(rfbSoftCursorSetImage *msg, rfbRectangle *rect)
/* framebuffer must be locked when calling this!!! */
static Bool
-PointerMove(unsigned int x, unsigned int y, unsigned int tqmask,
+PointerMove(unsigned int x, unsigned int y, unsigned int mask,
int ox, int oy, int ow, int oh)
{
int nx, ny, nw, nh;
@@ -585,7 +585,7 @@ PointerMove(unsigned int x, unsigned int y, unsigned int tqmask,
SyncScreenRegion(nx, ny, nw, nh);
}
- postMouseEvent(cursorX, cursorY, tqmask);
+ postMouseEvent(cursorX, cursorY, mask);
return True;
}
@@ -759,7 +759,7 @@ static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD3
if (width * height == 0)
return True;
- /* Allocate memory for pixel data and temporary tqmask data. */
+ /* Allocate memory for pixel data and temporary mask data. */
rcSource = malloc(width * height * bytesPerPixel);
if (rcSource == NULL)
@@ -830,7 +830,7 @@ static Bool HandletqCursorShape(int xhot, int yhot, int width, int height, CARD3
}
}
- /* Read tqmask data. */
+ /* Read mask data. */
if (!ReadFromRFBServer((char*)rcMask, bytesMaskData)) {
free(rcSource);
diff --git a/krdc/vnc/rfbproto.h b/krdc/vnc/rfbproto.h
index 9622eb2e..1b5fd839 100644
--- a/krdc/vnc/rfbproto.h
+++ b/krdc/vnc/rfbproto.h
@@ -436,11 +436,11 @@ typedef struct {
* the last tile in each row will be correspondingly smaller. Similarly if the
* height is not an exact multiple of 16 then the height of each tile in the
* final row will also be smaller. Each tile begins with a "subencoding" type
- * byte, which is a tqmask made up of a number of bits. If the Raw bit is set
+ * byte, which is a mask made up of a number of bits. If the Raw bit is set
* then the other bits are irrelevant; w*h pixel values follow (where w and h
* are the width and height of the tile). Otherwise the tile is encoded in a
* similar way to RRE, except that the position and size of each subrectangle
- * can be specified in just two bytes. The other bits in the tqmask are as
+ * can be specified in just two bytes. The other bits in the mask are as
* follows:
*
* BackgroundSpecified - if set, a pixel value follows which specifies
@@ -706,10 +706,10 @@ typedef struct {
CARD16 imageLength;
/*
* Followed by an image of the cursor in the client's image format
- * with the following RLE tqmask compression. It begins with CARD8 that
- * specifies the number of tqmask'ed pixels that will be NOT transmitted.
- * Then follows a CARD8 that specified by the number of untqmask'd pixels
- * that will be transmitted next. Then a CARD8 with the number of tqmask'd
+ * with the following RLE mask compression. It begins with CARD8 that
+ * specifies the number of mask'ed pixels that will be NOT transmitted.
+ * Then follows a CARD8 that specified by the number of unmask'd pixels
+ * that will be transmitted next. Then a CARD8 with the number of mask'd
* pixels and so on.
*/
} rfbSoftCursorSetImage;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 02:28:03 +0000