1 files changed, 18 insertions, 2 deletions

diff --git a/vncviewer/OptionsDialog.h b/vncviewer/OptionsDialog.h
index f6ca89b1..daa9f3e8 100644
--- a/vncviewer/OptionsDialog.h
+++ b/vncviewer/OptionsDialog.h
@@ -24,9 +24,11 @@
 #include <FL/Fl_Window.H>
 
 class Fl_Widget;
+class Fl_Box;
 class Fl_Group;
 class Fl_Check_Button;
 class Fl_Round_Button;
+class Fl_Toggle_Button;
 class Fl_Input;
 class Fl_Int_Input;
 class Fl_Choice;
@@ -54,18 +56,24 @@ protected:
   void createCompressionPage(int tx, int ty, int tw, int th);
   void createSecurityPage(int tx, int ty, int tw, int th);
   void createInputPage(int tx, int ty, int tw, int th);
+  void createShortcutsPage(int tx, int ty, int tw, int th);
   void createDisplayPage(int tx, int ty, int tw, int th);
   void createMiscPage(int tx, int ty, int tw, int th);
 
   static void handleAutoselect(Fl_Widget *widget, void *data);
   static void handleCompression(Fl_Widget *widget, void *data);
   static void handleJpeg(Fl_Widget *widget, void *data);
+  static void handleAlwaysCursor(Fl_Widget *widget, void *data);
 
   static void handleX509(Fl_Widget *widget, void *data);
   static void handleRSAAES(Fl_Widget *widget, void *data);
 
+  static void handleSystemKeys(Fl_Widget *widget, void *data);
+
   static void handleClipboard(Fl_Widget *widget, void *data);
 
+  static void handleModifier(Fl_Widget *widget, void *data);
+
   static void handleFullScreenMode(Fl_Widget *widget, void *data);
 
   static void handleCancel(Fl_Widget *widget, void *data);
@@ -115,10 +123,10 @@ protected:
   Fl_Check_Button *viewOnlyCheckbox;
   Fl_Group *mouseGroup;
   Fl_Check_Button *emulateMBCheckbox;
-  Fl_Check_Button *dotCursorCheckbox;
+  Fl_Check_Button *alwaysCursorCheckbox;
+  Fl_Choice *cursorTypeChoice;
   Fl_Group *keyboardGroup;
   Fl_Check_Button *systemKeysCheckbox;
-  Fl_Choice *menuKeyChoice;
   Fl_Group *clipboardGroup;
   Fl_Check_Button *acceptClipboardCheckbox;
 #if !defined(WIN32) && !defined(__APPLE__)
@@ -129,6 +137,14 @@ protected:
   Fl_Check_Button *sendPrimaryCheckbox;
 #endif
 
+  /* Keyboard shortcuts */
+  Fl_Toggle_Button *ctrlButton;
+  Fl_Toggle_Button *altButton;
+  Fl_Toggle_Button *shiftButton;
+  Fl_Toggle_Button *superButton;
+
+  Fl_Box *shortcutsText;
+
   /* Display */
   Fl_Group *displayModeGroup;
   Fl_Round_Button *windowedButton;