diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-03 21:29:43 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-04-03 21:29:43 -0400 |
commit | d48e7036aa04f8503737de678519cc389058b259 (patch) | |
tree | 4180ebb2da71f46af5c2bb07675e28a8f2b53fff /swaybar | |
parent | Add hidpi support to swaybar (diff) | |
download | sway-d48e7036aa04f8503737de678519cc389058b259.tar.gz sway-d48e7036aa04f8503737de678519cc389058b259.tar.zst sway-d48e7036aa04f8503737de678519cc389058b259.zip |
Don't use asserts with side-effects
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/bar.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index cf812a60..b617f9ab 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -299,7 +299,8 @@ void bar_setup(struct swaybar *bar, | |||
299 | bar->status = status_line_init(bar->config->status_command); | 299 | bar->status = status_line_init(bar->config->status_command); |
300 | } | 300 | } |
301 | 301 | ||
302 | assert(bar->display = wl_display_connect(NULL)); | 302 | bar->display = wl_display_connect(NULL); |
303 | assert(bar->display); | ||
303 | 304 | ||
304 | struct wl_registry *registry = wl_display_get_registry(bar->display); | 305 | struct wl_registry *registry = wl_display_get_registry(bar->display); |
305 | wl_registry_add_listener(registry, ®istry_listener, bar); | 306 | wl_registry_add_listener(registry, ®istry_listener, bar); |
@@ -317,14 +318,15 @@ void bar_setup(struct swaybar *bar, | |||
317 | } | 318 | } |
318 | } | 319 | } |
319 | 320 | ||
320 | assert(pointer->cursor_theme = wl_cursor_theme_load( | 321 | pointer->cursor_theme = wl_cursor_theme_load( |
321 | NULL, 16 * (max_scale * 2), bar->shm)); | 322 | NULL, 16 * (max_scale * 2), bar->shm); |
323 | assert(pointer->cursor_theme); | ||
322 | struct wl_cursor *cursor; | 324 | struct wl_cursor *cursor; |
323 | assert(cursor = wl_cursor_theme_get_cursor( | 325 | cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); |
324 | pointer->cursor_theme, "left_ptr")); | 326 | assert(cursor); |
325 | pointer->cursor_image = cursor->images[0]; | 327 | pointer->cursor_image = cursor->images[0]; |
326 | assert(pointer->cursor_surface = | 328 | pointer->cursor_surface = wl_compositor_create_surface(bar->compositor); |
327 | wl_compositor_create_surface(bar->compositor)); | 329 | assert(pointer->cursor_surface); |
328 | 330 | ||
329 | // TODO: we might not necessarily be meant to do all of the outputs | 331 | // TODO: we might not necessarily be meant to do all of the outputs |
330 | wl_list_for_each(output, &bar->outputs, link) { | 332 | wl_list_for_each(output, &bar->outputs, link) { |
@@ -334,8 +336,8 @@ void bar_setup(struct swaybar *bar, | |||
334 | continue; | 336 | continue; |
335 | } | 337 | } |
336 | output->name = strdup(coutput->name); | 338 | output->name = strdup(coutput->name); |
337 | assert(output->surface = wl_compositor_create_surface( | 339 | output->surface = wl_compositor_create_surface(bar->compositor); |
338 | bar->compositor)); | 340 | assert(output->surface); |
339 | output->layer_surface = zwlr_layer_shell_v1_get_layer_surface( | 341 | output->layer_surface = zwlr_layer_shell_v1_get_layer_surface( |
340 | bar->layer_shell, output->surface, output->output, | 342 | bar->layer_shell, output->surface, output->output, |
341 | ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel"); | 343 | ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel"); |