loolwsd/ChildSession.cpp | 3 +++
loolwsd/LOKitHelper.hpp | 12 ++++++++++++
loolwsd/protocol.txt | 4 ++++
3 files changed, 19 insertions(+)
New commits:
commit 9f1070ded748e5f3f07a6d9b688152b81d8c1742
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Wed Aug 3 19:50:02 2016 +0530
loolwsd: forward notification for LOK_CALLBACK_VIEW_CURSOR_VISIBLE too
diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 682750c..4cc4eb9 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -249,6 +249,9 @@ public:
case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
_session.sendTextFrame("graphicviewselection: " + rPayload);
break;
+ case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
+ _session.sendTextFrame("viewcursorvisible: " + rPayload);
+ break;
case LOK_CALLBACK_VIEW_LOCK:
_session.sendTextFrame("viewlock: " + rPayload);
break;
diff --git a/loolwsd/LOKitHelper.hpp b/loolwsd/LOKitHelper.hpp
index ede78d3..2986dc3 100644
--- a/loolwsd/LOKitHelper.hpp
+++ b/loolwsd/LOKitHelper.hpp
@@ -107,6 +107,8 @@ namespace LOKitHelper
return "CELL_VIEW_CURSOR";
case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
return "GRAPHIC_VIEW_SELECTION";
+ case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
+ return "VIEW_CURSOR_VISIBLE";
case LOK_CALLBACK_VIEW_LOCK:
return "VIEW_LOCK";
}
diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index 607bfc7..9eaceae 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -324,6 +324,10 @@ graphicviewselection:
Per-view graphic selection. JSON payload.
+viewcursorvisible:
+
+ Per-view cursor visible. JSON payload.
+
viewlock:
Per-view lock rectangle. JSON payload.
commit 1e26b2ea469ca9ed47e88952290d2b85b92db532
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Wed Aug 3 19:07:34 2016 +0530
loolwsd: Add missing view callbacks to LOKitHelper
diff --git a/loolwsd/LOKitHelper.hpp b/loolwsd/LOKitHelper.hpp
index f05bddd..ede78d3 100644
--- a/loolwsd/LOKitHelper.hpp
+++ b/loolwsd/LOKitHelper.hpp
@@ -99,6 +99,16 @@ namespace LOKitHelper
return "ERROR";
case LOK_CALLBACK_CONTEXT_MENU:
return "CONTEXT_MENU";
+ case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
+ return "INVALIDATE_VIEW_CURSOR";
+ case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+ return "TEXT_VIEW_SELECTION";
+ case LOK_CALLBACK_CELL_VIEW_CURSOR:
+ return "CELL_VIEW_CURSOR";
+ case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
+ return "GRAPHIC_VIEW_SELECTION";
+ case LOK_CALLBACK_VIEW_LOCK:
+ return "VIEW_LOCK";
}
return std::to_string(nType);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
