Cleanups, remove defaults.

6 files changed, 3 insertions, 313 deletions

diff --git a/doc/help-output.txt b/doc/help-output.txt
index 3e12c345..e250cc8c 100644
--- a/doc/help-output.txt
+++ b/doc/help-output.txt
@@ -8,15 +8,15 @@ Command line only options:
 	-display [string]                      X server to contact.
 		${DISPLAY}
 	-h,-help                               This help message.
-	-dump-xresources                       Dump the current configuration in Xresources format and exit.
 	-e [string]                            Show a dialog displaying the passed message and exit.
 	-markup                                Enable pango markup where possible.
 	-normal-window                         Behave as a normal window. (experimental)
 	-show [mode]                           Show the mode 'mode' and exit. The mode has to be enabled.
 	-no-lazy-grab                          Disable lazy grab that, when fail to grab keyboard, does not block but retry later.
 	-no-plugins                            Disable loading of external plugins.
-	-plugin-path                           Directory used to search for rofi plugins.
+	-plugin-path                           Directory used to search for rofi plugins. *DEPRECATED*
 	-dump-config                           Dump the current configuration in rasi format and exit.
+	-upgrade-config                        Upgrade the old-style configuration file in the new rasi format and exit.
 	-dump-theme                            Dump the current theme in rasi format and exit.
 DMENU command line options:
 	-mesg [string]                         Print a small user message under the prompt (uses pango markup)
@@ -41,3 +41,4 @@ DMENU command line options:
 	-async-pre-read [number]               Read several entries blocking before switching to async mode
 		25
 	-w windowid                            Position over window with X11 windowid.
+	-keep-right                            Set ellipsize to end.
diff --git a/doc/test_xr.txt b/doc/test_xr.txt
deleted file mode 100644
index b2a68be5..00000000
--- a/doc/test_xr.txt
+++ /dev/null
@@ -1,276 +0,0 @@
-! "Enabled modi" Set from: File
-rofi.modi:                           combi,drun
-! "Window width" Set from: File
-rofi.width:                          50
-! "Number of lines" Set from: File
-rofi.lines:                          8
-! "Number of columns" Set from: File
-rofi.columns:                        1
-! "Font to use" Set from: File
-rofi.font:                           Source Code Pro Medium 10
-! "Border width" Set from: Default
-! rofi.bw:                             1
-! "Location on screen" Set from: File
-rofi.location:                       2
-! "Padding" Set from: Default
-! rofi.padding:                        5
-! "Y-offset relative to location" Set from: File
-rofi.yoffset:                        -2
-! "X-offset relative to location" Set from: File
-rofi.xoffset:                        0
-! "Always show number of lines" Set from: File
-rofi.fixed-num-lines:                true
-! "Whether to load and show icons" Set from: Default
-! rofi.show-icons:                     false
-! "Terminal to use" Set from: File
-rofi.terminal:                       sakura
-! "Ssh client to use" Set from: File
-rofi.ssh-client:                     ssh
-! "Ssh command to execute" Set from: File
-rofi.ssh-command:                    {terminal} -e {ssh-client} {host}
-! "Run command to execute" Set from: File
-rofi.run-command:                    bash -c "{cmd}"
-! "Command to get extra run targets" Set from: Default
-! rofi.run-list-command:               
-! "Run command to execute that runs in shell" Set from: File
-rofi.run-shell-command:              {terminal} -e {cmd}
-! "Command executed on accep-entry-custom for window modus" Set from: File
-rofi.window-command:                 xkill -id {window}
-! "Window fields to match in window mode" Set from: Default
-! rofi.window-match-fields:            all
-! "Theme to use to look for icons" Set from: Default
-! rofi.icon-theme:                     
-! "Desktop entry fields to match in drun" Set from: Default
-! rofi.drun-match-fields:              name,generic,exec,categories,keywords
-! "Only show Desktop entry from these categories" Set from: Default
-! rofi.drun-categories:                
-! "Desktop entry show actions." Set from: Default
-! rofi.drun-show-actions:              false
-! "DRUN format string. (Supports: generic,name,comment,exec,categories)" Set from: Default
-! rofi.drun-display-format:            {name} [<span weight='light' size='small'><i>({generic})</i></span>]
-! "Disable history in run/ssh" Set from: File
-rofi.disable-history:                false
-! "Programs ignored for history" Set from: Default
-! rofi.ignored-prefixes:               
-! "Use sorting" Set from: Default
-! rofi.sort:                           false
-! "Choose the strategy used for sorting: normal (levenshtein) or fzf." Set from: Default
-! rofi.sorting-method:                 
-! "Set case-sensitivity" Set from: File
-rofi.case-sensitive:                 false
-! "Cycle through the results list" Set from: File
-rofi.cycle:                          true
-! "Enable sidebar-mode" Set from: File
-rofi.sidebar-mode:                   false
-! "Row height (in chars)" Set from: File
-rofi.eh:                             1
-! "Enable auto select mode" Set from: File
-rofi.auto-select:                    false
-! "Parse hosts file for ssh mode" Set from: File
-rofi.parse-hosts:                    false
-! "Parse known_hosts file for ssh mode" Set from: File
-rofi.parse-known-hosts:              true
-! "Set the modi to combine in combi mode" Set from: File
-rofi.combi-modi:                     window,drun,run,ssh
-! "Set the matching algorithm. (normal, regex, glob, fuzzy)" Set from: Default
-! rofi.matching:                       normal
-! "Tokenize input string" Set from: File
-rofi.tokenize:                       true
-! "Monitor id to show on" Set from: File
-rofi.m:                              -1
-! "Margin between rows *DEPRECATED*" Set from: Default
-! rofi.line-margin:                    2
-! "Padding within rows *DEPRECATED*" Set from: Default
-! rofi.line-padding:                   1
-! "Pre-set filter" Set from: Default
-! rofi.filter:                         
-! "Separator style (none, dash, solid) *DEPRECATED*" Set from: Default
-! rofi.separator-style:                dash
-! "Hide scroll-bar *DEPRECATED*" Set from: Default
-! rofi.hide-scrollbar:                 false
-! "Fullscreen" Set from: File
-rofi.fullscreen:                     false
-! "Fake transparency *DEPRECATED*" Set from: Default
-! rofi.fake-transparency:              false
-! "DPI" Set from: File
-rofi.dpi:                            101
-! "Threads to use for string matching" Set from: File
-rofi.threads:                        8
-! "Scrollbar width *DEPRECATED*" Set from: Default
-! rofi.scrollbar-width:                8
-! "Scrolling method. (0: Page, 1: Centered)" Set from: File
-rofi.scroll-method:                  0
-! "Background to use for fake transparency. (background or screenshot) *DEPRECATED*" Set from: Default
-! rofi.fake-background:                screenshot
-! "Window Format. w (desktop name), t (title), n (name), r (role), c (class)" Set from: Default
-! rofi.window-format:                  {w}    {c}   {t}
-! "Click outside the window to exit" Set from: Default
-! rofi.click-to-exit:                  true
-! "Indicate how it match by underlining it." Set from: Default
-! rofi.show-match:                     true
-! "New style theme file" Set from: Default
-! rofi.theme:                          
-! "Color scheme for normal row" Set from: Default
-! rofi.color-normal:                   
-! "Color scheme for urgent row" Set from: Default
-! rofi.color-urgent:                   
-! "Color scheme for active row" Set from: Default
-! rofi.color-active:                   
-! "Color scheme window" Set from: Default
-! rofi.color-window:                   
-! "Max history size (WARNING: can cause slowdowns when set to high)." Set from: Default
-! rofi.max-history-size:               25
-! "Hide the prefix mode prefix on the combi view." Set from: Default
-! rofi.combi-hide-mode-prefix:         false
-! "Set the character used to negate the matching. ('\0' to disable)" Set from: Default
-! rofi.matching-negate-char:           -
-! "Directory where history and temporary files are stored." Set from: Default
-! rofi.cache-dir:                      
-! "Show window thumbnail in window switcher if availalbe." Set from: Default
-! rofi.window-thumbnail:               false
-! "Pidfile location" Set from: File
-rofi.pid:                            /tmp/rofi.pid
-! "Paste primary selection" Set from: File
-rofi.kb-primary-paste:               Control+Shift+v,Shift+Insert
-! "Paste clipboard" Set from: File
-rofi.kb-secondary-paste:             Control+v,Insert
-! "Clear input line" Set from: File
-rofi.kb-clear-line:                  Control+w
-! "Beginning of line" Set from: File
-rofi.kb-move-front:                  Control+a
-! "End of line" Set from: File
-rofi.kb-move-end:                    Control+e
-! "Move back one word" Set from: File
-rofi.kb-move-word-back:              Alt+b,Ctrl+Left
-! "Move forward one word" Set from: File
-rofi.kb-move-word-forward:           Alt+f,Ctrl+Right
-! "Move back one char" Set from: File
-rofi.kb-move-char-back:              Left,Control+b
-! "Move forward one char" Set from: File
-rofi.kb-move-char-forward:           Right,Control+f
-! "Delete previous word" Set from: File
-rofi.kb-remove-word-back:            Control+Alt+h,Control+BackSpace
-! "Delete next word" Set from: File
-rofi.kb-remove-word-forward:         Control+Alt+d
-! "Delete next char" Set from: File
-rofi.kb-remove-char-forward:         Delete,Control+d
-! "Delete previous char" Set from: File
-rofi.kb-remove-char-back:            BackSpace,Shift+BackSpace,Control+h
-! "Delete till the end of line" Set from: File
-rofi.kb-remove-to-eol:               Control+k
-! "Delete till the start of line" Set from: File
-rofi.kb-remove-to-sol:               Control+u
-! "Accept entry" Set from: File
-rofi.kb-accept-entry:                Control+j,Control+m,Return,KP_Enter
-! "Use entered text as command (in ssh/run modi)" Set from: File
-rofi.kb-accept-custom:               Control+Return
-! "Use alternate accept command." Set from: File
-rofi.kb-accept-alt:                  Shift+Return
-! "Delete entry from history" Set from: File
-rofi.kb-delete-entry:                Shift+Delete
-! "Switch to the next mode." Set from: File
-rofi.kb-mode-next:                   Shift+Right,Control+Tab
-! "Switch to the previous mode." Set from: File
-rofi.kb-mode-previous:               Shift+Left,Control+ISO_Left_Tab
-! "Go to the previous column" Set from: File
-rofi.kb-row-left:                    Control+Page_Up
-! "Go to the next column" Set from: File
-rofi.kb-row-right:                   Control+Page_Down
-! "Select previous entry" Set from: File
-rofi.kb-row-up:                      Up,Control+p,ISO_Left_Tab
-! "Select next entry" Set from: File
-rofi.kb-row-down:                    Down,Control+n
-! "Go to next row, if one left, accept it, if no left next mode." Set from: File
-rofi.kb-row-tab:                     Tab
-! "Go to the previous page" Set from: File
-rofi.kb-page-prev:                   Page_Up
-! "Go to the next page" Set from: File
-rofi.kb-page-next:                   Page_Down
-! "Go to the first entry" Set from: File
-rofi.kb-row-first:                   Home,KP_Home
-! "Go to the last entry" Set from: File
-rofi.kb-row-last:                    End,KP_End
-! "Set selected item as input text" Set from: File
-rofi.kb-row-select:                  Control+space
-! "Take a screenshot of the rofi window" Set from: File
-rofi.kb-screenshot:                  Alt+S
-! "Toggle between ellipsize modes for displayed data" Set from: Default
-! rofi.kb-ellipsize:                   Alt+period
-! "Toggle case sensitivity" Set from: File
-rofi.kb-toggle-case-sensitivity:     grave,dead_grave
-! "Toggle sort" Set from: File
-rofi.kb-toggle-sort:                 Alt+grave
-! "Quit rofi" Set from: File
-rofi.kb-cancel:                      Escape,Control+bracketleft
-! "Custom keybinding 1" Set from: File
-rofi.kb-custom-1:                    Alt+1
-! "Custom keybinding 2" Set from: File
-rofi.kb-custom-2:                    Alt+2
-! "Custom keybinding 3" Set from: File
-rofi.kb-custom-3:                    Alt+3
-! "Custom keybinding 4" Set from: File
-rofi.kb-custom-4:                    Alt+4
-! "Custom Keybinding 5" Set from: File
-rofi.kb-custom-5:                    Alt+5
-! "Custom keybinding 6" Set from: File
-rofi.kb-custom-6:                    Alt+6
-! "Custom Keybinding 7" Set from: File
-rofi.kb-custom-7:                    Alt+7
-! "Custom keybinding 8" Set from: File
-rofi.kb-custom-8:                    Alt+8
-! "Custom keybinding 9" Set from: File
-rofi.kb-custom-9:                    Alt+9
-! "Custom keybinding 10" Set from: File
-rofi.kb-custom-10:                   Alt+0
-! "Custom keybinding 11" Set from: File
-rofi.kb-custom-11:                   Alt+Shift+1
-! "Custom keybinding 12" Set from: File
-rofi.kb-custom-12:                   Alt+at
-! "Custom keybinding 13" Set from: File
-rofi.kb-custom-13:                   Alt+numbersign
-! "Custom keybinding 14" Set from: File
-rofi.kb-custom-14:                   Alt+dollar
-! "Custom keybinding 15" Set from: File
-rofi.kb-custom-15:                   Alt+percent
-! "Custom keybinding 16" Set from: File
-rofi.kb-custom-16:                   Alt+dead_circumflex
-! "Custom keybinding 17" Set from: File
-rofi.kb-custom-17:                   Alt+ampersand
-! "Custom keybinding 18" Set from: File
-rofi.kb-custom-18:                   Alt+asterisk
-! "Custom Keybinding 19" Set from: File
-rofi.kb-custom-19:                   Alt+parenleft
-! "Select row 1" Set from: Default
-! rofi.kb-select-1:                    Super+1
-! "Select row 2" Set from: Default
-! rofi.kb-select-2:                    Super+2
-! "Select row 3" Set from: Default
-! rofi.kb-select-3:                    Super+3
-! "Select row 4" Set from: Default
-! rofi.kb-select-4:                    Super+4
-! "Select row 5" Set from: Default
-! rofi.kb-select-5:                    Super+5
-! "Select row 6" Set from: Default
-! rofi.kb-select-6:                    Super+6
-! "Select row 7" Set from: Default
-! rofi.kb-select-7:                    Super+7
-! "Select row 8" Set from: Default
-! rofi.kb-select-8:                    Super+8
-! "Select row 9" Set from: Default
-! rofi.kb-select-9:                    Super+9
-! "Select row 10" Set from: Default
-! rofi.kb-select-10:                   Super+0
-! "Go to the previous column" Set from: Default
-! rofi.ml-row-left:                    ScrollLeft
-! "Go to the next column" Set from: Default
-! rofi.ml-row-right:                   ScrollRight
-! "Select previous entry" Set from: Default
-! rofi.ml-row-up:                      ScrollUp
-! "Select next entry" Set from: Default
-! rofi.ml-row-down:                    ScrollDown
-! "Select hovered row" Set from: Default
-! rofi.me-select-entry:                MousePrimary
-! "Accept hovered row" Set from: Default
-! rofi.me-accept-entry:                MouseDPrimary
-! "Accept hovered row with custom action" Set from: Default
-! rofi.me-accept-custom:               Control+MouseDPrimary
diff --git a/test/run_all_tests.sh b/test/run_all_tests.sh
index 8d619ab0..b2f11b9f 100755
--- a/test/run_all_tests.sh
+++ b/test/run_all_tests.sh
@@ -13,7 +13,6 @@ tests=(
     run_dmenu_empty
     run_dmenu_issue_292
     run_screenshot_test
-    xr_dump_test
     run_combi_test
     run_regex_test
     run_glob_test
diff --git a/test/run_dmenu_custom_test.sh b/test/run_dmenu_custom_test.sh
index fd36de3a..e2e292ae 100755
--- a/test/run_dmenu_custom_test.sh
+++ b/test/run_dmenu_custom_test.sh
@@ -29,10 +29,5 @@ then
     exit 1
 fi
 
-OUTPUT=$(rofi -dump-xresources)
-if [ -z "${OUTPUT}" ]
-then
-    exit 1
-fi
 
 exit ${RETV}
diff --git a/test/theme-parser-test.c b/test/theme-parser-test.c
index dd722468..89f03463 100644
--- a/test/theme-parser-test.c
+++ b/test/theme-parser-test.c
@@ -1135,14 +1135,6 @@ START_TEST  ( test_properties_list )
 }
 END_TEST
 
-START_TEST ( test_configuration )
-{
-    rofi_theme_parse_string ( "configuration { font: \"blaat€\"; yoffset: 4; }");
-    ck_assert_int_eq ( g_utf8_collate ( config.menu_font, "blaat€" ) , 0 );
-    ck_assert_int_eq ( config.y_offset , 4 );
-}
-END_TEST
-
 START_TEST ( test_parse_file_empty )
 {
     rofi_theme_parse_file ("/dev/null");
@@ -1382,12 +1374,6 @@ static Suite * theme_parser_suite (void)
         suite_add_tcase(s, tc_prop_list );
     }
     {
-        TCase *tc_prop_configuration = tcase_create("Configuration");
-        tcase_add_checked_fixture(tc_prop_configuration, theme_parser_setup, theme_parser_teardown);
-        tcase_add_test ( tc_prop_configuration, test_configuration);
-        suite_add_tcase(s, tc_prop_configuration );
-    }
-    {
         TCase *tc_prop_parse_file = tcase_create("ParseFile");
         tcase_add_checked_fixture(tc_prop_parse_file, theme_parser_setup, theme_parser_teardown);
         tcase_add_test ( tc_prop_parse_file, test_parse_file_empty);
diff --git a/test/xr_dump_test.sh b/test/xr_dump_test.sh
deleted file mode 100755
index 1c4f6caa..00000000
--- a/test/xr_dump_test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-TOP_DIR=$1
-
-xrdb -retain -load ${TOP_DIR}/doc/test_xr.txt
-rofi -config ${TOP_DIR}/doc/test_xr.txt -dump-xresources | grep -v "rofi.display-" | grep -v "The display name of this browser"  > temp.txt
-
-if ! diff temp.txt ${TOP_DIR}/doc/test_xr.txt > /dev/null
-then
-    echo "Dump xresources does not match."
-    diff temp.txt ${TOP_DIR}/doc/test_xr.txt 
-    exit 1;
-fi
-
-exit ${RETV}