Merge remote-tracking branch 'origin/master' into highlight_match

6 files changed, 18 insertions, 3 deletions

diff --git a/include/dialogs/dialogs.h b/include/dialogs/dialogs.h
index 2690bc90..8f5d09b0 100644
--- a/include/dialogs/dialogs.h
+++ b/include/dialogs/dialogs.h
@@ -15,4 +15,5 @@
 #include "dialogs/script.h"
 #include "dialogs/window.h"
 #include "dialogs/combi.h"
+#include "dialogs/help-keys.h"
 #endif // ROFI_DIALOGS_DIALOGS_H
diff --git a/include/dialogs/help-keys.h b/include/dialogs/help-keys.h
new file mode 100644
index 00000000..c7934c55
--- /dev/null
+++ b/include/dialogs/help-keys.h
@@ -0,0 +1,11 @@
+#ifndef ROFI_DIALOG_HELPKEYS_H
+#define ROFI_DIALOG_HELPKEYS_H
+
+/**
+ * @defgroup HELPKEYSMode KeysHelp
+ * @ingroup MODES
+ * @{
+ */
+extern Mode help_keys_mode;
+/*@}*/
+#endif // ROFI_DIALOG_HELPKEYS_H
diff --git a/include/i3-support.h b/include/i3-support.h
index cc14e4ea..1d003b72 100644
--- a/include/i3-support.h
+++ b/include/i3-support.h
@@ -11,7 +11,6 @@
  */
 
 /**
- * @param socket_path The I3 IPC socket.
  * @param id          The window to focus on.
  *
  * If we want to switch windows in I3, we use I3 IPC mode.
@@ -22,7 +21,7 @@
 void i3_support_focus_window ( xcb_window_t id );
 
 /**
- * @param display The display to read the i3 property from.
+ * @param xcb The xcb to read the i3 property from.
  *
  * Get the i3 socket from the X root window.
  * @returns TRUE when i3 is running, FALSE when not.
diff --git a/include/mode.h b/include/mode.h
index 1a0d9b01..4cd2244d 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -66,7 +66,7 @@ int mode_init ( Mode *mode );
 void mode_destroy ( Mode *mode );
 
 /**
- * @param mode The mode to query
+ * @param sw The mode to query
  *
  * Get the number of entries in the mode.
  *
diff --git a/include/settings.h b/include/settings.h
index 4ac38af8..848d8a6b 100644
--- a/include/settings.h
+++ b/include/settings.h
@@ -90,6 +90,8 @@ typedef struct
     unsigned int   levenshtein_sort;
     /** Search case sensitivity */
     unsigned int   case_sensitive;
+    /** Cycle through in the element list */
+    unsigned int   cycle;
     /** Height of an element in number of rows */
     int            element_height;
     /** Sidebar mode, show the modi */
diff --git a/include/xrmoptions.h b/include/xrmoptions.h
index e8967158..218015f7 100644
--- a/include/xrmoptions.h
+++ b/include/xrmoptions.h
@@ -142,5 +142,7 @@ void print_options ( void );
  */
 void print_help_msg ( const char *option, const char *type, const char*text, const char *def, int isatty );
 
+char ** config_parser_return_display_help ( unsigned int *length );
+
 /* @}*/
 #endif