fd06e8f8c1
Merge branch 'master' into dcdc_rework
...
Conflicts:
Xext/xevie.c
dix/dispatch.c
2008-04-07 07:56:41 +09:30
b5f98fcea2
XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
...
Patch by Joe Nall.
The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
2008-03-28 14:14:23 -04:00
87bfd3bd96
Bug #11508 : Fix build without XV.
2008-03-24 13:33:38 -04:00
4f2cd0ed96
Merge branch 'master' into mpx
...
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
34bf308a9e
dix: Refactoring of selection code to allow for polyinstantiation.
...
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
2008-02-29 18:01:37 -05:00
d5715f7bea
dix: Refactoring of property code to allow for polyinstantiation.
...
Introduces dixLookupProperty() API.
2008-02-29 18:01:37 -05:00
26c2e95fa5
Nuke a duplicate SYMFUNC(xf86CVTMode)
2008-02-29 16:01:15 -05:00
ca5625b911
Add xf86GTFMode().
...
This should probably be shared like xf86CVTMode().
2008-02-29 16:01:15 -05:00
ee21aba6be
Fix Xinerama's consolidated visual handling.
...
Formerly the code claimed it could only handle up to 256 visuals, which
was true. Also true, but not explicitly stated, was that it could only
handle visuals with VID < 256. If you have enough screens, and subsystems
that add lots of visuals, you can easily run off the end. (Made worse
because we allocate visual IDs from the same pool as XIDs.) If your app
then chooses a visual > 256, then the Xinerama code would throw BadMatch
on CreateColormap and your app wouldn't start.
With this change, PanoramiXVisualTable is gone. Other subsystems that
were using it as a translation table between each screen's visuals now
use a PanoramiXTranslateVisual() helper.
2008-02-22 15:19:54 -05:00
6dc71f6b2c
xfree86: plug memory leak in InitPathList.
...
All the failure paths were very diligent in freeing the "fullpath" temporary
string, but the success case was not. All the content only got strdup()d, so
it's not live memory anymore.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-02-18 18:14:33 +10:30
ba69904148
Simplify dlloader a bit more.
2008-02-14 08:52:43 +11:00
f750ce53ac
Remove some braindamage from ModuleDesc.
...
Yay dead code elimination.
2008-02-14 08:22:57 +11:00
e91ff09568
Friends don't let friends call xf86AddModuleInfo.
...
That code only existed to leak memory. It can go now, thanks.
2008-02-14 08:21:44 +11:00
e5e531ce96
Merge branch 'master' into mpx
...
Conflicts:
dix/events.c
2008-01-31 16:36:17 +10:30
94f412cb7e
Loader: Fix verbosity confusion
...
'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
2008-01-29 14:46:15 +11:00
8da83836b6
Merge branch 'master' into mpx
...
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
85ed0bb440
Add a missing linebreak after LoadModule: "foo"
...
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
2007-12-08 02:53:51 +01:00
1faba797cb
Death to libcwrapper.
...
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
54cb729ecc
registry: Add a call for DTRACE compatibility.
2007-11-26 15:59:01 -05:00
decd5a7c60
registry: Rebase registry to use the server config file of protocol names.
2007-11-26 15:26:49 -05:00
60be452c2e
xace: restore the old SaveScreens function and introduce new API, since the
...
old version is called from drivers...
2007-11-19 16:59:34 -05:00
0b729051c0
Merge branch 'master' into mpx
...
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
4b14c9a9cd
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
...
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
2007-10-19 16:34:54 -07:00
6adeba1730
dix: Add a new "registry" mechanism for registering string names of things.
...
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
2007-10-11 14:18:59 -04:00
8b54865720
xace: add hooks + new access codes: XKB extension.
...
Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway.
2007-09-28 13:34:18 -04:00
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
c2d80529fc
Remove the now-dead PciAvoid symbol.
2007-08-30 11:26:17 -07:00
4017d31902
devPrivates rework: since API is already broken, switch everything
...
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04:00
8554707326
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
2007-08-28 07:25:21 -04:00
9e2112b2b5
Remove unused xf8GetBlock and xf86GetSparse entry points.
2007-08-27 18:50:34 -07:00
8b6b40b727
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
81f8b652d9
Add _X_EXPORT to exported functions in hw/xfree86/modes/*
...
Also add missing exports to hw/xfree86/loader/xf86sym.c
2007-08-22 19:26:34 -04:00
1f6ddae003
add xf86_crtc_clip_video_helper to xf86sym.c
2007-08-21 00:37:33 -04:00
1d4bea6106
Add some more support for DragonFly. From Joerg Sonnenberger
...
and pkgsrc.
2007-08-16 11:20:12 -05:00
f367285fd5
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
2007-08-12 15:31:10 +09:30
e717eb82dc
xserver: stop bcopy from going really slow
...
The outport is most likely unnecessary on any currently used hardware,
the byte copy is necessary from what I know on IA64 and friends so leave it.
Add a new API entry point which lets a driver select the old behaviour if
such a needs is ever found.
This gives me ~20% speed up on startup on 945 hardware.
2007-08-05 09:51:36 +10:00
d445d2f22b
security: drop the "declare extension security" dix call. Use the
...
SecurityPolicy configuration file instead.
2007-08-03 10:56:18 -04:00
e34fcd2bf4
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
2007-08-02 14:27:03 -04:00
21bbd7d64b
Delete some pre-dlloader debugging scaffolding.
...
If your loader is as bad as elfloader, then it makes sense for the
server to have some stubs for you to assign to / break on. However it
is no longer 1996.
2007-07-18 15:45:11 -04:00
1f71f0c057
Remove (long-)deprecated xf86EnablePciBusMaster.
2007-07-18 15:44:45 -04:00
f7f3fe7fe7
Remove the remnants of OS/2 support.
...
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
2007-06-28 18:59:05 -04:00
e523859a95
Include module name in "already built-in" message
2007-06-20 17:54:38 -07:00
1f97a76476
Merge branch 'master' into mpx
...
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
2007-06-19 17:20:52 +09:30
ab7a6d860d
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
2007-06-18 16:51:13 -07:00
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
0e1384d831
Delete VDIF support; it was never used anyway.
2007-06-02 16:07:20 -04:00
3c6f142848
Make sure that the ramdac symbols are present in the server
...
The former ramdac module is now built into the server, so its symbols need to
be explicitly exported to drivers (Debian #423129 ).
2007-05-29 22:01:30 -04:00
cb22bdbe67
Add selected RamDac functions to xfree86LookupTab.
...
Adding those makes drivers for s3 and tga work again.
2007-05-03 10:05:58 +09:30
Peter Hutterer
Eamon Walsh
Adam Jackson
Peter Hutterer
Arjan van de Ven
Julien Goodwin
Brice Goglin
Eric Anholt
Ian Romanick
Alex Deucher
Alex Deucher
Jeremy C. Reed
Dave Airlie
Adam Jackson
Alan Coopersmith
Julien Cristau