Made "hide-panels" hide the findbar, then panels (and removed "fullscreen").

Redefined "hide-panels" to close the findbar if it's visible, and all the
panels when the findbar is not visible.

7 files changed, 10 insertions, 21 deletions

diff --git a/src/keys.cc b/src/keys.cc
index 7f499153..e5510ef0 100644
--- a/src/keys.cc
+++ b/src/keys.cc
@@ -107,7 +107,6 @@ static const KeyBinding_t default_keys[] = {
    { "find"         , KEYS_FIND         , FL_CTRL   , 'f'             },
    { "websearch"    , KEYS_WEBSEARCH    , FL_CTRL   , 's'             },
    { "bookmarks"    , KEYS_BOOKMARKS    , FL_CTRL   , 'b'             },
-   { "fullscreen"   , KEYS_FULLSCREEN   , FL_CTRL   , ' '             },
    { "reload"       , KEYS_RELOAD       , FL_CTRL   , 'r'             },
    { "stop"         , KEYS_STOP         , 0         , 0               },
    { "save"         , KEYS_SAVE         , 0         , 0               },
diff --git a/src/keys.hh b/src/keys.hh
index d234838c..893cf17b 100644
--- a/src/keys.hh
+++ b/src/keys.hh
@@ -27,7 +27,6 @@ typedef enum {
    KEYS_FIND,
    KEYS_WEBSEARCH,
    KEYS_BOOKMARKS,
-   KEYS_FULLSCREEN,
    KEYS_RELOAD,
    KEYS_STOP,
    KEYS_SAVE,
diff --git a/src/keysrc b/src/keysrc
index ede236a9..df658be4 100644
--- a/src/keysrc
+++ b/src/keysrc
@@ -56,7 +56,7 @@
 # "find" lets you search for a text string on the current page.
 #<ctrl>f = find
 
-# "hide-panels" hides the findbar.
+# "hide-panels" hides the findbar if present, control panels if not.
 #esc = hide-panels
 
 # "websearch" lets you send a text string to the search engine that you
@@ -66,9 +66,6 @@
 # go to your "bookmarks".
 #<ctrl>b = bookmarks
 
-# "fullscreen" hides/shows the panels at the top and bottom of a dillo window.
-#<ctrl>space = fullscreen
-
 # "file-menu" pops up the file menu.
 #<alt>f = file-menu
 
diff --git a/src/ui.cc b/src/ui.cc
index 9d526958..0faa4da7 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -760,7 +760,7 @@ UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) :
    customize(0);
 
    if (Panelmode == UI_HIDDEN) {
-      fullscreen_toggle();
+      panels_toggle();
    }
 }
 
@@ -824,7 +824,8 @@ int UI::handle(int event)
          focus_location();
          ret = 1;
       } else if (cmd == KEYS_HIDE_PANELS) {
-         fullscreen_toggle();
+         /* Hide findbar if present, hide panels if not */
+         (FindBarSpace) ? findbar_toggle(0) : panels_toggle();
          ret = 1;
          //if (get_panelmode() == UI_TEMPORARILY_SHOW_PANELS)
          //   set_panelmode(UI_HIDDEN);
@@ -843,9 +844,6 @@ int UI::handle(int event)
       } else if (cmd == KEYS_SAVE) {
          a_UIcmd_save(a_UIcmd_get_bw_by_widget(this));
          ret = 1;
-      } else if (cmd == KEYS_FULLSCREEN) {
-         fullscreen_toggle();
-         ret = 1;
       } else if (cmd == KEYS_FILE_MENU) {
          a_UIcmd_file_popup(a_UIcmd_get_bw_by_widget(this), FileButton);
          ret = 1;
@@ -1193,7 +1191,7 @@ void UI::findbar_toggle(bool add)
  *             size to (0,0) while hidden.
  *             (Already reported to FLTK team)
  */
-void UI::fullscreen_toggle()
+void UI::panels_toggle()
 {
    int hide = StatusBar->visible();
 
diff --git a/src/ui.hh b/src/ui.hh
index 7865d9e9..beb202a9 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -160,7 +160,7 @@ public:
    int get_smallicons() { return Small_Icons; }
    void change_panel(int new_size, int small_icons);
    void findbar_toggle(bool add);
-   void fullscreen_toggle();
+   void panels_toggle();
 
    CustTabs *tabs() { return Tabs; }
    void tabs(CustTabs *tabs) { Tabs = tabs; }
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 13cdfd91..f257d537 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -165,9 +165,6 @@ int CustTabs::handle(int e)
       } else if (cmd == KEYS_NEW_WINDOW) {
          a_UIcmd_open_url_nw(bw, NULL);
          ret = 1;
-      } else if (cmd == KEYS_FULLSCREEN) {
-         MSG("CustTabs::handle KEYS_FULLSCREEN\n");
-         ret = 1;
       } else if (cmd == KEYS_CLOSE_ALL) {
          a_Timeout_add(0.0, a_UIcmd_close_all_bw, NULL);
          ret = 1;
@@ -1216,11 +1213,11 @@ int a_UIcmd_pointer_on_link(BrowserWindow *bw)
 }
 
 /*
- * Toggle control panel (aka. fullscreen)
+ * Toggle control panel
  */
-void a_UIcmd_fullscreen_toggle(BrowserWindow *bw)
+void a_UIcmd_panels_toggle(BrowserWindow *bw)
 {
-   BW2UI(bw)->fullscreen_toggle();
+   BW2UI(bw)->panels_toggle();
 }
 
 /*
diff --git a/src/uicmd.hh b/src/uicmd.hh
index 65394ff2..dc7294a1 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -34,7 +34,7 @@ void a_UIcmd_search_dialog(void *vbw);
 const char *a_UIcmd_get_passwd(const char *user);
 void a_UIcmd_book(void *vbw);
 void a_UIcmd_add_bookmark(BrowserWindow *bw, const DilloUrl *url);
-void a_UIcmd_fullscreen_toggle(BrowserWindow *bw);
+void a_UIcmd_panels_toggle(BrowserWindow *bw);
 void a_UIcmd_findtext_dialog(BrowserWindow *bw);
 void a_UIcmd_findtext_search(BrowserWindow *bw,const char *key,int case_sens,
                              int backwards);
@@ -78,7 +78,6 @@ void a_UIcmd_set_bug_prog(BrowserWindow *bw, int n_bug);
 void a_UIcmd_set_page_title(BrowserWindow *bw, const char *label);
 void a_UIcmd_set_msg(BrowserWindow *bw, const char *format, ...);
 void a_UIcmd_set_buttons_sens(BrowserWindow *bw);
-void a_UIcmd_fullscreen_toggle(BrowserWindow *bw);
 void a_UIcmd_set_pointer_on_link(BrowserWindow *bw, int flag);
 int a_UIcmd_pointer_on_link(BrowserWindow *bw);