Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Eskil Abrahamsen-Blomfeldt
VNC Server
Commits
8e3080ec
Commit
8e3080ec
authored
Mar 08, 2022
by
Eskil Abrahamsen-Blomfeldt
Browse files
Port vncserver lib to Qt 5
parent
241eb055
Changes
6
Hide whitespace changes
Inline
Side-by-side
.qmake.conf
0 → 100644
View file @
8e3080ec
load
(
qt_build_config
)
CONFIG
+=
warning_clean
DEFINES
+=
QT_NO_LINKED_LIST
DEFINES
+=
QT_NO_JAVA_STYLE_ITERATORS
MODULE_VERSION
=
5
.
15
.
9
qtvncserver.pro
0 → 100644
View file @
8e3080ec
load
(
qt_parts
)
src/src.pro
0 → 100644
View file @
8e3080ec
TEMPLATE
=
subdirs
SUBDIRS
+=
\
vncserver
src/vncserver/qtvncserverglobal.h
View file @
8e3080ec
...
...
@@ -30,7 +30,20 @@
#ifndef QTVNCSERVERGLOBAL_H
#define QTVNCSERVERGLOBAL_H
#include <QtVncServer/qtvncserverexports.h>
#include <QtCore/qglobal.h>
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
# include <QtVncServer/qtvncserverexports.h>
#else
# if !defined(Q_VNCSERVERT_EXPORT)
# if defined(QT_SHARED)
# define Q_VNCSERVER_EXPORT Q_DECL_EXPORT
# else
# define Q_VNCSERVER_EXPORT
# endif
# endif
#endif
#include <QtCore/qloggingcategory.h>
Q_DECLARE_LOGGING_CATEGORY
(
lcVnc
)
...
...
src/vncserver/qvncclient.cpp
View file @
8e3080ec
...
...
@@ -112,7 +112,11 @@ QVNCDirtyMap::QVNCDirtyMap(QImage referenceImage)
bufferStride
=
bufferWidth
*
bytesPerPixel
;
const
size_t
bufferSize
=
bufferHeight
*
bufferStride
;
buffer
=
new
uchar
[
bufferSize
];
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
std
::
memcpy
(
buffer
,
referenceImage
.
constBits
(),
bufferSize
);
#else
memcpy
(
buffer
,
referenceImage
.
constBits
(),
bufferSize
);
#endif
mapWidth
=
(
bufferWidth
+
MAP_TILE_SIZE
-
1
)
/
MAP_TILE_SIZE
;
mapHeight
=
(
bufferHeight
+
MAP_TILE_SIZE
-
1
)
/
MAP_TILE_SIZE
;
...
...
@@ -1300,7 +1304,11 @@ void QVncClient::keyEvent()
emit
keyEventReceived
(
ev
.
down
?
QEvent
::
KeyPress
:
QEvent
::
KeyRelease
,
Qt
::
Key
(
ev
.
keycode
),
m_keymod
,
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QChar
::
fromUcs2
(
ev
.
unicode
));
#else
QChar
(
ev
.
unicode
));
#endif
}
if
(
ev
.
keycode
==
Qt
::
Key_Shift
)
m_keymod
=
ev
.
down
?
m_keymod
|
Qt
::
ShiftModifier
:
...
...
src/vncserver/vncserver.pro
0 → 100644
View file @
8e3080ec
TARGET
=
QtVncServer
QMAKE_USE_PRIVATE
+=
zlib
QT
=
core
-
private
gui
-
private
network
-
private
HEADERS
+=
\
$$
PWD
/
qrfbprotocol_p
.
h
\
$$
PWD
/
qtvncserverglobal
.
h
\
$$
PWD
/
qvncclient_p
.
h
\
$$
PWD
/
qvncclientcursor_p
.
h
\
$$
PWD
/
qvncserver
.
h
SOURCES
+=
\
$$
PWD
/
qrfbprotocol
.
cpp
\
$$
PWD
/
qtvncserverglobal
.
cpp
\
$$
PWD
/
qvncclient
.
cpp
\
$$
PWD
/
qvncclientcursor
.
cpp
\
$$
PWD
/
qvncserver
.
cpp
load
(
qt_module
)
CONFIG
-=
create_cmake
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment