Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

servers/app: html5/remote drawing 64-bit fixes

Browse Source 
* Still doesn't seem to work anymore.
* Documentation: TARGET_SCREEN="html5:127.0.0.1:80" DeskCalc
This commit is contained in:
Alexander von Gluck IV 2017-09-22 23:54:08 +00:00
parent 6103c9d186
commit 1a472d01fd
9 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/servers/app/Jamfile
View File

@ -53,11 +53,6 @@ if [ FIsBuildFeatureEnabled fontconfig ] {
: [ BuildFeatureAttribute freetype : headers ] ;
}
local BROKEN_64 = ;
if $(TARGET_ARCH) != x86_64 {
BROKEN_64 = "" ;
}
Server app_server :
Angle.cpp
AppServer.cpp
@ -112,7 +107,7 @@ Server app_server :
# libraries
:
libtranslation.so libbe.so libbnetapi.so
libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
libaslocal.a libasremote.a libashtml5.a
libasdrawing.a libpainter.a libagg.a
[ BuildFeatureAttribute freetype : library ]
[ BuildFeatureAttribute fontconfig : library ]

2
src/servers/app/ScreenManager.cpp
View File

@ -105,7 +105,7 @@ ScreenManager::AcquireScreens(ScreenOwner* owner, int32* wishList,
}
}
#if TEST_MODE == 0 && !defined(__x86_64__)
#if TEST_MODE == 0
if (added == 0 && target != NULL) {
// there's a specific target screen we want to initialize
// TODO: right now we only support remote screens, but we could

2
src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
View File

@ -23,7 +23,7 @@ HTML5DrawingEngine::HTML5DrawingEngine(HTML5HWInterface* interface)
:
DrawingEngine(interface),
fHWInterface(interface),
fToken((uint32)this), // TODO: need to redo that for 64 bit
fToken((addr_t)this),
fExtendWidth(0),
fCallbackAdded(false),
fResultNotify(-1),

2
src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
View File

@ -162,7 +162,7 @@ private:
UtilityBitmap**& bitmaps);
HTML5HWInterface* fHWInterface;
uint32 fToken;
addr_t fToken;
DrawState fState;
BRegion fClippingRegion;

5
src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
View File

@ -78,7 +78,7 @@ HTML5HWInterface::HTML5HWInterface(const char* target)
if (portStart != NULL) {
portStart[0] = 0;
portStart++;
if (sscanf(portStart, "%lu", &fRemotePort) != 1) {
if (sscanf(portStart, "%" B_PRIu32, &fRemotePort) != 1) {
fInitStatus = B_BAD_VALUE;
return;
}
@ -304,7 +304,8 @@ HTML5HWInterface::_EventThread()
return result;
}
TRACE("got message code %u with %lu bytes\n", code, message.DataLeft());
TRACE("got message code %" B_PRIu16 " with %" B_PRIu32 " bytes\n", code,
message.DataLeft());
if (code >= RP_MOUSE_MOVED && code <= RP_MODIFIERS_CHANGED) {
// an input event, dispatch to the event stream

4
src/servers/app/drawing/interface/html5/WebWorker.cpp
View File

@ -115,7 +115,7 @@ WebWorker::_Work()
readSize = io->Read(buffer, sizeof(buffer));
else if (rb)
readSize = rb->Read(buffer, sizeof(buffer));
TRACE("readSize %ld\n", readSize);
TRACE("readSize %" B_PRId32 "\n", readSize);
if (readSize < 0) {
TRACE_ERROR("read failed, closing connection: %s\n",
@ -140,7 +140,7 @@ WebWorker::_Work()
errorCount = 0;
result = fEndpoint->Send(buffer, readSize);
TRACE("writeSize %ld\n", result);
// TRACE("writeSize %ld\n", result);
if (result < readSize) {
TRACE_ERROR("writing to peer failed: %s\n",
strerror(result));

2
src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
View File

@ -22,7 +22,7 @@ RemoteDrawingEngine::RemoteDrawingEngine(RemoteHWInterface* interface)
:
DrawingEngine(interface),
fHWInterface(interface),
fToken((uint32)this), // TODO: need to redo that for 64 bit
fToken((addr_t)this),
fExtendWidth(0),
fCallbackAdded(false),
fResultNotify(-1),

2
src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
View File

@ -161,7 +161,7 @@ private:
UtilityBitmap**& bitmaps);
RemoteHWInterface* fHWInterface;
uint32 fToken;
addr_t fToken;
DrawState fState;
BRegion fClippingRegion;

8
src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
View File

@ -63,7 +63,7 @@ RemoteHWInterface::RemoteHWInterface(const char* target)
if (portStart != NULL) {
portStart[0] = 0;
portStart++;
if (sscanf(portStart, "%lu", &fRemotePort) != 1) {
if (sscanf(portStart, "%" B_PRIu32, &fRemotePort) != 1) {
fInitStatus = B_BAD_VALUE;
return;
}
@ -300,11 +300,11 @@ RemoteHWInterface::_EventThread()
status_t
RemoteHWInterface::_Connect()
{
TRACE("connecting to host \"%s\" port %lu\n", fRemoteHost, fRemotePort);
TRACE("connecting to host \"%s\" port %" B_PRIu32 "\n", fRemoteHost, fRemotePort);
status_t result = fSendEndpoint->Connect(fRemoteHost, (uint16)fRemotePort);
if (result != B_OK) {
TRACE_ERROR("failed to connect to host \"%s\" port %lu\n", fRemoteHost,
fRemotePort);
TRACE_ERROR("failed to connect to host \"%s\" port %" B_PRIu32 "\n",
fRemoteHost, fRemotePort);
return result;
}