Peter Hutterer
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
Eamon Walsh
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
Brice Goglin
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
Adam Jackson
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
Eamon Walsh
54cb729ecc
registry: Add a call for DTRACE compatibility.
2007-11-26 15:59:01 -05:00
Eamon Walsh
decd5a7c60
registry: Rebase registry to use the server config file of protocol names.
2007-11-26 15:26:49 -05:00
Eamon Walsh
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
Peter Hutterer
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
Eamon Walsh
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
Eric Anholt
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
Eamon Walsh
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
Eamon Walsh
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
Eamon Walsh
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
Eric Anholt
c2d80529fc
Remove the now-dead PciAvoid symbol.
2007-08-30 11:26:17 -07:00
Eamon Walsh
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
Eamon Walsh
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
Eric Anholt
9e2112b2b5
Remove unused xf8GetBlock and xf86GetSparse entry points.
2007-08-27 18:50:34 -07:00
Ian Romanick
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
Alex Deucher
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
Alex Deucher
1f6ddae003
add xf86_crtc_clip_video_helper to xf86sym.c
2007-08-21 00:37:33 -04:00
Jeremy C. Reed
1d4bea6106
Add some more support for DragonFly. From Joerg Sonnenberger
...
and pkgsrc.
2007-08-16 11:20:12 -05:00
Peter Hutterer
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
Dave Airlie
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
Eamon Walsh
d445d2f22b
security: drop the "declare extension security" dix call. Use the
...
SecurityPolicy configuration file instead.
2007-08-03 10:56:18 -04:00
Eamon Walsh
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
Adam Jackson
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
Adam Jackson
1f71f0c057
Remove (long-)deprecated xf86EnablePciBusMaster.
2007-07-18 15:44:45 -04:00
Adam Jackson
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
Alan Coopersmith
e523859a95
Include module name in "already built-in" message
2007-06-20 17:54:38 -07:00
Peter Hutterer
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
Ian Romanick
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
Eamon Walsh
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
Adam Jackson
0e1384d831
Delete VDIF support; it was never used anyway.
2007-06-02 16:07:20 -04:00
Julien Cristau
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
Peter Hutterer
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
Eamon Walsh
1f06d32ef5
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/privates.c
2007-04-17 12:10:22 -04:00
Keith Packard
97a2c2579c
Using wrong log level in extension to built-in message
...
was: typo in built-in module log message
(cherry picked from commit 00cfd1f765
)
2007-04-16 11:52:58 -07:00
Eamon Walsh
ed75b05651
dix: add new, combined resource lookup function. Move all dix lookup API
...
deprecated so far to a new file dix/deprecated.c. Remove the deprecation
warnings for the time being.
2007-04-04 16:00:15 -04:00
Eamon Walsh
99b220969f
Merge branch 'master' into XACE-SELINUX
2007-03-28 12:54:04 -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
Eamon Walsh
0331c6a8fc
Merge branch 'master' into XACE-SELINUX
2007-03-26 10:28:05 -04:00
Adam Jackson
9a0f25de7c
Static cleanups, dead code deletion.
2007-03-25 12:27:01 -04:00
Dave Airlie
1072b88a8f
loader: fix already built-in message
2007-03-25 10:06:00 +10:00
Keith Packard
b63e0d2545
Clean up Rotate state on server reset.
...
The rotation state is stored in the xf86_config structure which is not
re-initialized at server reset time. Clean it up at CloseScreen time.
(cherry picked from commit f8db7665dc
)
2007-03-23 01:30:00 -07:00
Eamon Walsh
1b766ffc06
dix: reorganize property code to better support xace hook; requires new API for
...
changing a property, dixChangeWindowProperty, taking an additional client argument.
2007-03-22 15:55:35 -04:00
Adam Jackson
021fc5cb2c
Static markup and dead code cull over xkb/.
...
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
2007-03-20 18:37:02 -04:00
Keith Packard
ae75019ccf
Create driver-independent CRTC-based cursor layer.
...
This moves most of the cursor management code out of the intel driver and
into the general server code. Of course, the hope is that this code will be
useful for other driver writers as well.
Check out xf86Crtc.h for the usage information, making sure you add the
needed hooks to the crtc funcs structure for your driver.
(cherry picked from commit 4d81c99a46
)
2007-03-15 00:02:40 -07:00
Eamon Walsh
b9cff1670f
Add ResourceStateCallback similar in function to ClientStateCallback.
2007-03-08 12:13:52 -05:00
Eamon Walsh
947f8d249b
devPrivates rework: redo interface again, dropping parent and type parameters
...
as well as preallocation routine.
2007-03-08 12:13:18 -05:00