iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

fix mode info memory leak.

Browse Source
This commit is contained in:
Miroslav Šedivý 2024-02-20 18:15:22 +01:00
parent ce3830f6a0
commit 5a16143cfe
2 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/xorg/xorg.c
View File

@ -306,40 +306,28 @@ void XCreateScreenMode(int width, int height, short rate) {
Display *display = getXDisplay(); Display *display = getXDisplay();
Window root = DefaultRootWindow(display); Window root = DefaultRootWindow(display);
char name[128]; // create new mode info
XRRModeInfo mode; XRRModeInfo *mode_info = XCreateScreenModeInfo(width, height, rate);
mode = XCreateScreenModeInfo(width, height, rate);
snprintf(name, sizeof name, "%dx%d_%d", width, height, rate);
mode.nameLength = strlen(name);
mode.name = name;
// create new mode // create new mode
XRRCreateMode(display, root, &mode); RRMode mode = XRRCreateMode(display, root, mode_info);
XSync(display, 0); XSync(display, 0);
// find newly created mode in resources
RRMode mode_id;
XRRScreenResources *resources = XRRGetScreenResources(display, root);
for (int i = 0; i < resources->nmode; ++i) {
if (strcmp(resources->modes[i].name, mode.name) == 0) {
mode_id = resources->modes[i].id;
break;
}
}
// add new mode to all outputs // add new mode to all outputs
XRRScreenResources *resources = XRRGetScreenResources(display, root);
for (int i = 0; i < resources->noutput; ++i) { for (int i = 0; i < resources->noutput; ++i) {
XRRAddOutputMode(display, resources->outputs[i], mode_id); XRRAddOutputMode(display, resources->outputs[i], mode);
} }
XRRFreeScreenResources(resources); XRRFreeScreenResources(resources);
XRRFreeModeInfo(mode_info);
} }
// Inspired by https://fossies.org/linux/xwayland/hw/xwayland/xwayland-cvt.c // Inspired by https://fossies.org/linux/xwayland/hw/xwayland/xwayland-cvt.c
XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) { XRRModeInfo *XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) {
XRRModeInfo modeinfo; char name[128];
memset(&modeinfo, 0, sizeof modeinfo); snprintf(name, sizeof name, "%dx%d_%d", hdisplay, vdisplay, vrefresh);
XRRModeInfo *modeinfo = XRRAllocModeInfo(name, strlen(name));
#ifdef _LIBCVT_H_ #ifdef _LIBCVT_H_
struct libxcvt_mode_info *mode_info; struct libxcvt_mode_info *mode_info;
@ -347,22 +335,22 @@ XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh) {
// get screen mode from libxcvt, if available // get screen mode from libxcvt, if available
mode_info = libxcvt_gen_mode_info(hdisplay, vdisplay, vrefresh, false, false); mode_info = libxcvt_gen_mode_info(hdisplay, vdisplay, vrefresh, false, false);
modeinfo.width = mode_info->hdisplay; modeinfo->width = mode_info->hdisplay;
modeinfo.height = mode_info->vdisplay; modeinfo->height = mode_info->vdisplay;
modeinfo.dotClock = mode_info->dot_clock * 1000; modeinfo->dotClock = mode_info->dot_clock * 1000;
modeinfo.hSyncStart = mode_info->hsync_start; modeinfo->hSyncStart = mode_info->hsync_start;
modeinfo.hSyncEnd = mode_info->hsync_end; modeinfo->hSyncEnd = mode_info->hsync_end;
modeinfo.hTotal = mode_info->htotal; modeinfo->hTotal = mode_info->htotal;
modeinfo.vSyncStart = mode_info->vsync_start; modeinfo->vSyncStart = mode_info->vsync_start;
modeinfo.vSyncEnd = mode_info->vsync_end; modeinfo->vSyncEnd = mode_info->vsync_end;
modeinfo.vTotal = mode_info->vtotal; modeinfo->vTotal = mode_info->vtotal;
modeinfo.modeFlags = mode_info->mode_flags; modeinfo->modeFlags = mode_info->mode_flags;
free(mode_info); free(mode_info);
#else #else
// fallback to a simple mode without refresh rate // fallback to a simple mode without refresh rate
modeinfo.width = hdisplay; modeinfo->width = hdisplay;
modeinfo.height = vdisplay; modeinfo->height = vdisplay;
#endif #endif
return modeinfo; return modeinfo;

2
pkg/xorg/xorg.h
View File

@ -40,7 +40,7 @@ Status XSetScreenConfiguration(int width, int height, short rate);
void XGetScreenConfiguration(int *width, int *height, short *rate); void XGetScreenConfiguration(int *width, int *height, short *rate);
void XGetScreenConfigurations(); void XGetScreenConfigurations();
void XCreateScreenMode(int width, int height, short rate); void XCreateScreenMode(int width, int height, short rate);
XRRModeInfo XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh); XRRModeInfo *XCreateScreenModeInfo(int hdisplay, int vdisplay, short vrefresh);
void XSetKeyboardModifier(unsigned char mod, int on); void XSetKeyboardModifier(unsigned char mod, int on);
unsigned char XGetKeyboardModifiers(); unsigned char XGetKeyboardModifiers();