Commit Graph

180 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
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
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
Daniel Stone d57060f167 DMX: Remove usage of alloca
Replace with heap allocations.
2007-11-05 14:34:42 +00: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
Adam Jackson a2ee5fe0c4 Enable MIT-SHM in Xdmx.
The extension is entirely DIX-level, no new DDX changes needed.
2007-11-01 13:47:17 -04:00
Eamon Walsh 32f3f5a1e7 registry: Register DMX extension protocol names. 2007-10-15 15:32:17 -04:00
Eamon Walsh 7e9e01a4a3 dix: pass a valid ClientPtr to SetFontPath in all cases. 2007-10-10 17:40:22 -04:00
Eamon Walsh 5c03d13181 xace: add new hooks + access controls: XInput extension.
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
2007-09-28 08:02:00 -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
Alan Hourihane 84eb7e6224 Fix Xdmx build 2007-09-06 13:37:24 +01: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 b82557c9fb xace: add hooks + new access codes: core protocol screensaver requests 2007-08-16 10:36:05 -04:00
Eamon Walsh 568ae737d1 xace: add hooks + new access codes: core protocol server requests 2007-08-16 10:33:58 -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
Colin Guthrie 873ef75b1e fix __glXErrorCallBack() proto 2007-04-30 10:33:12 -06:00
Brian 18252a515d bump release date to reflect input code updates 2007-04-24 14:10:09 -06:00
Eamon Walsh cf962a849d Merge branch 'master' into XACE-SELINUX
Conflicts:

	configure.ac
2007-04-05 14:41:39 -04: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
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 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
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
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
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
Eamon Walsh a7cd53deb9 remove PIXPRIV checks as this flag is always set. 2007-03-06 17:05:03 -05:00
Daniel Stone 17d85387d1 dmx, vfb, xnest: fix fbcmap compilation
Don't always define XFree86Server, but only for damn fbcmap.c.
Split fbcmap.c into its own library to achieve this.
2007-02-05 03:43:10 +02:00
George Sapountzis cf5b29d75d dmx: drop leftover __GLXdrawablePrivateRec struct. 2007-02-02 12:57:38 +02:00
James Steven Supancic III a5fcf1e5e7 Fix RENDER issues (bug #7555) and implement RENDER add/remove screen
support (bug #8485).
2006-12-16 12:02:38 -05:00
Eamon Walsh 10aabb729d Convert callers of LookupDrawable() to dixLookupDrawable(). 2006-12-15 16:36:29 -05:00
Eamon Walsh 25d5e0a629 Convert callers of SecurityLookupWindow() to dixLookupWindow(). 2006-12-15 15:50:46 -05:00
Eamon Walsh 6c46645cfc Naming change: Security*Access -> Dix*Access 2006-12-14 14:45:42 -05: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
Brian f7c1d94241 Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
to prevent potential segfault.
2006-09-23 10:38:10 -06:00
Brian 945b7c6394 The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors.
2006-09-23 10:35:25 -06:00
Brian 891e9c3e6c Replace broken DMXDBG3() with DMXDBG2() 2006-09-23 10:28:24 -06:00
Michel Dänzer 8356be492c Make sure _XSERVER64 is defined when it should be and gets tested. 2006-09-06 15:20:55 +02:00
Kristian Høgsberg 3821f6aeaa Unlibc-wrap DMX glxscreens.c and fix tag-removal typo. 2006-07-26 01:56:02 -04:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Adam Jackson 985c34bf06 Remove the DDXTIME conditional, for being unused. 2006-07-20 17:33:13 -04: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
Kristian Høgsberg f029e9a32d Un-glx-libcwrap DMX GLX proxy so it works without GL/include. 2006-07-15 22:06:35 -04:00
James Steven Supancic III 4c225a3a8b Bug #7482: Fix Xdmx's Render code to match reality; fixes BadLength client
crashes.
2006-07-13 10:03:57 -04:00
Greg Kroah-Hartman 59836c0f2a fix wrong function pointer type in hw/dmx/dmxcmap.c 2006-07-05 09:30:48 -07:00
Greg Kroah-Hartman 78f4ab6b89 Fix compiler warning about undefined ReinitializeRootWindow function 2006-06-07 14:12:40 -07:00
Greg Kroah-Hartman cc465800dd Fix compiler warnings about SetVendorRelease and SetVendorString 2006-06-07 14:03:35 -07:00
Daniel Stone 32be08ba72 Remove horrendously ugly DDX backward-compatibility. 2006-06-01 19:22:38 +00:00
Daniel Stone fd8bde8bb0 Remove -xkbmap argument. 2006-05-29 11:14:03 +00:00
Adam Jackson 0e62d92d5b Coverity #804: Another leak on OOM path. 2006-04-14 23:43:32 +00:00
Adam Jackson 6545051902 Coverity #1003, #1004: Two more useless null checks. 2006-04-14 23:10:59 +00:00
Adam Jackson ab1d420022 Coverity #1005: Avoid a null deref. 2006-04-14 23:09:38 +00:00
Adam Jackson d01e0956a8 Coverity #1007: Fix a silly null check. 2006-04-14 23:08:10 +00:00
Adam Jackson 20c1ef2cc3 Coverity #769: Fix a potential memory leak for systems that allocate on
malloc(0)
2006-04-07 01:50:07 +00:00
Adam Jackson 536628bb4b Coverity #1037: Sanity check idx before use. 2006-04-07 01:18:01 +00:00
Alan Hourihane 2a6c11aa3b Fix a server crash due to memsetting beyond allocated memory when running
GL applications.
2006-04-03 09:12:28 +00:00
Adam Jackson f6ca2b3ea9 Coverity #38: Dead branch elimination. 2006-04-03 02:15:55 +00:00
Adam Jackson 323fec2029 Reorder link order for Xdmx to fix new screensaver variable reference
properly; remove previous awful hack.
2006-04-02 00:46:20 +00:00
Adam Jackson 277f612d4e Hack around the new screensaver variable for DMX, which is otherwise
blissfully ignorant of it.
2006-04-01 23:19:08 +00:00
Adam Jackson ff6f88348c More warning cleanup. 2006-03-29 01:05:09 +00:00
Kristian Høgsberg c3342c8000 Merge accel_indirect branch to HEAD. 2006-03-12 00:11:34 +00:00
Alexander Gottwald 43324132af Added Mesa include directory 2006-02-22 16:08:56 +00:00
Alan Coopersmith a2a5254675 Add <string.h>, <stdlib.h>, and <stdio.h> to clear undefined function
warnings after the removal of libcwrapper headers.
2006-02-11 19:16:51 +00:00
Adam Jackson 6798fd0170 Bug #4190: Add a rule for 'make relink' since automake sucks. 2005-12-26 19:13:52 +00:00
Adam Jackson 62f3ef930a Bug #5258: Restore binary compatibility with 6.8.2's PictureRec. (Aaron
Plattner)
2005-12-09 18:35:21 +00:00
Kevin E Martin 26b41ff439 Fix sgml docs build. 2005-12-09 03:02:21 +00:00
Kevin E Martin 4a39354e14 Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 2005-12-06 22:48:51 +00:00
Kevin E Martin 7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Alan Coopersmith 51a721a6db Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
2005-11-28 22:05:09 +00:00
Alan Coopersmith 267cbffa41 Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019> xserver
installs manpages into 'man1' instead of 'man1x'
2005-11-13 20:53:24 +00:00
Kevin E Martin 462a2407d5 Add xorg-server.m4 for driver dependency checking.
Update pkgcheck depedencies to work with separate build roots.
2005-11-01 15:01:51 +00:00
Adam Jackson dd0d010e9c Fix parallel builds my ensuring libdmxconfig builds first. 2005-10-18 19:14:08 +00:00
Kristian Høgsberg b349b20d78 Dist NOTES.
Dist helper shell scripts.
Dist XAA.HOWTO and a few more unused C files.
Dist xorgconf.cpp.
Fix DIST_EXTRA typo.
Clean yacc and lex generated files only during make maintainer-clean as we
    don't expect users to have those tools installed.
2005-10-13 18:08:24 +00:00
Alan Coopersmith 2770233069 Don't build "ev" example on systems without <linux/input.h> 2005-10-06 19:59:26 +00:00