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

Do some small cleanup

Browse source 
- Fix workspace events (security config isn't in use so it wasn't being
  sent)
- Kill status bar process when swaybar exits
- Don't rearrange windows on every layer surface commit
This commit is contained in:
Drew DeVault 2018-03-29 21:09:34 -04:00
parent 5f5076baff
commit f3fbf19312
3 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/desktop/layer_shell.c
View file

@ -204,8 +204,8 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
if (wlr_output != NULL) { if (wlr_output != NULL) {
struct sway_output *output = wlr_output->data; struct sway_output *output = wlr_output->data;
struct wlr_box old_geo = layer->geo; struct wlr_box old_geo = layer->geo;
arrange_layers(output);
if (memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0) { if (memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0) {
arrange_layers(output);
// TODO DAMAGE apply whole surface from previous and new geos // TODO DAMAGE apply whole surface from previous and new geos
} else { } else {
// TODO DAMAGE from surface damage // TODO DAMAGE from surface damage

23
sway/ipc-server.c
View file

@ -242,33 +242,10 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
} }
static void ipc_send_event(const char *json_string, enum ipc_command_type event) { static void ipc_send_event(const char *json_string, enum ipc_command_type event) {
static struct {
enum ipc_command_type event;
enum ipc_feature feature;
} security_mappings[] = {
{ IPC_EVENT_WORKSPACE, IPC_FEATURE_EVENT_WORKSPACE },
{ IPC_EVENT_OUTPUT, IPC_FEATURE_EVENT_OUTPUT },
{ IPC_EVENT_MODE, IPC_FEATURE_EVENT_MODE },
{ IPC_EVENT_WINDOW, IPC_FEATURE_EVENT_WINDOW },
{ IPC_EVENT_BINDING, IPC_FEATURE_EVENT_BINDING },
{ IPC_EVENT_INPUT, IPC_FEATURE_EVENT_INPUT }
};
uint32_t security_mask = 0;
for (size_t i = 0; i < sizeof(security_mappings) / sizeof(security_mappings[0]); ++i) {
if (security_mappings[i].event == event) {
security_mask = security_mappings[i].feature;
break;
}
}
int i; int i;
struct ipc_client *client; struct ipc_client *client;
for (i = 0; i < ipc_client_list->length; i++) { for (i = 0; i < ipc_client_list->length; i++) {
client = ipc_client_list->items[i]; client = ipc_client_list->items[i];
if (!(client->security_policy & security_mask)) {
continue;
}
if ((client->subscribed_events & event_mask(event)) == 0) { if ((client->subscribed_events & event_mask(event)) == 0) {
continue; continue;
} }

1
swaybar/status_line.c
View file

@ -76,5 +76,6 @@ struct status_line *status_line_init(char *cmd) {
void status_line_free(struct status_line *status) { void status_line_free(struct status_line *status) {
close(status->read_fd); close(status->read_fd);
close(status->write_fd); close(status->write_fd);
kill(status->pid, SIGTERM);
free(status); free(status);
} }