diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/river-private.h | 14 | ||||
| -rw-r--r-- | include/river.h | 37 | ||||
| -rw-r--r-- | include/wayland-source.h | 4 |
3 files changed, 23 insertions, 32 deletions
diff --git a/include/river-private.h b/include/river-private.h index 1b94495..d32e074 100644 --- a/include/river-private.h +++ b/include/river-private.h @@ -1,20 +1,20 @@ #ifndef ASTAL_RIVER_OUTPUT_PRIVATE_H #define ASTAL_RIVER_OUTPUT_PRIVATE_H -#include "river.h" -#include "river-status-unstable-v1-client.h" #include <wayland-client.h> +#include "river-status-unstable-v1-client.h" +#include "river.h" + G_BEGIN_DECLS -AstalRiverOutput *astal_river_output_new(guint id, - struct wl_output *wl_output, +AstalRiverOutput *astal_river_output_new(guint id, struct wl_output *wl_output, struct zriver_status_manager_v1 *status_manager, struct wl_display *wl_display); -struct wl_output* astal_river_output_get_wl_output(AstalRiverOutput *self); -void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar* focused_view); +struct wl_output *astal_river_output_get_wl_output(AstalRiverOutput *self); +void astal_river_output_set_focused_view(AstalRiverOutput *self, gchar *focused_view); G_END_DECLS -#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H +#endif // !ASTAL_RIVER_OUTPUT_PRIVATE_H diff --git a/include/river.h b/include/river.h index 7e2bd59..e8576a3 100644 --- a/include/river.h +++ b/include/river.h @@ -7,7 +7,7 @@ G_BEGIN_DECLS #define ASTAL_RIVER_TYPE_OUTPUT (astal_river_output_get_type()) -G_DECLARE_FINAL_TYPE (AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) +G_DECLARE_FINAL_TYPE(AstalRiverOutput, astal_river_output, ASTAL_RIVER, OUTPUT, GObject) /** * astal_river_output_get_nid @@ -23,7 +23,7 @@ guint astal_river_output_get_id(AstalRiverOutput *self); * * Returns: (transfer none) (nullable): the name of the output */ -gchar* astal_river_output_get_name(AstalRiverOutput *self); +gchar *astal_river_output_get_name(AstalRiverOutput *self); /** * astal_river_output_get_layout_name @@ -31,7 +31,7 @@ gchar* astal_river_output_get_name(AstalRiverOutput *self); * * Returns: (transfer none) (nullable): the currently used layout name of the output */ -gchar* astal_river_output_get_layout_name(AstalRiverOutput *self); +gchar *astal_river_output_get_layout_name(AstalRiverOutput *self); /** * astal_river_output_get_focused_view @@ -39,7 +39,7 @@ gchar* astal_river_output_get_layout_name(AstalRiverOutput *self); * * Returns: (transfer none) (nullable): the focused view on the output */ -gchar* astal_river_output_get_focused_view(AstalRiverOutput *self); +gchar *astal_river_output_get_focused_view(AstalRiverOutput *self); /** * astal_river_output_get_focused_tags @@ -57,7 +57,6 @@ guint astal_river_output_get_focused_tags(AstalRiverOutput *self); */ guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); - /** * astal_river_output_get_occupied_tags * @self: the AstalRiverOutput object @@ -66,13 +65,9 @@ guint astal_river_output_get_urgent_tags(AstalRiverOutput *self); */ guint astal_river_output_get_occupied_tags(AstalRiverOutput *self); - - #define ASTAL_RIVER_TYPE_RIVER (astal_river_river_get_type()) -G_DECLARE_FINAL_TYPE (AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) - - +G_DECLARE_FINAL_TYPE(AstalRiverRiver, astal_river_river, ASTAL_RIVER, RIVER, GObject) /** * astal_river_river_new @@ -86,7 +81,7 @@ AstalRiverRiver *astal_river_river_new(); * * Returns: (nullable) (transfer none): gets the default River object. */ -AstalRiverRiver* astal_river_river_get_default(); +AstalRiverRiver *astal_river_river_get_default(); /** * astal_river_river_get_outputs * @self: the AstalRiverRiver object @@ -94,7 +89,7 @@ AstalRiverRiver* astal_river_river_get_default(); * Returns: (transfer none) (element-type AstalRiver.Output): a list of all outputs * */ -GList* astal_river_river_get_outputs(AstalRiverRiver *self); +GList *astal_river_river_get_outputs(AstalRiverRiver *self); /** * astal_river_river_get_output @@ -103,8 +98,7 @@ GList* astal_river_river_get_outputs(AstalRiverRiver *self); * * Returns: (transfer none) (nullable): the output with the given name or null */ -AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* name); - +AstalRiverOutput *astal_river_river_get_output(AstalRiverRiver *self, gchar *name); /** * astal_river_river_get_focused_view @@ -112,7 +106,7 @@ AstalRiverOutput* astal_river_river_get_output(AstalRiverRiver *self, gchar* nam * * Returns: (transfer none) (nullable): the currently focused view */ -gchar* astal_river_river_get_focused_view(AstalRiverRiver *self); +gchar *astal_river_river_get_focused_view(AstalRiverRiver *self); /** * astal_river_river_get_focused_output @@ -120,8 +114,7 @@ gchar* astal_river_river_get_focused_view(AstalRiverRiver *self); * * Returns: (transfer none) (nullable): the name of the currently focused output */ -gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); - +gchar *astal_river_river_get_focused_output(AstalRiverRiver *self); /** * astal_river_river_get_mode @@ -129,8 +122,7 @@ gchar* astal_river_river_get_focused_output(AstalRiverRiver *self); * * Returns: (transfer none) (nullable): the currently active mode */ -gchar* astal_river_river_get_mode(AstalRiverRiver *self); - +gchar *astal_river_river_get_mode(AstalRiverRiver *self); /** * AstalRiverCommandCallback: @@ -150,10 +142,9 @@ typedef void (*AstalRiverCommandCallback)(gboolean success, const gchar *msg); * * Calls the given callback with the provided parameters. */ -void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, AstalRiverCommandCallback callback); - - +void astal_river_river_run_command_async(AstalRiverRiver *self, gint length, const gchar **cmd, + AstalRiverCommandCallback callback); G_END_DECLS -#endif // !ASTAL_RIVER_H +#endif // !ASTAL_RIVER_H diff --git a/include/wayland-source.h b/include/wayland-source.h index ad6ed8c..342d82b 100644 --- a/include/wayland-source.h +++ b/include/wayland-source.h @@ -6,8 +6,8 @@ G_BEGIN_DECLS typedef struct _WLSource WLSource; WLSource* wl_source_new(); -void wl_source_free(WLSource *self); -struct wl_display* wl_source_get_display(WLSource *source); +void wl_source_free(WLSource* self); +struct wl_display* wl_source_get_display(WLSource* source); G_END_DECLS |