[four-in-a-row] Add some keyboard shortcuts.

[Arnaud B. <arnaudb src gnome org>]

commit e41b892b20455dfe96297b5ddfbc8ad42159fc37
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Dec 21 21:30:02 2019 +0100

    Add some keyboard shortcuts.

 data/ui/help-overlay.ui | 10 ++++-----
 src/four-in-a-row.vala  | 59 ++++++++++++++++++++++++++++++++++++++-----------
 src/game-window.vala    | 12 +++++-----
 3 files changed, 56 insertions(+), 25 deletions(-)
---
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 0c6a757..0a0331c 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -68,9 +68,9 @@
                 <property name="accelerator">Left Right</property>
               </object>
             </child>
-            <child><!-- TODO make visible -->
+            <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">False</property>
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; hitting 
number moves directly to the nth column -->
                 <property name="title" translatable="yes" context="shortcut window">Select the given 
column</property>
                 <property name="accelerator">1...7</property>
@@ -81,7 +81,7 @@
                 <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; shortcut 
for dropping the tile -->
                 <property name="title" translatable="yes" context="shortcut window">Play in selected 
column</property>
-                <property name="accelerator">Down</property><!-- TODO Return space -->
+                <property name="accelerator">Down Return space</property>
               </object>
             </child>
           </object>
@@ -114,9 +114,9 @@
             <property name="visible">True</property>
             <!-- Translators: section of the Keyboard Shortcuts window; contains "Help", "About", "Quit"... 
-->
             <property name="title" translatable="yes" context="shortcut window">Generic</property>
-            <child><!-- TODO make visible -->
+            <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">False</property>
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic" -->
                 <property name="title" translatable="yes" context="shortcut window">Keyboard 
shortcuts</property>
                 <property name="accelerator">&lt;Primary&gt;question &lt;Primary&gt;F1</property>
diff --git a/src/four-in-a-row.vala b/src/four-in-a-row.vala
index ce37add..122f330 100644
--- a/src/four-in-a-row.vala
+++ b/src/four-in-a-row.vala
@@ -64,6 +64,8 @@ private class FourInARow : Gtk.Application
     private GameBoardView game_board_view;
     private GameWindow window;
     private NewGameScreen new_game_screen;
+    private MenuButton history_button_1;
+    private MenuButton history_button_2;
 
     // game state
     private char vstr [53];
@@ -176,8 +178,8 @@ private class FourInARow : Gtk.Application
 
         app_menu.freeze ();
 
-        MenuButton history_button_1 = new HistoryButton (/* direction: down */ false);
-        MenuButton history_button_2 = new HistoryButton (/* direction: up   */ true);
+        history_button_1 = new HistoryButton (/* direction: down */ false);
+        history_button_2 = new HistoryButton (/* direction: up   */ true);
 
         /* Window */
         window = new GameWindow ("/org/gnome/Four-in-a-row/ui/four-in-a-row.css",
@@ -203,7 +205,8 @@ private class FourInARow : Gtk.Application
 
         /* various */
         game_board_view.column_clicked.connect (column_clicked_cb);
-        window.key_press_event.connect (on_key_press);
+        window.key_press_event.connect (on_key_press_event);
+        game_board_view.key_press_event.connect (on_key_press);
 
         window.play.connect (on_game_new);
         window.undo.connect (on_game_undo);
@@ -233,8 +236,8 @@ private class FourInARow : Gtk.Application
      // set_accels_for_action ("ui.redo",               { "<Shift><Primary>z"       });
         set_accels_for_action ("ui.back",               {                 "Escape"  });
         set_accels_for_action ("ui.toggle-hamburger",   {                 "F10"     });
-        set_accels_for_action ("app.help",              {                 "F1"      });
-        set_accels_for_action ("app.about",             {          "<Shift>F1"      });
+     // set_accels_for_action ("app.help",              {                 "F1"      });
+     // set_accels_for_action ("app.about",             {          "<Shift>F1"      });
 
         add_action_entries (app_entries, this);
 
@@ -831,13 +834,37 @@ private class FourInARow : Gtk.Application
     * * game interaction
     \*/
 
-    private inline bool on_key_press (Gdk.EventKey e)
+    private inline bool on_key_press_event (Gdk.EventKey event)
+    {
+        string name = (!) (Gdk.keyval_name (event.keyval) ?? "");
+
+        if (name == "F1") // TODO fix dance done with the F1 & <Primary>F1 shortcuts that show help overlay
+        {
+            window.close_hamburger ();
+            history_button_1.active = false;
+            history_button_2.active = false;
+            if ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0)
+                return false;                           // help overlay
+            if ((event.state & Gdk.ModifierType.SHIFT_MASK) == 0)
+            {
+                on_help_contents ();
+                return false;
+            }
+            on_help_about ();
+            return true;
+        }
+
+        return false;
+    }
+
+    private inline bool on_key_press (Gdk.EventKey event)
     {
         if (timeout != 0
-         || !is_player_human ()
-         || (e.keyval != keypress_left
-          && e.keyval != keypress_right
-          && e.keyval != keypress_drop))
+         || (!gameover && !is_player_human ()))
+            return false;
+
+        string key = (!) (Gdk.keyval_name (event.keyval) ?? "");
+        if (key == "" || key == "Tab")
             return false;
 
         if (gameover)
@@ -846,18 +873,24 @@ private class FourInARow : Gtk.Application
             return true;
         }
 
-        if (e.keyval == keypress_left && column != 0)
+        if (key == "Left" || event.keyval == keypress_left)
         {
+            if (column <= 0)
+                return false;
             column_moveto--;
             move_cursor (column_moveto);
         }
-        else if (e.keyval == keypress_right && column < 6)
+        else if (key == "Right" || event.keyval == keypress_right)
         {
+            if (column >= 6)
+                return false;
             column_moveto++;
             move_cursor (column_moveto);
         }
-        else if (e.keyval == keypress_drop)
+        else if (key == "space" || key == "Return" || key == "KP_Enter" || key == "Down" || event.keyval == 
keypress_drop)
             process_move (column);
+        else if (key == "1" || key == "2" || key == "3" || key == "4" || key == "5" || key == "6" || key == 
"7")
+            process_move (int.parse (key) - 1);
 
         return true;
     }
diff --git a/src/game-window.vala b/src/game-window.vala
index 44ac972..7014f16 100644
--- a/src/game-window.vala
+++ b/src/game-window.vala
@@ -31,13 +31,6 @@ private enum GameWindowFlags {
 [GtkTemplate (ui = "/org/gnome/Four-in-a-row/ui/game-window.ui")]
 private class GameWindow : AdaptativeWindow, AdaptativeWidget
 {
-    /* settings */
-    private bool window_is_tiled;
-    private bool window_is_maximized;
-    private bool window_is_fullscreen;
-    private int window_width;
-    private int window_height;
-
     private bool game_finished = false;
 
     private string program_name = "";
@@ -434,4 +427,9 @@ private class GameWindow : AdaptativeWindow, AdaptativeWidget
     {
         info_button.active = !info_button.active;
     }
+
+    internal void close_hamburger () // TODO manage also the HistoryButton here?
+    {
+        info_button.active = false;
+    }
 }