summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-01-08 21:36:06 +0100
committerDave Davenport <qball@gmpclient.org>2017-01-08 21:36:06 +0100
commitbaab2047adf24642cbc727b50a77dc544e934a76 (patch)
treef9437dda9ae91d4e59b67231eec2cb3b51a1fe93 /include
parent8c0c43952dceb78d717f036478b4d66c75267a3b (diff)
Indent magic, rework makefile so lexer and yacc file are not passed.
Diffstat (limited to 'include')
-rw-r--r--include/theme.h60
-rw-r--r--include/view-internal.h2
-rw-r--r--include/view.h1
-rw-r--r--include/widgets/textbox.h22
-rw-r--r--include/widgets/widget-internal.h14
-rw-r--r--include/widgets/widget.h1
6 files changed, 53 insertions, 47 deletions
diff --git a/include/theme.h b/include/theme.h
index f867cb72..c1d187f0 100644
--- a/include/theme.h
+++ b/include/theme.h
@@ -6,7 +6,8 @@
#include <settings.h>
/** Style of line */
-typedef enum {
+typedef enum
+{
/** Solid line */
SOLID,
/** Dashed line */
@@ -16,7 +17,8 @@ typedef enum {
/**
* Distance unit type.
*/
-typedef enum {
+typedef enum
+{
/** PixelWidth in pixels. */
PW_PX,
/** PixelWidth in EM. */
@@ -28,7 +30,8 @@ typedef enum {
/**
* Structure representing a distance.
*/
-typedef struct {
+typedef struct
+{
/** Distance */
double distance;
/** Unit type of the distance */
@@ -40,14 +43,16 @@ typedef struct {
/**
* Type of orientation.
*/
-typedef enum {
+typedef enum
+{
ORIENTATION_VERTICAL,
ORIENTATION_HORIZONTAL
} Orientation;
/**
* Type of property
*/
-typedef enum {
+typedef enum
+{
/** Integer */
P_INTEGER,
/** Double */
@@ -85,7 +90,7 @@ typedef struct
* Padding
*/
typedef struct
- {
+{
Distance top;
Distance right;
Distance bottom;
@@ -95,29 +100,32 @@ typedef struct
/**
* Property structure.
*/
-typedef struct Property {
+typedef struct Property
+{
/** Name of property */
- char *name;
+ char *name;
/** Type of property. */
PropertyType type;
/** Value */
- union {
+ union
+ {
/** integer */
- int i;
+ int i;
/** Double */
- double f;
+ double f;
/** String */
- char *s;
+ char *s;
/** boolean */
- gboolean b;
+ gboolean b;
/** Color */
ThemeColor color;
/** Padding */
Padding padding;
/** Reference */
- struct {
+ struct
+ {
/** Name */
- char *name;
+ char *name;
/** Cached looked up ref */
struct Property *ref;
} link;
@@ -126,19 +134,19 @@ typedef struct Property {
/**
* ThemeWidget.
*/
-typedef struct ThemeWidget {
- int set;
- char *name;
+typedef struct ThemeWidget
+{
+ int set;
+ char *name;
- unsigned int num_widgets;
+ unsigned int num_widgets;
struct ThemeWidget **widgets;
- GHashTable *properties;
+ GHashTable *properties;
struct ThemeWidget *parent;
} ThemeWidget;
-
/**
* Global pointer to the current active theme.
*/
@@ -234,7 +242,7 @@ Distance rofi_theme_get_distance ( const widget *widget, const char *property, i
*
* @returns The integer value of this property for this widget.
*/
-int rofi_theme_get_integer ( const widget *widget, const char *property, int def );
+int rofi_theme_get_integer ( const widget *widget, const char *property, int def );
/**
* @param widget The widget to query
@@ -267,7 +275,7 @@ int rofi_theme_get_integer_exact ( const widget *widget, const char *property, i
*
* @returns The boolean value of this property for this widget.
*/
-int rofi_theme_get_boolean ( const widget *widget, const char *property, int def );
+int rofi_theme_get_boolean ( const widget *widget, const char *property, int def );
/**
* @param widget The widget to query
@@ -278,7 +286,7 @@ int rofi_theme_get_boolean ( const widget *widget, const char *property, int
*
* @returns The string value of this property for this widget.
*/
-char *rofi_theme_get_string ( const widget *widget, const char *property, char *def );
+char *rofi_theme_get_string ( const widget *widget, const char *property, char *def );
/**
* @param widget The widget to query
@@ -289,7 +297,7 @@ char *rofi_theme_get_string ( const widget *widget, const char *property, cha
*
* @returns The double value of this property for this widget.
*/
-double rofi_theme_get_double ( const widget *widget, const char *property, double def );
+double rofi_theme_get_double ( const widget *widget, const char *property, double def );
/**
* @param widget The widget to query
@@ -299,7 +307,7 @@ double rofi_theme_get_double ( const widget *widget, const char *property, dou
* Obtain the color of the widget and applies this to the drawable d.
*
*/
-void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t *d);
+void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t *d );
/**
* @param widget The widget to query
diff --git a/include/view-internal.h b/include/view-internal.h
index 51a1c90d..70c8f2ff 100644
--- a/include/view-internal.h
+++ b/include/view-internal.h
@@ -24,7 +24,7 @@ struct RofiViewState
/** Flag indicating if view needs to be refiltered. */
int refilter;
/** Widget representing the main container. */
- container *main_window;
+ container *main_window;
/** Main #box widget holding different elements. */
box *main_box;
/** #box widget packing the input bar widgets. */
diff --git a/include/view.h b/include/view.h
index 3a482310..1c9cec6d 100644
--- a/include/view.h
+++ b/include/view.h
@@ -111,7 +111,6 @@ unsigned int rofi_view_get_selected_line ( const RofiViewState *state );
*/
void rofi_view_restart ( RofiViewState *state );
-
/**
* @param state The handle to the view
* @param action The keyboard action
diff --git a/include/widgets/textbox.h b/include/widgets/textbox.h
index 536bd30e..d81d8806 100644
--- a/include/widgets/textbox.h
+++ b/include/widgets/textbox.h
@@ -40,7 +40,7 @@ typedef struct
int blink;
guint blink_timeout;
//
- const char *theme_name ;
+ const char *theme_name;
} textbox;
/**
@@ -48,16 +48,16 @@ typedef struct
*/
typedef enum
{
- TB_AUTOHEIGHT = 1 << 0,
- TB_AUTOWIDTH = 1 << 1,
- TB_LEFT = 1 << 16,
- TB_RIGHT = 1 << 17,
- TB_CENTER = 1 << 18,
- TB_EDITABLE = 1 << 19,
- TB_MARKUP = 1 << 20,
- TB_WRAP = 1 << 21,
- TB_PASSWORD = 1 << 22,
- TB_INDICATOR = 1 << 23,
+ TB_AUTOHEIGHT = 1 << 0,
+ TB_AUTOWIDTH = 1 << 1,
+ TB_LEFT = 1 << 16,
+ TB_RIGHT = 1 << 17,
+ TB_CENTER = 1 << 18,
+ TB_EDITABLE = 1 << 19,
+ TB_MARKUP = 1 << 20,
+ TB_WRAP = 1 << 21,
+ TB_PASSWORD = 1 << 22,
+ TB_INDICATOR = 1 << 23,
} TextboxFlags;
/**
* Flags indicating current state of the textbox.
diff --git a/include/widgets/widget-internal.h b/include/widgets/widget-internal.h
index e26fb8f2..06a82145 100644
--- a/include/widgets/widget-internal.h
+++ b/include/widgets/widget-internal.h
@@ -57,8 +57,8 @@ struct _widget
void ( *free )( struct _widget *widget );
/** Name of widget (used for theming) */
- char *name;
- const char *state;
+ char *name;
+ const char *state;
};
/**
@@ -68,7 +68,7 @@ struct _widget
* Initializes the widget structure.
*
*/
-void widget_init ( widget *widget , const char *name );
+void widget_init ( widget *widget, const char *name );
/**
* @param widget The widget handle.
@@ -117,17 +117,17 @@ int widget_padding_get_bottom ( const widget *wid );
/**
* @param wid The widget handle.
*
- * Get width of the content of the widget
+ * Get width of the content of the widget
*
- * @returns the widget width, excluding padding.
+ * @returns the widget width, excluding padding.
*/
int widget_padding_get_remaining_width ( const widget *wid );
/**
* @param wid The widget handle.
*
- * Get height of the content of the widget
+ * Get height of the content of the widget
*
- * @returns the widget height, excluding padding.
+ * @returns the widget height, excluding padding.
*/
int widget_padding_get_remaining_height ( const widget *wid );
/**
diff --git a/include/widgets/widget.h b/include/widgets/widget.h
index 9dda0457..89869770 100644
--- a/include/widgets/widget.h
+++ b/include/widgets/widget.h
@@ -174,7 +174,6 @@ void widget_set_clicked_handler ( widget *wid, widget_clicked_cb cb, void *udata
*/
gboolean widget_motion_notify ( widget *wid, xcb_motion_notify_event_t *xme );
-
/**
* @param wid The widget handle
* @param name The name of the widget.