Commit graph

6961 commits

Author SHA1 Message Date
Tor Lillqvist
8f86e63563 Call fakeSocketDumpState() when LOOLWSD::main() is about to return 2018-10-16 01:36:01 +03:00
Tor Lillqvist
cab2f9b6bb Add fakeSocketDumpState() 2018-10-16 01:11:20 +03:00
Tor Lillqvist
ef3e09728f Revert "Drop one use of TerminationFlag"
Turns out not to be useful for the iOS app after all.

This reverts commit bff5c17693.

Change-Id: I93367e9de1b6e66b1cbb7587259f1136564e53a4
2018-10-16 01:03:47 +03:00
Tor Lillqvist
843e74e533 Log what TerminationFlag is after the loop in innerMain()
Change-Id: Ib53dc7d760a89a72b47f575ba2787d08cdcd29ec
2018-10-16 01:02:00 +03:00
Tor Lillqvist
a6e0d407d5 Bin unused function handleShutdownRequest()
Change-Id: I1be1fdba9623e7d2c5ee0a43c976a5d3ccf9fd28
2018-10-16 00:46:47 +03:00
Tor Lillqvist
c2b8b1c090 Bin unused variable ShutdownFlag
Change-Id: I19c91cbf82beda4498b37d29fbca3c603974f46a
2018-10-16 00:40:35 +03:00
Tor Lillqvist
405982716e Bin unused function 2018-10-16 00:37:42 +03:00
Tor Lillqvist
1ce8c94022 Don't hide check for TerminationFlag behind a pointless local abstraction layer
It is useful to find all uses of TerminationFlag directly with git
grep without having to look through abstractions.

Change-Id: I8bc999bd36d06c805c2a6331dba739b41239ddec
2018-10-16 00:22:35 +03:00
Tor Lillqvist
c05079d6d5 Mention TerminationFlag in a couple more log lines
Why log something vague like "Stop flagged" when we can log what we
actually do?

Also, the log lines already include the name of the thread, so no need
to prefix with "Kit:".

Change-Id: I5a05492aa4e8a26714889cc6341a26862c80e4d0
2018-10-16 00:08:44 +03:00
Henry Castro
f94c5e25f6 loleaflet: mobile: fix scrolling the menu bar
Change-Id: Ic0bdbfb825507ab3b09f56627e0218a40fd95172
2018-10-15 12:20:36 -04:00
Tor Lillqvist
bff5c17693 Drop one use of TerminationFlag
Doesn't help my current issue in the iOS app, but the less use of
TerminationFlag the better, I think. (Doesn't break 'make check' on
Linux.)

Change-Id: I8fef271d6e0e81dea92e0da76ecb7211239adab6
2018-10-15 17:59:40 +03:00
Tor Lillqvist
f40e05de42 It's enough to document a variable in one place
Let's not have slightly different documentation for the same variables
in the SigUtil.hpp and SigUtil.cpp files. That is just silly.
2018-10-15 16:33:54 +03:00
Tor Lillqvist
e9acbe175d ShutdownRequestFlag can be a constant false in the mobile app
We don't have any user-generated signals to handle by shutting down in
an app.

One less thing to worry about. Now it's just the global
TerminationFlag that is problematic when the code runs in just one
process.
2018-10-15 16:33:54 +03:00
Tor Lillqvist
8ead4af199 Say "TerminationFlag" in logging when that is what we mean
We already did in other places.
2018-10-15 15:36:51 +03:00
Tor Lillqvist
7073d4feca Don't call std::_Exit() in the mobile app
Instead we should just exit the thread(s) that serve the document that
was being edited, and the app should return to showing the document
browser. (Or whatever we eventually will have as its state when the
user is not editing or viewing a document.) Work in progress.
2018-10-15 15:36:51 +03:00
Miklos Vajna
116510296e net: unnecessary value parameter in Socket 2018-10-15 09:31:03 +02:00
Ashod Nakashian
7563490fd4 leaflet: new sample iframe html
This loads a writer doc and demonstrates the
use of Capitalise.py and InsertText.py.

Change-Id: I4a200eff54b697b1179627b49c27961edf188e59
2018-10-12 17:43:40 +02:00
Ashod Nakashian
03f58b9a9a wsd: disable tile caching when TileCachePersistent is false
Change-Id: I660438d478ab6d1ef60575b5f63b71c8b86bab4f
2018-10-12 17:43:31 +02:00
Tor Lillqvist
ed348677f2 Add "Close document" menu entry (or corresponding button) to the iOS app
In the JS, send the special "BYE" message to the app code.

In the iOS app code, handle that message by closing the fake socket
connection to the Online code, which eventually will cause the
corresponding thread to exit etc, and the app to return to displaying
the DocumentBrowserViewController. (Currently it causes the whole app
to exit which is wrong of course; an iOS should never exit
intentionally.)
2018-10-12 17:48:45 +03:00
Tor Lillqvist
0318f383f7 Agan, add more core source files 2018-10-12 15:09:07 +03:00
Tor Lillqvist
ab54f21a54 Adapt to change in core: paintTile() now takes a buffer pointer also on iOS
Makes the code here a little bit simpler.
2018-10-10 16:31:38 +03:00
Tor Lillqvist
a083c1451f Silence eslint warning: error 'i' is already defined 2018-10-10 14:38:37 +03:00
Tor Lillqvist
e9293f6954 Silence eslint warning: error 'map' is not defined
Not sure why it has worked anyway (says kendy), but presumably using
this._map instead, like at the beginning of the function, works
identically. Yay for static syntax analysis of a very dynamic
language.
2018-10-10 14:38:37 +03:00
Jan Holesovsky
4cce0e8d0a Cleanup the debugging logging.
Change-Id: I52ba4be4017a1b4d7a2464c078ec2144511f11f7
Reviewed-on: https://gerrit.libreoffice.org/61338
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 6baa59678c34ec1e618ba0a2ac2b74983fbbd858)
2018-10-10 14:38:37 +03:00
Jan Holesovsky
f3d7e5c6c2 android chrome: Make the insertion of . , ! $ and similar chars work.
The trick is that actually the 'onInput' (the 'input') event decides
what data we should actually use - if those from compose event, or from
the text input event.

With this, things finally seem to work reasonably well - I am able to
insert even emoji :-)

Change-Id: I9f19d1e56e4e638cf88b8497abb8eefd24e82cee
Reviewed-on: https://gerrit.libreoffice.org/61337
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 10bfc4b449577590c4de82cb15d73204be053a3c)
2018-10-10 14:38:37 +03:00
Jan Holesovsky
2bb3e5955c android chrome: Move the onTextInput handling to a separate method.
Change-Id: I1cf091ed9bf82b719ff7bd5170b9e75ecb999d01
Reviewed-on: https://gerrit.libreoffice.org/61336
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit ea5165794338a05837cc14257ebfcf0fa437c2ab)
2018-10-10 14:38:37 +03:00
Jan Holesovsky
bd2bd13749 android chrome: Stop composing when we get an actual key event.
So that it is possible to press Enter while still in composition.
It is necessary to stop the composing itself, because otherwise the word
gets duplicated on the new line as soon as the user presses a key.

Change-Id: I78951a423715e71533f1a73d5bbe3b0f0f05e6cd
Reviewed-on: https://gerrit.libreoffice.org/61334
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit f42e0bb4d1c99c1d229a638e59061ef7985d01e8)
2018-10-10 14:38:37 +03:00
Jan Holesovsky
d99736cc9a android chrome: We have to delete the interim results sometimes.
When we are autocorrecting a word, we get a deleteContentBackward event;
in that case we have to delete everything we have composed so far.

Change-Id: I36f3d1afcb9b74ac75dee7d64832cc5a3d346045
Reviewed-on: https://gerrit.libreoffice.org/61333
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit f176bb1e81b5f3769cb56752c7102f93f2eca024)
2018-10-10 14:38:37 +03:00
Jan Holesovsky
a346d690fa android chrome: When autocompleting a word, don't enter it twice.
Most of the text input on Android in Chrome works via the composition;
only the space has to be entered via textInput.

Change-Id: Icd6cea54a962f324215bb6438265e6500f28421d
Reviewed-on: https://gerrit.libreoffice.org/61332
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
(cherry picked from commit 04b858d90fb1de00f312efcbf131bacda5479e7c)
2018-10-10 14:38:37 +03:00
Tor Lillqvist
b193e95696 Add source files from sfx2/source/doc for easier breakpointing in advance 2018-10-10 10:31:07 +03:00
Tor Lillqvist
e907d0ee01 Switch to using just one mutex in FakeSocket.cpp for now
Makes things simpler and easier to follow, I hope. I had hoped it
would also make the occasional hang I see when loading the document go
away, but nope. Possibly it isn't caused by FakeSocket after all, even
if FakeSocket is the obvious first suspect.
2018-10-10 10:31:07 +03:00
Tor Lillqvist
be945ed51b Bin duplicate const variable 2018-10-10 10:31:07 +03:00
Andras Timar
ff5f7a5260 typo
Change-Id: I925c99699b8d383d2b8643c3846dafc1d19f33ec
2018-10-10 09:04:05 +02:00
Michael Meeks
8211bef32f Hide other view cursors on zoom.
Change-Id: I9e953f841b5c526b499f9170aef9b2682011947e
2018-10-09 21:48:17 +01:00
Michael Meeks
70a99202fa cursor simplify.
Don't show cursor when graphics are selected either.

Change-Id: I0a604d73bd1818317a2b04d8bdd392d1d6472627
2018-10-09 21:48:17 +01:00
Michael Meeks
1f54217261 First attempt to simplify cursor visibility.
Removes race conditions between kit messages and browser.
Avoid storing old state wherever possible.

Change-Id: I56aa57df22a4190881c8d197df8445ca542d4fc1
2018-10-09 21:48:17 +01:00
Henry Castro
1cc4acd95c loleaflet: mobile: ensure to not create the ruler
Change-Id: I7f985f93d8282533aa6cb32bff455b08011d7dfc
Reviewed-on: https://gerrit.libreoffice.org/61281
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-10-09 15:55:37 -04:00
Henry Castro
25e4bb1c51 loleaflet: mobile: use max-device-height media query
max-height it is used for window size, max-device-height
it is the device screen dimensions, so when a tablet
rotate to landscape we keep the mobile layout

Change-Id: I921007014a63374114ec7563144f3532a53fd021
Reviewed-on: https://gerrit.libreoffice.org/61339
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-10-09 15:54:50 -04:00
Henry Castro
fcc34e6fb9 loleafet: mobile: fix max-height screen size tablet
Change-Id: I1c869089aee6991de34e06daf0a38d8b07f82a22
Reviewed-on: https://gerrit.libreoffice.org/61280
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-10-09 15:54:05 -04:00
Henry Castro
278904ef80 loleaflet: mobile fix after hitting back, on-screen keyboard...
"permanently" disappears

This forces to blur and focus the text area even it is focused
because there is no way to determine when the soft on-screen keyboard
disappears

Change-Id: Ib89ecc42fb795e34032564a62715463dd944c588
Reviewed-on: https://gerrit.libreoffice.org/61277
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-10-09 15:52:56 -04:00
Henry Castro
0610196d4f loleaflet: mobile: fix max-width screen size tablet
Change-Id: I3337e669521f0f0f1dd749884f38dd35663491d3
Reviewed-on: https://gerrit.libreoffice.org/60977
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-10-09 15:51:56 -04:00
Henry Castro
95b10e27b4 loleaflet: mobile: fix the dragging of the map when the size ...
fits with the maximum bounds

Change-Id: Ib30afed8f8a8538a438b70e3983fb1c55baf9d42
2018-10-09 15:46:35 -04:00
Tor Lillqvist
1f6eabafce Bin leftover verbose dump of part of a tile 2018-10-09 15:54:46 +03:00
Tor Lillqvist
f09c84e809 It's hard to get the references to the core build and source directories sane
Sadly we can't use the so-called user-defined LOSRCDIR and LOBUILDDIR
variables from the Build Settings in the pathnames to files. We have
to use relative pathnames, so if attempting to build this you need to
fix them all (instead of just editing the LOSRCDIR and LOBUILDDIR
values), most easily by editing the project.pbxproj manually.

Anyway, for me now I don't see any "red" (not found) referenced files
any more in Xcode.
2018-10-09 12:51:01 +03:00
Tor Lillqvist
72f36be509 Set up the EditFileExtensions set also for the mobile app
Use the same discovery.xml and the ClientRequestDispatcher::
InitStaticFileContentCache() call as in Online, even if as such we
aren't serving any "static files" (like discovery.xml) to a WOPI
server in the mobile app case.
2018-10-08 16:47:15 +03:00
Tor Lillqvist
de0d57faac Pass also permission=edit in the query URL 2018-10-08 16:25:02 +03:00
Tor Lillqvist
f2644681d6 Remove accidental whitespace 2018-10-08 16:09:04 +03:00
Tor Lillqvist
61c9a21c53 Add more core source files for easier setting of breakpoints in advance 2018-10-05 19:01:19 +03:00
Tor Lillqvist
51035056d6 LibreOfficeKit wants the tile pixmap bytes to be in BGRA order in memory
To get that with CoreGraphics on iOS we need to use also
kCGImageByteOrder32Little in the CGBitmapContextCreate() call,
otherwise the bytes will be in ARGB order in memory.

Also, yes, we do need to turn the coordinate system upside-down from
the top left corner.
2018-10-05 19:01:19 +03:00
Andras Timar
2d62529359 don't use ssl key file for admin console auth, use a generated key instead
Change-Id: I424afe0184a64b7f069d896bde6941e42b7b5531
rational: setup is easier in case, when user does not use ssl in loolwsd config
Reviewed-on: https://gerrit.libreoffice.org/61076
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-10-05 16:38:46 +02:00