Added support for showing in fullscreen (#665)

Author: ImTheSquid

src/bar_manager.c

@@ -44,6 +44,8 @@ void bar_manager_init(struct bar_manager* bar_manager) {
 
   bar_manager->sticky = true;
 
+  bar_manager->show_in_fullscreen = false;
+
   image_init(&bar_manager->current_artwork);
   background_init(&bar_manager->background);
   bar_manager->background.bounds.size.height = 25;
@@ -59,7 +61,7 @@ void bar_manager_init(struct bar_manager* bar_manager) {
   custom_events_init(&bar_manager->custom_events);
 
   animator_init(&bar_manager->animator);
-  
+
   int shell_refresh_frequency = 1;
 
   bar_manager->clock = CFRunLoopTimerCreate(NULL,
@@ -259,6 +261,12 @@ bool bar_manager_set_font_smoothing(struct bar_manager* bar_manager, bool smooth
   return true;
 }
 
+bool bar_manager_set_show_in_fullscreen(struct bar_manager* bar_manager, bool show_in_fullscreen) {
+    if (bar_manager->show_in_fullscreen == show_in_fullscreen) return false;
+    bar_manager->show_in_fullscreen = show_in_fullscreen;
+    return true;
+}
+
 bool bar_manager_set_hidden(struct bar_manager *bar_manager, uint32_t adid, bool hidden) {
   bar_manager->any_bar_hidden = false;
   if (adid > 0) {
@@ -342,7 +350,7 @@ bool bar_manager_bar_needs_redraw(struct bar_manager* bar_manager, struct bar* b
   for (int i = 0; i < bar_manager->bar_item_count; i++) {
     struct bar_item* bar_item = bar_manager->bar_items[i];
     bool draws_item = bar_draws_item(bar, bar_item);
-    
+
     bool regular_update = bar_item->needs_update
                           && draws_item;
 
@@ -403,15 +411,15 @@ bool bar_manager_bar_needs_redraw(struct bar_manager* bar_manager, struct bar* b
 }
 
 void bar_manager_clear_needs_update(struct bar_manager* bar_manager) {
-  for (int i = 0; i < bar_manager->bar_item_count; i++) 
+  for (int i = 0; i < bar_manager->bar_item_count; i++)
     bar_manager->bar_items[i]->needs_update = false;
 
   bar_manager->needs_ordering = false;
   bar_manager->bar_needs_update = false;
 }
 
 void bar_manager_reset_bar_association(struct bar_manager* bar_manager) {
-  for (int i = 0; i < bar_manager->bar_item_count; i++) 
+  for (int i = 0; i < bar_manager->bar_item_count; i++)
     bar_item_reset_associated_bar(bar_manager->bar_items[i]);
 }
 
@@ -428,7 +436,7 @@ void bar_manager_refresh(struct bar_manager* bar_manager, bool forced, bool thre
 
   for (int i = 0; i < bar_manager->bar_count; ++i) {
     if (forced
-        || bar_manager_bar_needs_redraw(bar_manager, bar_manager->bars[i])) { 
+        || bar_manager_bar_needs_redraw(bar_manager, bar_manager->bars[i])) {
       bar_calculate_bounds(bar_manager->bars[i]);
       bar_draw(bar_manager->bars[i], false, threaded);
       if (bar_manager->needs_ordering) {
@@ -513,7 +521,7 @@ void bar_manager_update_space_components(struct bar_manager* bar_manager, bool f
         else {
           bar_item->updates = false;
         }
-      } 
+      }
     }
   }
 }
@@ -586,7 +594,7 @@ void bar_manager_begin(struct bar_manager* bar_manager) {
     memset(bar_manager->bars, 0, sizeof(struct bar*) * bar_manager->bar_count);
     bar_manager->bars[0] = bar_create(did);
     bar_manager->bars[0]->adid = display_arrangement(did);
-  } 
+  }
   else {
     uint32_t display_count = display_active_display_count();
     uint32_t bar_count = 0;
@@ -964,7 +972,7 @@ void bar_manager_handle_space_change(struct bar_manager* bar_manager, bool force
     bar_manager->bars[i]->sid = mission_control_index(dsid);
 
     bool was_shown = bar_manager->bars[i]->shown;
-    bar_manager->bars[i]->shown = SLSSpaceGetType(g_connection, dsid) != 4;
+    bar_manager->bars[i]->shown = SLSSpaceGetType(g_connection, dsid) != 4 || bar_manager->show_in_fullscreen;
 
     bar_manager->needs_ordering |= !was_shown && bar_manager->bars[i]->shown;
     force_refresh |= !was_shown && bar_manager->bars[i]->shown;
@@ -1106,6 +1114,7 @@ void bar_manager_serialize(struct bar_manager* bar_manager, FILE* rsp) {
                "%s\"hidden\": \"%s\",\n"
                "%s\"shadow\": \"%s\",\n"
                "%s\"font_smoothing\": \"%s\",\n"
+               "%s\"show_in_fullscreen\": \"%s\",\n"
                "%s\"blur_radius\": %u,\n"
                "%s\"margin\": %d,\n",
                indent, bar_manager->position == POSITION_BOTTOM
@@ -1115,6 +1124,7 @@ void bar_manager_serialize(struct bar_manager* bar_manager, FILE* rsp) {
                indent, format_bool(bar_manager->any_bar_hidden),
                indent, format_bool(bar_manager->shadow),
                indent, format_bool(bar_manager->font_smoothing),
+               indent, format_bool(bar_manager->show_in_fullscreen),
                indent, bar_manager->blur_radius,
                indent, bar_manager->margin         );
 

src/bar_manager.h

@@ -26,6 +26,7 @@ struct bar_manager {
   bool might_need_clipping;
   bool bar_needs_update;
   bool bar_needs_resize;
+  bool show_in_fullscreen;
 
   uint32_t displays;
   char position;
@@ -78,6 +79,7 @@ bool bar_manager_set_topmost(struct bar_manager* bar_manager, char level, bool t
 bool bar_manager_set_sticky(struct bar_manager *bar_manager, bool sticky);
 bool bar_manager_set_shadow(struct bar_manager* bar_manager, bool shadow);
 bool bar_manager_set_font_smoothing(struct bar_manager* bar_manager, bool smoothing);
+bool bar_manager_set_show_in_fullscreen(struct bar_manager* bar_manager, bool show_in_fullscreen);
 bool bar_manager_set_notch_width(struct bar_manager* bar_manager, uint32_t width);
 bool bar_manager_set_notch_offset(struct bar_manager* bar_manager, uint32_t offset);
 bool bar_manager_set_notch_display_height(struct bar_manager* bar_manager, uint32_t offset);

src/message.c

@@ -1,7 +1,9 @@
 #include "message.h"
 #include "app_windows.h"
+#include "bar_manager.h"
 #include "misc/defines.h"
 #include "hotload.h"
+#include "misc/helpers.h"
 #include "volume.h"
 #include "media.h"
 #include "wifi.h"
@@ -68,7 +70,7 @@ static void handle_domain_trigger(FILE* rsp, struct token domain, char* message)
   struct token token = get_token(&message);
   while (token.text && token.length > 0) {
     struct key_value_pair key_value_pair = get_key_value_pair(token.text, '=');
-    
+
     if (key_value_pair.key && key_value_pair.value) {
       env_vars_set(&env_vars,
                    string_copy(key_value_pair.key),
@@ -100,7 +102,7 @@ static void handle_domain_trigger(FILE* rsp, struct token domain, char* message)
 
 static void handle_domain_push(FILE* rsp, struct token domain, char* message) {
   struct token name = get_token(&message);
-  
+
   int item_index_for_name = bar_manager_get_item_index_for_name(&g_bar_manager,
                                                                 name.text    );
 
@@ -180,15 +182,15 @@ static void handle_domain_add(FILE* rsp, struct token domain, char* message) {
                               token_to_string(event),
                               NULL                         );
     return;
-  } 
+  }
 
   struct token name = get_token(&message);
   struct token position = get_token(&message);
 
   if (bar_manager_get_item_index_for_name(&g_bar_manager, name.text) >= 0) {
     respond(rsp, "[?] Add: Item '%s' already exists\n", name.text);
     return;
-  } 
+  }
   struct bar_item* bar_item = bar_manager_create_item(&g_bar_manager);
 
   if (!bar_item_set_type(bar_item, command.text)) {
@@ -216,7 +218,7 @@ static void handle_domain_add(FILE* rsp, struct token domain, char* message) {
     if (bar_item->type == BAR_COMPONENT_GRAPH) {
       struct token width = get_token(&message);
       graph_setup(&bar_item->graph, token_to_uint32t(width));
-    } 
+    }
     else if (bar_item->type == BAR_COMPONENT_SLIDER) {
       struct token width = get_token(&message);
       slider_setup(&bar_item->slider, token_to_uint32t(width));
@@ -440,6 +442,11 @@ static bool handle_domain_bar(FILE *rsp, struct token domain, char *message) {
             &g_bar_manager,
             g_bar_manager.background.bounds.size.height,
             token_to_int(token)                         );
+  } else if (token_equals(command, PROPERTY_SHOW_IN_FULLSCREEN)) {
+      struct token token = get_token(&message);
+
+      needs_refresh = bar_manager_set_show_in_fullscreen(&g_bar_manager,
+          evaluate_boolean_state(token, g_bar_manager.show_in_fullscreen));
   } else
     needs_refresh = background_parse_sub_domain(&g_bar_manager.background, rsp, command, message);
 
@@ -452,7 +459,7 @@ static char* reformat_batch_key_value_pair(struct token token) {
   char* rbr_msg = malloc((strlen(key_value_pair.key) + (key_value_pair.value
                                                         ? strlen(key_value_pair.value)
                                                         : 0)
-                          + 3) * sizeof(char)                                         ); 
+                          + 3) * sizeof(char)                                         );
 
   pack_key_value_pair(rbr_msg, &key_value_pair);
   return rbr_msg;
@@ -739,7 +746,7 @@ void handle_message_mach(struct mach_buffer* buffer) {
 
       if (reload) {
         struct event event = { NULL, HOTLOAD };
-        event_post(&event); 
+        event_post(&event);
       }
     } else {
       char* rbr_msg = get_batch_line(&message);

src/misc/defines.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #define DOMAIN_ADD                             "--add"
-#define COMMAND_ADD_ITEM                       "item"                                  
+#define COMMAND_ADD_ITEM                       "item"
 #define COMMAND_ADD_COMPONENT                  "component"
 #define COMMAND_ADD_EVENT                      "event"
 
@@ -107,6 +107,7 @@
 #define PROPERTY_SPACE                         "space"
 #define PROPERTY_TOPMOST                       "topmost"
 #define PROPERTY_STICKY                        "sticky"
+#define PROPERTY_SHOW_IN_FULLSCREEN            "show_in_fullscreen"
 #define PROPERTY_HIDDEN                        "hidden"
 #define PROPERTY_FONT_SMOOTHING                "font_smoothing"
 #define PROPERTY_SHADOW                        "shadow"
@@ -167,7 +168,7 @@
 #define ARGUMENT_DISPLAY_MAIN                  "main"
 #define ARGUMENT_DISPLAY_ALL                   "all"
 
-#define ARGUMENT_UPDATES_WHEN_SHOWN            "when_shown" 
+#define ARGUMENT_UPDATES_WHEN_SHOWN            "when_shown"
 #define ARGUMENT_DYNAMIC                       "dynamic"
 
 #define ARGUMENT_WINDOW                        "window"