mirror of
https://github.com/swaywm/sway.git
synced 2026-02-12 04:28:25 -05:00
Start port of swaybar to layer shell
This starts up the event loop and wayland display and shims out the basic top level rendering concepts. Also includes some changes to incorporate pango into the 1.x codebase properly.
This commit is contained in:
Drew DeVault
parent
382e8af418
commit
cab1352801
23 changed files with 345 additions and 3787 deletions
16
include/pango.h
Normal file
16
include/pango.h
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
#ifndef _SWAY_PANGO_H
|
||||
#define _SWAY_PANGO_H
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <cairo/cairo.h>
|
||||
#include <pango/pangocairo.h>
|
||||
|
||||
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
|
||||
const char *text, int32_t scale, bool markup);
|
||||
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
|
||||
int32_t scale, bool markup, const char *fmt, ...);
|
||||
void pango_printf(cairo_t *cairo, const char *font,
|
||||
int32_t scale, bool markup, const char *fmt, ...);
|
||||
|
||||
#endif
|
||||
|
|
@ -1,17 +1,16 @@
|
|||
#ifndef _SWAY_CONFIG_H
|
||||
#define _SWAY_CONFIG_H
|
||||
|
||||
#define PID_WORKSPACE_TIMEOUT 60
|
||||
|
||||
#include <libinput.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <wlr/types/wlr_box.h>
|
||||
#include <xkbcommon/xkbcommon.h>
|
||||
#include <time.h>
|
||||
#include "list.h"
|
||||
#include "layout.h"
|
||||
#include "container.h"
|
||||
#include "wlr-layer-shell-unstable-v1-protocol.h"
|
||||
|
||||
/**
|
||||
* Describes a variable created via the `set` command.
|
||||
|
|
@ -152,7 +151,7 @@ struct bar_config {
|
|||
char *id;
|
||||
uint32_t modifier;
|
||||
list_t *outputs;
|
||||
//enum desktop_shell_panel_position position; // TODO
|
||||
char *position;
|
||||
list_t *bindings;
|
||||
char *status_command;
|
||||
bool pango_markup;
|
||||
|
|
|
|||
|
|
@ -1,72 +1,45 @@
|
|||
#ifndef _SWAYBAR_BAR_H
|
||||
#define _SWAYBAR_BAR_H
|
||||
|
||||
#include "client/registry.h"
|
||||
#include "client/window.h"
|
||||
#include <wayland-client.h>
|
||||
#include "pool-buffer.h"
|
||||
#include "list.h"
|
||||
|
||||
struct bar {
|
||||
struct config *config;
|
||||
struct status_line *status;
|
||||
list_t *outputs;
|
||||
struct output *focused_output;
|
||||
struct swaybar_config;
|
||||
struct swaybar_output;
|
||||
struct swaybar_workspace;
|
||||
|
||||
int ipc_event_socketfd;
|
||||
int ipc_socketfd;
|
||||
int status_read_fd;
|
||||
int status_write_fd;
|
||||
pid_t status_command_pid;
|
||||
struct swaybar {
|
||||
struct wl_display *display;
|
||||
struct wl_compositor *compositor;
|
||||
struct zwlr_layer_shell_v1 *layer_shell;
|
||||
struct wl_shm *shm;
|
||||
|
||||
struct swaybar_config *config;
|
||||
struct swaybar_output *focused_output;
|
||||
|
||||
struct wl_list outputs;
|
||||
};
|
||||
|
||||
struct output {
|
||||
struct window *window;
|
||||
struct registry *registry;
|
||||
list_t *workspaces;
|
||||
#ifdef ENABLE_TRAY
|
||||
list_t *items;
|
||||
#endif
|
||||
struct swaybar_output {
|
||||
struct wl_list link;
|
||||
struct swaybar *bar;
|
||||
struct wl_output *output;
|
||||
struct wl_surface *surface;
|
||||
struct zwlr_layer_surface_v1 *layer_surface;
|
||||
|
||||
char *name;
|
||||
int idx;
|
||||
bool focused;
|
||||
|
||||
uint32_t width, height;
|
||||
struct pool_buffer buffers[2];
|
||||
struct pool_buffer *current_buffer;
|
||||
};
|
||||
|
||||
struct workspace {
|
||||
int num;
|
||||
char *name;
|
||||
bool focused;
|
||||
bool visible;
|
||||
bool urgent;
|
||||
};
|
||||
void bar_setup(struct swaybar *bar,
|
||||
const char *socket_path,
|
||||
const char *bar_id);
|
||||
void bar_run(struct swaybar *bar);
|
||||
void bar_teardown(struct swaybar *bar);
|
||||
|
||||
/** Global bar state */
|
||||
extern struct bar swaybar;
|
||||
|
||||
/** True if sway needs to render */
|
||||
extern bool dirty;
|
||||
|
||||
/**
|
||||
* Setup bar.
|
||||
*/
|
||||
void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id);
|
||||
|
||||
/**
|
||||
* Create new output struct from name.
|
||||
*/
|
||||
struct output *new_output(const char *name);
|
||||
|
||||
/**
|
||||
* Bar mainloop.
|
||||
*/
|
||||
void bar_run(struct bar *bar);
|
||||
|
||||
/**
|
||||
* free workspace list.
|
||||
*/
|
||||
void free_workspaces(list_t *workspaces);
|
||||
|
||||
/**
|
||||
* Teardown bar.
|
||||
*/
|
||||
void bar_teardown(struct bar *bar);
|
||||
|
||||
#endif /* _SWAYBAR_BAR_H */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
#ifndef _SWAYBAR_CONFIG_H
|
||||
#define _SWAYBAR_CONFIG_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include "list.h"
|
||||
#include "util.h"
|
||||
|
||||
|
|
@ -19,10 +17,10 @@ struct box_colors {
|
|||
/**
|
||||
* Swaybar config.
|
||||
*/
|
||||
struct config {
|
||||
struct swaybar_config {
|
||||
char *status_command;
|
||||
bool pango_markup;
|
||||
uint32_t position;
|
||||
uint32_t position; // zwlr_layer_surface_v1_anchor
|
||||
char *font;
|
||||
char *sep_symbol;
|
||||
char *mode;
|
||||
|
|
@ -32,18 +30,6 @@ struct config {
|
|||
bool workspace_buttons;
|
||||
bool all_outputs;
|
||||
list_t *outputs;
|
||||
|
||||
#ifdef ENABLE_TRAY
|
||||
// Tray
|
||||
char *tray_output;
|
||||
char *icon_theme;
|
||||
|
||||
uint32_t tray_padding;
|
||||
uint32_t activate_button;
|
||||
uint32_t context_button;
|
||||
uint32_t secondary_button;
|
||||
#endif
|
||||
|
||||
int height;
|
||||
|
||||
struct {
|
||||
|
|
@ -63,24 +49,7 @@ struct config {
|
|||
} colors;
|
||||
};
|
||||
|
||||
/**
|
||||
* Parse position top|bottom|left|right.
|
||||
*/
|
||||
uint32_t parse_position(const char *position);
|
||||
struct swaybar_config *init_config();
|
||||
void free_config(struct swaybar_config *config);
|
||||
|
||||
/**
|
||||
* Parse font.
|
||||
*/
|
||||
char *parse_font(const char *font);
|
||||
|
||||
/**
|
||||
* Initialize default sway config.
|
||||
*/
|
||||
struct config *init_config();
|
||||
|
||||
/**
|
||||
* Free config struct.
|
||||
*/
|
||||
void free_config(struct config *config);
|
||||
|
||||
#endif /* _SWAYBAR_CONFIG_H */
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
#ifndef _SWAYBAR_EVENT_LOOP_H
|
||||
#define _SWAYBAR_EVENT_LOOP_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include <time.h>
|
||||
|
||||
|
|
@ -23,4 +22,5 @@ bool remove_timer(timer_t timer);
|
|||
void event_loop_poll();
|
||||
|
||||
void init_event_loop();
|
||||
#endif /*_SWAYBAR_EVENT_LOOP_H */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,23 +1,9 @@
|
|||
#ifndef _SWAYBAR_IPC_H
|
||||
#define _SWAYBAR_IPC_H
|
||||
#include "swaybar/bar.h"
|
||||
|
||||
#include "bar.h"
|
||||
|
||||
/**
|
||||
* Initialize ipc connection to sway and get sway state, outputs, bar_config.
|
||||
*/
|
||||
void ipc_bar_init(struct bar *bar, const char *bar_id);
|
||||
|
||||
/**
|
||||
* Handle ipc event from sway.
|
||||
*/
|
||||
bool handle_ipc_event(struct bar *bar);
|
||||
|
||||
|
||||
/**
|
||||
* Send workspace command to sway
|
||||
*/
|
||||
void ipc_bar_init(struct swaybar *bar, const char *bar_id);
|
||||
bool handle_ipc_event(struct swaybar *bar);
|
||||
void ipc_send_workspace_command(const char *workspace_name);
|
||||
|
||||
#endif /* _SWAYBAR_IPC_H */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,22 +1,10 @@
|
|||
#ifndef _SWAYBAR_RENDER_H
|
||||
#define _SWAYBAR_RENDER_H
|
||||
|
||||
#include "config.h"
|
||||
#include "bar.h"
|
||||
struct swaybar;
|
||||
struct swaybar_output;
|
||||
struct swaybar_config;
|
||||
|
||||
/**
|
||||
* Render swaybar.
|
||||
*/
|
||||
void render(struct output *output, struct config *config, struct status_line *line);
|
||||
void render_frame(struct swaybar *bar, struct swaybar_output *output);
|
||||
|
||||
/**
|
||||
* Set window height and modify internal spacing accordingly.
|
||||
*/
|
||||
void set_window_height(struct window *window, int height);
|
||||
|
||||
/**
|
||||
* Compute the size of a workspace name
|
||||
*/
|
||||
void workspace_button_size(struct window *window, const char *workspace_name, int *width, int *height);
|
||||
|
||||
#endif /* _SWAYBAR_RENDER_H */
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue