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

22 lines
619 B
C
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/.
*/
tdf#123733: Keep the WebKit view until the lokit_main thread has finished Otherwise, if you close a document before it has been rendered completely, the plumbing of threads and FakeSocket connections gets confused and opening the next document hangs or runs into an assertion failure. This typically happened for large presentations where rendering the slide previews takes significant time. Change-Id: I0f586bec021c4c045a129b3f179ddb3942915c58 Reviewed-on: https://gerrit.libreoffice.org/80882 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-10-15 10:15:22 -05:00
#include <mutex>
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 <LibreOfficeKit/LibreOfficeKit.hxx>
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
extern int loolwsd_server_socket_fd;
Fix crash in iOS app: Just use a raw pointer as the lok_document hack The lok_document pointer will only be used when it is valid anyway. Fixes a crash when you open a second document after closing the first. Change-Id: I362db282e4eccf419b56bf790ea58181594ab0fe
2019-02-26 06:02:26 -06:00
extern lok::Document *lok_document;
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
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
extern LibreOfficeKit *lo_kit;
tdf#123733: Keep the WebKit view until the lokit_main thread has finished Otherwise, if you close a document before it has been rendered completely, the plumbing of threads and FakeSocket connections gets confused and opening the next document hangs or runs into an assertion failure. This typically happened for large presentations where rendering the slide previews takes significant time. Change-Id: I0f586bec021c4c045a129b3f179ddb3942915c58 Reviewed-on: https://gerrit.libreoffice.org/80882 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-10-15 10:15:22 -05:00
extern std::mutex lokit_main_mutex;
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