Re: master branch
Re: master branch
- Subject: Re: master branch
- From: Ben Byer <email@hidden>
- Date: Thu, 22 Nov 2007 03:11:40 -0800
On Nov 22, 2007, at 12:45 AM, Jeremy Huddleston wrote:
Hi Ben,
I've finished cherry picking changes from xorg-server-1.2-apple into
master. There are still plenty of variances between the two
branches. Just looking in hw/darwin, the main offenders are below.
You can see the diffs by doing 'git diff master xorg-server-1.2-
apple <file>' ... can you sort through these and try to resolve the
differences between 1.2-apple and master. I'd like to try to get hw/
darwin (and hopefully miext/rootless) synced up as much as possible
between the two branches.
--Jeremy
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.)
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.)
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. :(
darwinKeyboard.c:
Missing DarwinModifierNXMaskToNXKeyCode, DarwinModifierNXMaskTostring
I think those were functions I added while trying to debug the stuck
modifier key issue; your call whether or not to keep them.
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.
(No, you don't have to do this all by yourself; I can take a deeper
look at it next week.)
---
Ben Byer
CoreOS / BSD Technology Group, XDarwin maintainer
_______________________________________________
Do not post admin requests to the list. They will be ignored.
X11-users mailing list (email@hidden)
This email sent to email@hidden
| References: | |
| | >master branch (From: Jeremy Huddleston <email@hidden>) |