strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
libreoffice-online/ios/ios.mm

25 lines
652 B
Text
Raw Normal View History

Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*-
//
// This file is part of the LibreOffice project.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <cstring>
tdf#122582: Add slideshow functionality Requires a couple of corresponding commits in core to its filter subdirectory. Change-Id: I3e6353752dd93e021fb6058fff5096f1d648d17e
2019-02-22 12:50:07 -06:00
#include "ios.h"
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
#import <Foundation/Foundation.h>
Pass correct argument on iOS as pBuffer to lok::Document::paintTile() On iOS it shouldn't actually be pointer to a pixel char buffer, but a craphics context reference. (This is how it has been since the experimental TiledLibreOffice app, maybe five years ago? Sadly it wasn't documented in the LibreOfficeKit include file. But it is how LibreOfficeLight used the API, too.) In TiledLibreOffice we rendered tiles directly into the CALayer of the view. In this Online-based app we of course do render tiles into pixel char buffers, just like in real Online, but we need to create bitmap graphics contexts for them and pass that to paintTile(). Now I get white tiles, not totally zero-filled ones. But still no document contents rendered. I don't yet want to change the pBuffer parameter to actually be a buffer pointer on iOS, too, like on other platforms. Also, changing it will mean the LibreOfficeLight app would need changing, too, and I don't feel like doing that. But ideally, sure, that should be done.
2018-09-21 02:10:53 -05:00
#import <CoreGraphics/CoreGraphics.h>
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
extern "C" {
#import <native-code.h>
}
Still more iOS app and related Online C++ code hacking Re-think the plumbing between the different parts of the C++ Online code. Do try to have it work more like in real Online on all but the lowest socket level. Except that we don't have multiple processes, but threads inside the same process. And instead of using actual system sockets for WebSocket traffic between the threads, we use our own FakeSocket things, with no WebSocket framing of messages. Reduce the amount of #ifdef MOBILEAPP a bit also by compiling in the UnitFoo things. Hardcode that so that no unit testing is ever attempted, though. We don't try to dlopen any library. Corresponding changes in the app Objective-C code. Plus fixes and functionality improvements. Now it gets so far that the JavaScript code thinks it has the document tiles presented, and doesn't crash. But it hangs occasionally. And all tiles show up blank. Anyway, progress. Change-Id: I769497c9a46ddb74984bc7af36d132b7b43895d4
2018-09-13 11:16:00 -05:00
int loolwsd_server_socket_fd = -1;
tdf#128577: Close an already open document when asked to open a new one Add a "singleton" class method to DocumentViewController to return the (as for now) singleton DocumentViewController. Change-Id: I0b8a8def558cfe7f9469b6062a86311dfa63f549 Reviewed-on: https://gerrit.libreoffice.org/82007 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 2807f907d947549a17c5bae586b85d412d552a09) Reviewed-on: https://gerrit.libreoffice.org/82021
2019-11-04 06:07:16 -06:00
lok::Document *lok_document = nullptr;
Just call lok_init_2() and LibreOfficeKit::setLanguageTag() once on iOS ... when the app starts. Change-Id: Icac4a9e1074fb6c5f3c9b5282e20a4513717a323 Reviewed-on: https://gerrit.libreoffice.org/80881 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-10-11 04:18:27 -05:00
LibreOfficeKit *lo_kit;
Still more iOS app and related Online C++ code hacking Re-think the plumbing between the different parts of the C++ Online code. Do try to have it work more like in real Online on all but the lowest socket level. Except that we don't have multiple processes, but threads inside the same process. And instead of using actual system sockets for WebSocket traffic between the threads, we use our own FakeSocket things, with no WebSocket framing of messages. Reduce the amount of #ifdef MOBILEAPP a bit also by compiling in the UnitFoo things. Hardcode that so that no unit testing is ever attempted, though. We don't try to dlopen any library. Corresponding changes in the app Objective-C code. Plus fixes and functionality improvements. Now it gets so far that the JavaScript code thinks it has the document tiles presented, and doesn't crash. But it hangs occasionally. And all tiles show up blank. Anyway, progress. Change-Id: I769497c9a46ddb74984bc7af36d132b7b43895d4
2018-09-13 11:16:00 -05:00
Intermediate commit of work in progress on an iOS app The app is unimaginatively called "Mobile" for now. Runs but crashes pretty quickly after loading the document by the LO core. Will need some heavy changes to get a ClientSession object created in there, too, to handle the (emulated) WebSocket messages from the JavaScript. It would then handle some of these messages itself, and forwards some to the ChildSession, which in this case is in the same process. Now the messsages from the JavaScript go to a ChildSession, which is wrong. As the assertion says, "Tile traffic should go through the DocumentBroker-LoKit WS"
2018-09-11 01:30:55 -05:00
// vim:set shiftwidth=4 softtabstop=4 expandtab:
Reference in a new issue Copy permalink