Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2024-11-22 19:33:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix segv after storing window id

Browse source
This commit is contained in:
FelixKratz 2021-09-19 23:17:10 +02:00
parent e6c758b87d
commit 08d6227c19
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
makefile
View file

@ -1,6 +1,6 @@
FRAMEWORK_PATH = -F/System/Library/PrivateFrameworks
FRAMEWORK = -framework Carbon -framework Cocoa -framework SkyLight
BUILD_FLAGS = -std=c99 -Wall -DNDEBUG -O0 -fvisibility=hidden -mmacosx-version-min=10.13
BUILD_FLAGS = -std=c99 -Wall -DNDEBUG -Ofast -fvisibility=hidden -mmacosx-version-min=10.13
BUILD_PATH = ./bin
SKETCHYBAR_SRC = ./src/manifest.m
BINS = $(BUILD_PATH)/sketchybar

24
src/alias.c
View file

@ -22,13 +22,18 @@ void alias_find_window(struct alias* alias) {
for (int i = 0; i < window_count; ++i) {
CFDictionaryRef dictionary = CFArrayGetValueAtIndex(window_list, i);
if (!dictionary) continue;
CFStringRef owner_ref = CFDictionaryGetValue(dictionary, kCGWindowOwnerName);
CFStringRef name_ref = CFDictionaryGetValue(dictionary, kCGWindowName);
if (!name_ref) continue;
if (!owner_ref) continue;
char* owner = cfstring_copy(owner_ref);
if (!owner) continue;
if (strcmp(alias->name, owner) != 0) { free(owner); continue; }
free(owner);
CFNumberRef layer_ref = CFDictionaryGetValue(dictionary, kCGWindowLayer);
printf("Moind \n");
if (!layer_ref) continue;
uint64_t layer = 0;
@ -37,14 +42,8 @@ void alias_find_window(struct alias* alias) {
CFNumberRef window_id_ref = CFDictionaryGetValue(dictionary, kCGWindowNumber);
if (!window_id_ref) continue;
CGWindowID window_id = 0;
CFNumberGetValue(window_id_ref, CFNumberGetType(window_id_ref), &window_id);
char* owner = cfstring_copy(owner_ref);
CFNumberGetValue(window_id_ref, CFNumberGetType(window_id_ref), &alias->wid);
if (strcmp(alias->name, owner) != 0) { free(owner); continue; }
alias->wid = window_id;
free(owner);
CFRelease(window_list);
return;
}
@ -54,8 +53,11 @@ void alias_find_window(struct alias* alias) {
bool alias_update_image(struct alias* alias) {
if (alias->wid == 0) alias_find_window(alias);
if (alias->wid == 0) { alias->image_ref = NULL; return false; }
if (alias->image_ref) CFRelease(alias->image_ref);
if (alias->wid == 0) {
alias->image_ref = NULL;
return false;
}
CGImageRelease(alias->image_ref);
alias->image_ref = CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow,
alias->wid, kCGWindowImageBestResolution);
if (!alias->image_ref) {