Brian Ashworth
7 years ago
committed by
GitHub
commit
9ba0dca7ba
@ -1,42 +1,61 @@
|
||||
#ifndef _SWAY_CRITERIA_H
|
||||
#define _SWAY_CRITERIA_H
|
||||
|
||||
#include "tree/container.h"
|
||||
#include <pcre.h>
|
||||
#include "list.h"
|
||||
#include "tree/view.h"
|
||||
|
||||
/**
|
||||
* Maps criteria (as a list of criteria tokens) to a command list.
|
||||
*
|
||||
* A list of tokens together represent a single criteria string (e.g.
|
||||
* '[class="abc" title="xyz"]' becomes two criteria tokens).
|
||||
*
|
||||
* for_window: Views matching all criteria will have the bound command list
|
||||
* executed on them.
|
||||
*
|
||||
* Set via `for_window <criteria> <cmd list>`.
|
||||
*/
|
||||
struct criteria {
|
||||
list_t *tokens; // struct crit_token, contains compiled regex.
|
||||
char *crit_raw; // entire criteria string (for logging)
|
||||
enum criteria_type {
|
||||
CT_COMMAND = 1 << 0,
|
||||
CT_ASSIGN_OUTPUT = 1 << 1,
|
||||
CT_ASSIGN_WORKSPACE = 1 << 2,
|
||||
};
|
||||
|
||||
struct criteria {
|
||||
enum criteria_type type;
|
||||
char *raw; // entire criteria string (for logging)
|
||||
char *cmdlist;
|
||||
char *target; // workspace or output name for `assign` criteria
|
||||
|
||||
pcre *title;
|
||||
pcre *app_id;
|
||||
pcre *class;
|
||||
pcre *instance;
|
||||
pcre *con_mark;
|
||||
uint32_t con_id; // internal ID
|
||||
uint32_t id; // X11 window ID
|
||||
pcre *window_role;
|
||||
uint32_t window_type;
|
||||
bool floating;
|
||||
bool tiling;
|
||||
char urgent; // 'l' for latest or 'o' for oldest
|
||||
char *workspace;
|
||||
};
|
||||
|
||||
int criteria_cmp(const void *item, const void *data);
|
||||
void free_criteria(struct criteria *crit);
|
||||
bool criteria_is_empty(struct criteria *criteria);
|
||||
|
||||
// Pouplate list with crit_tokens extracted from criteria string, returns error
|
||||
// string or NULL if successful.
|
||||
char *extract_crit_tokens(list_t *tokens, const char *criteria);
|
||||
void criteria_destroy(struct criteria *criteria);
|
||||
|
||||
// Returns list of criteria that match given container. These criteria have
|
||||
// been set with `for_window` commands and have an associated cmdlist.
|
||||
list_t *criteria_for(struct sway_container *cont);
|
||||
/**
|
||||
* Generate a criteria struct from a raw criteria string such as
|
||||
* [class="foo" instance="bar"] (brackets inclusive).
|
||||
*
|
||||
* The error argument is expected to be an address of a null pointer. If an
|
||||
* error is encountered, the function will return NULL and the pointer will be
|
||||
* changed to point to the error string. This string should be freed afterwards.
|
||||
*/
|
||||
struct criteria *criteria_parse(char *raw, char **error);
|
||||
|
||||
// Returns a list of all containers that match the given list of tokens.
|
||||
list_t *container_for_crit_tokens(list_t *tokens);
|
||||
/**
|
||||
* Compile a list of criterias matching the given view.
|
||||
*
|
||||
* Criteria types can be bitwise ORed.
|
||||
*/
|
||||
list_t *criteria_for_view(struct sway_view *view, enum criteria_type types);
|
||||
|
||||
// Returns true if any criteria in the given list matches this container
|
||||
bool criteria_any(struct sway_container *cont, list_t *criteria);
|
||||
/**
|
||||
* Compile a list of views matching the given criteria.
|
||||
*/
|
||||
list_t *criteria_get_views(struct criteria *criteria);
|
||||
|
||||
#endif
|
||||
|
||||
@ -1,165 +0,0 @@
|
||||
#define _POSIX_C_SOURCE 199309L
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/types/wlr_wl_shell.h>
|
||||
#include "sway/tree/container.h"
|
||||
#include "sway/tree/layout.h"
|
||||
#include "sway/server.h"
|
||||
#include "sway/tree/view.h"
|
||||
#include "sway/input/seat.h"
|
||||
#include "sway/input/input-manager.h"
|
||||
#include "log.h"
|
||||
|
||||
static struct sway_wl_shell_view *wl_shell_view_from_view(
|
||||
struct sway_view *view) {
|
||||
if (!sway_assert(view->type == SWAY_VIEW_WL_SHELL,
|
||||
"Expected wl_shell view")) {
|
||||
return NULL;
|
||||
}
|
||||
return (struct sway_wl_shell_view *)view;
|
||||
}
|
||||
|
||||
static const char *get_prop(struct sway_view *view, enum sway_view_prop prop) {
|
||||
if (wl_shell_view_from_view(view) == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
switch (prop) {
|
||||
case VIEW_PROP_TITLE:
|
||||
return view->wlr_wl_shell_surface->title;
|
||||
case VIEW_PROP_CLASS:
|
||||
return view->wlr_wl_shell_surface->class;
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static void configure(struct sway_view *view, double ox, double oy, int width,
|
||||
int height) {
|
||||
struct sway_wl_shell_view *wl_shell_view = wl_shell_view_from_view(view);
|
||||
if (wl_shell_view == NULL) {
|
||||
return;
|
||||
}
|
||||
wl_shell_view->pending_width = width;
|
||||
wl_shell_view->pending_height = height;
|
||||
wlr_wl_shell_surface_configure(view->wlr_wl_shell_surface, 0, width, height);
|
||||
}
|
||||
|
||||
static void _close(struct sway_view *view) {
|
||||
if (wl_shell_view_from_view(view) == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
wl_client_destroy(view->wlr_wl_shell_surface->client);
|
||||
}
|
||||
|
||||
static void destroy(struct sway_view *view) {
|
||||
struct sway_wl_shell_view *wl_shell_view = wl_shell_view_from_view(view);
|
||||
if (wl_shell_view == NULL) {
|
||||
return;
|
||||
}
|
||||
wl_list_remove(&wl_shell_view->commit.link);
|
||||
wl_list_remove(&wl_shell_view->destroy.link);
|
||||
wl_list_remove(&wl_shell_view->request_fullscreen.link);
|
||||
wl_list_remove(&wl_shell_view->set_state.link);
|
||||
free(wl_shell_view);
|
||||
}
|
||||
|
||||
static void set_fullscreen(struct sway_view *view, bool fullscreen) {
|
||||
// TODO
|
||||
}
|
||||
|
||||
static const struct sway_view_impl view_impl = {
|
||||
.get_prop = get_prop,
|
||||
.configure = configure,
|
||||
.close = _close,
|
||||
.destroy = destroy,
|
||||
.set_fullscreen = set_fullscreen,
|
||||
};
|
||||
|
||||
static void handle_commit(struct wl_listener *listener, void *data) {
|
||||
struct sway_wl_shell_view *wl_shell_view =
|
||||
wl_container_of(listener, wl_shell_view, commit);
|
||||
struct sway_view *view = &wl_shell_view->view;
|
||||
// NOTE: We intentionally discard the view's desired width here
|
||||
// TODO: Let floating views do whatever
|
||||
view_update_size(view, wl_shell_view->pending_width,
|
||||
wl_shell_view->pending_height);
|
||||
view_damage_from(view);
|
||||
}
|
||||
|
||||
static void handle_destroy(struct wl_listener *listener, void *data) {
|
||||
struct sway_wl_shell_view *wl_shell_view =
|
||||
wl_container_of(listener, wl_shell_view, destroy);
|
||||
view_destroy(&wl_shell_view->view);
|
||||
}
|
||||
|
||||
static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
|
||||
struct sway_wl_shell_view *wl_shell_view =
|
||||
wl_container_of(listener, wl_shell_view, request_fullscreen);
|
||||
view_set_fullscreen(&wl_shell_view->view, true);
|
||||
}
|
||||
|
||||
static void handle_set_state(struct wl_listener *listener, void *data) {
|
||||
struct sway_wl_shell_view *wl_shell_view =
|
||||
wl_container_of(listener, wl_shell_view, set_state);
|
||||
struct sway_view *view = &wl_shell_view->view;
|
||||
struct wlr_wl_shell_surface *surface = view->wlr_wl_shell_surface;
|
||||
if (view->is_fullscreen &&
|
||||
surface->state != WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {
|
||||
view_set_fullscreen(view, false);
|
||||
}
|
||||
}
|
||||
|
||||
void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
|
||||
struct sway_server *server = wl_container_of(listener, server,
|
||||
wl_shell_surface);
|
||||
struct wlr_wl_shell_surface *shell_surface = data;
|
||||
|
||||
if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) {
|
||||
// popups don't get views
|
||||
wlr_log(L_DEBUG, "New wl_shell popup");
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO: make transient windows floating
|
||||
|
||||
wlr_log(L_DEBUG, "New wl_shell toplevel title='%s' app_id='%s'",
|
||||
shell_surface->title, shell_surface->class);
|
||||
wlr_wl_shell_surface_ping(shell_surface);
|
||||
|
||||
struct sway_wl_shell_view *wl_shell_view =
|
||||
calloc(1, sizeof(struct sway_wl_shell_view));
|
||||
if (!sway_assert(wl_shell_view, "Failed to allocate view")) {
|
||||
return;
|
||||
}
|
||||
|
||||
view_init(&wl_shell_view->view, SWAY_VIEW_WL_SHELL, &view_impl);
|
||||
wl_shell_view->view.wlr_wl_shell_surface = shell_surface;
|
||||
|
||||
// TODO:
|
||||
// - Wire up listeners
|
||||
// - Look up pid and open on appropriate workspace
|
||||
// - Set new view to maximized so it behaves nicely
|
||||
// - Criteria
|
||||
|
||||
wl_shell_view->commit.notify = handle_commit;
|
||||
wl_signal_add(&shell_surface->surface->events.commit,
|
||||
&wl_shell_view->commit);
|
||||
|
||||
wl_shell_view->destroy.notify = handle_destroy;
|
||||
wl_signal_add(&shell_surface->events.destroy, &wl_shell_view->destroy);
|
||||
|
||||
wl_shell_view->request_fullscreen.notify = handle_request_fullscreen;
|
||||
wl_signal_add(&shell_surface->events.request_fullscreen,
|
||||
&wl_shell_view->request_fullscreen);
|
||||
|
||||
wl_shell_view->set_state.notify = handle_set_state;
|
||||
wl_signal_add(&shell_surface->events.set_state, &wl_shell_view->set_state);
|
||||
|
||||
view_map(&wl_shell_view->view, shell_surface->surface);
|
||||
|
||||
if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {
|
||||
view_set_fullscreen(&wl_shell_view->view, true);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue