From 41c51d761446214866c5551c373984e6f77ea2c9 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Tue, 15 May 2018 16:09:04 +0200
Subject: [PATCH] 3DScene's char event handler moved to c++

---
 lib/Slic3r/GUI/3DScene.pm               | 62 +++++++++++++------------
 xs/src/slic3r/GUI/GLCanvas3D.cpp        | 35 ++++++++++++++
 xs/src/slic3r/GUI/GLCanvas3D.hpp        |  2 +
 xs/src/slic3r/GUI/GLCanvas3DManager.cpp |  1 +
 4 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 89e46a55db..a654f6554f 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -244,36 +244,38 @@ sub new {
 #==============================================================================================================================
     EVT_MOUSEWHEEL($self, \&mouse_wheel_event);
     EVT_MOUSE_EVENTS($self, \&mouse_event);
-#    EVT_KEY_DOWN($self, sub {
-    EVT_CHAR($self, sub {
-        my ($s, $event) = @_;
-        if ($event->HasModifiers) {
-            $event->Skip;
-        } else {
-            my $key = $event->GetKeyCode;
-            if ($key == ord('0')) {
-                $self->select_view('iso');
-            } elsif ($key == ord('1')) {
-                $self->select_view('top');
-            } elsif ($key == ord('2')) {
-                $self->select_view('bottom');
-            } elsif ($key == ord('3')) {
-                $self->select_view('front');
-            } elsif ($key == ord('4')) {
-                $self->select_view('rear');
-            } elsif ($key == ord('5')) {
-                $self->select_view('left');
-            } elsif ($key == ord('6')) {
-                $self->select_view('right');
-            } elsif ($key == ord('z')) {
-                $self->zoom_to_volumes;
-            } elsif ($key == ord('b')) {
-                $self->zoom_to_bed;
-            } else {
-                $event->Skip;
-            }
-        }
-    });
+#==============================================================================================================================
+##    EVT_KEY_DOWN($self, sub {
+#    EVT_CHAR($self, sub {
+#        my ($s, $event) = @_;
+#        if ($event->HasModifiers) {
+#            $event->Skip;
+#        } else {
+#            my $key = $event->GetKeyCode;
+#            if ($key == ord('0')) {
+#                $self->select_view('iso');
+#            } elsif ($key == ord('1')) {
+#                $self->select_view('top');
+#            } elsif ($key == ord('2')) {
+#                $self->select_view('bottom');
+#            } elsif ($key == ord('3')) {
+#                $self->select_view('front');
+#            } elsif ($key == ord('4')) {
+#                $self->select_view('rear');
+#            } elsif ($key == ord('5')) {
+#                $self->select_view('left');
+#            } elsif ($key == ord('6')) {
+#                $self->select_view('right');
+#            } elsif ($key == ord('z')) {
+#                $self->zoom_to_volumes;
+#            } elsif ($key == ord('b')) {
+#                $self->zoom_to_bed;
+#            } else {
+#                $event->Skip;
+#            }
+#        }
+#    });
+#==============================================================================================================================
     
     $self->{layer_height_edit_timer_id} = &Wx::NewId();
     $self->{layer_height_edit_timer} = Wx::Timer->new($self, $self->{layer_height_edit_timer_id});
diff --git a/xs/src/slic3r/GUI/GLCanvas3D.cpp b/xs/src/slic3r/GUI/GLCanvas3D.cpp
index 2e4b15af4b..4a5a97c95e 100644
--- a/xs/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp
@@ -609,6 +609,41 @@ void GLCanvas3D::on_idle(wxIdleEvent& evt)
     }
 }
 
+void GLCanvas3D::on_char(wxKeyEvent& evt)
+{
+    if (evt.HasModifiers())
+        evt.Skip();
+    else
+    {
+        int keyCode = evt.GetKeyCode();
+        switch (keyCode - 48)
+        {
+        // numerical input
+        case 0: { select_view("iso"); break; }
+        case 1: { select_view("top"); break; }
+        case 2: { select_view("bottom"); break; }
+        case 3: { select_view("front"); break; }
+        case 4: { select_view("rear"); break; }
+        case 5: { select_view("left"); break; }
+        case 6: { select_view("right"); break; }
+        default:
+            {
+                // text input
+                switch (keyCode)
+                {
+                // key B/b
+                case 66:
+                case 98:  { zoom_to_bed(); break; }
+                // key Z/z
+                case 90:
+                case 122: { zoom_to_volumes(); break; }
+                default: { evt.Skip(); break; }
+                }
+            }
+        }
+    }
+}
+
 void GLCanvas3D::_zoom_to_bounding_box(const BoundingBoxf3& bbox)
 {
     // Calculate the zoom factor needed to adjust viewport to bounding box.
diff --git a/xs/src/slic3r/GUI/GLCanvas3D.hpp b/xs/src/slic3r/GUI/GLCanvas3D.hpp
index f3b459b968..507964136e 100644
--- a/xs/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/xs/src/slic3r/GUI/GLCanvas3D.hpp
@@ -8,6 +8,7 @@ class wxGLCanvas;
 class wxGLContext;
 class wxSizeEvent;
 class wxIdleEvent;
+class wxKeyEvent;
 
 namespace Slic3r {
 
@@ -172,6 +173,7 @@ public:
 
     void on_size(wxSizeEvent& evt);
     void on_idle(wxIdleEvent& evt);
+    void on_char(wxKeyEvent& evt);
 
 private:
     void _zoom_to_bounding_box(const BoundingBoxf3& bbox);
diff --git a/xs/src/slic3r/GUI/GLCanvas3DManager.cpp b/xs/src/slic3r/GUI/GLCanvas3DManager.cpp
index f4b367c95b..61867c61ca 100644
--- a/xs/src/slic3r/GUI/GLCanvas3DManager.cpp
+++ b/xs/src/slic3r/GUI/GLCanvas3DManager.cpp
@@ -79,6 +79,7 @@ bool GLCanvas3DManager::add(wxGLCanvas* canvas, wxGLContext* context)
 
     canvas->Bind(wxEVT_SIZE, [canvas3D](wxSizeEvent& evt) { canvas3D->on_size(evt); });
     canvas->Bind(wxEVT_IDLE, [canvas3D](wxIdleEvent& evt) { canvas3D->on_idle(evt); });
+    canvas->Bind(wxEVT_CHAR, [canvas3D](wxKeyEvent& evt)  { canvas3D->on_char(evt); });
 
     m_canvases.insert(CanvasesMap::value_type(canvas, canvas3D));