Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workspaces can be clicked on to switch #4

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Workspaces can be clicked on to switch #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion config/config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,17 @@ local function render_workspaces(displayName)
wsbox(label{label=" " .. zen.u.html_escape(workspace.name) .. " "}, boxcolor),
wsbox(label{label=zen.u.html_escape(app_name)}, boxcolor),
},
tag = workspace.name
}
table.insert(workspaces, workspace)
end
return { type = "flex", direction = "column", padding = { left = 10, bottom = 10 }, items = workspaces }
end

local function click_workspace(tag)
os.execute("swaymsg workspace '" .. tag .. "'")
end

local function render_time()
local t = os.time()
local markup = os.date("<span font='digital-7' size='40pt' color='" .. BLACK .. "' rise='-3pt'>%H:%M</span><span size='15pt' color='" .. BLACK .. "'>\n%Y-%m-%d</span>")
Expand Down Expand Up @@ -192,7 +197,7 @@ return {
{
anchor = "left",
widgets = {
{ sources = {'displays'}, padding = {left = 10 }, on_render = render_workspaces },
{ sources = {'displays'}, padding = {left = 10 }, on_render = render_workspaces, on_click = click_workspace },
},
},
{
Expand Down
19 changes: 13 additions & 6 deletions src/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,16 @@ struct Border {

enum class Anchor { Left, Right, Top, Bottom };

struct Target {
Rect position;
std::string tag;
};

struct Renderable {
Renderable() : computed{} {}
virtual ~Renderable() {}
virtual void Compute(cairo_t*) {}
virtual void Draw(cairo_t*, int /*x*/, int /*y*/) const {}
virtual void Draw(cairo_t*, int /*x*/, int /*y*/, std::vector<Target>& /*targets*/) const {}
Size computed;
};

Expand All @@ -60,7 +65,7 @@ struct Markup : public Renderable {
if (m_layout) g_object_unref(m_layout);
}
void Compute(cairo_t* cr) override;
void Draw(cairo_t* cr, int x, int y) const override;
void Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const override;

private:
const std::string string;
Expand All @@ -71,37 +76,39 @@ struct MarkupBox : public Renderable {
MarkupBox(const std::string& string)
: Renderable(), markup(string), color({}), border({}), radius(0), padding({}) {}
void Compute(cairo_t* cr) override;
void Draw(cairo_t* cr, int x, int y) const override;
void Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const override;

Markup markup;
RGBA color;
Border border;
uint8_t radius;
Padding padding;
std::string tag;
};

struct FlexContainer : public Renderable {
FlexContainer() : Renderable(), isColumn(false), padding({}) {}
void Compute(cairo_t* cr) override;
void Draw(cairo_t* cr, int x, int y) const override;
void Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const override;

bool isColumn;
Padding padding;
std::vector<std::unique_ptr<Renderable>> children;
std::string tag;
};

struct WidgetConfig {
WidgetConfig() : padding({}) {}
std::function<std::unique_ptr<Renderable>(const std::string& outputName)> render;
std::function<void()> click;
std::function<void(std::string_view tag)> click;
std::set<std::string> sources;
Padding padding;
};

struct Widget {
Widget() : computed({}), m_renderable(nullptr), m_paddingX(0), m_paddingY(0) {}
void Compute(const WidgetConfig& config, const std::string& outputName, cairo_t* cr);
void Draw(cairo_t* cr, int x, int y) const;
void Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const;
Size computed;

private:
Expand Down
33 changes: 23 additions & 10 deletions src/Draw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void Markup::Compute(cairo_t* cr) {
LogComputed(computed, ("Markup " + string).c_str());
}

void Markup::Draw(cairo_t* cr, int x, int y) const {
void Markup::Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const {
LogDraw("Markup", x, y);
cairo_move_to(cr, x, y);
pango_cairo_show_layout(cr, m_layout);
Expand Down Expand Up @@ -54,7 +54,7 @@ void MarkupBox::Compute(cairo_t* cr) {
LogComputed(computed, "MarkupBox ");
}

void MarkupBox::Draw(cairo_t* cr, int x, int y) const {
void MarkupBox::Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const {
LogDraw("MarkupBox", x, y);
BeginRectangleSubPath(cr, x + border.width, y + border.width, computed.cx - (2 * border.width),
computed.cy - (2 * border.width), radius);
Expand All @@ -78,7 +78,11 @@ void MarkupBox::Draw(cairo_t* cr, int x, int y) const {
cairo_set_source_rgba(cr, color.r, color.g, color.b, color.a);
cairo_fill(cr);
// Inner
markup.Draw(cr, x + padding.left + border.width, y + padding.top + border.width);
markup.Draw(cr, x + padding.left + border.width, y + padding.top + border.width, targets);
if (tag != "") {
targets.push_back(Target{
.position = Rect{.x = x, .y = y, .cx = computed.cx, .cy = computed.cy}, .tag = tag});
}
}

void FlexContainer::Compute(cairo_t* cr) {
Expand All @@ -97,23 +101,30 @@ void FlexContainer::Compute(cairo_t* cr) {
LogComputed(computed, "FlexContainer");
}

void FlexContainer::Draw(cairo_t* cr, int x, int y) const {
void FlexContainer::Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const {
LogDraw("FlexBox", x, y);
const int startx = x;
const int starty = y;
if (isColumn) {
for (const auto& r : children) {
y += padding.top;
r->Draw(cr, x + padding.left, y);
r->Draw(cr, x + padding.left, y, targets);
y += r->computed.cy + padding.bottom;
}
} else {
y += padding.top;
for (const auto& r : children) {
x += padding.left;
r->Draw(cr, x, y);
r->Draw(cr, x, y, targets);
x += r->computed.cx + padding.right;
}
y += padding.bottom;
}
if (tag != "") {
targets.push_back(
Target{.position = Rect{.x = startx, .y = starty, .cx = computed.cx, .cy = computed.cy},
.tag = tag});
}
}

void Widget::Compute(const WidgetConfig& config, const std::string& outputName, cairo_t* cr) {
Expand All @@ -134,13 +145,13 @@ void Widget::Compute(const WidgetConfig& config, const std::string& outputName,
m_renderable = std::move(item);
}

void Widget::Draw(cairo_t* cr, int x, int y) const {
void Widget::Draw(cairo_t* cr, int x, int y, std::vector<Target>& targets) const {
if (!m_renderable) {
// Lua render failed previously
return;
}
cairo_save(cr);
m_renderable->Draw(cr, x + m_paddingX, y + m_paddingY);
m_renderable->Draw(cr, x + m_paddingX, y + m_paddingY, targets);
cairo_restore(cr);
}

Expand Down Expand Up @@ -171,6 +182,7 @@ bool Draw::Panel(const PanelConfig& panelConfig, const std::string& outputName,
cx += widget.computed.cx;
cy += widget.computed.cy;
}
std::vector<Target> targets;
Align align;
int xfac = 0, yfac = 0;
if (panelConfig.isColumn) {
Expand Down Expand Up @@ -225,9 +237,10 @@ bool Draw::Panel(const PanelConfig& panelConfig, const std::string& outputName,
y = (maxCy - widget.computed.cy) / 2;
break;
}
widget.Draw(cr, x, y);
widget.Draw(cr, x, y, targets);
drawn.widgets.push_back(
DrawnWidget{.position = {x, y, widget.computed.cx, widget.computed.cy}});
DrawnWidget{.position = {x, y, widget.computed.cx, widget.computed.cy},
.targets = std::move(targets)});
x += widget.computed.cx * xfac;
y += widget.computed.cy * yfac;
}
Expand Down
1 change: 1 addition & 0 deletions src/Draw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

struct DrawnWidget {
Rect position;
std::vector<Target> targets;
};

struct DrawnPanel {
Expand Down
12 changes: 11 additions & 1 deletion src/ScriptContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ Padding PaddingFromProperty(const sol::table& t, const char* name) {
return o ? PaddingFromTable(*o) : Padding{};
}

std::string TagFromTable(const sol::table& t) {
const sol::optional<std::string> optionalTag = t["tag"];
return optionalTag ? *optionalTag : "";
}

static std::unique_ptr<MarkupBox> MarkupBoxFromTable(const sol::table& t) {
const sol::optional<std::string> optionalMarkup = t["markup"];
const std::string markup = optionalMarkup ? *optionalMarkup : "";
Expand All @@ -44,6 +49,7 @@ static std::unique_ptr<MarkupBox> MarkupBoxFromTable(const sol::table& t) {
box->border = BorderFromProperty(t, "border");
box->color = RGBAFromProperty(t, "color");
box->padding = PaddingFromProperty(t, "padding");
box->tag = TagFromTable(t);
return box;
}

Expand Down Expand Up @@ -71,6 +77,7 @@ static std::unique_ptr<Renderable> FlexContainerFromTable(const sol::table& t) {
if (children) {
FromChildTable(*children, f.children);
}
f.tag = TagFromTable(t);
return std::unique_ptr<Renderable>(new FlexContainer(std::move(f)));
}

Expand Down Expand Up @@ -128,7 +135,10 @@ static void ParseWidgetConfig(const sol::table& table, std::vector<WidgetConfig>
sol::optional<sol::protected_function> maybeClickFunction = table["on_click"];
if (maybeClickFunction) {
auto clickFunction = *maybeClickFunction;
widget.click = [clickFunction]() { clickFunction(); };
widget.click = [clickFunction](std::string_view tag) {
clickFunction(tag);
return true;
};
}
widget.padding = PaddingFromProperty(table, "padding");
widgets.push_back(std::move(widget));
Expand Down
15 changes: 12 additions & 3 deletions src/ShellSurface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,21 @@ bool ShellSurface::ClickSurface(wl_surface *surface, int x, int y) {
}
// Check what widget
int i = 0;
for (const auto w : m_drawn.widgets) {
for (const auto &w : m_drawn.widgets) {
if (w.position.Contains(x, y)) {
spdlog::trace("Found widget click target");
auto &widget = m_panelConfig.widgets.at(i);
if (widget.click) {
widget.click();
// Widget has a click handler. There might be inner more
// specific targets, find the tag of the correct one.
std::string tag = "";
for (const auto &t : w.targets) {
if (t.position.Contains(x, y)) {
tag = t.tag;
break;
}
}
spdlog::debug("Click in widget, tag: {}", tag);
widget.click(tag);
}
break;
}
Expand Down