Commit Graph

3299 Commits

Author SHA1 Message Date
Matthieu Herrb 1cc8db7281 Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver 2007-04-03 16:04:45 +02:00
Matthieu Herrb 645d87cf8e CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption 2007-04-03 15:47:18 +02: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
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
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
George Sapountzis 76756f2756 Make xf86glx.c unaware of Mesa internals
Use newly added XMesaCopyContext() and drop the GlxSetRenderTables() call
for Xgl, as this is now done inside XMesaForceCurrent(). This leaves xmesaP.h
but only for the declarations of the three XMesa/XFree86 functions. Also,
GlxSetRenderTables() stays but is only used in hw/xgl/glxext/ .

Also drop xf86glxint.h, no longer used.

Depends on mesa commit 7439a36785b6a2783e80a40a96c09db8f56dc2bc of 2007-03-30.
2007-03-30 20:06:35 +03:00
Peter Hutterer 307d2b57bb Xi: remove 'register' keywords. 2007-03-29 15:23:41 +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
Tomas Janousek 8c7f56d92d Bug #10296: Fix timer rescheduling. 2007-03-28 14:46:30 -04:00
Adam Jackson 5ba4d9eedf Refuse to create tiny modes from EDID detailed timing. 2007-03-28 12:03:19 -04:00
Daniel Stone 8522044635 GL: Update for Mesa changes
Added s_fragprog.c to fix the build.
2007-03-28 13:03:32 +03:00
Eric Anholt 1af2ef0b25 Enable Composite by default now that it disables itself in the known bad cases. 2007-03-27 17:34:04 -07:00
Eric Anholt 0bfc3cc22d Disable composite when Xinerama is active.
It will likely take a decent bit of work to make that work right.
2007-03-27 17:34:00 -07:00
Eric Anholt 5e7936371c Disable Composite when the screen's visual is pseudocolor.
Rendering fails badly in this case, and I don't care enough to fix it.
2007-03-27 17:31:39 -07:00
Eric Anholt 8afc7e2eb3 Refuse to initialize Composite if Render is not present.
Composite relies on the presence of Render, in particular for the automatic
compositing.
2007-03-27 17:31:34 -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
Michel Dänzer 6a0bed16e8 Fix typo in GL/mesa/shader/slang/Makefile.am. 2007-03-27 16:51:12 +02:00
Dave Airlie b8f846a9df gl: oops dodgy s appeared pointed out by jcristau on irc.. 2007-03-27 14:17:40 +10:00
Dave Airlie a63ee90bc2 gl: update for latest mesa glsl-compiler merge 2007-03-27 11:05:52 +10: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 f7c5aa0dc0 Remove dead NEED_DBE_BUF_BITS code. 2007-03-26 10:21:44 -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 e88fa75c9b Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
Adam Jackson 4b5802ddbd General DIX static and dead code cleanup. 2007-03-25 17:57:54 -04:00
Adam Jackson 04b87d6dfa Static and dead code cleaup for Xext/ 2007-03-25 17:57:22 -04:00