ryan
/
dwl-bar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved monitor main initialization point to in setup rather than in registry_global_add. 

Placing the initialization of the monitor (other than for wl_output and xdg_name) in the registry_global_add can cause problems when we depend on a global for some fields.
master
MadcowOG 2023-04-22 03:26:42 -07:00
parent cfaa4348e8
commit 3a6c255b97
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -257,12 +257,6 @@ void registry_global_add(void *data, struct wl_registry *registry, uint32_t name
monitor->wl_name = name; monitor->wl_name = name;
monitor->xdg_name = NULL; monitor->xdg_name = NULL;
monitor->xdg_output = NULL; monitor->xdg_output = NULL;
monitor->hotspots = list_create(1);
monitor->pipeline = pipeline_create();
monitor->bar = bar_create(monitor->hotspots, monitor->pipeline);
if (!monitor->pipeline || !monitor->bar)
return;
wl_list_insert(&monitors, &monitor->link); wl_list_insert(&monitors, &monitor->link);
@ -378,6 +372,15 @@ void setup(void) {
wl_display_roundtrip(display); wl_display_roundtrip(display);
struct Monitor *monitor;
wl_list_for_each(monitor, &monitors, link) {
monitor->hotspots = list_create(1);
monitor->pipeline = pipeline_create();
monitor->bar = bar_create(monitor->hotspots, monitor->pipeline);
if (!monitor->pipeline || !monitor->bar)
panic("Failed to create a pipline or bar for monitor: %s", monitor->xdg_name);
}
if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) < 0) if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) < 0)
panic("STDIN_FILENO O_NONBLOCK"); panic("STDIN_FILENO O_NONBLOCK");