fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-06 13:14:21 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

resolution options

Browse Source
This commit is contained in:
Linus Dierheimer
2021-03-11 22:15:48 +01:00
parent c988777c79
commit b9c7324aa5
6 changed files with 97 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/packages.c
+2 -2
View File
@@ -25,8 +25,8 @@ static uint32_t get_num_dirs(const char* dirname) {
void ffPrintPackages(FFinstance* instance)
{
uint32_t pacman = instance->config.packagesPacman ? get_num_dirs("/var/lib/pacman/local") : 0;
uint32_t flatpak = instance->config.packagesFlatpak ? get_num_dirs("/var/lib/flatpak/app") : 0;
uint32_t pacman = instance->config.packagesShowPacman ? get_num_dirs("/var/lib/pacman/local") : 0;
uint32_t flatpak = instance->config.packagesShowFlatpak ? get_num_dirs("/var/lib/flatpak/app") : 0;
uint32_t all = pacman + flatpak;
src/modules/resolution.c
+15 -5
View File
@@ -3,9 +3,13 @@
#include "X11/extensions/Xrandr.h"
#include "dlfcn.h"
static short getCurrentRate(Display* display)
static short getCurrentRate(FFinstance* instance, Display* display)
{
void* xrandr = dlopen("libXrandr.so", RTLD_LAZY);
void* xrandr;
if(instance->config.resolutionLibXrandr[0] != '\0')
xrandr = dlopen(instance->config.resolutionLibXrandr, RTLD_LAZY);
else
xrandr = dlopen("libXrandr.so", RTLD_LAZY);
if(xrandr == NULL)
return 0;
@@ -39,7 +43,11 @@ void ffPrintResolution(FFinstance* instance)
if(ffPrintCachedValue(instance, "Resolution"))
return;
void* x11 = dlopen("libX11.so", RTLD_LAZY);
void* x11;
if(instance->config.resolutionLibX11[0] != '\0')
x11 = dlopen(instance->config.resolutionLibX11, RTLD_LAZY);
else
x11 = dlopen("libX11.so", RTLD_LAZY);
if(x11 == NULL)
{
ffPrintError(instance, "Resolution", "dlopen(\"libX11.so\", RTLD_LAZY) == NULL");
@@ -62,13 +70,15 @@ void ffPrintResolution(FFinstance* instance)
Screen* screen = DefaultScreenOfDisplay(display);
short currentRate = getCurrentRate(display);
short currentRate = instance->config.resolutionShowRefreshRate ? getCurrentRate(instance, display) : 0;
dlclose(x11);
char resolution[1024];
if(currentRate == 0)
if(instance->config.resolutionFormat[0] != '\0')
sprintf(resolution, instance->config.resolutionFormat, screen->width, screen->height, currentRate);
else if(currentRate == 0)
sprintf(resolution, "%ix%i", screen->width, screen->height);
else
sprintf(resolution, "%ix%i @ %dHz", screen->width, screen->height, currentRate);