Hi Carlos
*data should not be CARD32, but 'long' as the original version.
There are problems in using CARD32 for a 'long' in 64-bits.
The original cairo work from Alfredo and Dan probably was using CARD32
because the patch removing this particular CARD32 is from Sept 2009,
see commit c7f2a189.
To be honest, I have not looked carefully at the mountain of stuff
that had to be merged. If you see something that is obviously wrong or
out of line, please fix. Most of this was done late at night
copy-and-pasting code from patch.rej files because the darcs patches
would not apply cleanly.
XChangeProperty(scr->display, win->view->window, scr->netwmIcon,
XA_CARDINAL, 32, PropModeReplace,
- (unsigned char *)data, (image->width * image->height +
2));
+ (unsigned char *)data,
+ (w * h + 2));
Why the new line for (w * h + 2)? It fits in the above and would make the
patch more readable.
There will be a large bunch of style issues in this patch. Most of the
lines i applied by hand should be OK, but some of the patches from
darcs did apply cleanly, and I did not even look at those. Perhaps it
might be worth it running 'indent' on this, and see if it cleans
things up a bit? If you have a look at the original darcs code, you
will see that a lot of the new code was written quickly, and the style
has definitely suffered.
This bug in the style is due to my automatic convertion to the linux
kernel style using 'indent' a while ago, where 'indent' would use
the correct style (without space between * and the name) if the type
was a known C type like 'char', 'int' etc, but used the wrong style
for "unknown" types like WMWindow above :-(
Again, I am sorry for this. But as you are changing the lines anyway,
I thought it would be better to point it out.
I will definitely check this for the lines I touch by hand. I dislike
the spaces between * and the name very much.
Do you want me to fix the these or have you already made more changes
to the code in the meantime?
You can fix these. I am sending patches for the cairo branch as soon
as possible, so I am sharing very early, perhaps too early. The upshot
is that it makes it easier for other people to help.
In fact, this is something I want to ask you. What workflow would you
prefer right now? If somebody decides to make changes (like the CARD32
above) should it go through you or will you be able to cope with the
code changing behind your back in #cairo, with you having probably
changes locally in your tree and having to rebase your own work locally
to take into account the "moving" cairo branch?
I think that because I am sharing my patches very early, there should
not be a big problem with code changing behind my back. I will try to
keep my branch up with the moving cairo branch.
-----------------------------------------------------
This message was sent using Obsidian SWiTCH web-mail.
Obsidian SWiTCH - an Obsidian Systems company.
(0860) 055-911 - http://www.switch-it.co.za/
--
To unsubscribe, send mail to [email protected].
