X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fdcpomatic_player.cc;h=90c37d08c726feb29a502585e81a717f3b9a92db;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hp=d1d4720edbbed6afc16adaef0eb90fb2e5b73ae4;hpb=f25061b8a6f35e490b731caefe63560045b10a1f;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index d1d4720ed..90c37d08c 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -224,7 +224,7 @@ public:
 
 		_stress.setup (this, _controls);
 
-		wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
+		std::vector<wxAcceleratorEntry> accel(accelerators);
 		accel[0].Set(wxACCEL_NORMAL,                WXK_SPACE, ID_start_stop);
 		accel[1].Set(wxACCEL_NORMAL,                WXK_LEFT,  ID_go_back_frame);
 		accel[2].Set(wxACCEL_NORMAL,                WXK_RIGHT, ID_go_forward_frame);
@@ -239,9 +239,8 @@ public:
 #ifdef __WXOSX__
 		accel[11].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
 #endif
-		wxAcceleratorTable accel_table (accelerators, accel);
+		wxAcceleratorTable accel_table (accelerators, accel.data());
 		SetAcceleratorTable (accel_table);
-		delete[] accel;
 
 		Bind (wxEVT_MENU, boost::bind(&DOMFrame::start_stop_pressed, this), ID_start_stop);
 		Bind (wxEVT_MENU, boost::bind(&DOMFrame::go_back_frame, this),      ID_go_back_frame);
@@ -805,6 +804,7 @@ private:
 			_dual_screen->SetBackgroundColour (wxColour(0, 0, 0));
 			_dual_screen->ShowFullScreen (true);
 			_viewer->panel()->Reparent (_dual_screen);
+			_viewer->panel()->SetFocus();
 			_dual_screen->Show ();
 			if (wxDisplay::GetCount() > 1) {
 				switch (Config::instance()->image_display()) {
@@ -819,6 +819,7 @@ private:
 					break;
 				}
 			}
+			_dual_screen->Bind(wxEVT_CHAR_HOOK, boost::bind(&DOMFrame::dual_screen_key_press, this, _1));
 		} else {
 			if (_dual_screen) {
 				_viewer->panel()->Reparent (_overall_panel);
@@ -830,6 +831,17 @@ private:
 		setup_main_sizer (_mode);
 	}
 
+	void dual_screen_key_press(wxKeyEvent& ev)
+	{
+		if (ev.GetKeyCode() == WXK_F11) {
+			if (ev.ShiftDown()) {
+				view_dual_screen();
+			} else if (!ev.HasAnyModifiers()) {
+				view_full_screen();
+			}
+		}
+	}
+
 	void view_closed_captions ()
 	{
 		_viewer->show_closed_captions ();
@@ -958,7 +970,7 @@ private:
 
 		int pos = _history_position;
 
-		/* Clear out non-existant history items before we re-build the menu */
+		/* Clear out non-existent history items before we re-build the menu */
 		Config::instance()->clean_player_history ();
 		auto history = Config::instance()->player_history ();