Commit Graph

3096 Commits

Author SHA1 Message Date
Brian
e1dea151db Implement a minor hack in dmxCheckFunctionKeys() to detect special keys.
Keep track of status of (left) alt/ctrl keys so that ctrl-alt-q to exit
can be detected.  Not ideal, but works for now.
2007-04-03 11:21:50 -06:00
Brian
23974f20bf add DDXRingBell() stub to solve link problem 2007-04-03 09:30:24 -06:00
Brian
a240c039c4 Split the xserver/fb/fbcmap.c file into two files.
Now, fbcmap_mi.c contains the fb functions which just wrap mi functions.
Previously, these were in fbcmap.c and compiled when XFree86Server was defined.
Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry
about setting the XFree86Server symbol.
2007-04-03 09:28:21 -06:00
Keith Packard
a39f297ada Don't erase current crtc for outputs on CloseScreen
Erasing this variable causes some outputs (SDVO on intel) to fail
to be correctly reset at server reset time.
(cherry picked from commit 56262a4ee943f328d089a8eb4aa70b9a4bd5d135)
2007-04-02 19:12:44 -07:00
Eric Anholt
11797ffdcc Move modes/ debugging output under Option "ModeDebug" in the Device section. 2007-04-02 18:21:58 -07:00
Brian
e44f106ffc clean-up, debug code 2007-04-02 16:26:15 -06:00
Brian
8d8bc89277 fix formatting 2007-04-02 16:21:57 -06:00
Brian
3e482de7b1 checkpoint: more clean-up 2007-04-02 15:38:15 -06:00
Brian
76a7a5ca1f formatting fixes 2007-04-02 15:24:05 -06:00
Brian
69baad321d clean-up dmxCoreMotion() dmxCoreMotion2() 2007-04-02 15:21:22 -06:00
Brian
44eb15adee checkpoint clean-up 2007-04-02 15:12:04 -06:00
Brian
0f873a9d4f remove some debug code 2007-04-02 14:51:38 -06:00
Brian
3a0ce1084a for completeness, init dummy's min/maxval[1] values (vertical axis) 2007-04-02 14:51:21 -06:00
Brian
12016f20f7 As for normal mouse device, init valuator maxval[] to real values, not zero. 2007-04-02 14:50:48 -06:00
Brian
0aaf28e563 In dmxBackendMouGetInfo() initialize the info->minval[], maxval[] arrays to the size of the backend display.
It seems that the changes to X input exposed a problem that wasn't detected
before.  The axis clipping code in GetPointerEvents() uses those limits to
constrain the pointer's coordinate range.  The max was zero so the pointer
couldn't move.
2007-04-02 12:41:30 -06:00
Brian
0013bf6ddb undo 1280 valuator hack 2007-04-02 12:39:04 -06:00
Brian
08a88d1803 Pass num_valuators=0 for ButtonPress/Release. This seems to fix the button coordinate problem 2007-04-02 12:29:37 -06:00
Brian
70683e338d formatting fixes 2007-04-02 12:29:37 -06:00
Peter Hutterer
e8777a91f3 Merge branch 'master' into mpx
Conflicts:

	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c
2007-04-02 15:36:26 +09:30
Alberto Mardegan
f2808005f4 Bug #6620: Fixed a missing 'else' in ATIPseudoDMAInit().
Before this, we'd write some registers twice on R200 hardware and also
possibly end up with a bad value in atis->cce_pri_size.
2007-03-31 16:51:24 +02:00
Aaron Plattner
5257b32e49 Bump video driver ABI to 2.0 for cw change (commit 6ed08949af). 2007-03-30 17:07:44 -07:00
Brian
73fdc16bc4 formatting fixes 2007-03-30 16:07:26 -06:00
Brian
ebdc8ce5c1 Checkpoint DMX updates: things are working much better now, but still not 100% right.
Use new dmxCoreMotion2() function which enqueues motion events with
GetPointerEvents()/mieqEnqueue().
The clipAxis() code in GetPointerEvents() is causing some grief.  The
limits seem to have always been (0,0) according to the original calls
to InitValuatorAxisStruct() in dmxinputinit.c.
Terrible hack for now: Call InitValuatorAxisStruct() with hard-coded max
values of 1280 (my screen width).
2007-03-30 16:05:46 -06:00
Ian Romanick
e9130b8bac Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-03-30 13:39:15 -07:00
Brian
3c7413e0c2 Tweak some parameters, etc. Things seem a little better now, but still a ways to go. 2007-03-30 14:07:04 -06:00
Brian
7989dacdcb num_valuators=1 for GetPointerEvents(), hack ButtonPress/Release position 2007-03-30 13:44:24 -06:00
Brian
1ea842960f more debug 2007-03-30 13:43:15 -06:00
Brian
92e8cdbd32 Checkpoint fixes to DMX for X input changes.
Xdmx builds and runs now.
Keyboard seems OK, and mouse pointer moves, but everything else is flakey.
Something is still seriously wrong.
2007-03-30 13:19:33 -06:00
Brian
d92da3d5f3 more formatting fixes 2007-03-30 12:56:34 -06:00
Brian
44acb2517d Fix some bad formatting.
Doing this:
    if (something) stmt;
is evil if you're debugging and want to break on stmt!
2007-03-30 12:54:22 -06:00
Brian
9f24798af5 ompile fbcmap.c w/ -DXFree86Server instead of linking libfbcmap.a.
The former works, the later doesn't (DMX blows up on visuals/pixel formats).
This undos Daniel's patch, which undid my prev patch.  Revisit someday.
2007-03-30 12:49:34 -06:00
Peter Hutterer
63d8f01819 dix: Fix wrong cursor refcount.
Calloc cursor struct to ensure devPrivates are zeroed out and don't
        increase the refcnt for devices automatically when allocating a new
        cursor. Use new DeviceIsPointerType() to detect if device is a pointer
        _before_ device has been activated and can thus be identified and set
        up grab functions accordingly. This way we can increase the refcnt
        when we get a pointer grab.
2007-03-30 14:59:43 +09:30
Adam Jackson
82a8b99a6c Move the XAA private indices to be static.
Technically this is an ABI break, if you aren't smart enough to be using the
getter functions.  Cope.
2007-03-28 15:17:02 -04:00
Eamon Walsh
99b220969f Merge branch 'master' into XACE-SELINUX 2007-03-28 12:54:04 -04:00
Adam Jackson
5ba4d9eedf Refuse to create tiny modes from EDID detailed timing. 2007-03-28 12:03:19 -04:00
Ian Romanick
2c6d471088 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
2007-03-28 08:08:04 -07:00
Eric Anholt
6ed08949af Move libcw setup to the only renderer requiring it (XAA).
Additionally, protect libcw setup behind checks for Render, to avoid
segfaulting if Render isn't available (xnest).

The previous setup was an ABI-preserving dance, which is better nuked now.
Now, anything that needs libcw must explicitly initialize it, and
miDisableCompositeWrapper (previously only called by EXA and presumably binary
drivers) is gone.
2007-03-27 17:31:28 -07:00
Eric Anholt
e76b634951 Fix indentation of fakexa help text. 2007-03-27 16:47:07 -07:00
Eamon Walsh
728ad64d97 Merge branch 'master' into XACE-SELINUX 2007-03-27 13:16:40 -04:00
Dave Airlie
d387a3ddf7 fix loading of GLcore after recent loading changes 2007-03-27 11:00:13 +10:00
Eric Anholt
92ba435bd9 Update xorg.conf manpage for new RandR 1.2 monitor options. 2007-03-26 12:44:58 -07:00
Eamon Walsh
0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -04:00
Adam Jackson
2e3cc861f9 Since ddc, i2c, and ramdac are in core now, remove their ModuleData stubs. 2007-03-25 22:01:34 -04:00
Adam Jackson
62224e3972 Static cleanup for xf86 ddx. 2007-03-25 17:55:15 -04:00
Adam Jackson
e8bc1988d9 Un-staticise VTSwitchEnabled, since kbd wants it apparently. 2007-03-25 15:13:05 -04:00
Adam Jackson
f36bf1a3e4 Delete a dead file. 2007-03-25 12:28:13 -04:00
Adam Jackson
9a0f25de7c Static cleanups, dead code deletion. 2007-03-25 12:27:01 -04:00
Peter Hutterer
5f9c10e8da Clean up DeviceIntPtr, prepare for Server 1.4 ABI. Move sprite-related
information into a new SpriteInfoRec, remove isMPDev flag.
2007-03-25 15:00:03 +09:30
Dave Airlie
1072b88a8f loader: fix already built-in message 2007-03-25 10:06:00 +10:00
Keith Packard
804080a709 Make pending properties force mode set. And, remove AttachScreen calls.
Yes, two changes in one commit. Sorry 'bout that.

The first change ensures that when pending property values have been
changed, a mode set to the current mode will actually do something, rather
than being identified as a no-op. In addition, the driver no longer needs to
manage the migration of pending to current values, that is handled both
within the xf86 mode setting code (to deal with non-RandR changes) as well
as within the RandR extension itself.

The second change eliminates the two-call Create/AttachScreen stuff that was
done in a failed attempt to create RandR resources before the screen
structures were allocated. Merging these back into the Create function is
cleaner.
(cherry picked from commit 57e87e0d006cbf1f5b175fe02eeb981f741d92f0)

Conflicts:

	randr/randrstr.h
	randr/rrcrtc.c

I think master and server-1.3-branch are more in sync now.
2007-03-24 00:01:47 -07:00