This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit d64f8e5ebf565f869eae4bda629379ae85cf0097
Author: Carsten Haitzler <ras...@rasterman.com>
AuthorDate: Sat Feb 8 13:49:36 2025 +0000
pants - build - fix missing quote
---
src/bin/e_comp.c | 1 +
src/bin/e_comp_x.c | 52 ++++++++++++++++++++++++++++++----
src/modules/pants/pants-db/meson.build | 2 +-
3 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 541fd4b18..e4c20dea3 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -875,6 +875,7 @@ _e_comp_shapes_update_comp_client_shape_comp_helper(E_Client *ec, Eina_Tiler *tb
{
x = rect->x, y = rect->y, w = rect->w, h = rect->h;
x += ec->client.x, y += ec->client.y;
+ printf("SHP: xxx sub %i %i %ix%i\n", x, y, w, h);
E_RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, e_comp->w, e_comp->h);
if ((w < 1) || (h < 1)) continue;
//#ifdef SHAPE_DEBUG not sure we can shape check these?
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index f3d13d93c..eacb74e8c 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -3404,7 +3404,17 @@ _e_comp_x_hook_client_post_new_client(void *d EINA_UNUSED, E_Client *ec)
{
_e_comp_x_client_shape_input_rectangle_set(ec);
if ((!ec->shaped) && _e_comp_x_client_data_get(ec)->reparented)
- ecore_x_window_shape_mask_set(e_client_util_pwin_get(ec), 0);
+ {
+ Ecore_X_Window pwin = e_client_util_pwin_get(ec);
+
+ printf("SHP: shp merge 0x%x - set 0\n", pwin);
+ ecore_x_window_shape_mask_set(pwin, 0);
+ if ((ec->shaped_input) && (ec->shape_input_rects))
+ {
+ printf("SHP: set00: 0x%x %p %i\n", pwin, (Ecore_X_Rectangle*)ec->shape_input_rects, ec->shape_input_rects_num);
+ ecore_x_window_shape_input_rectangles_set(pwin, (Ecore_X_Rectangle*)ec->shape_input_rects, ec->shape_input_rects_num);
+ }
+ }
ec->need_shape_merge = 0;
}
@@ -3540,9 +3550,15 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec)
e_pixmap_parent_window_set(ep, pwin);
ec->border.changed = 1;
if (!ec->shaped)
- ecore_x_window_shape_mask_set(pwin, 0);
+ {
+ printf("SHP: not shaped zero 0x%x\n", pwin);
+ ecore_x_window_shape_mask_set(pwin, 0);
+ }
if (ec->shaped_input)
- ecore_x_window_shape_input_rectangles_set(pwin, (Ecore_X_Rectangle*)ec->shape_input_rects, ec->shape_input_rects_num);
+ {
+ printf("SHP: set0: 0x%x %p %i\n", pwin, (Ecore_X_Rectangle*)ec->shape_input_rects, ec->shape_input_rects_num);
+ ecore_x_window_shape_input_rectangles_set(pwin, (Ecore_X_Rectangle*)ec->shape_input_rects, ec->shape_input_rects_num);
+ }
ec->changes.shape = 1;
ec->changes.shape_input = 1;
if (ec->internal_elm_win)
@@ -4412,6 +4428,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
{
if (cd->reparented)
{
+ printf("SHP: rectangles set 0x%x %i\n", pwin, num);
ecore_x_window_shape_rectangles_set(pwin, rects, num);
if ((!ec->shaped) && (!ec->bordername))
{
@@ -4454,7 +4471,10 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
{
_e_comp_x_client_shape_input_rectangle_set(ec);
if ((!ec->shaped) && cd->reparented)
- ecore_x_window_shape_mask_set(pwin, 0);
+ {
+ printf("SHP: mask set 0x%x set 0\n", pwin);
+ ecore_x_window_shape_mask_set(pwin, 0);
+ }
}
ec->need_shape_merge = 1;
}
@@ -4500,7 +4520,17 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
{
ec->shaped_input = 1;
if (cd->reparented)
- ecore_x_window_shape_input_rectangles_set(pwin, rects, num);
+ {
+ int ii;
+
+ printf("SHP: set2: 0x%x %p %i\n", pwin, rects, num);
+ for (ii = 0; ii < num; ii++) printf("SHP: %i %i %ix%i\n",
+ rects[ii].x,
+ rects[ii].y,
+ rects[ii].width,
+ rects[ii].height);
+ ecore_x_window_shape_input_rectangles_set(pwin, rects, num);
+ }
changed = EINA_TRUE;
free(ec->shape_input_rects);
ec->shape_input_rects = (Eina_Rectangle*)rects;
@@ -4512,7 +4542,17 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
{
ec->shaped_input = 1;
if (cd->reparented)
- ecore_x_window_shape_input_rectangles_set(pwin, rects, num);
+ {
+ int ii;
+
+ printf("SHP: set3: 0x%x %p %i\n", pwin, rects, num);
+ for (ii = 0; ii < num; ii++) printf("SHP: %i %i %ix%i\n",
+ rects[ii].x,
+ rects[ii].y,
+ rects[ii].width,
+ rects[ii].height);
+ ecore_x_window_shape_input_rectangles_set(pwin, rects, num);
+ }
changed = EINA_TRUE;
evas_object_pass_events_set(ec->frame, 1);
free(ec->shape_input_rects);
diff --git a/src/modules/pants/pants-db/meson.build b/src/modules/pants/pants-db/meson.build
index df200ff50..2b48bba17 100644
--- a/src/modules/pants/pants-db/meson.build
+++ b/src/modules/pants/pants-db/meson.build
@@ -8,6 +8,6 @@ install_data([
'030-lederhosen-on.png.txt', '030-lederhosen-on.png',
'031-lederhosen-off.png.txt', '031-lederhosen-off.png',
'040-malloc-pants-on.png.txt', '040-malloc-pants-on.png',
- '041-malloc-pants-off.png.txt','041-malloc-pants-off.png,
+ '041-malloc-pants-off.png.txt','041-malloc-pants-off.png'
],
install_dir: join_paths(_dir + '/pants-db'))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
