Mirrors/SketchyBar
2
0
Fork 0
mirror of https://github.com/FelixKratz/SketchyBar synced 2024-11-24 04:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

added proper reporting on unknown domain/property

Browse source
This commit is contained in:
FelixKratz 2021-09-26 18:33:00 +02:00
parent b8ec7da349
commit db8266e272
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/alias.c
View file

@ -9,7 +9,8 @@ extern void SLSCaptureWindowsContentsToRectWithOptions(uint32_t cid, uint32_t* w
void print_all_menu_items(FILE* rsp) { void print_all_menu_items(FILE* rsp) {
CFArrayRef window_list = CGWindowListCopyWindowInfo(kCGWindowListOptionAll, kCGNullWindowID); CFArrayRef window_list = CGWindowListCopyWindowInfo(kCGWindowListOptionAll, kCGNullWindowID);
int window_count = CFArrayGetCount(window_list); int window_count = CFArrayGetCount(window_list);
fprintf("Total Windows: %d \n", window_count); fprintf(rsp, "Total Windows: %d \n", window_count);
printf("Total Windows: %d \n", window_count);
for (int i = 0; i < window_count; ++i) { for (int i = 0; i < window_count; ++i) {
CFDictionaryRef dictionary = CFArrayGetValueAtIndex(window_list, i); CFDictionaryRef dictionary = CFArrayGetValueAtIndex(window_list, i);
@ -35,6 +36,7 @@ void print_all_menu_items(FILE* rsp) {
if (strcmp(name, "") == 0) continue; if (strcmp(name, "") == 0) continue;
fprintf(rsp, "Menu Item -> Owner: %s; with PID:%llu, Name: %s \n", owner, owner_pid, name); fprintf(rsp, "Menu Item -> Owner: %s; with PID:%llu, Name: %s \n", owner, owner_pid, name);
printf("Menu Item -> Owner: %s; with PID:%llu, Name: %s \n", owner, owner_pid, name);
free(owner); free(owner);
free(name); free(name);

21
src/message.c
View file

@ -345,6 +345,7 @@ static void handle_domain_add(FILE* rsp, struct token domain, char* message) {
bar_item_set_type(bar_item, identifier.text[0]); bar_item_set_type(bar_item, identifier.text[0]);
} else { } else {
printf("Command: %s not found \n", command.text); printf("Command: %s not found \n", command.text);
fprintf(rsp, "Command: %s not found \n", command.text);
} }
struct token modifier = get_token(&message); struct token modifier = get_token(&message);
if (token_equals(modifier, ARGUMENT_COMMON_NO_SPACE)) bar_item->nospace = true; if (token_equals(modifier, ARGUMENT_COMMON_NO_SPACE)) bar_item->nospace = true;
@ -354,13 +355,14 @@ static void handle_domain_add(FILE* rsp, struct token domain, char* message) {
if (bar_manager_get_item_index_for_name(&g_bar_manager, name.text) >= 0) { if (bar_manager_get_item_index_for_name(&g_bar_manager, name.text) >= 0) {
bar_manager_destroy_item(&g_bar_manager, bar_item); bar_manager_destroy_item(&g_bar_manager, bar_item);
printf("Name: %s already exists... skipping \n", name.text); printf("Name: %s already exists... skipping \n", name.text);
fprintf(rsp, "Name: %s already exists... skipping \n", name.text);
return; return;
} }
bar_item_set_name(bar_item, token_to_string(name)); bar_item_set_name(bar_item, token_to_string(name));
bar_manager_refresh(&g_bar_manager, true); bar_manager_refresh(&g_bar_manager, true);
} }
static void bar_item_parse_set_message(struct bar_item* bar_item, char* message) { static void message_parse_set_message_for_bar_item(FILE* rsp, struct bar_item* bar_item, char* message) {
struct token property = get_token(&message); struct token property = get_token(&message);
if (token_equals(property, COMMAND_SET_ICON)) { if (token_equals(property, COMMAND_SET_ICON)) {
@ -464,19 +466,22 @@ static void bar_item_parse_set_message(struct bar_item* bar_item, char* message)
// DEPRECATED // DEPRECATED
else if (token_equals(property, COMMAND_SET_ENABLED)) { else if (token_equals(property, COMMAND_SET_ENABLED)) {
printf("Command: enabled soon to be deprecated: Use drawing and scripting commands \n"); printf("Command: enabled soon to be deprecated: Use drawing and scripting commands \n");
fprintf(rsp, "Command: enabled soon to be deprecated: Use drawing and scripting commands \n");
bar_item->drawing = evaluate_boolean_state(get_token(&message), bar_item->drawing); bar_item->drawing = evaluate_boolean_state(get_token(&message), bar_item->drawing);
bar_item->updates = evaluate_boolean_state(get_token(&message), bar_item->updates); bar_item->updates = evaluate_boolean_state(get_token(&message), bar_item->updates);
} else if (token_equals(property, COMMAND_SET_HIDDEN)) { } else if (token_equals(property, COMMAND_SET_HIDDEN)) {
printf("Command: hidden soon to be deprecated: Use drawing command \n"); printf("Command: hidden soon to be deprecated: Use drawing command \n");
fprintf(rsp, "Command: hidden soon to be deprecated: Use drawing command \n");
bar_item->drawing = evaluate_boolean_state(get_token(&message), bar_item->drawing); bar_item->drawing = evaluate_boolean_state(get_token(&message), bar_item->drawing);
} else { } else {
fprintf(rsp, "unknown command '%s' for domain 'set'\n", property.text);
printf("unknown command '%s' for domain 'set'\n", property.text); printf("unknown command '%s' for domain 'set'\n", property.text);
} }
} }
// Syntax: sketchybar -m default <property> <value> // Syntax: sketchybar -m default <property> <value>
static void handle_domain_default(FILE* rsp, struct token domain, char* message) { static void handle_domain_default(FILE* rsp, struct token domain, char* message) {
bar_item_parse_set_message(&g_bar_manager.default_item, message); message_parse_set_message_for_bar_item(rsp, &g_bar_manager.default_item, message);
} }
// Syntax: sketchybar -m set <name> <property> <value> // Syntax: sketchybar -m set <name> <property> <value>
@ -485,11 +490,12 @@ static void handle_domain_set(FILE* rsp, struct token domain, char* message) {
int item_index_for_name = bar_manager_get_item_index_for_name(&g_bar_manager, name.text); int item_index_for_name = bar_manager_get_item_index_for_name(&g_bar_manager, name.text);
if (item_index_for_name < 0) { if (item_index_for_name < 0) {
fprintf(rsp, "Name: %s not found in bar items \n", name.text);
printf("Name: %s not found in bar items \n", name.text); printf("Name: %s not found in bar items \n", name.text);
return; return;
} }
struct bar_item* bar_item = g_bar_manager.bar_items[item_index_for_name]; struct bar_item* bar_item = g_bar_manager.bar_items[item_index_for_name];
bar_item_parse_set_message(bar_item, message); message_parse_set_message_for_bar_item(rsp, bar_item, message);
if (bar_item_is_shown(bar_item)) bar_manager_refresh(&g_bar_manager, false); if (bar_item_is_shown(bar_item)) bar_manager_refresh(&g_bar_manager, false);
} }
@ -549,21 +555,26 @@ static void handle_domain_bar(FILE *rsp, struct token domain, char *message) {
int length = strlen(message); int length = strlen(message);
if (length <= 0) { if (length <= 0) {
fprintf(rsp, "%s\n", g_bar_manager.display); fprintf(rsp, "%s\n", g_bar_manager.display);
printf("%s\n", g_bar_manager.display);
} else if ((strcmp(message,BAR_DISPLAY_MAIN_ONLY) == 0) || (strcmp(message,BAR_DISPLAY_ALL) == 0)) { } else if ((strcmp(message,BAR_DISPLAY_MAIN_ONLY) == 0) || (strcmp(message,BAR_DISPLAY_ALL) == 0)) {
bar_manager_set_display(&g_bar_manager, string_copy(message)); bar_manager_set_display(&g_bar_manager, string_copy(message));
} else { } else {
printf("value for '%.*s' must be either 'main' or 'all'.\n", command.length, command.text); printf("value for '%.*s' must be either 'main' or 'all'.\n", command.length, command.text);
fprintf(rsp, "value for '%.*s' must be either 'main' or 'all'.\n", command.length, command.text);
} }
} else if (token_equals(command, COMMAND_BAR_POSITION)) { } else if (token_equals(command, COMMAND_BAR_POSITION)) {
if (strlen(message) <= 0) { if (strlen(message) <= 0) {
fprintf(rsp, "%s\n", g_bar_manager.position); fprintf(rsp, "%s\n", g_bar_manager.position);
printf("%s\n", g_bar_manager.position);
} else if (strcmp(message, BAR_POSITION_TOP) != 0 && strcmp(message, BAR_POSITION_BOTTOM) != 0) { } else if (strcmp(message, BAR_POSITION_TOP) != 0 && strcmp(message, BAR_POSITION_BOTTOM) != 0) {
printf("value for '%.*s' must be either '%s' or '%s'.\n", command.length, command.text, BAR_POSITION_TOP, BAR_POSITION_BOTTOM); printf("value for '%.*s' must be either '%s' or '%s'.\n", command.length, command.text, BAR_POSITION_TOP, BAR_POSITION_BOTTOM);
fprintf(rsp, "value for '%.*s' must be either '%s' or '%s'.\n", command.length, command.text, BAR_POSITION_TOP, BAR_POSITION_BOTTOM);
} else { } else {
bar_manager_set_position(&g_bar_manager, string_copy(message)); bar_manager_set_position(&g_bar_manager, string_copy(message));
} }
} }
else { else {
fprintf(rsp, "unknown command '%s' for domain 'bar'\n", command.text);
printf("unknown command '%s' for domain 'bar'\n", command.text); printf("unknown command '%s' for domain 'bar'\n", command.text);
} }
} }
@ -603,6 +614,7 @@ static void handle_domain_batch(FILE* rsp, struct token domain, char* message) {
struct token name = get_token(&message); struct token name = get_token(&message);
int item_index_for_name = bar_manager_get_item_index_for_name(&g_bar_manager, name.text); int item_index_for_name = bar_manager_get_item_index_for_name(&g_bar_manager, name.text);
if (item_index_for_name < 0) { if (item_index_for_name < 0) {
fprintf(rsp, "Name: %s not found in bar items \n", name.text);
printf("Name: %s not found in bar items \n", name.text); printf("Name: %s not found in bar items \n", name.text);
break; break;
} }
@ -611,7 +623,7 @@ static void handle_domain_batch(FILE* rsp, struct token domain, char* message) {
while (token.text && token.length > 0) { while (token.text && token.length > 0) {
char* rbr_msg = reformat_batch_key_value_pair(token); char* rbr_msg = reformat_batch_key_value_pair(token);
if (!rbr_msg) break; if (!rbr_msg) break;
bar_item_parse_set_message(bar_item, rbr_msg); message_parse_set_message_for_bar_item(rsp, bar_item, rbr_msg);
free(rbr_msg); free(rbr_msg);
if (message && message[0] == '-') break; if (message && message[0] == '-') break;
token = get_token(&message); token = get_token(&message);
@ -689,6 +701,7 @@ void handle_message(FILE *rsp, char *message) {
} else if (token_equals(domain, DOMAIN_QUERY)) { } else if (token_equals(domain, DOMAIN_QUERY)) {
handle_domain_query(rsp, domain, message); handle_domain_query(rsp, domain, message);
} else { } else {
fprintf(rsp, "unknown domain '%.*s'\n", domain.length, domain.text);
printf("unknown domain '%.*s'\n", domain.length, domain.text); printf("unknown domain '%.*s'\n", domain.length, domain.text);
} }
} }