quartz/X11Application.m:
Looks mostly like reformatting, but I didn't want to sift through
it all...
True. there are some symbol thingies at the top (added a couple of
externs, etc). The biggest thing to watch out for here is
send_nsevent at the bottom, which I had to completely rewrite for
server-1.4. We've got to be careful with that code, since it's
mostly untested -- and probably needs, for example, some of the
stuck modifier fixes we just did. (Unfortunately, the structure of
the code is fairly different, although at least it's simpler in 1.4.)
I cleaned up the 3 branches to have the same formatting here
(send_nsevent being the main difference between the two versions
now). What is going on with this difference, though:
apple/bundle-main.c:
Looks like some xcb stuff in master didn't get into 1.2-apple and
some other changes in 1.2-apple didn't get in master.
Okay, this is a bit embarrassing. The problem here is that the old
X11.app pulled some sleazy moves, using XTrans internal functions,
and it's no longer even possible to do that. Instead, we can use
xcb. In one version, I just removed the code entirely, in the
other, I added xcb code in -- but I'm not sure that it even works.
(You've probably noticed when debugging the server that it starts
out at :0, and then starts counting upwards as you restart the
server -- I think it's because this code is broken, but it doesn't
really have much of a visible effect.)
I'll leave this up to you to resolve then...
darwin.c:
Looks like backStorage changes weren't rolled into master, and I
think you rolled this change into a big commit to our branch, so I
can't cherry-pick. Is there a reason this isn't in master?
No clue. :(
Ok, I merged it into master...
darwinEvents.c:
Many conflicts between the two... which is right? I ended up not
cherry-picking these commits because of the discrepancies:
Same story as with X11Application.m -- this is the big rewrite I had
to do to get events working. So, we need to start with the code in
1.4 (since it at least marginally works) and then, as necessary,
port over the recent fixes from 1.2-apple.
Ok, so the only differences now (modulo API or xserver-wide changes)
are in GL/apple, apple/bundle-main.c, events-rewrite (X11Application.m
and darwwinEvents.c), and my keyboard mapping changes.
--Jeremy
_______________________________________________
Do not post admin requests to the list. They will be ignored.
X11-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription: http://lists.apple.com/mailman/options/x11-users/email@hidden
This email sent to email@hidden
References:
>master branch (From: Jeremy Huddleston <email@hidden>)
