Re: [XonX-Users] X11.app patch Revisited

[Torrey L. <to...@mr...>]

At 1:33 AM -0700 4/19/05, John Davidorff Pell wrote:
>I've posted a few bugs with the patch against 6.8.2 on the patch 
>page. Here they are again:

Yes, recall that this patch does not really properly work against the 
6.8 branch. (Despite its name. :-) ) It is intended for use with the 
top of the tree, which does build and run properly now.

>In .../apple/dri_glx.c, __driConfigOptions is declared as static, 
>though in extras/Mesa/include/GL/internal/dri_interface.h it is not 
>(its declared with extern, then used in .../glx/dri_glx.c). This 
>causes the build on 6.8.2 to fail. :-!
>
>In .../darwin/quartz/applewm.c, appleWMProcs is declared as static, 
>though in .../darwin/quartz/applewmExt.h it it not. This causes the 
>build to fail. :-!
>
>I "fixed" both by commenting out static on that particular line. :-p

Both of these issues were fixed in the top of the tree towards the 
end of last week.

>I have another problem that I'm not sure how to fix. In 
>.../apple/X11Application.m, `darwinSwapAltMeta' is used. This 
>variable is defined in .../drwinKeyboard.c (note that's a .c file, 
>not a .h file...?). I'm not sure what to include here to make this 
>happy... Should I declare it again in X11Application.m? iDon't think 
>so, b/c darwinKeyboard.c uses it...
>
>in darwinKeyboard.c, darwinSwapAltMeta is declared `int 
>darwinSwapAltMeta = 0;', and then checked at the end of the function 
>`if (darwinSwapAltMeta)'. I'm guessing that this is supposed to pick 
>up somewhere the setting! But, appearently it doesn't...? meThinks 
>that X11Application.m is trying to set this very setting, but its 
>not available. Did it used to be global? If I make it global, will 
>Jesus hate me?

This is declared in darwin.h in the top of tree:

extern int              darwinSwapAltMeta;

--Torrey