summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-09-12 09:14:42 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-09-12 09:14:42 +0100
commit4cd3bb45c4a41a6af698dfae743b3039586ba075 (patch)
tree383e1f2a120895fb692781c29425851c557fdbe7
parentf8d8d82d34f71df3282eb21b44bf7c1aa6d387da (diff)
convert a whole lot of CRIs to ERRs that will not be useful with aborts
-rw-r--r--src/bin/e_client.c4
-rw-r--r--src/bin/e_comp_object.c24
-rw-r--r--src/bin/e_hints.c17
3 files changed, 16 insertions, 29 deletions
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 1d7659964..ffc182511 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4905,13 +4905,13 @@ e_client_border_set(E_Client *ec, const char *name)
4905 if ((!e_comp_object_frame_allowed(ec->frame)) && (!e_comp_object_frame_exists(ec->frame))) 4905 if ((!e_comp_object_frame_allowed(ec->frame)) && (!e_comp_object_frame_exists(ec->frame)))
4906 return EINA_FALSE; 4906 return EINA_FALSE;
4907 if (ec->border.changed) 4907 if (ec->border.changed)
4908 CRI("CALLING WHEN border.changed SET!"); 4908 ERR("CALLING WHEN border.changed SET!");
4909 4909
4910 if (eina_streq(ec->border.name, name)) return EINA_TRUE; 4910 if (eina_streq(ec->border.name, name)) return EINA_TRUE;
4911 if (ec->mwm.borderless && (!eina_streq(name, "borderless"))) 4911 if (ec->mwm.borderless && (!eina_streq(name, "borderless")))
4912 { 4912 {
4913 e_util_dialog_show(_("Client Error!"), _("Something has attempted to set a border when it shouldn't! Report this!")); 4913 e_util_dialog_show(_("Client Error!"), _("Something has attempted to set a border when it shouldn't! Report this!"));
4914 CRI("border change attempted for MWM borderless client!"); 4914 ERR("border change attempted for MWM borderless client!");
4915 } 4915 }
4916 if ((!ec->border.name) && eina_streq(name, "borderless")) return EINA_TRUE; 4916 if ((!ec->border.name) && eina_streq(name, "borderless")) return EINA_TRUE;
4917 pborder = ec->border.name; 4917 pborder = ec->border.name;
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index ffbe1988e..a26e6a5f6 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -320,7 +320,7 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object *above, E_Comp_Object
320 if (below_ec) 320 if (below_ec)
321 { 321 {
322 if (e_comp->layers[cw->layer].obj == below_ec->frame) 322 if (e_comp->layers[cw->layer].obj == below_ec->frame)
323 CRI("ACK!"); 323 ERR("ACK!");
324 } 324 }
325 } 325 }
326#endif 326#endif
@@ -802,7 +802,7 @@ _e_comp_object_done_defer(void *data, Evas_Object *obj EINA_UNUSED, const char *
802 //INF("DONE DEFER %p: %dx%d - %s", cw->ec, cw->w, cw->h, emission); 802 //INF("DONE DEFER %p: %dx%d - %s", cw->ec, cw->w, cw->h, emission);
803 /* visible clients which have never been sized are a bug */ 803 /* visible clients which have never been sized are a bug */
804 if ((!cw->ec->new_client) && (!cw->ec->changes.size) && ((cw->w < 0) || (cw->h < 0)) && (!strcmp(emission, "e,action,show,done"))) 804 if ((!cw->ec->new_client) && (!cw->ec->changes.size) && ((cw->w < 0) || (cw->h < 0)) && (!strcmp(emission, "e,action,show,done")))
805 CRI("ACK!"); 805 ERR("ACK!");
806 if (!_e_comp_object_animating_end(cw)) return; 806 if (!_e_comp_object_animating_end(cw)) return;
807 if (cw->animating) return; 807 if (cw->animating) return;
808 /* hide only after animation finishes to guarantee a full run of the animation */ 808 /* hide only after animation finishes to guarantee a full run of the animation */
@@ -1199,7 +1199,7 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h)
1199 INF("%p: CUR(%dx%d) || REQ(%dx%d)", cw->ec, cw->ec->client.w, cw->ec->client.h, iw, ih); 1199 INF("%p: CUR(%dx%d) || REQ(%dx%d)", cw->ec, cw->ec->client.w, cw->ec->client.h, iw, ih);
1200 cw->ec->client.w = iw; 1200 cw->ec->client.w = iw;
1201 cw->ec->client.h = ih; 1201 cw->ec->client.h = ih;
1202 if ((cw->ec->client.w < 0) || (cw->ec->client.h < 0)) CRI("WTF"); 1202 if ((cw->ec->client.w < 0) || (cw->ec->client.h < 0)) ERR("WTF");
1203 } 1203 }
1204 if ((!cw->ec->input_only) && cw->redirected && (!cw->ec->shading) && (!cw->ec->shaded) && 1204 if ((!cw->ec->input_only) && cw->redirected && (!cw->ec->shading) && (!cw->ec->shaded) &&
1205 (e_pixmap_dirty_get(cw->ec->pixmap) || (!e_pixmap_size_get(cw->ec->pixmap, &pw, &ph)))) 1205 (e_pixmap_dirty_get(cw->ec->pixmap) || (!e_pixmap_size_get(cw->ec->pixmap, &pw, &ph))))
@@ -1408,7 +1408,7 @@ _e_comp_intercept_layer_set(void *data, Evas_Object *obj, int layer)
1408 if (evas_object_below_get(obj) == e_comp->layers[cw->layer].obj) 1408 if (evas_object_below_get(obj) == e_comp->layers[cw->layer].obj)
1409 { 1409 {
1410 /* can't stack a client above its own layer marker */ 1410 /* can't stack a client above its own layer marker */
1411 CRI("STACKING ERROR!!!"); 1411 ERR("STACKING ERROR!!!");
1412 } 1412 }
1413 if (!cw->visible) return; 1413 if (!cw->visible) return;
1414 e_comp_render_queue(); 1414 e_comp_render_queue();
@@ -1510,7 +1510,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
1510 if (e_comp->layers[cw->layer].obj) 1510 if (e_comp->layers[cw->layer].obj)
1511 if (evas_object_below_get(cw->smart_obj) == e_comp->layers[cw->layer].obj) 1511 if (evas_object_below_get(cw->smart_obj) == e_comp->layers[cw->layer].obj)
1512 { 1512 {
1513 CRI("STACKING ERROR!!!"); 1513 ERR("STACKING ERROR!!!");
1514 } 1514 }
1515 if (cw->ec->new_client || (!ecstack) || (ecstack->frame != o)) 1515 if (cw->ec->new_client || (!ecstack) || (ecstack->frame != o))
1516 evas_object_data_del(cw->smart_obj, "client_restack"); 1516 evas_object_data_del(cw->smart_obj, "client_restack");
@@ -1816,7 +1816,7 @@ _e_comp_intercept_focus(void *data, Evas_Object *obj, Eina_Bool focus)
1816 if (focus && ec->lock_focus_out) return; 1816 if (focus && ec->lock_focus_out) return;
1817 if (e_object_is_del(E_OBJECT(ec)) && focus) 1817 if (e_object_is_del(E_OBJECT(ec)) && focus)
1818 { 1818 {
1819 CRI("CAN'T FOCUS DELETED CLIENT!"); 1819 ERR("CAN'T FOCUS DELETED CLIENT!");
1820 return; 1820 return;
1821 } 1821 }
1822 1822
@@ -2367,7 +2367,7 @@ _e_comp_smart_show(Evas_Object *obj)
2367 cw->defer_hide = 0; 2367 cw->defer_hide = 0;
2368 cw->visible = 1; 2368 cw->visible = 1;
2369 if ((cw->w < 0) || (cw->h < 0)) 2369 if ((cw->w < 0) || (cw->h < 0))
2370 CRI("ACK!"); 2370 ERR("ACK!");
2371 2371
2372 //INF("SMART SHOW: %p EC(%dx%d) CW(%dx%d)", cw->ec, cw->ec->w, cw->ec->h, cw->w, cw->h); 2372 //INF("SMART SHOW: %p EC(%dx%d) CW(%dx%d)", cw->ec, cw->ec->w, cw->ec->h, cw->w, cw->h);
2373 2373
@@ -2552,7 +2552,7 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
2552 INTERNAL_ENTRY; 2552 INTERNAL_ENTRY;
2553 2553
2554 //INF("RSZ(%p): %dx%d -> %dx%d", cw->ec, cw->w, cw->h, w, h); 2554 //INF("RSZ(%p): %dx%d -> %dx%d", cw->ec, cw->w, cw->h, w, h);
2555 if (!cw->effect_obj) CRI("ACK!"); 2555 if (!cw->effect_obj) ERR("ACK!");
2556 first = ((cw->w < 1) || (cw->h < 1)); 2556 first = ((cw->w < 1) || (cw->h < 1));
2557 cw->w = w, cw->h = h; 2557 cw->w = w, cw->h = h;
2558 if ((!cw->ec->shading) && (!cw->ec->shaded)) 2558 if ((!cw->ec->shading) && (!cw->ec->shaded))
@@ -2576,7 +2576,7 @@ _e_comp_smart_resize(Evas_Object *obj, int w, int h)
2576 //evas_object_size_hint_min_set(cw->obj, pw, ph); 2576 //evas_object_size_hint_min_set(cw->obj, pw, ph);
2577 //} 2577 //}
2578 if ((ww != pw) || (hh != ph)) 2578 if ((ww != pw) || (hh != ph))
2579 CRI("CW RSZ: %dx%d || PX: %dx%d", ww, hh, pw, ph); 2579 ERR("CW RSZ: %dx%d || PX: %dx%d", ww, hh, pw, ph);
2580 } 2580 }
2581 evas_object_resize(cw->effect_obj, w, h); 2581 evas_object_resize(cw->effect_obj, w, h);
2582 if (cw->zoomobj) e_zoomap_child_resize(cw->zoomobj, pw, ph); 2582 if (cw->zoomobj) e_zoomap_child_resize(cw->zoomobj, pw, ph);
@@ -3342,7 +3342,7 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b)
3342 3342
3343 API_ENTRY; 3343 API_ENTRY;
3344 if (cw->frame_object) 3344 if (cw->frame_object)
3345 CRI("ACK!"); 3345 ERR("ACK!");
3346 if ((cw->client_inset.l == l) && (cw->client_inset.r == r) && 3346 if ((cw->client_inset.l == l) && (cw->client_inset.r == r) &&
3347 (cw->client_inset.t == t) && (cw->client_inset.b == b)) return; 3347 (cw->client_inset.t == t) && (cw->client_inset.b == b)) return;
3348 calc = cw->client_inset.calc; 3348 calc = cw->client_inset.calc;
@@ -3616,7 +3616,7 @@ e_comp_object_frame_theme_set(Evas_Object *obj, const char *name)
3616 } 3616 }
3617 else 3617 else
3618 { 3618 {
3619 CRI("USER IS USING A SHITTY THEME! ABORT!!!!"); 3619 ERR("USER IS USING A BAD THEME! ABORT!!!!");
3620 evas_object_del(o); 3620 evas_object_del(o);
3621 E_FREE_FUNC(cw->frame_icon, evas_object_del); 3621 E_FREE_FUNC(cw->frame_icon, evas_object_del);
3622 E_FREE_FUNC(cw->frame_volume, evas_object_del); 3622 E_FREE_FUNC(cw->frame_volume, evas_object_del);
@@ -3815,7 +3815,7 @@ e_comp_object_render_update_add(Evas_Object *obj)
3815 3815
3816 if (cw->ec->input_only || (!cw->updates) || (!cw->redirected)) return; 3816 if (cw->ec->input_only || (!cw->updates) || (!cw->redirected)) return;
3817 if (e_object_is_del(E_OBJECT(cw->ec))) 3817 if (e_object_is_del(E_OBJECT(cw->ec)))
3818 CRI("CAN'T RENDER A DELETED CLIENT!"); 3818 ERR("CAN'T RENDER A DELETED CLIENT!");
3819 if (!e_pixmap_usable_get(cw->ec->pixmap)) return; 3819 if (!e_pixmap_usable_get(cw->ec->pixmap)) return;
3820 //if (e_client_util_resizing_get(cw->ec) && (e_pixmap_type_get(cw->ec->pixmap) == E_PIXMAP_TYPE_WL)) 3820 //if (e_client_util_resizing_get(cw->ec) && (e_pixmap_type_get(cw->ec->pixmap) == E_PIXMAP_TYPE_WL))
3821 //INF("WL RENDER UPDATE"); 3821 //INF("WL RENDER UPDATE");
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 42e75db5c..daadc6c6b 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -346,7 +346,7 @@ e_hints_client_stacking_set(void)
346 346
347//#define CLIENT_STACK_DEBUG 347//#define CLIENT_STACK_DEBUG
348 /* Get client count */ 348 /* Get client count */
349 c = e_clients_count(); 349 c = 20 + (e_clients_count() * 2);
350 if (c) 350 if (c)
351 { 351 {
352 E_Client *ec; 352 E_Client *ec;
@@ -372,23 +372,10 @@ e_hints_client_stacking_set(void)
372#endif 372#endif
373 if (i > c) 373 if (i > c)
374 { 374 {
375 CRI("Window list size greater than window count."); 375 ERR("Window list size greater than window count.");
376 break; 376 break;
377 } 377 }
378 } 378 }
379
380 if (i < c - non_x)
381 {
382#ifdef CLIENT_STACK_DEBUG
383 Eina_List *lll = eina_list_clone(e_comp->clients);
384
385 EINA_LIST_FREE(ll, ec)
386 lll = eina_list_remove(lll, ec);
387 EINA_LIST_FREE(lll, ec)
388 WRN("Missing %p: %snew client", ec, ec->new_client ? "" : "not ");
389#endif
390 CRI("Window list size less than window count.");
391 }
392 } 379 }
393 /* XXX: it should be "more correct" to be setting the stacking atom as "windows per root" 380 /* XXX: it should be "more correct" to be setting the stacking atom as "windows per root"
394 * since any apps using it are probably not going to want windows from other screens 381 * since any apps using it are probably not going to want windows from other screens