From 67eda1a776b0511409f5c67b86a6e3536d5a9ed6 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sun, 2 May 2021 20:15:58 +0200
Subject: [PATCH] Remove -fullscreen option, deprecated by new theme format.

Use 'window {fullscreen: true;}' instead.
---
 config/config.c     | 1 -
 doc/rofi.1          | 6 ------
 doc/rofi.1.markdown | 4 ----
 include/settings.h  | 2 --
 source/helper.c     | 1 -
 source/view.c       | 2 +-
 source/xrmoptions.c | 4 +---
 7 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/config/config.c b/config/config.c
index c4abe00c..039e0426 100644
--- a/config/config.c
+++ b/config/config.c
@@ -141,7 +141,6 @@ Settings config = {
     .separator_style           = "dash",
     /** Hide scrollbar */
     .hide_scrollbar         = FALSE,
-    .fullscreen             = FALSE,
     .fake_transparency      = FALSE,
     .dpi                    = -1,
     .threads                = 0,
diff --git a/doc/rofi.1 b/doc/rofi.1
index 655c843a..d2fe6652 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -712,12 +712,6 @@ Define the inner margin of the window.
 .PP
 Default: \fI5\fP
 
-.PP
-\fB\fC\-fullscreen\fR
-
-.PP
-Use the full\-screen height and width.
-
 .PP
 \fB\fC\-sidebar\-mode\fR
 
diff --git a/doc/rofi.1.markdown b/doc/rofi.1.markdown
index d1156002..7c4c2f78 100644
--- a/doc/rofi.1.markdown
+++ b/doc/rofi.1.markdown
@@ -393,10 +393,6 @@ Define the inner margin of the window.
 
 Default: *5*
 
-`-fullscreen`
-
-Use the full-screen height and width.
-
 `-sidebar-mode`
 
 Open in sidebar-mode. In this mode a list of all enabled modes is shown at the bottom.
diff --git a/include/settings.h b/include/settings.h
index d80a71bf..4952eb02 100644
--- a/include/settings.h
+++ b/include/settings.h
@@ -165,8 +165,6 @@ typedef struct
     char           *separator_style;
     /** hide scrollbar */
     unsigned int   hide_scrollbar;
-    /** fullscreen */
-    unsigned int   fullscreen;
     /** bg image */
     unsigned int   fake_transparency;
     /** dpi */
diff --git a/source/helper.c b/source/helper.c
index 07441732..b443fb9f 100644
--- a/source/helper.c
+++ b/source/helper.c
@@ -695,7 +695,6 @@ int config_sanity_check ( void )
     if ( g_strcmp0 ( config.monitor, "-3" ) == 0 ) {
         // On -3, set to location 1.
         config.location   = 1;
-        config.fullscreen = 0;
     }
 
     if ( found_error ) {
diff --git a/source/view.c b/source/view.c
index f91421d3..5d94f89d 100644
--- a/source/view.c
+++ b/source/view.c
@@ -848,7 +848,7 @@ void __create_window ( MenuFlags menu_flags )
     }
 
     TICK_N ( "setup window attributes" );
-    CacheState.fullscreen = rofi_theme_get_boolean ( WIDGET ( win ), "fullscreen", config.fullscreen );
+    CacheState.fullscreen = rofi_theme_get_boolean ( WIDGET ( win ), "fullscreen", FALSE );
     if ( CacheState.fullscreen ) {
         xcb_atom_t atoms[] = {
             xcb->ewmh._NET_WM_STATE_FULLSCREEN,
diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index 9fe6393a..727476fd 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -158,7 +158,7 @@ static XrmOption xrmOptions[] = {
       "Cycle through the results list", CONFIG_DEFAULT },
     { xrm_Boolean, "sidebar-mode",              { .num   = &config.sidebar_mode                         }, NULL,
       "Enable sidebar-mode", CONFIG_DEFAULT },
-    { xrm_Boolean, "hover-select",              { .num   = &config.hover_select                         }, NULL,
+    { xrm_Boolean, "hover-select",              { .snum   = &config.hover_select                         }, NULL,
       "Enable hover-select", CONFIG_DEFAULT },
     { xrm_SNumber, "eh",                        { .snum  = &config.element_height                       }, NULL,
       "Row height (in chars)", CONFIG_DEFAULT },
@@ -189,8 +189,6 @@ static XrmOption xrmOptions[] = {
       "Separator style (none, dash, solid) *DEPRECATED*", CONFIG_DEFAULT },
     { xrm_Boolean, "hide-scrollbar",            { .num   = &config.hide_scrollbar                       }, NULL,
       "Hide scroll-bar *DEPRECATED*", CONFIG_DEFAULT },
-    { xrm_Boolean, "fullscreen",                { .num   = &config.fullscreen                           }, NULL,
-      "Fullscreen", CONFIG_DEFAULT },
     { xrm_Boolean, "fake-transparency",         { .num   = &config.fake_transparency                    }, NULL,
       "Fake transparency *DEPRECATED*", CONFIG_DEFAULT },
     { xrm_SNumber, "dpi",                       { .snum  = &config.dpi                                  }, NULL,