[Libreoffice-commits] online.git: Changes to 'master'
Tor Lillqvist
tml at collabora.com
Thu May 21 08:18:20 PDT 2015
New branch 'master' available with the following commits:
commit 95b25f2de78786f7d76a69c1b9c6ec2dd88034bb
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 20 20:46:12 2015 +0300
Add a spec file for leaflet to package it
Ugly hack.
commit c3e48af0fa92fe5f0139e7e72ae40190f047ad81
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 20 20:14:47 2015 +0300
Bump version to 1.0.15
Accidentally committed the bump to 1.0.14 on the master branch, too.
commit 272170616869af42020eda035076d176fca89ccf
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 20 20:10:17 2015 +0300
Generate the "upstream" loolwsd.spec here from an .in file
So that the version doesn't need to be manually maintained. Downstream
packagers will then have to add release information etc.
commit a59dd5d278fa051fd28094ed210bcd7e0ff3e26e
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 20 18:51:15 2015 +0300
Forgot to remove debugging output
commit 19e94da9318d1085072a06c6e7bad78e4036c3a2
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue May 19 15:21:02 2015 +0300
Handle 'searchnotfound' command
commit 531cccc02629e8cd02d72567683aefd70608f0c7
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue May 19 15:15:21 2015 +0300
Mouse handlers
It works for: click, dblclick and dragging
commit c62ee925198408349adaec0d8b9056a1d03a45d1
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue May 19 11:56:04 2015 +0300
Search not found callback handler
commit 12e0a880f631e97520625133becf472d804d7031
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 20 16:00:47 2015 +0300
Revert "We want 'make dist' to actually create a *source* tarball"
Nah. Trying to package this JS crack in RPM so that it is buildable from
source on openSUSE does not seem easy. Let's just package the deliverables for
now. Those who want to look at sources can use git.
This reverts commit 434550f3522508ccc611a62c9201aa32c75b0e13.
commit 434550f3522508ccc611a62c9201aa32c75b0e13
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 20 14:59:18 2015 +0300
We want 'make dist' to actually create a *source* tarball
Use 'git archive' of the loleaflet subdirectory.
commit 3e9531f90a8c436059ba6a2430ada9e71d068151
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 17:04:24 2015 +0300
Create a 'lool' user and run the systemplate setup script upon installation
Not sure if this is the right thing to do, but should work for our purposes
for now. If and when somebody else wants to fine-tune this stuff, feel free.
commit 873e7c5102a8237d03616ea3cef204d154818989
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 14:29:55 2015 +0300
Add a Makefile to create a tarball
Not sure whether this makes sense, but for now...
commit 70c934dd6df1357cb78a8bf58ed4b9101c9c854b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 14:17:46 2015 +0300
Forgot to rename the script in one place
commit 316a9e81515e8677f9fe7d9951ddf4752f7fd307
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 14:04:51 2015 +0300
Add a spec file, works for openSUSE 13.2 at least
Wonder if it would be good style to expand the spec file from a .in one by the
configury, so that one could use autoconf expansions for the version number in
it?
commit d40ba38f9fd37c82a7d388a8c6b9372fe2d5aa4e
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:59:55 2015 +0300
Build 1.0.12 tarball and bump version to 1.0.13
commit 92d7256b5dbb1f9fd283514734e99b604ae0800e
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:58:53 2015 +0300
Use dist_bin_SCRIPTS, not bin_SCRIPTS
Otherwise we won't get loolwsd-systemplate-setup in the tarball.
commit 1459b6956f4cb39b180991338bd413de0333aafe
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:55:03 2015 +0300
Build 1.0.10 tarball and bump version to 1.0.11
commit bc49cccee2874ff1530f227c629502e5dc3c5d62
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:52:42 2015 +0300
Log the capabilities after dropping one
commit 707f7f7f642876725c7daad5e2deb37dd11384f4
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:51:25 2015 +0300
Build 1.0.8 tarball and bump version to 1.0.9
commit 65ab397d34f1fc7f58664434eb76005c62b7f250
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:48:20 2015 +0300
We need CAP_FOWNER, too, on newer Linuxes to be able to hardlink the LO files
At least when not running as the owner of those files. Refactor the capability
dropping so that we can separately drop the CAP_FOWNER and CAP_SYS_CHROOT
capabilities. The child process never needs CAP_FOWNER and the parent process
never needs CAP_SYS_CHROOT.
commit 08573973522e4c0df76e2656c94af8cb3b670ec1
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 13:20:16 2015 +0300
Rename the systemplate setup script to better name and install it
It was a bit misleading to have "chroot" in the name of the script as it isn't
a chroot jail as such that the script is setting up, but a *template* that
will be copied (hardlinked) into each chroot jail.
The script should be installed, so that a loolwsd package can include it. We
don't want to loolwsd use to depend on having the sources available,
obviously.
commit 5cb5c1a935fd523faeaaadf0652f236b5ac6c48a
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 10:02:20 2015 +0300
Build 1.0.6 tarball and bump version to 1.0.7
commit e50f243897b2e0a365f2c1265b4ca873e175d726
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 19 07:52:37 2015 +0300
Let's not over-complicate this
commit c2f0b5b17da7af90c529d862e4bad4daedd44b77
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 18:03:26 2015 +0300
Pressing enter always searcheas forward
commit 51bbdd91ed652238676ca5863e5c0055c0a8ab32
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 17:40:55 2015 +0300
Prevent document from jumping when zooming
commit a4391c1017ade232b0d0e4c5fccd33653bbacbdf
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 16:10:24 2015 +0300
Fix for stack size limit exceded
commit 428f6dbe6f5c5e8f15cda9ef77fde874f6cacf6d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 15:34:21 2015 +0300
Match the background color with what LOkit provides
commit 058416b9d78be61037a00f357442d93f65c72f59
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 18 11:21:30 2015 +0300
Handle arbitrarily large tile: messages from child to parent
The parent currently uses a fixed-size 100000 byte buffer to receive
messages. Even with a tile size of 256x256 pixels, that is not enough for some
tiles that compress badly as PNG. Add a nextmessage: message that gives the
size of the immediately following message. Send a such before each tile:
message, and handle it appropriately. The nextmessage: message is used only
from child to parent process, it is never sent to the Websocket client.
Once Poco 1.6.1 is released, this will not be necessary.
commit 40552d424c279193180c77573ebd3cc19262413d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 10:37:20 2015 +0300
Clear selections when the search string is modified
commit 249d8fdaf681efb2e49429d0517d95a95175940a
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 10:30:51 2015 +0300
Finished the parts control
commit e55d216708798c9cff28fc9767284658899a5cc2
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 18 09:15:23 2015 +0300
No search result -> the search bar flashes red
This still needs work because the search bar will flash
if the user clicks on the map and doesn't select anything.
This will need a proper 'no-result-found' message from the server
commit b482dabe37e8c6c7c44efb2d3eaf451a0a0e8fdf
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 18:35:05 2015 +0300
Alert when there is a connection error
commit cb33fd5035987387cdcdb5b1baf6cdaa567c408b
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 17:00:43 2015 +0300
Added selection border and set the selection color to: #43ACE8
commit 94396cf87bb92256d833abbb056b120d11e30b93
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 16:19:59 2015 +0300
Searh next/prev searches the latest enterd value
commit 40172d3dd52a1d2cbaabf5da421b8985f413a2ae
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 15:10:59 2015 +0300
'Part' command is now parsed and interpreted
commit 2d9c526ed099dbb0a4ccf5a8b6b0e12f8d4328dc
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 14:37:37 2015 +0300
Build 1.0.4 tarball and bump version to 1.0.5
commit 230e0ff45130f4dd4e837272c4f7abe15ee1c9ff
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 14:36:01 2015 +0300
Check whether we need to explicitly link with -lpcre
For instance on Debian, poco is built to use the system pcre.
commit ed5491921a39f45b6528012df99bb222ce5f10ad
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 14:37:08 2015 +0300
Update scrollbars on window resize
commit 7cb553841c26a7d8f83779eda1a205d91538f6a2
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 13:38:43 2015 +0300
Build 1.0.2 tarball and bump version to 1.0.3
commit f4eccc714a00a832ec7c4cf4f5c4f2597b5c35c6
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 13:37:48 2015 +0300
Include also headers in the tarball
commit 5c6cb156f999a83482c5fb6ab8bb264c528d535f
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 13:37:24 2015 +0300
Delete those bundled LOKit headers we don't actually use
commit fe40e3d592ee77e721dcd5cb60dd2822af45683d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 13:07:05 2015 +0300
Less space between the toolbar and the document
commit a3cc8784fb7f0c75e5d0d9b7ccc8db0008a28ec3
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 13:06:43 2015 +0300
Text mouse cursor (editing cursor)
commit ab86440cb27d0cbf64625fb8deaa9ceee90d3026
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 12:46:01 2015 +0300
Prevent img drawing on mozilla
commit c057a420630470663d947743a6ea491404c0135c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 12:11:39 2015 +0300
Working text selection by mouse dragging
commit c2c379ac6987415eae274e7fde726e94ced9f0c1
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 09:32:41 2015 +0300
Removed unnecessary variables
commit d1b7bfeaae61787f7da1a53ca8568c0559a338d1
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 10:18:44 2015 +0300
Bump loolwsd version to 1.0.1
I have made a pseudo-release tarball (for internal testing purposed) with the
version 1.0.0.
Use the following policy for versioning: When doing a release tarball, bump
the version in configure.ac so that the third (micro) version number is
even. Don't commit that to git, but do run make dist. After you have the
tarball, bump the micro version number again to an odd number. Commit. This
way, anything from git will always have an odd micro version number.
commit 4bff5fef7371aad4d3cee91ae3398b7b8cec8bbd
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 15 10:10:32 2015 +0300
Include LibreOfficeKit headers from today for optional use
Useful when building loolwsd on a system that doesn't have new enough
LibreOfficeKit headers available. (It makes sense to use them only if the
resulting loolwsd will then be run on a system with a new enough LibreOffice
installation anyway.)
Pass the --with-lokit-path=bundled/include configure option to use them.
commit 7122e9738203251d1bf1d923f8c7c28b689a7c52
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 15 09:23:21 2015 +0300
Fixed an unused result compiler error
commit e2dc523b110c77d0fa4c15d8572e47d429066a9a
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 15:11:14 2015 +0300
Bin one pointless line of debugging output
commit 6d5fb333eee0c28337777b6da1a2cd4debd92663
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 14:51:27 2015 +0300
It's url=, not uri=
commit 1e17966bb9fcce417d729a7ebdf3e698eee31401
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 14:22:19 2015 +0300
Drop super-user privileges if using sudo by necessity when debugging
It doesn't work to debug a program that has file capabilities set, it seems,
so to debug the loolwsd master process, one in practice needs to run sudo gdb
on it. But it is not necessarily a good idea to run all of the code as
root. When configured for debugging (--enable-debug), reset real and effective
uid to a non-root one, either one given with an --uid option (typically that
of the developer), or "nobody".
commit efd750d2eecd3d8bdc6bdbae16c3bc0fa73d3ca8
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 13:24:05 2015 +0300
Add ENABLE_DEBUG to the config.h
commit 60801cd01412dc4fe8e46398d2e43d02334f729d
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 13:16:10 2015 +0300
Be less verbose: don't log messages received
commit 72304b15936f01cbe8ff4ae1a67d816b1220638a
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 13:15:22 2015 +0300
Send the part number, too (always 0 for now)
commit 5ea8efe602d0e7594141ef897a10ca849dbe844e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 13 13:15:00 2015 +0300
Loop through tiles in x direction, too
commit 1f073e6219ac7bee25ae840fecd7e32dbe4b401a
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 13:00:33 2015 +0300
Fixed unused result compile error
commit 906e9e28fccc0f706a87a87a2c0a6f70ae012e48
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 12:39:57 2015 +0300
Search scrolls to result if it's out of the viewing area
commit 5e4225c860f2ddd07537165435cd8ec98d07d553
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 12:05:13 2015 +0300
In fact, it is better not to prefix the url
commit 04d2b531a1bbc6b9732e92a9d4ce7052527c8851
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 12:01:10 2015 +0300
Check if file:// is added in the url
commit 0a7e20e851ff86e14ef727885e8b9683a666d108
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 11:54:12 2015 +0300
Encode spaces in the URL
commit 124de292d1f194cca6d6fd11c84fbfb04a62701e
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 11:17:03 2015 +0300
Updated the text selection handler
And also removed an unnecessary method
commit e4b1624d2b1408c688ae4fc4d4c4078187f50d9b
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 11:13:46 2015 +0300
Updated the search bar to send the correct command to the server
commit bc2303353753ef2b110b941b101b061c42c04d21
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 13 11:13:18 2015 +0300
Fixed tiwps->latlng and backwards conversion
commit b6c36e23f306b5b66b7bee0f9da44caa7e2eddff
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 12 12:28:46 2015 +0300
Improve error handling for documents that can't be opened
Catch IOException when trying to copy the document and send error message.
Otherwise, the exception will just propagate up to handleRequest() and the
connection will be silently closed. Closing the connection is fine as such, I
think, but we need to send an error message first.
commit d78642806ab530806833e83b9289a2ecfc3f07eb
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 11 17:55:38 2015 +0300
Removed URL tiles specific methods
commit 47e301cc927d3f741f0f6b638adaebab8449a1b6
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 11 17:03:40 2015 +0300
Parts command from the server is parsed but not yet interpreted
commit 4c6d87231cc07df9f70aedea197c3086ea324a66
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 11 16:59:47 2015 +0300
Parts control for switching between parts
commit 90b3b32bbc4b5623dacdd8529d7d70f1ed816473
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 11 16:32:18 2015 +0300
Renamed method to _parseServerCmd
commit 13582c7f04687dd7ecc7a46dd760c4094a5a7810
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 11 16:28:43 2015 +0300
Fixed typo
commit c91d77c684cab72f55cd2eb78e257e75538dd8d0
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 11 11:21:07 2015 +0300
Check that the POCO version used is the one we want
Currently we require the current version, 1.6.0, and as soon as 1.6.1 is out,
I will start requiring that, because I want to use a feature I submitted to
it.
Surround most of configure.ac with AC_LANG_PUSH([C++]) while at it, as this is
all C++ code anyway.
commit 6393cbfd7da1f549ec58d76dfe8daa0e61f4ffd2
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 8 21:29:13 2015 +0300
Improve help for --port a bit
It must bit be the port number used for listening for the child processes
contacting the master process.
commit 3e9c4d4bf34ef46825cc3d1e33d7c28516136008
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 8 21:24:46 2015 +0300
Use a separate HTTPServer listening for child processes connnecting
Otherwise, if we use the same port number and same HTTPServer, if enough
clients try to contact us and, we won't be able to accept child processes
having been spawned.
Also add some temporary debugging output here and there to debug lifecycle
management issues.
commit 5b1233bdb46130fca27be02956d71282f42ead43
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 8 15:46:10 2015 +0300
Be sure avoid global object dtors when exiting a child process
The LO ones have a tendency to crash anyway on Solar Mutex assertions (in a
build where assertions are active, obviously).
commit 3a23186217d1221301c1f8be1e5bb6ea8752f3d7
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 8 12:45:04 2015 +0300
If we run out of pre-spawned children, spawn one more
Just a stopgap measure so far. Clearly will need some logic to get rid of too
many children if they are just hanging around with no clients incoming. Also,
we need some sanity check not to spawn an unlimited number of children.
commit aa403353289e52eeb120a90cb316000081d1f4c4
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri May 8 12:25:24 2015 +0300
Include also the childId in this (temporary) log output
commit febaaa19002174262a7b4766abb2e957051f9e31
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 8 15:24:47 2015 +0300
Mouse event handlers for selection
commit 1858147801cba54c9819c5123c3563aaf909f4a8
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 8 15:24:26 2015 +0300
Twips to latlng and reverse methods
commit affdbc6ff167e2d6023f0ec900b92a93ae1b8221
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 8 13:58:13 2015 +0300
Added search command (from the server) handler
commit 5dabc12660d506d69476d74d478dcf882f6bd8d3
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 8 13:56:28 2015 +0300
Search bar buttons are updated based on the current search index
commit c622852514b19874364980f1d423ce2f7b9c84f6
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 8 11:44:37 2015 +0300
Removed the Draw plugin interface
We don't actually need this plugin because the server
dictates how the selection will work.
Will remove the whole plugin when I'm sure this won't have other
applications
commit 5bde4775f6dc4977e701ce55d9775b00c5f0ac7c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 8 11:10:48 2015 +0300
Added cancel search button + search bar sends propper events
commit e22e1da038b9415a636beaef145cbc183c836957
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 7 20:15:05 2015 +0300
Must use thread-local storage for the variables used by the nftw callback
Otherwise two or more linkOrCopy() functions running simultaneously will lead
to a mess.
Actually nftw() is not guaranteed to be thread-safe, I think, so we should
really use something that is, like Poco's SimpleRecursiveDirectoryIterator.
commit c69fc09a1b6dd54ced2e9673d4b14afff9ab24cf
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 7 20:01:40 2015 +0300
Use just one RNG for the MasterProcessSession objects
It probably is not a good idea to keep depleting the entropy source needlessly
by having a separate RNG in the preSpawn(). Use just one shared RNG and
protect access to it with a mutex.
commit de52608a357daaf172f92309bcc1225005110195
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 7 18:27:37 2015 +0300
Drop setuid-root on Linux too, if we for some reason have it
commit caea0f99868fa329162d01469bb4536a4de11860
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 7 18:26:03 2015 +0300
Try to make the server more stable when heavily loaded by connections
Use an explicit backlog parameter to the ServerSocket, and an explicit max number
of threads to use for the HTTPServer's thread pool.
commit 0ca7f3129b6047dd8955756457dc3fd50123fbbf
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 7 16:29:36 2015 +0300
Add code to wait for a child session to become available
Not sure it is completely correct. Lots of testing needed.
commit d3acdbb225734d3e7643cba6c97b0185d62f314a
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 6 18:41:09 2015 +0300
String::startsWith is Firefox-only it seems
commit 5aec1fc2f83bdc9f9c0fa82a0e4a8b11cf6de77a
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed May 6 17:08:44 2015 +0300
Register for callbacks from the LibreOfficeKit object, too
They are used for statgus indicator callbacks while loading a document. (This
is a fresh feature in LO master.)
commit cb65bbbc3636d1bd32d424ea9e3733bffff39409
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue May 5 14:57:51 2015 +0300
Include <string> for completeness
Sure, it seems to get included indirectly already, but we can't be sure that
holds for all compilers.
commit 15a889db91b021a3e8f7dccf5ee3be4a90b4441d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 6 12:39:03 2015 +0300
Search bar implemented as a leaflet Control
It is not ready yet, buttons' functionality and the search
functionality is to be added
commit 57a2663cb9ebffd92e3fbde4d47b1821d7981c85
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 6 10:41:26 2015 +0300
Search bar bax with prev and next buttons
commit 1b5f9b1f220a63de22bb36e5005cf13c0750b32f
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 6 10:08:56 2015 +0300
Readme update that describes how to open a doc
commit bc5bee675192b07eba863476753c299b959a4e9a
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 6 09:44:32 2015 +0300
Smoother scroll without intertia
commit b9351c6fede86aed43e7c6a745244ab9c4dfd160
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 6 09:37:44 2015 +0300
Forgot to replace evt.data with textMsg
commit 6c6f8c29de847f122d99aa05ebc38ac5b1cf9cb3
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed May 6 09:33:20 2015 +0300
Document file path and host are encoded in the url
Usage:
http://web-page?file_path=/PATH/TO/DOC&host=ws://localhost:9980
commit 9bce431eea4c38e768f1d58ea7dda520a07e49ea
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 4 20:55:35 2015 +0300
We have setcap only on Linux
Use setuid root otherwise. (But note that the portablity to other
Unixes is a work in progress, and for instance it is known that this
doesn't work on OS X yet.)
commit 295e8305f9606821f0b081ff38dbc658acd0755a
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 4 20:59:42 2015 +0300
Use the Linux capability API only on Linux
commit 580c99d76cfe24592e745c0c79409c568d03dbc2
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 4 20:52:28 2015 +0300
Add SIGPIPE which was missing by mistake, and make it compile on OS X
commit 8a3dfa4936fd97a1e0b78c501aeecd85e2d52089
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 4 20:52:05 2015 +0300
The ld -rpath switch means a different thing on OS X
commit 4ecc431159df5a6d52afa47989722501d672875f
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon May 4 20:17:41 2015 +0300
Look for setcap and libcap only on Linux
commit 22276e797552f4424b130c075aa53d4558088343
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 4 18:36:47 2015 +0300
Better msg reading method that allows adding new types of msgs
commit 4b31303cc03adab572ebcd13a3de92cf701e004f
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 4 18:02:32 2015 +0300
Let leaflet track window resize
commit 55508c66803a3021c056a694a31aad29efa597ff
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 4 16:27:46 2015 +0300
Enabled doc. nagivation by keyboard and mousewheel
Scrolling now works from the arrowkeys, pgUp, pgDown
Home and End buttons and also from the mouseWheel
TODO update the compressed file
commit bc29447b8657eacfa2ce425912e328197b2e4090
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 4 16:26:02 2015 +0300
Removed trailing whitespaces from scrollbar code
commit 7d3458eb5e7e44b37b78fb4d4fd529d88bc910ca
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon May 4 11:16:24 2015 +0300
This fixes a bug that's triggered when zooming at document's end
commit a03e9f2e73ba23623ba8ab1c58adbdb826732542
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 19:18:03 2015 +0300
Updated readme to reflect the new changes
commit fa15ef1b206fe81c0a32561652d950d8c08d180c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 19:00:17 2015 +0300
Updated the example document
commit 320e094a47827f0c2a5130ff6202d77add2e2544
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 18:24:16 2015 +0300
Scroll event handlers + document centering
The document is centered by setting map's maxBounds
There are 2 types of scroll events:
- one generated during scrolling which actually pan's the map
- one generated when scrolling stops, this is used to keep track of
scrolling events
When the document is zoomed, the scrollbars are placed at the right
offset as the document's dimension changes and this is done with
the scrollTo method after temporarily disabling the event listener.
commit f0502879b4c19e9b330c5c6324b6d64b215b6712
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 18:13:45 2015 +0300
New containers + restored some methods implementations to their original
Added scrollContainer - the div that will get scrollbars
mockDoc - a mock document div of size equal to the document's, which
will cause the appearance of scrollbars
The size of the map now equals the visible area, so I've restored
the methods to work on this new size
commit c788ab8886c5773d7f9a132a96b7b06832533502
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 18:12:42 2015 +0300
Event handlers for the new scrollbars
commit bee74de0593b2e225c82f1d74187e29a7575aa3b
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 18:12:08 2015 +0300
CSS updates for the new div elements
commit 43c68037ec0355a056a9d8ac0af4d9ea18a1ef3b
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 18:07:49 2015 +0300
Custom scrollbars for document navigation
jQuery scrollbars, they should be easy to replace if we find something
better, maybe something written in vanilla javascript
Github project: https://github.com/malihu/malihu-custom-scrollbar-plugin
MIT license available at:
https://github.com/malihu/malihu-custom-scrollbar-plugin/blob/master/LICENSE.txt
commit dd8a9f81451aaa9f7883964f462ae97d80261193
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri May 1 18:07:09 2015 +0300
Leaflet small fixes
commit af1821bb3b70a914ffa625b33876b610163e26fc
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 21:09:56 2015 +0300
Temporarily bypass modification time things for actual URLs
The code works only for pathnames currently. Need to fix soon.
commit dce8e0870ebbf8038b7e634fdc7dd1ef1b589022
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 21:06:47 2015 +0300
Just _Exit() in childMain
Otherwise various LO global objects will try to run dtors and whatnot, often
crashing.
commit 600b5bc4d8834b6c9950f60aaf204cd7df9b713f
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 21:05:16 2015 +0300
Log also when copying of the document is done
commit af400fcef4b4c76be9408cc3bc282eb4b85fca22
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 18:44:27 2015 +0300
This is cleaner
commit f7375bb5ba1727df9dfa0002622bd9fbe59485b7
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 18:03:00 2015 +0300
Try to be a little more robust
commit 59055b975e922e5ab33c91bcb2ed50b49d039a2e
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 18:01:21 2015 +0300
Use Poco::StreamCopier, just because it looks nicer
A test program did not show any performance difference between using the
std::copy() thing, Poco::StreamCopier, or std output << input.rdbuf() trick.
commit 8b43cd25b047fc96924813655cf8cbfef18385c0
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 15:58:13 2015 +0300
Handle file: and http: URLs
commit 847ce0442e7ed8f62fe3b5729aac23ed81ca49fd
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 15:19:29 2015 +0300
Add the part parameter to the example tile message here, too
commit e48ba86eb9484882b41dc3647cc416299ac66980
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 30 13:49:05 2015 +0300
Mention using actual URLs
commit 3ea260f97267a86129939ccab4e84001e3a63fe6
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 29 15:02:59 2015 +0300
Portability improvements
Allow the directory parameters to be relative paths; turn them into absolute
ones for later use in the script as we change directories back and forth.
Use cpio instead of cp --parent for each file separately. (The latter has the
problem that parent directories are created using the protection the
corresponding source directory has, and tht might not permit you to copy other
files later into the same directory.)
Also copy usr/share/liblangtag, for the (common) case when LibreOffice is
built to use a system liblangtag.
Don't bother with the special handling of /usr/share/fonts/ghostscript unless
it exists and is a symlink.
With these changes, it worked for CentOS 7, too.
commit 19276ed5d81824b022bde043d8b4fbcb88a80f5e
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 11:23:33 2015 +0300
Actually drop the chroot capability also in the child process
I forgot to do it in childMain() in 28c9561722d522712698ca4324fbb7e8e8ece169.
commit 25575961ed43e60b7fe913bee99c4a7cb47b8533
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 11:17:26 2015 +0300
We need to check for cache dir access only in the master process
commit 4d6dfebf8ec39097527d22bba634bcb897a578f3
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 11:14:46 2015 +0300
Expand on debugging details
commit 2110aef06aaa007964f5c8a251e5dcb09994ed5d
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 11:02:29 2015 +0300
No need for this member to be public
commit 6df6a5d58b31d5e2ef98ca038971d690904f94e2
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 11:01:18 2015 +0300
Spawn just one child in the --test case
commit 88cb21867b6d9ef66636df8fabdc58ac62c517d7
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 28 10:57:05 2015 +0300
Spawn children only after starting to listen on the server port
Otherwise some children, especially when there are more than just a few of
them to spawn, might try to contact the server before it is listening.
commit 9251fefe941b161fd85dcffc1e84a906e5047c48
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 21:58:54 2015 +0300
Clarify remaining need for part parameter in messages
commit 28c9561722d522712698ca4324fbb7e8e8ece169
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 21:55:36 2015 +0300
Get rid of the CHROOT capability after using it, or when not needing it
commit 1b06290d2b3a00ffb0e74dc62ad97833b8ffec2c
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 21:24:05 2015 +0300
Add a part parameter to the tile messages
The JS code always passes in 0 for now. The server parses the parameter and
calls LibreOfficeKitDocument::setPart() before calling paintTile().
Probably also the status, key, mouse and selection messages will need a part
number. The intent is after all that the protocol is as stateless as
possible. (So maybe we should also pass the document URL in each message?)
commit 389815ac63c7b8402a817d24d123c3a5d64a0252
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 21:09:27 2015 +0300
Introduce LOLProtocol::getTokenKeyword() and use it
The new function takes a map from keywords to integer values, and accepts
parameters in the form of either name=keyword, or for backward compatibility,
name='keyword'. Use it to parse the type parameter of the key, mouse,
selecttext and selectgraphic messages. This restricts the accepted keywords to
those actually valid for each message.
commit 5267753b82e69c68558463789b463b908e2f376f
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 18:03:52 2015 +0300
Add mention that MasterProcessSession::dispatchChild() should wait
commit 9cd120f7ab3157c0c7308c5ff45570045616df18
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 27 16:03:50 2015 +0300
Restore scrollbar offset
commit b2f34b0c3d01fcdac773e26734b9a2a5db0c33f9
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 16:01:11 2015 +0300
Maybe /usr/share/fonts/ghostscript is also good to have
commit 0019dc4943817838d2d26d16aa1fe559bf7cef47
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 15:51:33 2015 +0300
Preserve timestamp of directories created in the jail
Needed for /usr/share/fonts so that fontconfig trusts its cache, but no harm
doing it for all directories. (Except a slight slowdown, need to see it if
has any significant impact if we would do the utime() only for directories
under /usr/share/fonts.)
Thus we need to pass the FTW_DEPTH flag to nftw() and handle FTP_DP instead of
FTP_D. We also need to make sure the directory is created also in the case of
an empty directory, for which no FTW_F callback of files inside it has been
received.
It is safest to not exit the nftw() in the FTW_SLN case.
commit 074a54dd6c63e06dd71f07c175a959c0fcd4dc01
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 15:49:25 2015 +0300
Make sure the fontconfig cache works for the sys-template
Need to copy /var/cache/fontconfig, too. For it to be valid, the directory
timestamps in /usr/share/fonts must be preserved.
commit be2bb356c36861da11c52b042812a98921ad869d
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 14:16:37 2015 +0300
Add seconds.milliseconds to the log prefix
commit 6b17e8b022e3fd6a46e4dac142372fa65c268706
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Apr 27 10:00:31 2015 +0100
Update README, and install ld.so.* into the jail.
commit 1317941b5afaff1a6a1a150be1dcec12cfe35fa7
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Mon Apr 27 09:44:59 2015 +0100
Use shell variables to make it more cut/paste-able.
commit 68d15726c41b91b8a90cac29d085195fa4103832
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 11:27:22 2015 +0300
Rephrase statement more logically
commit bced6a0771a15898a04e9564bfd665f6154aec10
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 27 11:26:00 2015 +0300
Clarification
commit b6671341a7f63d8bdc759431768e809ba3ad56bd
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 27 10:18:13 2015 +0300
The map handles keypress events but no panning keys
commit 7fa1ae861dbfd6e850f713c6ac3bdbc209c1a450
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 27 09:57:06 2015 +0300
The map should not yet handle keyboard events
commit 0615ce950f448a207871b1a9abc27e0baeba26ea
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 24 18:09:01 2015 +0200
LOOLSession: log error if nftw() fails
Should help finding out the problem if --lotemplate is given a
non-existing directory by mistake.
commit 7d25ffada6d7370a931284d207bde0b2c3a2029d
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 18:56:20 2015 +0300
Remove part that is not relevant any longer
I don't see the busy looping any more, and child porcesses are indeed now
pre-spawned as needed (not just "re-started").
commit d6005eb5249c139c335c0c0c4084e38c62152076
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 18:54:44 2015 +0300
Mention we need a part number parameter in many places
commit 4a7265ae76bb971e0080a4ceb1f3db6a5810a954
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 24 17:16:46 2015 +0200
Makefile: fix autoreconf warning
Makefile.am:18: warning: deprecated feature: target 'SETCAP' overrides 'SETCAP$(EXEEXT)'
Makefile.am:18: change your target to read 'SETCAP$(EXEEXT)'
/usr/share/automake-1.13/am/program.am: target 'SETCAP$(EXEEXT)' was defined here
Makefile.am:1: while processing program 'SETCAP'
commit e9f3e815fed6d8957b01d87f06efe8d762fde5ac
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 18:18:56 2015 +0300
Don't try to run the 'display' program if there is no $DISPLAY
commit 3ff60eaea1cedc682ee6d0f9f2a6a90fb9f689c4
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 17:45:57 2015 +0300
Mention that the tile cache directory needs to be created
commit caf7c2e6c6db90e275b808fd479f4f9b48bb6e84
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 24 17:21:38 2015 +0300
The map should not trace a resize event
The container div should handle the resize by updating the scrollbars
This fixes the map crash during window resize.
commit 3ee29053aaf824016fc0b79a275d5f78e454b7bf
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 14:34:43 2015 +0300
Add a section about coding style
commit 4eaffc74f0385aea698e0a5b2c21cdb5aad24c3d
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 13:14:57 2015 +0300
Log the exit status of a child process, or the signal that killed it
commit 00da867e97e780c844fbc20489bc86de3934b681
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 12:49:47 2015 +0300
Cosmetics
commit 4782d058523fcce3e62918ee610915e064b36910
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 12:49:19 2015 +0300
Add Util::signalName()
commit 91d0e9329cb82a465ca1f67b5527b0a658fafc4e
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 24 11:26:41 2015 +0300
Fix the waitpid() use
We don't want to use WNOHANG, not sure where I got that idea from. That leads
to busy looping. The loop is in a thread of its own, so it is fine to just
wait ("hang") for some child to die.
commit 4f9739854ad63bf66533b4be1d06dc265307c5ce
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 18:52:16 2015 +0300
s/localhost/127.0.0.1/
Makes the chrooted child process more reliable on diverse distros/versions.
Let's use 127.0.0.1 in all cases for consistency.
commit 5f2de45584a1f14357fa50b41b538e2696c2681b
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 23 17:24:22 2015 +0200
Update README with debugging hints.
commit 2d23eaff6da34020f27f363a6cbcae46c0ec1ebd
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 23 17:23:04 2015 +0200
Add the debug suffix to Poco libs only when self-built.
commit 8be550056b9d114748b17779b32e176e612b86e4
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 23 15:25:59 2015 +0200
SLEEPFORDEBUGGER is still useful for debugging, re-introduce that.
This reverts commit af3545b8976e1b4a6ed71a9a9fc39586ba4bb630.
commit ed07f1a4e1c071f478797cf7beef7e2757dad619
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 17:16:44 2015 +0300
Avoid accessing string out of bounds
commit 4d717182ad6414ed09025b4910854754beef3dea
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 16:00:43 2015 +0300
Look for setcap during configury
commit bf929d5618e9af4536b4371b7470f959ceceda6c
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 23 14:53:41 2015 +0200
Add libcap-progs to the README as dependency.
commit ae500514f54213d8ca53caa5f97a4418bb947a57
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 15:51:10 2015 +0300
Forgot to actually have the --test switch in the example of its use
commit a18169225581c00a0c47e5d41f22c80ccc8e6e77
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 15:23:42 2015 +0300
Simplify
Just use find ... -type f instead of a for loop.
One note: I wonder how text rendering by the LO code in the child process
works even if we haven't copied any actual fonts into the sys template (and
thus chroot jail)? Is FreeType (or whatever it) already present in the
process, and font files open, even before the chroot? Weird.
commit d970d327b9161efb3922503c133d42ae72e1433b
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 15:18:22 2015 +0300
Don't exit if cp fails
It might be that for instance there is no /lib64/ld-*, as on a 32-bit system.
commit b8f2ce741e00f0de0d13fec4f34168b1d47954b4
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 23 14:44:41 2015 +0300
Fix thinko
commit b49d4d8885843e484facb55a31d066b5d144102b
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 21:35:52 2015 +0300
Use shared_ptr and weak_ptr in attempt to make the pointer dance more robust
It was obviously very wrong to use both a unique_ptr to the
MasterProcessSession in WebSocketRequestHandler::handleRequest(), and then a
bare pointers to the peer object in the MasterProcessSession object. We got
crashes here and there related to the destructors.
Let's see if we can manage without mutexes.
commit eade187ebb428978564fcbce010554fb8a866a9b
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 19:49:16 2015 +0300
Bin pointless logging
We logged effectively the same information a few lines earlier.
commit 59bd08299c7dfd5055fff27110086efbe3162c74
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 19:48:20 2015 +0300
_childId is used only in MasterProcessSession
commit 08f53df08add7f970ddd7c54b5bd701c99f681b6
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 19:26:35 2015 +0300
_childIdToChildSession[childId] is not used
commit e83559795d5677d30b369d701d34f992ed5cfd1e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 15:50:09 2015 +0300
Mention that sudo is used
commit 8534aebf8e8e50f7e3f6d158f754d8a3f02aad1c
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 11:19:19 2015 +0300
Only the MasterProcessSession class uses a tile cache
commit d94b494c0c5f36ea4e01296604b917f0e976d94d
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 11:18:04 2015 +0300
Check if the peer MasterProcessSession has a tile cache yet
commit 54d106f47b2d91bf1bbd6a63ea4a70237d01745e
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 11:14:11 2015 +0300
Factor out WebSocket::shutdown() ignoring IOException
commit 6b7dcdb5449e5c9bff207b480b9cbeaf9a7d5fa9
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 21 15:27:08 2015 +0300
Typo
commit 520236fb7e895ea4b8abc1e7c3c562db3cc90e40
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 21 15:24:28 2015 +0300
Updates
commit a0292468da1dae8f7253ca36f70802ef6cc774df
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 21 15:06:41 2015 +0300
Catch (and ignore) Poco::IOException in a couple of places
There probably are more places where I should catch those and act
appropriately. At least in these places, where the websocket connection is
already closed, or being closed, anyway, the right thing to do is just to
ignore exceptions, which are generated from attempts to write to an already
closed Poco WebSocket, for instance.
commit fcea475bb55c0902fb0e173023eb1dc80a192f91
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 20 17:43:31 2015 +0300
Use separate classes derived from LOOLSession for parent and child processes
Work in progress. Does not work properly yet.
commit fda13c6c747e84031b4ea3449b71c53a34062e03
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 20 17:42:47 2015 +0300
Tweak temporary timing parameters a bit while hacking
commit 84eff99fde0af8b885d254c57712b45c137cbb50
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 20 17:30:03 2015 +0300
Add --help option
commit faec3cd961a21ac833327ed3ef06e50702dc2081
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 20:30:36 2015 +0300
We indeed don't need the signalfd stuff, I hope
As such it worked, but if we can manage with simpler code, no need to use it.
commit a63f797fff321e50c1efc094711baf48f8505786
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 20:18:25 2015 +0300
Call shutdown on the peer's websocket when the session to the client dies
Also, seems that calling LOKitDocument::destroy() (in the child process's
LOOLSession dtor) causes crashes, avoid that. The can be little need for any
cleanup as the process is about to exit anyway, and the user profile is a
temporary one that will be binned.
commit 02f12402bf0769e041ae71f06e14c283927f3f12
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 19:55:49 2015 +0300
This was what I meant
But actually I wonder why I thought I would need signalfd at all; wouldn't it
be enough to just loop in the undertaker thread, calling waitpid(), as long as
there are child processes? I'll try after this commit.
(Besides, I now notice that when I client disconnects, we don't close the
websocket to the child process, so it never goes away. Will fix that.)
commit 59e4d4d25d81a5b944beb56523f6d12f0d8998da
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 19:25:18 2015 +0300
This is done
commit 39b6258aa942abe5d362980d3ae0167321b4cf81
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 19:15:40 2015 +0300
Clean up the jail after the prisoner has died
commit 291710cc1c81dd2c8b1f32533314e89a035afe53
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 15:31:58 2015 +0300
Typo
commit af3545b8976e1b4a6ed71a9a9fc39586ba4bb630
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Apr 16 15:23:01 2015 +0300
No need for the SLEEPFORDEBUGGER thing any more
As the child processes are pre-spawned and just hang around waiting, there is
ample time to attach one in a debugger in a controlled debugging scenario
anyway.
commit 27a680457e5ac798f85fb58b002b4bc3953dcf68
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 15 17:26:23 2015 +0300
Pre-spawn a new child when we take one into use
commit 1b32383875f01a23d4235a82bfeb0be42ef60539
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 15 15:21:17 2015 +0300
Improve help messages
commit b760359bdadd0b2bee54c6c221987466ff6a8ebf
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 15 15:17:15 2015 +0300
Terminology change: s/fork/spawn
We aren't doing any fork-but-not-exec trick anyway, just a straightforward
start of a child process.
commit a2e2102ad1fc002ffc4a5ac0f58b7ecd354e13a2
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 15 15:13:00 2015 +0300
Call dispatchChild() only if needed
commit c33d3a3aaed19b8190683b6bc99676fd96fe1975
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 15 14:46:42 2015 +0300
Add a couple of items
commit acbad93ac7b16587ee6fa81eadec4aeff653d2dd
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 14 18:30:23 2015 +0300
Update README
commit d513536cfe7ba15146fac1d9b748a7fc66a90c52
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 14 18:25:13 2015 +0300
Must seed the RNG explicitly
Otherwise it uses a timestamp with one-second granularity as seed, and thus
most of the child processes pre-spawned at start will use the same seed, which
causes breakage.
commit 3abb6d0307900d8669839cda4b5b415e26eccf5b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 14 17:50:38 2015 +0300
Now the chroot etc re-work is getting closer to working
Works now for the trivial 'connect' test program. Still need to add
pre-spawning of a new child process as soon as an existing one from the pool
has been taking into use. And need to test with the actual JS client.
commit 8800dd46e115f122a408aa807c28bbb3822405c8
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 13 17:03:55 2015 +0300
Fix typo and bin leftover FOO debug output
commit 652580a761f4f20545f9f08be95834e41c04d4ea
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 13 15:13:38 2015 +0300
Another intermediate commit, code still in a non-working state
commit a4480e2a8ee4c11f32514c216af6cf8bf8d6bc07
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 13 14:50:17 2015 +0300
Add "sleep <n>" pseudo-request
commit 0a60ea9dcc953eee7b1c35d97aa13e8e1884b18f
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Apr 13 12:09:02 2015 +0300
Bump Emacs fill-column to 100
The default 70 is so last century.
commit 7f50f06bf4336b9c3affc5d01a1c8f35c842ac59
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 15:20:04 2015 +0300
Add some comments
commit 4c7b5a39e399ee5f6a33783b104a3671c247cf28
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 12:25:54 2015 +0300
master LibreOffice no longer does the "restart required" thing when used from LOKit
commit f9d93ea57cc67fb9b534e9a65c2d42dd22cdac37
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 8 17:22:42 2015 +0300
Work in progress: "pre-forking", chroot, etc. Non-working state
Lots of changes to the server code, LOOLWSD and LOOLSession mainly. This is an
intermediate commit.
commit defbb6a809444a546f3b86cd69e33754876b6333
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 28 23:23:45 2015 +0200
Remove write of superfluous empty line
commit 6950f7d8410658ccd6a384a1d4515876b8a6c2bd
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Apr 22 21:26:50 2015 +0300
Adapt to changed LibreOfficeKitDocument::postUnoCommand() API
commit 497a50c76da523d9807f78879ee3940b47e2679d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 22 20:49:20 2015 +0300
Tiles are added again in batch
This gives us smoother and faster tile loading
and a tile is requested just once
commit d0f77df7670c20dd22cb826e454d1ef7328cde70
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 22 20:15:42 2015 +0300
Removed image link
commit caf1773e5479e185e18c687022cd0835c29dd72e
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 22 17:49:06 2015 +0300
The map no longer moves when zooming == smoother zooming
The zoomed tiles now perfectly match the new ones that are about
to be received from the server.
The zooming factor is again exponentail (1.2) instead of linear.
TODO: when the window size modifies the gets paned out of the bounds
commit 0214f331e795cd7e94b99a43f25b0e4878ad2eb5
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Apr 22 08:41:09 2015 +0200
test document: Make it clear the white area is deliberate.
commit ff81959c7bd7d891f8cf3b4dc8aa9878cf8b8ab4
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Apr 21 16:03:17 2015 +0200
Updated the loleaflet README.
commit 44553f82c01f3113c028907684462e1792985811
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Apr 21 15:51:28 2015 +0200
loolwsd: Don't even start when the cache dir is not available.
commit 4715df95872baed05744ed60b1c05c610d6afbaa
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Apr 21 12:48:17 2015 +0200
Reformatted loolwsd README.
commit 37dfad0672d6e48fb41d4a2620de3acd42d8991e
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 15 14:02:33 2015 +0300
Removed pop that displays pixel location
commit 3bf5939f8ceb0d1921234c1edfd372377c46ba3e
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 15 10:16:47 2015 +0300
We no longer need the timeout
Another commit must have fixed the thing that caused the crash
commit 62c394f5bdc182c5062c8de6abe1427993831f89
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 15 10:13:57 2015 +0300
This does not work well yet
commit c72f197e71e6b5cf4270fb350512fab4f2a523d4
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 14 14:51:36 2015 +0300
Handle LOK_CALLBACK_STATE_CHANGED
commit f4f12359df5e846fd59f206aeb2f505f5580540f
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 14 13:02:16 2015 +0300
Cosmetics
commit 32ec786180ce77e220db001dabc7d1bf26808b67
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Apr 14 12:54:41 2015 +0300
Update
commit 57a00504212ef4ed686b4644a1152be1aeb87084
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 13 20:46:09 2015 +0300
Selection handler in leaflet
commit 7d66119532b2afa4ae865c1c998c893027717aef
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 13 20:42:44 2015 +0300
Command type handler for selectText, selectGraphic, key, mouse
commit b666dc7d4709520626885d600e552fe76a0dc041
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 13 10:39:12 2015 +0300
This better handles the scroll percentage after zooming
commit 54d0af6fb8d53eac0a07d9a4a9f3ba1d76db6287
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 10 16:29:01 2015 +0300
How zoom works
commit 144c9ab1dff1886915d083d2e69243fa78c245a8
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 10 16:23:23 2015 +0300
Fixed some js lint errors
commit 2aa7f55ea80402bd50868af0d3e8c00e3855a446
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 10 16:15:55 2015 +0300
Zooming now works properly
The initial zoom level is 10 and it goes to:
1, which is 10% and 20, which is 200%
commit 9ecc37d433c2f831aa3b493e51d593a8e355ba82
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 10 14:23:46 2015 +0300
Method for adding map controls to the toolbar div
commit 803ace146bfd021db960eddc023144ac0982ddfc
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 12:51:42 2015 +0300
Some compilers seem very picky about ignoring return values
commit e6ddb042cd4b8730ef008898a36b65dfc1ee245f
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 12:40:13 2015 +0300
WaE: ignoring return value
commit bf709edf086d710e3000424d36c63f2ca4389828
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 12:39:12 2015 +0300
Adapt for older libpng
commit aedea4229f741a855778ede7c30f462a845933cb
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 12:20:42 2015 +0300
Call LibreOfficeKitDocument::initializeForRendering()
commit 565ac27cb6559427ea224a667b92686901bc3fea
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 10 10:33:19 2015 +0300
Readme instruction on how to use archived modules
commit 225bbbc24a86405a8aa9ea0e6df65278d0d54f44
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 10 10:29:58 2015 +0300
Added essential node modules to avoid npm install
commit 06d98ec0b76226da0a7de93bc80e8784b2a5c940
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 10 01:25:48 2015 +0300
This is C++
commit abec49b4bcda826f6433a42acbb5faf930b78e91
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Apr 9 14:38:20 2015 +0100
memcpy in string.h
commit 94f8076332c4c123d7cf0814c038e214cb69a814
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 8 11:38:45 2015 +0300
Map initial maxBounds are set in the constructor
commit 4d8028613b6592f2086c8a69e63cba29113c2cfa
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 8 11:01:45 2015 +0300
Document is placed in the middle of the screen
commit e0da2747cca9ed6b7f02155931c7510be81ef085
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue Apr 7 20:21:32 2015 +0300
RemoveAll method for removing all selections
commit d8c221b9c2df49948c3aa8491cc61b7e30ad04dd
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue Apr 7 20:20:27 2015 +0300
Renamed tooltips to resemble selection and removed surface area
commit 01207119746e711cb11390c7cc69bdfef97ef0ba
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue Apr 7 18:01:43 2015 +0300
Place toolbar items next to each other
commit a212001512a8d76740ebc90227c10b205ab54b65
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 17:20:43 2015 +0300
Workaround for drawing shapes bug.
Without this shapes cannot be shrunken when they are being drawn.
If draw a shape and then move the mouse inside it (to reduce its size)
the wrong type of event is fired and the shape is not updated.
commit e2d5e35597839ba5e8b326042a97126f73c7e555
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 17:14:21 2015 +0300
README update
commit 4b7362ac081cc6f5d0b300773b59867b87a72173
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 17:09:27 2015 +0300
Ignore resulting js files in dist
commit a7f9b427d630b4e443820bb5bbd548381cbb6850
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 17:06:50 2015 +0300
This is generated by the build
commit 98e9b6ecb0fd208f34d5f831dc68160fed55a26d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 17:02:43 2015 +0300
Added draw control to the example html doc
commit 20195a3f4318eeea91a8d25ad2768ee480fcfdea
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 16:30:09 2015 +0300
Fixed js lint errors
commit f76216071e2641821bf5defd93adcffc9b6d56dd
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 12:44:50 2015 +0300
Use node modules from leaflet
commit c88e7260a44ffcdd0f17f11e7fd84b01c50b0edf
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 12:39:11 2015 +0300
This file is generated by the build, no for it to be on git
commit ff700ae81389d1e8339fd6257e2d0dec012bae5d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 12:23:19 2015 +0300
Added Leaflet.Draw-0.2.4
Draw is a plugin that adds support for drawing and editing vectors and
markers on Leaflet maps. This will be used to create selections on the
document.
Source code: https://github.com/Leaflet/Leaflet.draw
Licence: MIT
commit 206a2538d6e81780076dc2ae9931b70f0906e16d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 10:09:16 2015 +0300
Container's background color is the same as document's #F0F0F0
commit 3fc926348d5fcdb14b72a7b3d57479d857167b94
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Apr 6 09:55:12 2015 +0300
Zooming is animated again
commit 4d66d025facd79a0fc93571b8cdeb314302268cc
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 3 17:22:19 2015 +0300
Center restore after zoom
commit f870f78e1d24f8e341e64278ea82dd97c3c368aa
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 3 14:04:01 2015 +0300
Prefetch 1 tile wide border around current visible area
If the user scrolls slowly he won't notice the loading tiles.
commit 54cf584a35261b8e6bf4675b27abf6a1d26a37fd
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 3 14:00:59 2015 +0300
Only load tiles from the visible area (outer container)
Previous to this, the whole documnet was loaded because of the way
scrollbars have been added.
Now the visible area is determined by the current scrollbar position
and the outer container's size.
commit 67e183105f1bc9c2c5fa9b3adf59c82e41470ed8
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Apr 3 12:01:02 2015 +0300
This places the controls above the map (in another div)
I have no experience with css but this works
TODO: needs proper fixing
commit 61210a92a380b75d63f64cfbdb8c9eb25f6702ca
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Apr 2 19:36:22 2015 +0300
Initialize the outer div (container) in map's constructor
This will be later used to get the center of the viewspace
commit 48c92dd555c1c0a3f87609147d0160e6d1a1b9f9
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 1 13:10:17 2015 +0300
Document is no longer dragable and scrollable
Mouse scrolling is now actualy scrolling instead of zooming
commit 3da367096d1bf922458a4b37d4b99adab75d3505
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 1 11:24:31 2015 +0300
Don't request invalid tiles
commit 0811e2eb99108ea903c67542fead5082645a274c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Wed Apr 1 11:12:45 2015 +0300
Use L.DomUtil instead of direct element access
commit d1fe237992245221dd4ff902441dc0f97b5b1f4e
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue Mar 31 19:55:37 2015 +0300
Update document info only if given status is different
Document info = height and width
commit 283b35ab6e3614d0f3bb4ce9fbfe3bebdc288e1f
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue Mar 31 19:51:42 2015 +0300
This fixes the loading problem
The document now loads and zooms smoothly
commit c22280f47ca9e1e5b9f9346290c0afc3efdb8756
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 30 19:22:17 2015 +0300
Removed unnecessary map._update() call
commit 04403ff7821ef58e34bf73c2138f9ae15adfa2c8
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 30 19:21:21 2015 +0300
Update div dimension when zooming for the scrollbar
commit 4944fcc57d6fff62472f0e4972ed577039ab5cf0
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 30 19:20:04 2015 +0300
Detached controls from the map and added scrollbars
The "controls" div holds map controls suchs as the Zoom button and
it's separated from the map in order to have the controls on the top
of the page all the time.
The "document-container" div is the actual display of the document, is
what the user sees and it should be no larger than the screen size.
The "map" div is the actual document and it has the document's size
and width, this being inside the smaller "document-container" will
cause the content to overflow, creating scrollbars
commit 5d6cbc4ed8845ec0c9ea6b6689c749bcb5fe71ed
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 30 19:18:58 2015 +0300
Switched the order in which docPixelLimits is created
commit c6ecfeaf8a507aa556fe23536b705a28ebcf299f
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 30 19:10:21 2015 +0300
Adapt document loading command to new protocol
commit ceae121b16363e444fdaa5901081bb2b6a68b6f8
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 28 13:58:15 2015 +0200
Can remove this, too
commit 6d9f298ee9a2c6da8fcdbd5ab92575fece43618d
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 28 13:55:35 2015 +0200
Prefer C++ std headers
commit 41f41f7af5179a7c475e34d1c079204dc5868538
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 28 13:53:44 2015 +0200
Have lokitclient display tiles using ImageMagick's 'display' if available
Refactor the PNG encoding of a pixmap out to Util.
commit c5a8104c4f96f9dbddcd995f17c6aaa807efa9dd
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 28 13:22:32 2015 +0200
Add a new minimal non-GUI LOKit test program
For easier debugging of the LO code invoked through LibreOfficeKit, with is no
GUI stuff complicating debugging.
commit 56f3678b3697817a4d88ae0f848365586355691b
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 28 13:22:15 2015 +0200
Add a separate include file for some helper functions
commit 7cb0449b8ec238bc4d110517dd8c123bfc81c933
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 27 18:25:06 2015 +0200
More hacking
commit 6e36de4534a831c142af989cf1c6935d0c959c61
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 27 18:23:27 2015 +0200
For debugging, sleep a bit before initialising LOKit if requested
Set the SLEEPFORDEBUGGER environment variable to the number of seconds a child
process should sleep before calling lok_init(), so that you have time to
attach the process in a debugger.
commit cec37456ef70aa5d631b1096b80cf3bb696df27d
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 27 16:53:33 2015 +0200
Set no receive timeout
commit 58f00ca16536e15201da66c795d9a65941e621f2
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 27 16:26:33 2015 +0200
Remove the dead "migratory socket" stuff
commit bb162a6ba77405417bd1296e1b4aceadf8eae027
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 27 16:23:20 2015 +0200
Add trivial test program for sending commands to the LOOL server
commit 022592e65c64cf5cfd8c77c855021504280be5c0
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 27 14:52:30 2015 +0200
Do remove also the first level of subdirectories
commit 70f175c9a7ae4b2409e9601b4a1492e49f100405
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 17:07:52 2015 +0200
Make Util a namespace instead of a class with just static member functions
This is not Java or C#.
commit 422dfd176710acf02b7b88b57da444807ce9fe54
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 16:49:07 2015 +0200
Start on load testing
Add a new program, loadtest, that runs a requested number of client sessions
in parallel to a loolwsd server. A client session loads one of a list of test
documents, and does some operations on it.
Move the getTokenInteger() and getTokenString() functions out from LOOLSession
into a new namespace LOOLProtocol, as they are neeeded also in the loadtest
program.
Add, also in LOOLProtocol, functions to parse some of the messages from the
server. (In general that is done in client JavaScript code, of course; only
for testing purposes needed in C++ code.)
commit 425cae6b294c80bed2a3d1814cb83d029d1dd9ce
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 14:52:25 2015 +0200
No need for <unistd.h> as far as I see
commit eb695513de346b50ecb63205ae8c160ba121668f
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 11:25:22 2015 +0200
Use const reference parameter
commit 3cb43839ea4a79235ae694cb9a2a0c500e1d7615
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 08:37:03 2015 +0200
Cosmetics
commit df95739819a02cc5a469264b5a292620f6db3dec
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 08:36:35 2015 +0200
Make DEFAULT_PORT_NUMBER public
commit b7c08d373e0c550a59da90a12bc108ade8604977
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 26 14:37:38 2015 +0200
WaE: private field '_helpRequested' is not used
commit 52376226d03cc1e833f7ace276c66bd254a81125
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Wed Mar 25 14:15:57 2015 +0000
More README grist.
commit e8aa011af4ea662a4d104ce1730573a91b6a7e81
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Mar 25 14:39:58 2015 +0200
Undo accidental indentation
commit 5df0766dad512c1aede4a063eebd6fa28ab8a345
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Mar 25 12:08:12 2015 +0200
Return an error if the documentLoad() fails
commit 867a66aa62bbe88911d0d459a3521e5f145b2522
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 24 19:04:16 2015 +0200
A bit more info
commit cae997c184cb08a1e9ce0075eedb9e38cca62dca
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 24 18:59:04 2015 +0200
Check 'tile' parameter validity
commit b138c2431d3cdbea2bd16dc68ef0d0353e71d633
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Tue Mar 24 16:26:40 2015 +0200
Tiles are cached on the client side
Updated the removeTile method to just mark the tile as
not current and the set _update method not to 'hide'
(set opacity to 0) tiles from the current zoom level
commit 8952d80dc07d74ba620801b78edcf47374a08b01
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 24 13:16:15 2015 +0200
No need to mention that
commit 32de8661bc64e58de255a0d4b73685c532a3cfdb
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Mar 24 13:15:43 2015 +0200
Mention how to run npm without root
commit 97fbe8e857937b95a44a8f1008ccbef74318b741
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 23 22:13:57 2015 +0200
Add 'saveas'
commit 3b2c3a69dfd44d473cabfd0cd6152d2665d1f574
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 23 19:37:42 2015 +0200
Mentioned about 'jake lint' in README
commit dc97c7eabd6485e30d903a8cf258208eb3a2c62f
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 23 19:36:01 2015 +0200
Fixed some lintjs coding style errors
commit 624873cf471354b81159f33e295cec90ffe5f2ef
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 23 19:24:39 2015 +0200
Added instructions on how to use loleaflet + an example
commit 31f5141c466981cf3bc9ad27201782019a93273c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 23 19:02:02 2015 +0200
Added zoom functionality
The document can be zoomed in an out. Each zoom level corresponds
to a 20% increase or decrease in tile dimmension (in twips).
Zooming doesn't work well yet. Tiles are removed and readded to
many times and it looks bad. Also the zooming center has to be fixed.
commit 5db22c1962c72d78ad61bb3162726925ccbecf47
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 23 18:57:23 2015 +0200
Temporary dded zoom control back
commit 4974ea15b197787e58be0cc9ed117fe85d07d509
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 20 15:52:19 2015 +0200
Bin leftover debug output
commit 1e734c2c0ecaa4e4b863079d4597f2178645b9e9
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 20 15:50:23 2015 +0200
Reduce copypasta
Handle the start of a child process when needed centrally, not in each command
handler.
Also, handle unrecognized commands always already in the parent
process. (Command syntax checks still done in child process, though.)
commit e05092ece254bb4016c5f7ef7d6bbda42fec313b
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 20 14:56:37 2015 +0200
Obviously need to handle input events etc in the child process
I need to re-factor this stuff, too much copypasta.
commit a3897bd9063ac56cec7811a150022e0cb609e872
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 20 13:16:41 2015 +0200
paintTile does not take a row stride parameter any more
commit 215fda02359d6bdb713d807ea0609cb55d51a2a6
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 19 14:38:04 2015 +0200
Add key and mouse event handling, uno command, and selection handling
Not "handled" here of course, just pass them on to LibreOfficeKit.
commit 721d835c7937779580ea32b7228937d13a7cfc44
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 19 13:55:06 2015 +0200
Also mention the communication between parent and child process
commit 3921903e8e8df2b08372dd9e92ed5473b90c9501
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Mar 20 10:05:22 2015 +0200
MaxBounds are set automatically based on the size specified by loolwsd
commit fe757bfc12ecb8d6bac94a498d3215742ba94795
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Fri Mar 20 10:02:58 2015 +0200
Workaround for Leaflet issue #3320
commit aa5d7c9ccce52b87f4477082762a031fe61a064d
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Thu Mar 19 19:08:29 2015 +0200
Fixed tiles interleaving problem + allowed static layers to be added
Tiles are now correctly displayed.
Layers that request tiles from a socket connection need to specify
the 'useSocket: true' option. This way layers that do not require an
internet connection can be added (like a grid, ruler, etc.).
I've also fixed some coding style problems suggested by lintjs
commit 27ea953a3b66a0f73fd93437a479a5279e63d079
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Mar 18 15:36:27 2015 +0200
Update
commit e8ea0f0d2e8c93c7cbded97a2a04822c3bc640ec
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Mar 18 01:56:15 2015 +0200
Use separate child processes for LibreOfficeKit
For now, each LOOL client has a separate child process (or none at all, if it
has accessed only information found in the cache). This will obviously have to
chnage to handle collaboration. Etc.
The parent process talks the same Websocket protocol with the child
processes. When there is a child process for a client, traffic from the client
is forwarded as such to the child process and vice versa.
commit d43e148ff4c678c8e5da457b4059ab1221c41e71
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Mar 18 01:57:13 2015 +0200
Updates
commit ff8ceac5606e8451d14371a37377b74747899ed4
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 16 21:08:07 2015 +0200
Caller expects empty string as failure, not nullptr
Fixes crash.
commit bd35c1aeb8edd6f9811970f75e03ff4e535e51c7
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 16 14:37:32 2015 +0200
Intermediate commit, will not actually do it like this
My comment in 1b0230e4dfdbdfd2644115c53b05cf87825f4fba was misleading, even if
doing this for Unix only, if we had done it as I was first thinking, we would
have needed to pass sockets between processes. But we won't, we will instead
keep all the connections to the clients in the same master process, and pass
on the WebSocketg protocol as such to child processes. That way the child
processes can go away when idle, or crash, without the connections
breaking. Or something.
commit 50e36c7ca5dbfa3d04e2c1bd3b0295700eb7a558
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 16 13:59:40 2015 +0200
Sort 'using' statements
commit 0c5b654194b86f53409e8f97dac7dd584402f80c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 16 17:46:20 2015 +0200
Tiles are now loaded from a loolwsd server
the '_addTile' method now also handles tiles comming from a websocket.
Tiles are no longer added in one batch as they are added when received.
Added twip to pixel and pixel to twip convertor methods.
1 twip = 15 px
commit a8075b8250edeebb4d09c8a4dfc2eb96906a519c
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 16 17:38:19 2015 +0200
Added websockets to the Map object
'onopen' and 'onmessage' events are handled
in src/layer/tile/TileLayer.js
Tile data is received as an ArrayBuffer which contains a string message
followed by a new line and then by the actual PNG data. The PNG data
is encoded in base-64 in order to be displayed.
commit 2213e76a3260bd9882f19f0a6fd4180ddec51eb5
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 16 17:33:07 2015 +0200
Removed zoom control and attribution display
commit 1b0230e4dfdbdfd2644115c53b05cf87825f4fba
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 16 12:25:47 2015 +0200
Intermediate commit of start on transporting sockets to child process
Will be needed if we want loolwsd to run on Windows. Then we will have one
process receiving the connections from WebSocket clients and sending the
accepted connection sockets to child processes thatr might be already running,
either because they have been "pre-forked", or because of a collaboration
scenario where new clients join a session working on a document.
But initially we will write this as if for Unix only, so development of this
migratory socket stuff is paused for now. (And it isn't even clear whether the
API design so far is a good idea and elegantly implementable.)
commit ea01aa20023e82a91da9c2e0a64f16a3b94cf6a1
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 14:17:51 2015 +0200
Cache also document status
commit 44c2ef32f5ed44e594166c39208db47f6a11bd65
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 13:59:51 2015 +0200
Small fix to error handling
commit 1a5e1b0fa4dd59a5f46e9bbccab628509391bcd8
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 11:30:45 2015 +0200
Incorporate LOK_CALLBACK_* generically
commit 68fec977528e818c8261ae1381c095c0cd1d7080
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 11:30:23 2015 +0200
More LibreOfficeKitCallbackType values have been added
commit 0bfd6ee02bb2b3242bed615b99143144c53734d7
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 11:29:55 2015 +0200
Use -Wall -Werror
commit 94254ec9e467c82e5d2fee8d4d8189df454b2cd9
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 11:25:00 2015 +0200
Missing break
commit ad3fda27afb5dbad56d8dc0a6220bdfc9f63a787
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Mar 13 01:34:42 2015 +0200
Further hacking on tile cache
commit 79a4eff2cf775933e7c817f05c96a80563b3ee6c
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 12 18:58:51 2015 +0200
Catch and log exceptions in the TestOutput thread
commit 076733251fa1cc44e47055668970cb50fb29efe8
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 12 18:58:29 2015 +0200
No need for the DUMPPNG debugging feature any more
commit 08583f8ebe6ccafc555bb30287f442c3a4a26d6b
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 12 16:18:35 2015 +0200
Add first cut at caching of tiles
commit 38d4fda3f6c5e636afbc36255493ff65eb7032bd
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 12 17:25:25 2015 +0200
Expand shell variables in LOOLWSD_CACHEDIR
commit 02815cb03eac6a91175e97b2a8561ebec9c92365
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 12 14:15:11 2015 +0200
Adapt for LOOLWSD.cpp renameing here, too...
commit bf611698b200a9bdfb44ce84724ea06ce762c107
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 17:40:06 2015 +0200
No need for a separate 'close' request
Having a 'close' would mean being able to do a new 'open', too, which
introduces unneeded complexity, at least at this stage.
Just start a fresh WebSocket connection for each document.
commit 5c8c36b55576928041e8996f287c0c157976433f
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 17:39:37 2015 +0200
Simplify
commit 163c08e62eb814dc279a2689217bd0803d8f2ae4
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 17:34:11 2015 +0200
Rename the LOOLWS class to LOOLWSD
commit 7e363f6058009d9c3bd72d38c6cc3dc051460862
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 17:33:53 2015 +0200
Add a few more fields for future
commit 1fe46cdf8dc41f98b42257a46ba6bd23b6ffcb80
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 17:32:01 2015 +0200
Just use autoheader (or autoreconf), no need for config.h.in in git
commit c53f2ec4580b6bc94006862207d57fb0e86d32eb
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 17:31:47 2015 +0200
Add LOOLWDS_CACHEDIR
commit 87dc6f5b8f8f88c7ad7ee653b4d4417b4c2466e1
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 9 15:58:37 2015 +0200
Set LF line terminator
commit 2c7c33d4546514811ba6cc3d681c05e077122c7e
Merge: 3d64e77 a9af4ab
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 9 15:55:01 2015 +0200
Merge branch 'master' of ssh://git.internal.collabora.co.uk/git/icewarp
commit 3d64e7764f18813af218fdabd7f5abbe408235da
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 9 15:54:27 2015 +0200
Readme that explains how to build and states code convetions
commit 699cab4cedd33cd602786d4ad8dcaa9f86a86646
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 9 15:54:01 2015 +0200
Removed initial README and contributing guide
commit a9af4ab657fe61d0d832f3f177a5f4bd566bca32
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 14:11:39 2015 +0200
Add missing comma
commit 4f54efe815fc4b4f32a2d31259720d48be76eddc
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 13:40:27 2015 +0200
Portabillity improvements
commit bb6fd2206a7544520bbb8129ae7ca7c8ca63cc03
Author: Mihai Varga <mihai.varga at collabora.com>
Date: Mon Mar 9 12:16:17 2015 +0200
Unmodified Leaflet
Checkout date: 09/03/2015
HEAD: a92c8a3c21f8d580de2dfd1e937ea90db76787b6
commit 23702c6d8416fba6199bf9dd95fed593425c4b8d
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 11:30:56 2015 +0200
We have a "proper" autofooized Unix build now
commit 6b121b2fa6f118c32e845fc9d959ddbed00e9b4e
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 11:11:15 2015 +0200
Autofooize
commit ce438007b2a45bf0ed6a9a1963602e182f76b960
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Mar 9 10:01:30 2015 +0200
Rename LOOLConnectionServer to LOOLSession
That is hopefully a better name.
commit 3f593403c31d2fcef26c2175939769f2f67101da
Author: Tor Lillqvist <tml at collabora.com>
Date: Sat Mar 7 13:23:46 2015 +0200
Pass callbacks from LOKit on to the client, and some other changes
Use a larger buffer in the TestOutput class to handle a bit larger tiles. Too
bad that the current Poco::WebSocket::receiveFrame() takes a fixed size
buffer. (I will submit a patch to Poco for a receiveFrame() that takes a
dynamically resizable buffer and handles whatever size frame the other side
sends.)
commit a526b2faa2809c59e6e2fa5218a9658c89916291
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 5 15:57:03 2015 +0200
Add the callbacks
commit 049ea0287050dcae1a53d86d3b1bd90b591f4cfa
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 5 12:26:22 2015 +0200
Don't write more data than there is
commit 798edd79ae21bdb1b1d35fbfa1164dcd14ea305d
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 5 01:57:13 2015 +0200
Delete unused files
commit 0798c3d1eaea1bb45a00d007a2ec4d1c00aca84e
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 5 01:14:04 2015 +0200
Initial commit of loolwsd
See loolwsd/README for some notes.
commit 8746ea936008eb181a3cb43bf790ce0f169b700d
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Mar 4 12:23:20 2015 +0200
Test commit
commit d106b7cb3a962ef33fb28c9fb49b4858beafc817
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Tue Mar 3 19:25:38 2015 +0000
Initial checkin.
More information about the Libreoffice-commits
mailing list