7 files changed, 140 insertions, 25 deletions

diff --git a/appcache.js b/appcache.js
index f200133..2e71164 100644
--- a/appcache.js
+++ b/appcache.js
@@ -35,9 +35,10 @@ class AppCache {
       "pointless/viewer/init.js",
       "pointless/viewer/viewer.js",
       "pointless/viewer/presentation.js",
-      "pointless/viewer/stage.js",
-      "pointless/viewer/screen.js",
-      "pointless/viewer/timer.js"
+      "pointless/viewer/stage/stage.js",
+      "pointless/viewer/stage/actions.js",
+      "pointless/viewer/screen/screen.js",
+      "pointless/viewer/screen/timer.js"
     ];
 
     const appCache = this;
diff --git a/index.html b/index.html
index f2168ed..72ea974 100644
--- a/index.html
+++ b/index.html
@@ -82,9 +82,10 @@
     <div id="message" class="notification"></div>
 
     <script type="text/javascript" src="pointless/pdfjs/pdf.js"></script>
-    <script type="text/javascript" src="pointless/viewer/timer.js"></script>
-    <script type="text/javascript" src="pointless/viewer/screen.js"></script>
-    <script type="text/javascript" src="pointless/viewer/stage.js"></script>
+    <script type="text/javascript" src="pointless/viewer/screen/timer.js"></script>
+    <script type="text/javascript" src="pointless/viewer/screen/screen.js"></script>
+    <script type="text/javascript" src="pointless/viewer/stage/actions.js"></script>
+    <script type="text/javascript" src="pointless/viewer/stage/stage.js"></script>
     <script type="text/javascript" src="pointless/viewer/presentation.js"></script>
     <script type="text/javascript" src="pointless/viewer/viewer.js"></script>
     <script type="text/javascript" src="pointless/viewer/init.js"></script>
diff --git a/pointless/viewer/screen.js b/pointless/viewer/screen/screen.js
index bf7a049..bf7a049 100644
--- a/pointless/viewer/screen.js
+++ b/pointless/viewer/screen/screen.js
diff --git a/pointless/viewer/timer.js b/pointless/viewer/screen/timer.js
index 21cd8b8..21cd8b8 100644
--- a/pointless/viewer/timer.js
+++ b/pointless/viewer/screen/timer.js
diff --git a/pointless/viewer/stage/actions.js b/pointless/viewer/stage/actions.js
new file mode 100644
index 0000000..271d7b7
--- /dev/null
+++ b/pointless/viewer/stage/actions.js
@@ -0,0 +1,121 @@
+/*
+ * Pointless Viewer, a web-based Beamer presentation viewer
+ * Copyright (C) 2018 Pacien TRAN-GIRARD
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+"use strict";
+
+class ActionEventHandler {
+  constructor(onNext, onPrevious) {
+    this.onNext = onNext;
+    this.onPrevious = onPrevious;
+  }
+}
+
+class KeyboardEventHandler extends ActionEventHandler {
+  register(window) {
+    const self = this;
+    window.addEventListener("keydown", function(event) {
+      self._onCommand(event);
+    })
+  }
+
+  _onCommand(keyboardEvent) {
+    switch (keyboardEvent.key) {
+      case "Enter":
+      case " ":
+      case "ArrowRight":
+      case "n":
+        return this.onNext();
+
+      case "ArrowLeft":
+      case "p":
+        return this.onPrevious();
+    }
+  }
+}
+
+class MouseClickEventHandler extends ActionEventHandler {
+  register(window) {
+    const self = this;
+    window.addEventListener("click", function(event) {
+      self._onCommand(event);
+    })
+  }
+
+  _onCommand(mouseEvent) {
+    this.onNext();
+  }
+}
+
+class TouchSwipeEventHandler extends ActionEventHandler {
+  constructor(onNext, onPrevious) {
+    super(onNext, onPrevious);
+    this.touchStartEvent = null;
+    this.touchMoveEvent = null;
+  }
+
+  register(window) {
+    const self = this;
+
+    window.addEventListener("touchstart", function(event) {
+      event.preventDefault();
+      self._onTouchStart(event);
+    });
+
+    window.addEventListener("touchmove", function(event) {
+      event.preventDefault();
+      self._onTouchMove(event);
+    });
+
+    window.addEventListener("touchend", function(event) {
+      event.preventDefault();
+      self._onTouchEnd();
+    });
+
+    window.addEventListener("touchcancel", function(event) {
+      event.preventDefault();
+    });
+  }
+
+  _onTouchStart(touchEvent) {
+    this.touchStartEvent = touchEvent;
+  }
+
+  _onTouchMove(touchEvent) {
+    this.touchMoveEvent = touchEvent;
+  }
+
+  _onTouchEnd() {
+    if (this.touchStartEvent == null || this.touchMoveEvent == null) return;
+
+    const touchDown = this._xCoordinate(this.touchStartEvent);
+    const touchUp = this._xCoordinate(this.touchMoveEvent);
+    const xDelta = touchDown - touchUp;
+
+    if (xDelta > 0)
+      this.onNext();
+    else if (xDelta < 0)
+      this.onPrevious();
+    
+    this.touchStartEvent = null;
+    this.touchMoveEvent = null;
+  }
+
+  _xCoordinate(touchEvent) {
+    return touchEvent.touches[0].clientX; // first finger
+  }
+}
diff --git a/pointless/viewer/stage.js b/pointless/viewer/stage/stage.js
index 1772480..e9a2d38 100644
--- a/pointless/viewer/stage.js
+++ b/pointless/viewer/stage/stage.js
@@ -20,8 +20,6 @@
 
 class Stage {
   constructor(onReady, onNext, onPrevious) {
-    this.onNext = onNext;
-    this.onPrevious = onPrevious;
     this.audienceScreen = null;
     this.presenterScreen = null;
 
@@ -37,6 +35,12 @@ class Stage {
       onReady();
     });
 
+    this.eventHandlers = [
+      new KeyboardEventHandler(onNext, onPrevious),
+      new MouseClickEventHandler(onNext, onPrevious),
+      new TouchSwipeEventHandler(onNext, onPrevious)
+    ];
+
     this._registerEventHandler(window);
     this._registerEventHandler(this.projector);
   }
@@ -47,24 +51,11 @@ class Stage {
   }
 
   _registerEventHandler(window) {
-    const self = this;
-    window.addEventListener("keydown", function(event) {
-      self._onCommand(event);
-    })
-  }
+    if (window == null) return;
 
-  _onCommand(keyboardEvent) {
-    switch (keyboardEvent.key) {
-      case "Enter":
-      case " ":
-      case "ArrowRight":
-      case "n":
-        return this.onNext();
-
-      case "ArrowLeft":
-      case "p":
-        return this.onPrevious();
-    }
+    this.eventHandlers.forEach(function(eventHandler) {
+      eventHandler.register(window);
+    });
   }
 
   _watchDetach() {
diff --git a/pointless/viewer/viewer.css b/pointless/viewer/viewer.css
index 6702702..21d58cc 100644
--- a/pointless/viewer/viewer.css
+++ b/pointless/viewer/viewer.css
@@ -21,6 +21,7 @@ html, body {
   color: white;
   font-family: sans-serif;
   overflow: hidden;
+  touch-action: none;
   height: 100%;
 }