Commit Graph

86 Commits

Author SHA1 Message Date
Eamon Walsh 2d17f47cc7 Merge branch 'master' into XACE-SELINUX
Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
2007-11-19 18:10:46 -05:00
Aaron Plattner f797c96845 Save pixmap allocation hints into the PixmapRec. 2007-11-15 12:21:25 -08:00
Eamon Walsh a52c9b2a59 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Aaron Plattner f2e310132f Add CreatePixmap allocation hints.
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
Eamon Walsh 526f40434c NULL is not a valid argument to CreatePicture, please use serverClient
as the client argument if no real client is creating the object.
2007-10-12 18:19:44 -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 e4d11e58ce Remove the PaintWindow optimization.
This was an attempt to avoid scratch gc creation and validation for paintwin
because that was expensive.  This is not the case in current servers, and the
danger of failure to implement it correctly (as seen in all previous
implementations) is high enough to justify removing it.  No performance
difference detected with x11perf -create -move -resize -circulate on Xvfb.
Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
2007-09-13 00:08:53 +00:00
Eric Anholt a02db0d500 Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
This cleans up server Makefile.ams a little bit, but also means that people
messing with configure.ac need to be careful with whether they put libraries
in the _LIBS or _SYS_LIBS targets.  Hopefully the comment in configure.ac will
clarify the issues.
2007-08-31 13:09:45 -07:00
Eamon Walsh 47ab4d648b devPrivates rework: convert CursorRec and CursorBits over to new interface. 2007-08-30 11:40:39 -04: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
Adam Jackson ae7f71a8b3 Implement core protocol backing store exclusively in terms of Composite.
Composite's automatic redirection is a more general mechanism than the
ad-hoc BS machinery, so it's much prettier to implement the one in terms
of the other.  Composite now wraps ChangeWindowAttributes and activates
automatic redirection for windows with backing store requested.  The old
backing store infrastructure is completely gutted: ABI-visible structures
retain the function pointers, but they never get called, and all the
open-coded conditionals throughout the DIX layer to implement BS are gone.

Note that this is still not a strictly complete implementation of backing
store, since Composite will throw the bits away on unmap and therefore
WhenMapped and Always hints are equivalent.
2007-08-25 15:08:20 -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 4d76075dbb Death to RCS tags. 2007-06-29 14:06:52 -04:00
Eamon Walsh 2a4aa63a23 Merge branch 'master' into XACE-SELINUX
Conflicts:

	include/miscstruct.h
2007-05-22 14:50:26 -04:00
Michel Dänzer 2866e0bac9 Fix a couple of picture repeat fields incorrectly compared to RepeatNormal. 2007-04-29 23:38:13 +02:00
Eamon Walsh 5ad562565a devPrivates rework: properly free devPrivates on compatibility structures,
type pixmap.  Requires ddx'es to call the free function from DestroyPixmap.
2007-04-05 14:18:05 -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 20e9144c07 Add $(DIX_CFLAGS) to remaining Makefile.am files 2006-11-07 12:49:28 -08:00
Daniel Stone ad631afcf3 make core keyboard/pointer map functions act on all core-sending devices
Make Set{Keyboard,Modifier,Pointer}Mapping act on all devices which send core
events.
Change LegalModifier to accept a DeviceIntPtr.
2006-09-29 00:34:23 +03:00
Daniel Stone 84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Daniel Stone fd8bde8bb0 Remove -xkbmap argument. 2006-05-29 11:14:03 +00:00
Adam Jackson 291e89d4f2 Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes. 2006-04-30 19:16:14 +00:00
Daniel Stone 9e202dfe40 Remove remnants of XkbCF code. 2006-03-27 22:25:56 +00:00
Eric Anholt 3d1667278f Remove leftover variables for cfb24 build, and finish commenting out Xglx
standalone stuff, which some versions of automake get whiny about.
2006-01-28 00:37:52 +00:00
Dave Airlie e70b64b930 Updated xgl code drop from Novell + xserver tree changes 2006-01-18 07:15:55 +00:00
Daniel Stone 2949c705f1 Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
Attempt to build xeglmodule.c, not xglxmodule.c.
Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
    treatment as _SOURCES in terms of automatically DISTing.
2006-01-10 03:23:05 +00:00
Eric Anholt b9c0ae867e Remove the manual AddFilter for convolution, which I'm pretty sure
shouldn't be necessary due to it already happening from
    PictureSetDefaultFilters.
2006-01-03 22:36:46 +00:00
Eric Anholt 1729fc882c Change REGION_INIT(pScreen, &foo, NullBox, 0) to REGION_NULL(pScreen,
&foo). While it is no longer (or rather, once again not) required as of
    regionstr.h r1.4, it matches the style of the rest of the xorg code.
2005-12-31 08:06:00 +00:00
Eric Anholt c25536a793 Initialize the fourcc value in stack-allocated glitz_pixel_format_t
structures. Greatly reduces the number of uninitialized-value accesses
    during Xgl startup according to valgrind. Allocating and filling these
    in by hand on the stack seems very shady to me.
2005-12-31 08:01:31 +00:00
Eric Anholt d6646307f0 Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in
miinitext in the XGL case. Prevents mismatched structure sizes on my
    _XSERVER64 machine. At this point, with the uncommitted render/ diffs,
    Xglx starts up but displays badly.
2005-12-29 00:19:33 +00:00
Eric Anholt b1b40ed6a8 Initial commit of XGL build infrastructure and XGL code changes for
building within the xorg server tree. Requires additional, uncommitted
    dix changes to successfully build, and successful running is still yet
    to happen.
2005-12-28 10:31:46 +00:00
Dave Airlie aeb770f645 recommit previous changes to evdev.c 2005-12-28 02:43:50 +00:00
Dave Airlie ce7c0c8937 some updates for default colormap install 2005-12-28 01:57:11 +00:00
Dave Airlie 5230e86b1c fix up xglglx.c 2005-12-23 04:13:37 +00:00
Dave Airlie feb735c5bb Well there were a couple of snapshots later than CVS available outside of
Novell, so I've done a crazy merge to try and get them into a workable
    CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if
    I did.
2005-12-23 02:07:58 +00:00
Dave Airlie ade104ce5a check drawable is available 2005-12-23 01:51:40 +00:00
Dave Airlie 7fb521e80d from davidr's tree update some fixes 2005-12-23 01:50:04 +00:00
Dave Airlie c88a3145d0 from davidr's tree if source picture defined return 2005-12-23 01:49:21 +00:00
Dave Airlie c59508566f fix glx up for newest glitz interface 2005-12-23 01:13:28 +00:00
Dave Airlie d822bc1596 make xgl code at least build against latest glitz. 2005-12-23 00:08:35 +00:00
Dave Airlie 6e2086395d fixups for newer glitz API 2005-12-22 23:32:49 +00:00
Dave Airlie f3ae42c0fd small fix towards new glitz interface 2005-12-22 23:31:15 +00:00
Dave Airlie 809906a754 make mouse support work - note you need to change the evdev devices in the
source.. hacky...
2005-08-15 08:24:45 +00:00
Jon Smirl 73a335a926 Point xegl at the DRI driver 2005-08-09 16:51:05 +00:00
Jon Smirl 29d0ba9f06 Touchup xgl for modular tree 2005-08-09 15:58:20 +00:00
David Reveman 276821605e Fix return values in Xgl render texture implementation 2005-07-01 03:14:54 +00:00
David Reveman bd54b96034 Shut up compiler 2005-06-15 05:50:15 +00:00
David Reveman 2eab094816 Build fixes 2005-06-13 16:38:06 +00:00