Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip window-icons: 4.12 rebase #32

Closed
wants to merge 1 commit into from
Closed

Conversation

lkraav
Copy link

@lkraav lkraav commented Mar 9, 2016

Merge conflicts weren't massively difficult but some of the APIs seem to have changed. Help would be appreciated. Build currently fails with:

$ [git:(b'4.12-1-gf870f32')?] make -j5
[libi3] AR libi3.a
[i3] CC src/commands_parser.c
[i3] CC src/x.c
[i3] CC src/ipc.c
[i3] CC src/xcb.c
[i3] CC src/sd-daemon.c
[i3] CC src/version.c
../i3.git/src/x.c: In function ‘x_draw_decoration’:
../i3.git/src/x.c:667:9: error: incompatible type for argument 3 of ‘copy_with_pixel_blend’
         copy_with_pixel_blend(icon_pixels, win->icon, p->color->background);
         ^
../i3.git/src/x.c:382:6: note: expected ‘uint32_t’ but argument is of type ‘color_t’
 void copy_with_pixel_blend(uint32_t *dst, uint32_t* src, uint32_t background)
      ^
../i3.git/src/x.c:681:39: error: ‘Con’ has no member named ‘pixmap’
             xcb_image_put(conn, parent->pixmap, parent->pm_gc,
                                       ^
../i3.git/src/x.c:681:55: error: ‘Con’ has no member named ‘pm_gc’
             xcb_image_put(conn, parent->pixmap, parent->pm_gc,
                                                       ^
src/i3.mk:40: recipe for target 'src/x.o' failed
make: *** [src/x.o] Error 1
make: *** Waiting for unfinished jobs....

@mariusmuja
Copy link

The decoration rendering was changed to cairo: i3/i3@b665049, the patch needs to be updated for that.

@lkraav
Copy link
Author

lkraav commented Mar 13, 2016

Thanks. That looks like it's over my head to understand how to fix up any time soon, too little domain specific knowledge and too much client work. In the meanwhile I upgraded to 4.12 anyway to test it but am certainly missing the icons. Hopefully someone skilled can step up.

@Airblader
Copy link

I can help out with this once I'm back from my vacation in a couple of weeks (maybe before, but no promises). I might need to be reminded.. :)

@lkraav
Copy link
Author

lkraav commented Mar 13, 2016

Gave you some emoji love and put it in my calendar to poke you in a few weeks :)

@haobug
Copy link

haobug commented Apr 29, 2016

@lkraav @Airblader
i have passed the building, but the app icons does not appear, as issue #35

@mickael9
Copy link
Contributor

mickael9 commented Apr 29, 2016

Hi, I've just made a partially working updated patch. Only problem is the icon only appears for the first window in the container.

im

@Airblader Do you happen have an idea what could cause this?

My fork is at https://github.com/mickael9/i3/tree/window-icons
I created a PR for discussing it, https://github.com/mickael9/i3/pull/1/commits

@mickael9
Copy link
Contributor

Never mind, I fixed it.
I'm going to create another PR with my updated patch

@Airblader
Copy link

@mickael9 Awesome! :-) I only gave it a quick glance, but it looks alright. Of course ideally the non-cairo case should be supported but until somebody needs it, it's not really important.

@ashinkarov
Copy link
Owner

This is out of date now, as the patch was merged from #36.

@ashinkarov ashinkarov closed this Apr 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants