Implemented mouse wheel handling and fixed click handling

README.rst

@@ -201,6 +201,8 @@ and interpreted:
     - Go forward 10 slides
 - Home
     - Go back to the first slide and reset the timer
+- g
+    - Input a slide number to jump to
 - Escape / q /Alt+F4
     - Quit the presentation viewer
 - b

src/classes/presentation_controller.vala

@@ -99,6 +99,9 @@ namespace org.westhoffswelt.pdfpresenter {
                     case 0x073: /* s */
                         this.notes.save_to_disk();
                     break;
+                    case 0x067: /* g */
+                        this.controllables_ask_goto_page();
+                    break;
                 }
                 return true;
             } else {
@@ -211,6 +214,13 @@ namespace org.westhoffswelt.pdfpresenter {
             }
         }
 
+        /**
+         * public interface for the above function
+         */
+        public void goto_page( int page_number ) {
+            controllables_goto_page(page_number);
+        }
+
         /**
          * Fill the presentation display with black
          */
@@ -228,5 +238,14 @@ namespace org.westhoffswelt.pdfpresenter {
                 c.edit_note();
             }
         }
+
+        /**
+         * Ask for the page to jump to
+         */
+        protected void controllables_ask_goto_page() {
+            foreach( Controllable c in this.controllables ) {
+                c.ask_goto_page();
+            }
+        }
     }
 }

src/classes/window/presentation.vala

@@ -202,6 +202,12 @@ namespace org.westhoffswelt.pdfpresenter.Window {
         public void edit_note() {
         }
 
+        /**
+         * Ask for the page to jump to. We don't do anything
+         */
+        public void ask_goto_page() {
+        }
+
         /**
          * Set the cache observer for the Views on this window
          *

src/classes/window/presenter.vala

@@ -58,6 +58,8 @@ namespace org.westhoffswelt.pdfpresenter.Window {
          * Slide progress label ( eg. "23/42" )
          */
         protected Label slide_progress;
+
+        protected Entry slide_jump;
 
         /**
          * Indication that the slide is blanked (faded to black)
@@ -223,15 +225,33 @@ namespace org.westhoffswelt.pdfpresenter.Window {
             this.slide_progress.set_justify( Justification.CENTER );
             this.slide_progress.modify_fg( StateType.NORMAL, white );
             this.slide_progress.modify_font( font );
-            this.slide_progress.set_size_request( 
+            this.slide_progress.set_size_request(
                 (int)Math.floor( this.screen_geometry.width * 0.25 ),
-                bottom_height - 10 
+                bottom_height - 10
             );
             this.fixedLayout.put(
                 this.slide_progress,
                 (int)Math.ceil( this.screen_geometry.width * 0.75 ),
                 bottom_position - 10
             );
+
+            this.slide_jump = new Entry();
+            this.slide_jump.set_alignment(0.5f);
+            //this.slide_jump.modify_base(StateType.NORMAL, black);
+            //this.slide_jump.modify_text(StateType.NORMAL, white);
+            this.slide_jump.modify_font( font );
+            this.slide_jump.editable = false;
+            this.slide_jump.no_show_all = true; 
+            this.slide_jump.key_press_event.connect( this.on_key_press_slide_jump );
+            this.slide_jump.set_size_request( 
+                (int)Math.floor( this.screen_geometry.width * 0.25 ),
+                bottom_height - 10 
+            );
+            this.fixedLayout.put(
+                this.slide_jump,
+                (int)Math.ceil( this.screen_geometry.width * 0.75 ),
+                bottom_position - 10
+            );
 
             this.blank_label = new Label( "Blank" );
             this.blank_label.set_justify( Justification.LEFT );
@@ -430,6 +450,39 @@ namespace org.westhoffswelt.pdfpresenter.Window {
             this.timer.start();
         }
 
+        /**
+         * Ask for the page to jump to
+         */
+        public void ask_goto_page() {
+           this.slide_jump.set_text("/%u".printf(this.slide_count));
+           this.slide_jump.editable = true;
+           this.slide_jump.grab_focus();
+           this.slide_jump.set_position(0);
+           this.slide_jump.show();
+           this.slide_progress.hide();
+           this.presentation_controller.set_ignore_input_events( true );
+        }
+
+        /**
+         * Handle key events for the slide_jump entry field
+         */
+        protected bool on_key_press_slide_jump( Gtk.Widget source, EventKey key ) {
+            if ( key.keyval == 0xff0d ) {
+                // Try to parse the input
+               string input_text = this.slide_jump.text;
+               int destination = int.parse(input_text.substring(0, input_text.index_of("/")));
+               this.slide_jump.editable = false;
+               this.slide_jump.hide();
+               this.slide_progress.show();
+               this.presentation_controller.set_ignore_input_events( false );
+               if ( destination != 0 )
+                  this.presentation_controller.goto_page(destination-1);
+               return true;
+            } else {
+               return false;
+            }
+        }
+
         /**
          * We will notify the presenter that the screen is faded to black, but
          * we will retain the slide view.
@@ -442,13 +495,19 @@ namespace org.westhoffswelt.pdfpresenter.Window {
             this.faded_to_black = !this.faded_to_black;
         }
 
+        /**
+         * Edit a note. Basically give focus to notes_view
+         */
         public void edit_note() {
             this.notes_view.editable = true;
             this.notes_view.cursor_visible = true;
             this.notes_view.grab_focus();
             this.presentation_controller.set_ignore_input_events( true );
         }
 
+        /**
+         * Handle key presses when editing a note
+         */
         protected bool on_key_press_notes_view( Gtk.Widget source, EventKey key ) {
             if ( key.keyval == 0xff1b) { /* Escape */
                 this.notes_view.editable = false;
@@ -461,6 +520,9 @@ namespace org.westhoffswelt.pdfpresenter.Window {
             }
         }
 
+        /**
+         * Update the text of the current note
+         */
         protected void update_note() {
             string this_note = notes.get_note_for_slide(this.current_view.get_current_slide_number());
             this.notes_view.buffer.text = this_note;

src/interfaces/controllable.vala

@@ -73,8 +73,13 @@ namespace org.westhoffswelt.pdfpresenter {
         public abstract void goto_page( int page_number );
 
         /**
-         * Edit note for current slide.
+         * Edit note for current slide
          */
         public abstract void edit_note();
+
+        /**
+         * Ask for the page to jump to
+         */
+        public abstract void ask_goto_page();
     }
 }