diff options
Diffstat (limited to 'krfb')
| -rw-r--r-- | krfb/kcm_krfb/kcmkrfb.desktop | 2 | ||||
| -rw-r--r-- | krfb/krfb/krfb.desktop | 2 | ||||
| -rw-r--r-- | krfb/krfb/rfbcontroller.cc | 8 | ||||
| -rw-r--r-- | krfb/libvncserver/rfb.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/krfb/kcm_krfb/kcmkrfb.desktop b/krfb/kcm_krfb/kcmkrfb.desktop index 3b95e734..9b26afa2 100644 --- a/krfb/kcm_krfb/kcmkrfb.desktop +++ b/krfb/kcm_krfb/kcmkrfb.desktop @@ -189,4 +189,4 @@ Keywords[uk]=спільні стільниці,krfb,vnc,спільний,rdp,krd Keywords[zh_CN]=desktop sharing,krfb,vnc,sharing,krdc,remote desktop connection,invitation,port,slp,uninvited,桌面共享,共享,远程桌面连接,邀请,端口,未邀请 Keywords[zh_TW]=desktop sharing,krfb,vnc,sharing,rdp,krdc,remote desktop connection,rdp,桌面分享,分享,遠端桌面連線,invitation,port,slp,uninvited -Categories=Qt;KDE;X-KDE-settings-network;Settings; +Categories=Qt;KDE;X-KDE-settings-network; diff --git a/krfb/krfb/krfb.desktop b/krfb/krfb/krfb.desktop index 6a39da53..028837db 100644 --- a/krfb/krfb/krfb.desktop +++ b/krfb/krfb/krfb.desktop @@ -61,4 +61,4 @@ GenericName[uz@cyrillic]=Иш столи билан бўлишиш GenericName[zh_CN]=桌面共享 GenericName[zh_HK]=桌面分享 GenericName[zh_TW]=桌面分享 -Categories=Qt;KDE;System;RemoteAccess;Network; +Categories=Qt;KDE;RemoteAccess;Network; diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cc index e6277b59..29f48278 100644 --- a/krfb/krfb/rfbcontroller.cc +++ b/krfb/krfb/rfbcontroller.cc @@ -398,11 +398,11 @@ void RFBController::startServer(int inetdFd, bool xtestGrab) int h = framebufferImage->height; char *fb = framebufferImage->data; + int bpp = framebufferImage->bits_per_pixel >> 3; + if (bpp != 1 && bpp != 2 && bpp != 4) bpp = 4; + rfbLogEnable(0); - server = rfbGetScreen(0, 0, w, h, - framebufferImage->bits_per_pixel, - 8, - framebufferImage->bits_per_pixel/8); + server = rfbGetScreen(0, 0, w, h, (bpp*8), 8, bpp); server->paddedWidthInBytes = framebufferImage->bytes_per_line; diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h index 53996812..a2ce39fc 100644 --- a/krfb/libvncserver/rfb.h +++ b/krfb/libvncserver/rfb.h @@ -67,7 +67,7 @@ typedef unsigned long KeySym; #include "rfbproto.h" -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) #include <endian.h> #elif defined(__APPLE__) || defined(__FreeBSD__) #include <sys/types.h> |