mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: move i3bar definitions into separate file

Browse source
This commit is contained in:
Ian Fan 2018-09-24 21:56:35 +01:00
parent bcd2a8fe12
commit 751bb4a376
6 changed files with 43 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
include/swaybar/i3bar.h Normal file
View file

@ -0,0 +1,34 @@
#ifndef _SWAYBAR_I3BAR_H
#define _SWAYBAR_I3BAR_H
#include "bar.h"
#include "status_line.h"
struct i3bar_block {
struct wl_list link;
int ref_count;
char *full_text, *short_text, *align;
bool urgent;
uint32_t *color;
int min_width;
char *name, *instance;
bool separator;
int separator_block_width;
bool markup;
// Airblader features
uint32_t background;
uint32_t border;
int border_top;
int border_bottom;
int border_left;
int border_right;
};
void i3bar_block_unref(struct i3bar_block *block);
bool i3bar_handle_readable(struct status_line *status);
enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
struct i3bar_block *block, int x, int y, enum x11_button button);
enum x11_button wl_button_to_x11_button(uint32_t button);
enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value);
#endif

26
include/swaybar/status_line.h
View file

@ -13,26 +13,6 @@ enum status_protocol {
PROTOCOL_I3BAR, PROTOCOL_I3BAR,
}; };
struct i3bar_block {
struct wl_list link;
int ref_count;
char *full_text, *short_text, *align;
bool urgent;
uint32_t *color;
int min_width;
char *name, *instance;
bool separator;
int separator_block_width;
bool markup;
// Airblader features
uint32_t background;
uint32_t border;
int border_top;
int border_bottom;
int border_left;
int border_right;
};
struct status_line { struct status_line {
pid_t pid; pid_t pid;
int read_fd, write_fd; int read_fd, write_fd;
@ -55,11 +35,5 @@ struct status_line *status_line_init(char *cmd);
void status_error(struct status_line *status, const char *text); void status_error(struct status_line *status, const char *text);
bool status_handle_readable(struct status_line *status); bool status_handle_readable(struct status_line *status);
void status_line_free(struct status_line *status); void status_line_free(struct status_line *status);
bool i3bar_handle_readable(struct status_line *status);
enum hotspot_event_handling i3bar_block_send_click(struct status_line *status,
struct i3bar_block *block, int x, int y, enum x11_button button);
void i3bar_block_unref(struct i3bar_block *block);
enum x11_button wl_button_to_x11_button(uint32_t button);
enum x11_button wl_axis_to_x11_button(uint32_t axis, wl_fixed_t value);
#endif #endif

7
swaybar/bar.c
View file

@ -16,12 +16,13 @@
#else #else
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#endif #endif
#include "swaybar/render.h" #include "swaybar/bar.h"
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/event_loop.h" #include "swaybar/event_loop.h"
#include "swaybar/status_line.h" #include "swaybar/i3bar.h"
#include "swaybar/bar.h"
#include "swaybar/ipc.h" #include "swaybar/ipc.h"
#include "swaybar/status_line.h"
#include "swaybar/render.h"
#include "ipc-client.h" #include "ipc-client.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"

2
swaybar/i3bar.c
View file

@ -6,7 +6,9 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "swaybar/bar.h"
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/i3bar.h"
#include "swaybar/status_line.h" #include "swaybar/status_line.h"
void i3bar_block_unref(struct i3bar_block *block) { void i3bar_block_unref(struct i3bar_block *block) {

1
swaybar/render.c
View file

@ -10,6 +10,7 @@
#include "pool-buffer.h" #include "pool-buffer.h"
#include "swaybar/bar.h" #include "swaybar/bar.h"
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/i3bar.h"
#include "swaybar/ipc.h" #include "swaybar/ipc.h"
#include "swaybar/render.h" #include "swaybar/render.h"
#include "swaybar/status_line.h" #include "swaybar/status_line.h"

2
swaybar/status_line.c
View file

@ -7,7 +7,9 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "swaybar/bar.h"
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/i3bar.h"
#include "swaybar/event_loop.h" #include "swaybar/event_loop.h"
#include "swaybar/status_line.h" #include "swaybar/status_line.h"
#include "readline.h" #include "readline.h"