Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2025-02-16 20:48:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

scripting working

Browse source
This commit is contained in:
FelixKratz 2021-08-10 01:10:31 +02:00
parent a6a5846f48
commit 8e37e190ab
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bar.c
View file

@ -310,8 +310,8 @@ struct bar *bar_create(uint32_t did)
SLSSetWindowLevel(g_connection, bar->id, CGWindowLevelForKey(4)); SLSSetWindowLevel(g_connection, bar->id, CGWindowLevelForKey(4));
bar->context = SLWindowContextCreate(g_connection, bar->id, 0); bar->context = SLWindowContextCreate(g_connection, bar->id, 0);
int refresh_frequency = 5; int refresh_frequency = 1;
int shell_refresh_frequency = 5; int shell_refresh_frequency = 1;
bar->power_source = IOPSNotificationCreateRunLoopSource(power_handler, NULL); bar->power_source = IOPSNotificationCreateRunLoopSource(power_handler, NULL);
bar->refresh_timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent() + refresh_frequency, refresh_frequency, 0, 0, timer_handler, NULL); bar->refresh_timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent() + refresh_frequency, refresh_frequency, 0, 0, timer_handler, NULL);
bar->shell_refresh_timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent() + shell_refresh_frequency, shell_refresh_frequency, 0, 0, shell_timer_handler, NULL); bar->shell_refresh_timer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent() + shell_refresh_frequency, shell_refresh_frequency, 0, 0, shell_timer_handler, NULL);

14
src/bar_item.c
View file

@ -10,7 +10,7 @@ void bar_item_init(struct bar_item* bar_item) {
bar_item->counter = 0; bar_item->counter = 0;
bar_item->name = ""; bar_item->name = "";
bar_item->type = BAR_ITEM; bar_item->type = BAR_ITEM;
bar_item->update_frequency = 5; bar_item->update_frequency = 10;
bar_item->script = ""; bar_item->script = "";
bar_item->position = BAR_POSITION_RIGHT; bar_item->position = BAR_POSITION_RIGHT;
bar_item->associated_display = 0; bar_item->associated_display = 0;
@ -29,16 +29,13 @@ void bar_item_init(struct bar_item* bar_item) {
bar_item->label_color = rgba_color_from_hex(0xffffffff); bar_item->label_color = rgba_color_from_hex(0xffffffff);
} }
void bar_item_script_update(struct bar_item* bar_item) { void bar_item_script_update(struct bar_item* bar_item, bool forced) {
if (strcmp(bar_item->script, "") != 0) { if (strcmp(bar_item->script, "") != 0) {
if (bar_item->update_frequency <= bar_item->counter) { bar_item->counter++;
if (bar_item->update_frequency < bar_item->counter || forced) {
bar_item->counter = 0; bar_item->counter = 0;
fork_exec(bar_item->script, NULL);
} }
else {
bar_item->counter++;
return;
}
fork_exec(bar_item->script, NULL);
} }
} }
@ -48,7 +45,6 @@ void bar_item_update_component(struct bar_item* bar_item, uint32_t did, uint32_t
bar_item_set_label(bar_item, focused_window_title()); bar_item_set_label(bar_item, focused_window_title());
} }
else if (strcmp(bar_item->identifier, "space") == 0) { else if (strcmp(bar_item->identifier, "space") == 0) {
printf("sid: %i did: %i \n", sid, did);
if (sid == bar_item->associated_space && did == bar_item->associated_display) { if (sid == bar_item->associated_space && did == bar_item->associated_display) {
bar_item->icon_color = g_bar_manager.space_icon_color; bar_item->icon_color = g_bar_manager.space_icon_color;
bar_item_set_icon(bar_item, bar_item->icon); bar_item_set_icon(bar_item, bar_item->icon);

2
src/bar_item.h
View file

@ -55,7 +55,7 @@ struct bar_item {
}; };
struct bar_item* bar_item_create(); struct bar_item* bar_item_create();
void bar_item_script_update(struct bar_item* bar_item); void bar_item_script_update(struct bar_item* bar_item, bool forced);
void bar_item_update_component(struct bar_item* bar_item, uint32_t did, uint32_t sid); void bar_item_update_component(struct bar_item* bar_item, uint32_t did, uint32_t sid);
void bar_item_init(struct bar_item* bar_item); void bar_item_init(struct bar_item* bar_item);
void bar_item_set_name(struct bar_item* bar_item, char* name); void bar_item_set_name(struct bar_item* bar_item, char* name);

4
src/bar_manager.c
View file

@ -121,9 +121,9 @@ void bar_manager_update_components(struct bar_manager* bar_manager, uint32_t did
} }
} }
void bar_manager_script_update(struct bar_manager* bar_manager) { void bar_manager_script_update(struct bar_manager* bar_manager, bool forced) {
for (int i = 0; i < bar_manager->bar_item_count; i++) { for (int i = 0; i < bar_manager->bar_item_count; i++) {
bar_item_script_update(bar_manager->bar_items[i]); bar_item_script_update(bar_manager->bar_items[i], forced);
} }
} }

2
src/bar_manager.h
View file

@ -23,7 +23,7 @@ struct bar_manager
int bar_manager_get_item_index_for_name(struct bar_manager* bar_manager, char* name); int bar_manager_get_item_index_for_name(struct bar_manager* bar_manager, char* name);
struct bar_item* bar_manager_create_item(struct bar_manager* bar_manager); struct bar_item* bar_manager_create_item(struct bar_manager* bar_manager);
void bar_manager_script_update(struct bar_manager* bar_manager); void bar_manager_script_update(struct bar_manager* bar_manager, bool forced);
void bar_manager_update_components(struct bar_manager* bar_manager, uint32_t did, uint32_t sid); void bar_manager_update_components(struct bar_manager* bar_manager, uint32_t did, uint32_t sid);
void bar_manager_set_foreground_color(struct bar_manager *bar_manager, uint32_t color); void bar_manager_set_foreground_color(struct bar_manager *bar_manager, uint32_t color);
void bar_manager_set_background_color(struct bar_manager *bar_manager, uint32_t color); void bar_manager_set_background_color(struct bar_manager *bar_manager, uint32_t color);

2
src/event.c
View file

@ -213,7 +213,7 @@ static EVENT_CALLBACK(EVENT_HANDLER_BAR_REFRESH)
static EVENT_CALLBACK(EVENT_HANDLER_SHELL_REFRESH) static EVENT_CALLBACK(EVENT_HANDLER_SHELL_REFRESH)
{ {
bar_manager_script_update(&g_bar_manager); bar_manager_script_update(&g_bar_manager, false);
return EVENT_SUCCESS; return EVENT_SUCCESS;
} }

4
src/message.c
View file

@ -22,6 +22,8 @@ extern bool g_verbose;
#define DOMAIN_SET "set" #define DOMAIN_SET "set"
#define DOMAIN_UPDATE "update"
/* --------------------------------DOMAIN SET-------------------------------- */ /* --------------------------------DOMAIN SET-------------------------------- */
// Syntax: spacebar -m set <name> <property> <value> // Syntax: spacebar -m set <name> <property> <value>
@ -365,6 +367,8 @@ void handle_message(FILE *rsp, char *message)
} else if (token_equals(domain, DOMAIN_SET)){ } else if (token_equals(domain, DOMAIN_SET)){
printf("DOMAIN: SET \n"); printf("DOMAIN: SET \n");
handle_domain_set(rsp, domain, message); handle_domain_set(rsp, domain, message);
} else if (token_equals(domain, DOMAIN_UPDATE)) {
bar_manager_script_update(&g_bar_manager, true);
} else { } else {
daemon_fail(rsp, "unknown domain '%.*s'\n", domain.length, domain.text); daemon_fail(rsp, "unknown domain '%.*s'\n", domain.length, domain.text);
} }