mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

menu/theme: use wlr_texture_destroy()

Browse source
This commit is contained in:
Johan Malm 2021-07-01 19:21:09 +01:00
parent a7dfa965d1
commit 6ad8252de9
3 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/menu/menu.c
View file

@ -15,6 +15,7 @@
#include "common/font.h" #include "common/font.h"
#include "common/nodename.h" #include "common/nodename.h"
#include "common/string-helpers.h" #include "common/string-helpers.h"
#include "common/zfree.h"
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "theme.h" #include "theme.h"
@ -29,10 +30,15 @@ static struct menuitem *current_item;
#define MENUHEIGHT (25) #define MENUHEIGHT (25)
#define MENU_PADDING_WIDTH (7) #define MENU_PADDING_WIDTH (7)
struct wlr_texture * static void
texture_create(struct server *server, struct wlr_box *geo, const char *text, texture_create(struct server *server, struct wlr_texture **texture,
float *bg, float *fg) struct wlr_box *geo, const char *text, float *bg, float *fg)
{ {
if (*texture) {
wlr_texture_destroy(*texture);
*texture = NULL;
}
cairo_surface_t *surf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, cairo_surface_t *surf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
geo->width, geo->height); geo->width, geo->height);
cairo_t *cairo = cairo_create(surf); cairo_t *cairo = cairo_create(surf);
@ -61,16 +67,15 @@ texture_create(struct server *server, struct wlr_box *geo, const char *text,
cairo_surface_flush(surf); cairo_surface_flush(surf);
unsigned char *data = cairo_image_surface_get_data(surf); unsigned char *data = cairo_image_surface_get_data(surf);
struct wlr_texture *texture = wlr_texture_from_pixels(server->renderer, *texture = wlr_texture_from_pixels(server->renderer, DRM_FORMAT_ARGB8888,
DRM_FORMAT_ARGB8888, cairo_image_surface_get_stride(surf), cairo_image_surface_get_stride(surf), geo->width,
geo->width, geo->height, data); geo->height, data);
cairo_destroy(cairo); cairo_destroy(cairo);
cairo_surface_destroy(surf); cairo_surface_destroy(surf);
return texture;
} }
struct menuitem * static struct menuitem *
menuitem_create(struct server *server, struct menu *menu, const char *text) menuitem_create(struct server *server, struct menu *menu, const char *text)
{ {
struct menuitem *menuitem = calloc(1, sizeof(struct menuitem)); struct menuitem *menuitem = calloc(1, sizeof(struct menuitem));
@ -80,10 +85,10 @@ menuitem_create(struct server *server, struct menu *menu, const char *text)
struct theme *theme = server->theme; struct theme *theme = server->theme;
menuitem->geo_box.width = MENUWIDTH; menuitem->geo_box.width = MENUWIDTH;
menuitem->geo_box.height = MENUHEIGHT; menuitem->geo_box.height = MENUHEIGHT;
menuitem->active_texture = texture_create(server, &menuitem->geo_box, texture_create(server, &menuitem->active_texture, &menuitem->geo_box,
text, theme->menu_items_active_bg_color, text, theme->menu_items_active_bg_color,
theme->menu_items_active_text_color); theme->menu_items_active_text_color);
menuitem->inactive_texture = texture_create(server, &menuitem->geo_box, texture_create(server, &menuitem->inactive_texture, &menuitem->geo_box,
text, theme->menu_items_bg_color, theme->menu_items_text_color); text, theme->menu_items_bg_color, theme->menu_items_text_color);
wl_list_insert(&menu->menuitems, &menuitem->link); wl_list_insert(&menu->menuitems, &menuitem->link);
return menuitem; return menuitem;
@ -254,14 +259,8 @@ menu_finish(struct menu *menu)
{ {
struct menuitem *menuitem, *next; struct menuitem *menuitem, *next;
wl_list_for_each_safe(menuitem, next, &menu->menuitems, link) { wl_list_for_each_safe(menuitem, next, &menu->menuitems, link) {
if (menuitem->action) zfree(menuitem->action);
free(menuitem->action); zfree(menuitem->command);
if (menuitem->command)
free(menuitem->command);
if (menuitem->active_texture)
free(menuitem->active_texture);
if (menuitem->inactive_texture)
free(menuitem->inactive_texture);
wl_list_remove(&menuitem->link); wl_list_remove(&menuitem->link);
free(menuitem); free(menuitem);
} }

7
src/theme.c
View file

@ -223,10 +223,5 @@ theme_init(struct theme *theme, struct wlr_renderer *renderer,
void void
theme_finish(struct theme *theme) theme_finish(struct theme *theme)
{ {
zfree(theme->xbm_close_active_unpressed); ; /* nothing to free */
zfree(theme->xbm_maximize_active_unpressed);
zfree(theme->xbm_iconify_active_unpressed);
zfree(theme->xbm_close_inactive_unpressed);
zfree(theme->xbm_maximize_inactive_unpressed);
zfree(theme->xbm_iconify_inactive_unpressed);
} }

5
src/xbm/xbm.c
View file

@ -56,6 +56,11 @@ static void
load_button(struct wlr_renderer *renderer, const char *filename, load_button(struct wlr_renderer *renderer, const char *filename,
struct wlr_texture **texture, char *button) struct wlr_texture **texture, char *button)
{ {
if (*texture) {
wlr_texture_destroy(*texture);
*texture = NULL;
}
/* Read file into memory as it's easier to tokenzie that way */ /* Read file into memory as it's easier to tokenzie that way */
char *buffer = grab_file(xbm_path(filename)); char *buffer = grab_file(xbm_path(filename));
if (!buffer) { if (!buffer) {