kiwmi:bg_color()

This commit is contained in:
tiosgz 2021-08-13 08:36:00 +00:00
parent 401864f990
commit feca54a974
9 changed files with 96 additions and 32 deletions

15
include/color.h Normal file
View file

@ -0,0 +1,15 @@
/* Copyright (c), Charlotte Meyer <dev@buffet.sh>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#ifndef KIWMI_COLOR_H
#define KIWMI_COLOR_H
#include <stdbool.h>
bool color_parse(const char *hex, float color[static 4]);
#endif /* KIWMI_COLOR_H */

View file

@ -21,6 +21,8 @@ struct kiwmi_desktop {
struct wl_list outputs; // struct kiwmi_output::link struct wl_list outputs; // struct kiwmi_output::link
struct wl_list views; // struct kiwmi_view::link struct wl_list views; // struct kiwmi_view::link
float bg_color[4];
struct wl_listener xdg_shell_new_surface; struct wl_listener xdg_shell_new_surface;
struct wl_listener xdg_toplevel_new_decoration; struct wl_listener xdg_toplevel_new_decoration;
struct wl_listener layer_shell_new_surface; struct wl_listener layer_shell_new_surface;

42
kiwmi/color.c Normal file
View file

@ -0,0 +1,42 @@
/* Copyright (c), Charlotte Meyer <dev@buffet.sh>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include "color.h"
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
bool
color_parse(const char *hex, float color[static 4])
{
if (hex[0] == '#') {
++hex;
}
int len = strlen(hex);
if (len != 6 && len != 8) {
return false;
}
uint32_t rgba = (uint32_t)strtoul(hex, NULL, 16);
if (len == 6) {
rgba = (rgba << 8) | 0xff;
}
for (size_t i = 0; i < 4; ++i) {
color[3 - i] = (rgba & 0xff) / 255.0;
rgba >>= 8;
}
// premultiply alpha
color[0] *= color[3];
color[1] *= color[3];
color[2] *= color[3];
return true;
}

View file

@ -43,6 +43,11 @@ desktop_init(struct kiwmi_desktop *desktop, struct wlr_renderer *renderer)
wlr_xdg_output_manager_v1_create( wlr_xdg_output_manager_v1_create(
server->wl_display, desktop->output_layout); server->wl_display, desktop->output_layout);
desktop->bg_color[0] = 0.1f;
desktop->bg_color[1] = 0.1f;
desktop->bg_color[2] = 0.1f;
desktop->bg_color[3] = 1.0f;
desktop->xdg_shell = wlr_xdg_shell_create(server->wl_display); desktop->xdg_shell = wlr_xdg_shell_create(server->wl_display);
desktop->xdg_shell_new_surface.notify = xdg_shell_new_surface_notify; desktop->xdg_shell_new_surface.notify = xdg_shell_new_surface_notify;
wl_signal_add( wl_signal_add(

View file

@ -128,7 +128,7 @@ output_frame_notify(struct wl_listener *listener, void *data)
wlr_output_effective_resolution(wlr_output, &width, &height); wlr_output_effective_resolution(wlr_output, &width, &height);
wlr_renderer_begin(renderer, width, height); wlr_renderer_begin(renderer, width, height);
wlr_renderer_clear(renderer, (float[]){0.1f, 0.1f, 0.1f, 1.0f}); wlr_renderer_clear(renderer, desktop->bg_color);
double output_lx = 0; double output_lx = 0;
double output_ly = 0; double output_ly = 0;

View file

@ -15,6 +15,7 @@
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "color.h"
#include "desktop/output.h" #include "desktop/output.h"
#include "luak/lua_compat.h" #include "luak/lua_compat.h"
#include "luak/luak.h" #include "luak/luak.h"
@ -24,36 +25,6 @@ struct kiwmi_renderer {
struct kiwmi_output *output; struct kiwmi_output *output;
}; };
static bool
parse_color(const char *hex, float color[static 4])
{
if (hex[0] == '#') {
++hex;
}
int len = strlen(hex);
if (len != 6 && len != 8) {
return false;
}
uint32_t rgba = (uint32_t)strtoul(hex, NULL, 16);
if (len == 6) {
rgba = (rgba << 8) | 0xff;
}
for (size_t i = 0; i < 4; ++i) {
color[3 - i] = (rgba & 0xff) / 255.0;
rgba >>= 8;
}
// premultiply alpha
color[0] *= color[3];
color[1] *= color[3];
color[2] *= color[3];
return true;
}
static int static int
l_kiwmi_renderer_draw_rect(lua_State *L) l_kiwmi_renderer_draw_rect(lua_State *L)
{ {
@ -70,7 +41,7 @@ l_kiwmi_renderer_draw_rect(lua_State *L)
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
float color[4]; float color[4];
if (!parse_color(lua_tostring(L, 2), color)) { if (!color_parse(lua_tostring(L, 2), color)) {
return luaL_argerror(L, 2, "not a valid color"); return luaL_argerror(L, 2, "not a valid color");
} }

View file

@ -17,6 +17,7 @@
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "color.h"
#include "desktop/view.h" #include "desktop/view.h"
#include "input/cursor.h" #include "input/cursor.h"
#include "input/input.h" #include "input/input.h"
@ -50,6 +51,28 @@ l_kiwmi_server_active_output(lua_State *L)
return 1; return 1;
} }
static int
l_kiwmi_server_bg_color(lua_State *L)
{
struct kiwmi_object *obj =
*(struct kiwmi_object **)luaL_checkudata(L, 1, "kiwmi_server");
luaL_checktype(L, 2, LUA_TSTRING);
struct kiwmi_server *server = obj->object;
float color[4];
if (!color_parse(lua_tostring(L, 2), color)) {
return luaL_argerror(L, 2, "not a valid color");
}
server->desktop.bg_color[0] = color[0];
server->desktop.bg_color[1] = color[1];
server->desktop.bg_color[2] = color[2];
// ignore alpha
return 0;
}
static int static int
l_kiwmi_server_cursor(lua_State *L) l_kiwmi_server_cursor(lua_State *L)
{ {
@ -278,6 +301,7 @@ l_kiwmi_server_view_at(lua_State *L)
static const luaL_Reg kiwmi_server_methods[] = { static const luaL_Reg kiwmi_server_methods[] = {
{"active_output", l_kiwmi_server_active_output}, {"active_output", l_kiwmi_server_active_output},
{"bg_color", l_kiwmi_server_bg_color},
{"cursor", l_kiwmi_server_cursor}, {"cursor", l_kiwmi_server_cursor},
{"focused_view", l_kiwmi_server_focused_view}, {"focused_view", l_kiwmi_server_focused_view},
{"on", luaK_callback_register_dispatch}, {"on", luaK_callback_register_dispatch},

View file

@ -1,6 +1,7 @@
kiwmi_sources = files( kiwmi_sources = files(
'main.c', 'main.c',
'server.c', 'server.c',
'color.c',
'desktop/desktop.c', 'desktop/desktop.c',
'desktop/layer_shell.c', 'desktop/layer_shell.c',
'desktop/output.c', 'desktop/output.c',

View file

@ -45,6 +45,10 @@ Used to register event listeners.
Quit kiwmi. Quit kiwmi.
#### kiwmi:bg_color(color)
Sets the background color (shown behind all views) to `color` (in the format #rrggbb).
#### kiwmi:schedule(delay, callback) #### kiwmi:schedule(delay, callback)
Call `callback` after `delay` ms. Call `callback` after `delay` ms.