mirror of
https://github.com/labwc/labwc.git
synced 2026-03-28 07:58:28 -04:00
Read rc.xml and begin parsing
This commit is contained in:
parent
fdc131049c
commit
6166e9b370
12 changed files with 227 additions and 7 deletions
12
data/rc.xml
Normal file
12
data/rc.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<openbox_config xmlns="http://openbox.org/3.4/rc"
|
||||||
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||||
|
|
||||||
|
<!-- wlroots specific settings - not part of openbox -->
|
||||||
|
<wlroots>
|
||||||
|
<!-- Use client-side decorations for xdg-shell views -->
|
||||||
|
<csd>no</csd>
|
||||||
|
</wlroots>
|
||||||
|
|
||||||
|
</openbox_config>
|
||||||
|
|
@ -34,7 +34,6 @@
|
||||||
#define XCURSOR_MOVE "grabbing"
|
#define XCURSOR_MOVE "grabbing"
|
||||||
#define XWL_TITLEBAR_HEIGHT (10)
|
#define XWL_TITLEBAR_HEIGHT (10)
|
||||||
#define XWL_WINDOW_BORDER (3)
|
#define XWL_WINDOW_BORDER (3)
|
||||||
#define LAB_DISABLE_CSD (0)
|
|
||||||
|
|
||||||
enum cursor_mode {
|
enum cursor_mode {
|
||||||
LAB_CURSOR_PASSTHROUGH,
|
LAB_CURSOR_PASSTHROUGH,
|
||||||
|
|
|
||||||
17
include/rcxml.h
Normal file
17
include/rcxml.h
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
#ifndef RCXML_H
|
||||||
|
#define RCXML_H
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
struct rcxml {
|
||||||
|
bool client_side_decorations;
|
||||||
|
};
|
||||||
|
|
||||||
|
extern struct rcxml rc;
|
||||||
|
|
||||||
|
void rcxml_init(struct rcxml *rc);
|
||||||
|
void rcxml_read(const char *filename);
|
||||||
|
void rcxml_set_verbose(void);
|
||||||
|
|
||||||
|
#endif /* RCXML_H */
|
||||||
|
|
@ -40,13 +40,16 @@ endif
|
||||||
wayland_server = dependency('wayland-server')
|
wayland_server = dependency('wayland-server')
|
||||||
wayland_protos = dependency('wayland-protocols')
|
wayland_protos = dependency('wayland-protocols')
|
||||||
xkbcommon = dependency('xkbcommon')
|
xkbcommon = dependency('xkbcommon')
|
||||||
|
xml2 = dependency('libxml-2.0')
|
||||||
|
|
||||||
labwc_inc = include_directories('include')
|
labwc_inc = include_directories('include')
|
||||||
|
|
||||||
subdir('protocols')
|
subdir('protocols')
|
||||||
subdir('src')
|
subdir('src')
|
||||||
|
|
||||||
labwc_deps = [ server_protos, wayland_server, wlroots, xkbcommon, ]
|
labwc_deps = [
|
||||||
|
server_protos, wayland_server, wlroots, xkbcommon, xml2
|
||||||
|
]
|
||||||
|
|
||||||
executable(
|
executable(
|
||||||
meson.project_name(),
|
meson.project_name(),
|
||||||
|
|
|
||||||
3
src/config/meson.build
Normal file
3
src/config/meson.build
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
labwc_sources += files(
|
||||||
|
'rcxml.c',
|
||||||
|
)
|
||||||
174
src/config/rcxml.c
Normal file
174
src/config/rcxml.c
Normal file
|
|
@ -0,0 +1,174 @@
|
||||||
|
#define _POSIX_C_SOURCE 200112L
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <strings.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <libxml/parser.h>
|
||||||
|
#include <libxml/tree.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#include "rcxml.h"
|
||||||
|
|
||||||
|
static bool in_keybind = false;
|
||||||
|
static bool is_attribute = false;
|
||||||
|
static bool verbose = false;
|
||||||
|
|
||||||
|
static void rstrip(char *buf, const char *pattern)
|
||||||
|
{
|
||||||
|
char *p = strstr(buf, pattern);
|
||||||
|
if (!p)
|
||||||
|
return;
|
||||||
|
*p = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
static void fill_keybind(xmlNode *n, char *nodename, char *content)
|
||||||
|
{
|
||||||
|
rstrip(nodename, ".keybind.keyboard");
|
||||||
|
if (!strcmp(nodename, "name.action")) {
|
||||||
|
; /* TODO: populate keybind with stuff */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool get_bool(const char *s)
|
||||||
|
{
|
||||||
|
if (!s)
|
||||||
|
return false;
|
||||||
|
if (!strcasecmp(s, "yes"))
|
||||||
|
return true;
|
||||||
|
if (!strcasecmp(s, "true"))
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void entry(xmlNode *node, char *nodename, char *content)
|
||||||
|
{
|
||||||
|
if (!nodename)
|
||||||
|
return;
|
||||||
|
rstrip(nodename, ".openbox_config");
|
||||||
|
if (verbose) {
|
||||||
|
if (is_attribute)
|
||||||
|
printf("@");
|
||||||
|
printf("%s: %s\n", nodename, content);
|
||||||
|
}
|
||||||
|
if (!content)
|
||||||
|
return;
|
||||||
|
if (in_keybind)
|
||||||
|
fill_keybind(node, nodename, content);
|
||||||
|
if (!strcmp(nodename, "csd.wlroots"))
|
||||||
|
rc.client_side_decorations = get_bool(content);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void keybind_begin(void)
|
||||||
|
{
|
||||||
|
/* TODO: xcalloc struct keybind */
|
||||||
|
in_keybind = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void keybind_end(void)
|
||||||
|
{
|
||||||
|
in_keybind = false;
|
||||||
|
/* TODO: wl_list_add keybind */
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *nodename(xmlNode *node, char *buf, int len)
|
||||||
|
{
|
||||||
|
if (!node || !node->name)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
/* Ignore superflous 'text.' in node name */
|
||||||
|
if (node->parent && !strcmp((char *)node->name, "text"))
|
||||||
|
node = node->parent;
|
||||||
|
|
||||||
|
buf += len;
|
||||||
|
*--buf = 0;
|
||||||
|
len--;
|
||||||
|
|
||||||
|
char *p = buf;
|
||||||
|
p[--len] = 0;
|
||||||
|
for (;;) {
|
||||||
|
const char *name = (char *)node->name;
|
||||||
|
char c;
|
||||||
|
while ((c = *name++) != 0) {
|
||||||
|
*p++ = tolower(c);
|
||||||
|
if (!--len)
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
*p = 0;
|
||||||
|
node = node->parent;
|
||||||
|
if (!node || !node->name)
|
||||||
|
return buf;
|
||||||
|
*p++ = '.';
|
||||||
|
if (!--len)
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void process_node(xmlNode *node)
|
||||||
|
{
|
||||||
|
char *content;
|
||||||
|
static char buffer[256];
|
||||||
|
char *name;
|
||||||
|
|
||||||
|
content = (char *)node->content;
|
||||||
|
if (xmlIsBlankNode(node))
|
||||||
|
return;
|
||||||
|
name = nodename(node, buffer, sizeof(buffer));
|
||||||
|
entry(node, name, content);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xml_tree_walk(xmlNode *node);
|
||||||
|
|
||||||
|
static void traverse(xmlNode *n)
|
||||||
|
{
|
||||||
|
process_node(n);
|
||||||
|
is_attribute = true;
|
||||||
|
for (xmlAttr *attr = n->properties; attr; attr = attr->next)
|
||||||
|
xml_tree_walk(attr->children);
|
||||||
|
is_attribute = false;
|
||||||
|
xml_tree_walk(n->children);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void xml_tree_walk(xmlNode *node)
|
||||||
|
{
|
||||||
|
for (xmlNode *n = node; n && n->name; n = n->next) {
|
||||||
|
if (!strcasecmp((char *)n->name, "comment"))
|
||||||
|
continue;
|
||||||
|
if (!strcasecmp((char *)n->name, "keybind")) {
|
||||||
|
keybind_begin();
|
||||||
|
traverse(n);
|
||||||
|
keybind_end();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
traverse(n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void parse_xml(const char *filename)
|
||||||
|
{
|
||||||
|
xmlDoc *d = xmlReadFile(filename, NULL, 0);
|
||||||
|
if (!d) {
|
||||||
|
fprintf(stderr, "fatal: error reading file '%s'\n", filename);
|
||||||
|
exit(EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
printf("info: reading config file '%s'\n", filename);
|
||||||
|
xml_tree_walk(xmlDocGetRootElement(d));
|
||||||
|
xmlFreeDoc(d);
|
||||||
|
xmlCleanupParser();
|
||||||
|
}
|
||||||
|
|
||||||
|
void rcxml_init(struct rcxml *rc)
|
||||||
|
{
|
||||||
|
LIBXML_TEST_VERSION
|
||||||
|
}
|
||||||
|
|
||||||
|
void rcxml_read(const char *filename)
|
||||||
|
{
|
||||||
|
parse_xml(filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
void rcxml_set_verbose(void)
|
||||||
|
{
|
||||||
|
verbose = true;
|
||||||
|
}
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
#include "labwc.h"
|
#include "labwc.h"
|
||||||
|
#include "rcxml.h"
|
||||||
|
|
||||||
struct server server = { 0 };
|
struct server server = { 0 };
|
||||||
|
struct rcxml rc = { 0 };
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
@ -23,6 +25,10 @@ int main(int argc, char *argv[])
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rcxml_init(&rc);
|
||||||
|
rcxml_set_verbose();
|
||||||
|
rcxml_read("data/rc.xml");
|
||||||
|
|
||||||
/* Wayland requires XDG_RUNTIME_DIR to be set */
|
/* Wayland requires XDG_RUNTIME_DIR to be set */
|
||||||
if (!getenv("XDG_RUNTIME_DIR")) {
|
if (!getenv("XDG_RUNTIME_DIR")) {
|
||||||
wlr_log(WLR_ERROR, "XDG_RUNTIME_DIR is not set");
|
wlr_log(WLR_ERROR, "XDG_RUNTIME_DIR is not set");
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,5 @@ labwc_sources = files(
|
||||||
'xwl.c',
|
'xwl.c',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
subdir('config')
|
||||||
subdir('debug')
|
subdir('debug')
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#include "labwc.h"
|
#include "labwc.h"
|
||||||
|
#include "rcxml.h"
|
||||||
|
|
||||||
static float window_active_title_bg[] = { 0.29, 0.55, 0.78, 1.0 };
|
static float window_active_title_bg[] = { 0.29, 0.55, 0.78, 1.0 };
|
||||||
static float window_active_handle_bg[] = { 0.21, 0.49, 0.71, 1.0 };
|
static float window_active_handle_bg[] = { 0.21, 0.49, 0.71, 1.0 };
|
||||||
|
|
@ -23,7 +24,8 @@ static void render_cycle_box(struct output *output)
|
||||||
if (view != output->server->cycle_view)
|
if (view != output->server->cycle_view)
|
||||||
continue;
|
continue;
|
||||||
struct wlr_box box;
|
struct wlr_box box;
|
||||||
if ((view->type == LAB_XWAYLAND_VIEW) || LAB_DISABLE_CSD) {
|
if ((view->type == LAB_XWAYLAND_VIEW) ||
|
||||||
|
!rc.client_side_decorations) {
|
||||||
box = deco_max_extents(view);
|
box = deco_max_extents(view);
|
||||||
} else {
|
} else {
|
||||||
box = view_get_surface_geometry(view);
|
box = view_get_surface_geometry(view);
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#include "labwc.h"
|
#include "labwc.h"
|
||||||
|
#include "rcxml.h"
|
||||||
|
|
||||||
#include <wlr/types/wlr_export_dmabuf_v1.h>
|
#include <wlr/types/wlr_export_dmabuf_v1.h>
|
||||||
#include <wlr/types/wlr_screencopy_v1.h>
|
#include <wlr/types/wlr_screencopy_v1.h>
|
||||||
|
|
@ -222,7 +223,7 @@ void server_init(struct server *server)
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
wlr_server_decoration_manager_set_default_mode(
|
wlr_server_decoration_manager_set_default_mode(
|
||||||
deco_mgr, LAB_DISABLE_CSD ?
|
deco_mgr, !rc.client_side_decorations ?
|
||||||
WLR_SERVER_DECORATION_MANAGER_MODE_SERVER :
|
WLR_SERVER_DECORATION_MANAGER_MODE_SERVER :
|
||||||
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT);
|
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#include "labwc.h"
|
#include "labwc.h"
|
||||||
|
#include "rcxml.h"
|
||||||
|
|
||||||
static bool is_toplevel(struct view *view)
|
static bool is_toplevel(struct view *view)
|
||||||
{
|
{
|
||||||
|
|
@ -19,7 +20,7 @@ void view_init_position(struct view *view)
|
||||||
if (!is_toplevel(view))
|
if (!is_toplevel(view))
|
||||||
return;
|
return;
|
||||||
struct wlr_box box;
|
struct wlr_box box;
|
||||||
if (view->type == LAB_XDG_SHELL_VIEW && !LAB_DISABLE_CSD) {
|
if (view->type == LAB_XDG_SHELL_VIEW && rc.client_side_decorations) {
|
||||||
/* CSD */
|
/* CSD */
|
||||||
wlr_xdg_surface_get_geometry(view->xdg_surface, &box);
|
wlr_xdg_surface_get_geometry(view->xdg_surface, &box);
|
||||||
} else if (!view_want_deco(view)) {
|
} else if (!view_want_deco(view)) {
|
||||||
|
|
@ -88,7 +89,7 @@ bool view_want_deco(struct view *view)
|
||||||
{
|
{
|
||||||
if (!is_toplevel(view))
|
if (!is_toplevel(view))
|
||||||
return false;
|
return false;
|
||||||
if (view->type == LAB_XDG_SHELL_VIEW && !LAB_DISABLE_CSD)
|
if (view->type == LAB_XDG_SHELL_VIEW && rc.client_side_decorations)
|
||||||
return false;
|
return false;
|
||||||
if (view->type == LAB_XDG_SHELL_VIEW)
|
if (view->type == LAB_XDG_SHELL_VIEW)
|
||||||
return true;
|
return true;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
#include "labwc.h"
|
#include "labwc.h"
|
||||||
|
#include "rcxml.h"
|
||||||
|
|
||||||
struct xdg_deco {
|
struct xdg_deco {
|
||||||
struct wlr_xdg_toplevel_decoration_v1 *wlr_decoration;
|
struct wlr_xdg_toplevel_decoration_v1 *wlr_decoration;
|
||||||
|
|
@ -22,7 +23,7 @@ static void xdg_deco_request_mode(struct wl_listener *listener, void *data)
|
||||||
struct xdg_deco *xdg_deco;
|
struct xdg_deco *xdg_deco;
|
||||||
xdg_deco = wl_container_of(listener, xdg_deco, request_mode);
|
xdg_deco = wl_container_of(listener, xdg_deco, request_mode);
|
||||||
enum wlr_xdg_toplevel_decoration_v1_mode mode;
|
enum wlr_xdg_toplevel_decoration_v1_mode mode;
|
||||||
if (LAB_DISABLE_CSD)
|
if (!rc.client_side_decorations)
|
||||||
mode = WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
|
mode = WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
|
||||||
else
|
else
|
||||||
mode = WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
|
mode = WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue