Added option -name-only to match only desktop entry name with drun (#690)

* Added option -name-only to match only desktop entry name with drun

* fixed indent and xrdump test

* fixed test

* option -drun-match-fields

* option -window-match-fields

* matching fields as static in window/drun + enums for field indexes

* prevent window_mode_parse_fields() from executing twice

8 files changed, 11 insertions, 7 deletions

diff --git a/include/mode.h b/include/mode.h
index 4a345c53..02c36161 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -41,7 +41,7 @@
  * Type of a mode.
  * Access should be done via mode_* functions.
  */
-typedef struct rofi_mode   Mode;
+typedef struct rofi_mode Mode;
 
 /**
  * Enum used to sum the possible states of ROFI.
diff --git a/include/settings.h b/include/settings.h
index 10a5fc4c..cbd0f2d4 100644
--- a/include/settings.h
+++ b/include/settings.h
@@ -85,6 +85,8 @@ typedef struct
     char           * run_list_command;
     /** Command for window */
     char           * window_command;
+    /** Window fields to match in window mode */
+    char           * window_match_fields;
     /** Theme for icons */
     char           * drun_icon_theme;
 
@@ -102,6 +104,8 @@ typedef struct
     unsigned int   disable_history;
     /** Toggle to enable sorting. */
     unsigned int   sort;
+    /** Desktop entries to match in drun */
+    char           * drun_match_fields;
     /** Use levenshtein sorting when matching */
     unsigned int   levenshtein_sort;
     /** Search case sensitivity */
diff --git a/include/view.h b/include/view.h
index 94a0a0ca..5a3a0855 100644
--- a/include/view.h
+++ b/include/view.h
@@ -39,7 +39,7 @@
  *
  * @{
  */
-typedef struct RofiViewState   RofiViewState;
+typedef struct RofiViewState RofiViewState;
 typedef enum
 {
     /** Create a menu for entering text */
diff --git a/include/widgets/box.h b/include/widgets/box.h
index 92ea407c..9933dd57 100644
--- a/include/widgets/box.h
+++ b/include/widgets/box.h
@@ -45,7 +45,7 @@
 /**
  * Abstract handle to the box widget internal state.
  */
-typedef struct _box   box;
+typedef struct _box box;
 
 /**
  * @param parent The widgets parent.
diff --git a/include/widgets/container.h b/include/widgets/container.h
index 8347dc31..b3ff2862 100644
--- a/include/widgets/container.h
+++ b/include/widgets/container.h
@@ -41,7 +41,7 @@
 /**
  * Abstract handle to the container widget internal state.
  */
-typedef struct _window   container;
+typedef struct _window container;
 
 /**
  * @param parent The widget's parent
diff --git a/include/widgets/listview.h b/include/widgets/listview.h
index e21f474f..cfd7f6c8 100644
--- a/include/widgets/listview.h
+++ b/include/widgets/listview.h
@@ -39,7 +39,7 @@
  * Handle to the listview.
  * No internal fields should be accessed directly.
  */
-typedef struct _listview   listview;
+typedef struct _listview listview;
 
 /**
  * The scrolling type used in the list view
diff --git a/include/widgets/widget.h b/include/widgets/widget.h
index 0ee2ba2c..28e3a8b1 100644
--- a/include/widgets/widget.h
+++ b/include/widgets/widget.h
@@ -48,7 +48,7 @@
  * Abstract structure holding internal state of a widget.
  * Structure is elaborated in widget-internal.h
  */
-typedef struct _widget   widget;
+typedef struct _widget widget;
 
 /**
  * Type of the widget. It is used to bubble events to the relevant widget.
diff --git a/include/xcb.h b/include/xcb.h
index 5ddd8cca..d86f580d 100644
--- a/include/xcb.h
+++ b/include/xcb.h
@@ -34,7 +34,7 @@
 /**
  * xcb data structure type declaration.
  */
-typedef struct _xcb_stuff   xcb_stuff;
+typedef struct _xcb_stuff xcb_stuff;
 
 /**
  * Global pointer to xcb_stuff instance.