Commit Graph

180 Commits

Author SHA1 Message Date
Eamon Walsh 25d5e0a629 Convert callers of SecurityLookupWindow() to dixLookupWindow(). 2006-12-15 15:50:46 -05:00
Eamon Walsh 04c721854f Convert callers of LookupWindow() to dixLookupWindow(). 2006-12-15 14:19:54 -05:00
Eamon Walsh 00f0705b3b Remove instances of macros SECURITY_VERIFY_GEOMETRABLE and SECURITY_VERIFY_GC. 2006-12-14 19:15:21 -05:00
Eamon Walsh 5e334f06a1 Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC. 2006-12-14 18:27:09 -05:00
Eamon Walsh 51b69ff499 Remove instances of macro SECURITY_VERIFY_DRAWABLE. 2006-12-14 17:53:43 -05:00
Eamon Walsh 0cf75e7432 Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE. 2006-12-14 17:45:11 -05:00
Eamon Walsh 6c46645cfc Naming change: Security*Access -> Dix*Access 2006-12-14 14:45:42 -05:00
Peter Hutterer ae3c24da34 dix: Moving SpriteRec into DeviceIntRec
removing global sprite structure
	beginning to remove MPX ifdefs

xnest:  Fix to make xnest compile again
2006-12-11 18:09:59 +10:30
Peter Hutterer 3c8f166022 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
Conflicts:

	dix/events.c
2006-12-05 18:28:33 +10:30
Eamon Walsh ac90ce58ba Naming change: Security*Operation -> Xace*Operation 2006-12-01 21:15:41 -05:00
Eamon Walsh f44f14fe56 Define calls away when not building XACE, allowing ifdef's to be removed. 2006-12-01 21:15:41 -05:00
Peter Hutterer 1c7568b8a1 mi: closing memory leak, miPointer is freed in miPointerCloseScreen
bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
	adding DeviceIntPtr parameter to ScreenRec's cursor functions.
	cleanup of miPointer code to use same scheme in each function

dix:	MPHasCursor() function determines checking whether to invoke
	cursor rendering.

animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
	 on the core pointer right now.

xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
	the core pointer right now.

rac:	adding DeviceIntPtr parameter to cursor functions but RAC relies on
	the core pointer right now.

ramdac:	adding DeviceIntPtr parameter to cursor functions but ramdac relies on
	the core pointer right now.
2006-11-23 17:15:14 +10:30
Peter Hutterer 8c16f21d5d dix GetSpriteWindow() adjusted for MPX
added device dependency for MPX to DoEnterLeaveEvents,
	EnterLeaveEvents, EnterNotifies, LeaveNotifies and
	FixUpEventFromWindow.
2006-11-22 17:06:47 +10:30
Peter Hutterer 9db851c22d dix: moved sprite from static to be pointer of type SpritePtr
added SpriteRecs for MPX devices
	changed sprite dependency and added MPX functionality to parts
	of events.c (ConfineToShape, PostNewCursor, XineramaCheckMotion,
	CheckMotion, XineramaChangeToCursor, ChangeToCursor, CheckPhysLimits,
	PointerConfinedToScreen)
	added DeviceIntRec param to GetSpritePosition(). This required some
	minor changes in ddx, xtest, xkb and xfixes.

mi:	changed miPointer to pointer instead of static struct.
2006-11-21 18:15:04 +10:30
Daniel Stone 8ba0c7b62c xace: avoid 'unused variable pScreen'
Initialise pScreen explicitly, as REGION_* macros ignore pScreen.
2006-11-08 15:29:16 +02:00
Eamon Walsh 3d39c02fe6 More work on Bug #8875: revert previous fix and try using client argument
instead of serverClient.  Also don't use totalClientSize as it is not
initialized until after the first call to InitClient.
2006-11-06 21:25:52 -05:00
Eamon Walsh 75fe0670eb whitespace adjust 2006-11-06 15:30:25 -05:00
Eamon Walsh 0539d9cf24 Bug #8875: Security extension causes Xorg to core dump on server reset 2006-11-06 15:29:17 -05:00
Eamon Walsh 49a70c8570 Merge branch 'master' into my-XACE-modular 2006-09-15 15:26:57 -04:00
Eamon Walsh d1110c5c83 Generalize the handling of configuration files that ship with extensions. 2006-09-08 15:28:48 -04:00
Eamon Walsh 0fba09cdfc Include dix-config.h. 2006-09-08 15:23:06 -04:00
Eamon Walsh c93877100e Don't need to allocate memory now that devPrivates are being used. 2006-09-08 15:21:57 -04:00
Michel Dänzer f6ce0839ba Fix #include paths for fontcacheproto headers. 2006-09-06 13:18:02 +02:00
Eamon Walsh 0b81fccd2e Merge branch 'master' into my-XACE-modular
Conflicts:

	configure.ac
2006-09-05 18:03:25 -04:00
Matthew Allum 5ddbf4bcd4 Re-add support for tslib (1.0 release) and Xcalibrate extension. 2006-08-29 22:07:15 +01:00
Eamon Walsh 13c6713c82 Add four new XACE hooks: auditing, key event notification, window init 2006-08-25 18:17:01 -04:00
Eamon Walsh 52ba722e4c Merge branch 'XACE-modular' into my-XACE-modular 2006-08-21 18:49:31 -04:00
Alan Coopersmith c2535f6792 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-10 10:37:59 -07:00
Daniel Stone 12dbd8a02f remove optional R3 backwards compatibility
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
2006-08-07 23:43:40 +03:00
Eamon Walsh 45c229f526 Remove LBX code. 2006-08-03 14:26:06 -04:00
Eamon Walsh 96e45626c4 Rebase Security extension to use devPrivates for storing security state. 2006-08-02 20:29:59 -04:00
Matthew Allum 02daa6bb10 Improve XRes to;
- Better estimate general pixmap memory usage.
 - Account for pixmaps shared between clients.
 - Account for window background and border pixmaps,
   and GC stripple and tile pixmaps.
2006-07-31 17:32:05 +01:00
Daniel Stone bf2d7499c8 add securitysrv.h 2006-07-30 11:17:02 +03:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Daniel Stone f8a7a1e40c fix XEvIE build without XKB
Don't unconditionally play with XKB stuff in XEvIE.
2006-07-21 15:16:42 -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
Eamon Walsh f83cee0338 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-21 16:40:06 -07:00
Alan Coopersmith 90af38fa0c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
2006-06-21 16:23:31 -07:00
Alan Coopersmith 77c947b900 Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
(Since all use is inside the xserver module, might as well keep the header
 in the Xserver module instead of in proto/XExt to allow easier synchronization
 of updates.)
2006-06-21 16:18:41 -07:00
Eamon Walsh 9af315a9be Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-20 19:03:05 -07:00
Alan Coopersmith f68ecfa482 Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
   to build XC-Security without X-ACE
 - Added XACE #define to dix-config.h
 - Added X-ACE sources to Xext/Makefile.am
2006-06-20 19:01:34 -07:00
Alan Coopersmith a46c06dab8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
	Xext/security.c
	dix/devices.c
	dix/dispatch.c
	dix/dixutils.c
	dix/events.c
	dix/extension.c
	dix/property.c
	dix/window.c
	os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith d44b2a0a57 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:22:51 -07:00
Alan Coopersmith a544359465 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:14:27 -07:00
Alan Coopersmith 63f6e6bbfd Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-20 16:03:34 -07:00
Alan Coopersmith 6df52fb774 Delete code that's been inside #if 0 since X11R6.7. 2006-06-20 16:02:55 -07:00
Eamon Walsh 227a319340 Add XACE extension source files.
(Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never
 imported to modular cvs or git trees.)
2006-06-20 15:29:42 -07:00
Eamon Walsh f818e0ab60 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
(cherry picked from 0106715000 commit)
2006-06-19 17:24:30 -07:00
Adam Jackson 71fbda8049 Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
Greg Kroah-Hartman 96c19a3ec1 put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Greg Kroah-Hartman 101ae61696 Add PanoramiXExtensionDisabledHack to globals.h as it was missing. 2006-06-07 12:06:22 -07:00
Greg Kroah-Hartman e5b72bd9c6 Remove 3 compiler warnings in the Xext/xevie.c file 2006-06-07 12:05:39 -07:00
Daniel Stone ee71cb61f8 Bug #6956: Fix crash when removing session leader before its children.
(Rich Coe)
2006-06-03 10:54:38 +00:00
Daniel Stone a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Daniel Stone d81edb9e00 Forgot to remove this one too. 2006-06-01 19:22:01 +00:00
Daniel Stone a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Søren Sandmann Pedersen 6558ba4e62 Fri May 12 17:51:26 2006 Søren Sandmann <sandmann@redhat.com>
Keep track of the previous item and update its next pointer when deleting
    from the linked list.
2006-05-12 21:53:28 +00:00
Fredrik Höglund e1fc15a85f Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
2006-04-05 21:08:45 +00:00
Adam Jackson 9b9dd747d8 Coverity #75: Dead variable elimination. 2006-04-03 02:13:47 +00:00
Adam Jackson 07ecf49521 Coverity #992: Prevent a NULL chase. 2006-04-03 01:28:11 +00:00
Fredrik Höglund 7ea30b507f Move the screensaver extension from module to builtins.
Add the server side implementation of the ScreenSaverSuspend request.
Require scrnsaverproto >= 1.1, and change the linking order of the Xorg
    static libs.
2006-03-31 18:49:38 +00:00
Adam Jackson 7deaaa797c Big old pile of warning fixes. 2006-03-28 01:21:00 +00:00
Fredrik Höglund ae935832fa Refactored the screensaver and DPMS timer code to use the screensaver timer
for both screensaver and DPMS. Removed the SetDPMSTimers() and
    FreeDPMSTimers() functions.
2006-03-24 20:50:13 +00:00
Kristian Høgsberg 966d93ef6d Make the server distcheck and tag 1.0.99.1 snapshot.
Bump CVS version to 1.0.99.1.
Distcheck fixes.
2006-03-21 22:54:38 +00:00
Eric Anholt ea0b3f65f7 Fix build of Xorg by putting xf86bigfont back into builtin instead of
module sources list.
2006-02-16 21:45:12 +00:00
Keith Packard 8987b2c1ef Make more extensions optional in build (for kdrive). Fix kdrive build for
actual hardware. Fix kdrive pointer signed/unsigned types. Add
    kdrive-required YX rotation functions. Replace rgb text file loading
    with static rgb color table.
2006-02-16 07:17:31 +00:00
Eric Anholt c845e152f5 Bug #5871: Drop special build infrastructure left over from libcwrapper
times. (George Fufutos)
2006-02-16 05:46:08 +00:00
Dave Airlie c2f685e644 Fix XSERVER64 should be _XSERVER64 2006-02-16 05:18:20 +00:00
Eric Anholt 1bbd5e49b1 Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
useful any more. (George Fufutos)
2006-02-16 04:59:45 +00:00
Adam Jackson f105b8da11 Mark everything in dixsym.c as _X_EXPORT. 2006-02-15 20:44:13 +00:00
Adam Jackson 010d6effa6 Mark everything in {ext,font}sym.c as _X_EXPORT. 2006-02-15 19:15:32 +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
Eric Anholt c3d1403672 Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
Dave Airlie 506eca5f57 Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
breaks.
2006-01-18 06:56:52 +00:00
Eric Anholt 9ceffb6b92 Merge from xserver a header for shm's server internal functions, which are
called by DDXes. Desired by XGL, and should be used in other locations,
    probably.
2005-12-28 10:37:17 +00:00
Adam Jackson b076dd787f Spell it XINERAMA_SRCS, not PANORAMIX_SRCS. 2005-12-13 17:34:06 +00:00
Alan Coopersmith 438a5549f0 Bugzilla #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Files in
xserver/xorg/Xext not included in tarball after make dist
2005-12-12 03:06:18 +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
Kean Johnson 5390c7ab05 See ChangeLog entry 2005-11-07 for details. 2005-11-08 06:33:30 +00:00
Adam Jackson 4a80720118 Bug #4730: Byte-swap the pixmap ID correctly. (Neil Campbell) 2005-10-21 18:50:09 +00:00
Kevin E Martin 1859c62607 include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
2005-10-17 07:18:59 +00:00
Alan Coopersmith 29b5f846d2 Bug #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Add
SecurityPolicy to EXTRA_DIST (Bill Crawford)
2005-10-09 17:47:34 +00:00
Alan Coopersmith e63f76caa1 Sun bug #6326551: xkbSetDetectableAutoRepeat broken when using XEvIE
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6326551>
    (Derek Wang, Sun Microsystems)
2005-10-06 17:55:54 +00:00
Alan Coopersmith 4608a2b654 Man page processing/installation and other doc file updates 2005-09-30 02:37:57 +00:00
Alan Coopersmith 256fa24945 Add SecurityPolicy file for XCSECURITY extension.
Add README to EXTRA_DIST
2005-09-25 17:48:09 +00:00
Daniel Stone 825a95a1fa Remove use of dix-config and xorg-config.h from public headers. 2005-08-24 11:18:35 +00:00
Søren Sandmann Pedersen df938987d6 Add buildsystem for Xprint, and:
Wed Aug 17 14:50:58 2005 Soren Sandmann <sandmann@redhat.com>
Include <X11/extensions/Print{,str}.h> instead of "Print{,str}.h"
Include <X11/fonts/fontstruct.h> isntead of "fonts/fontstruct.h"
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally compile in xprint.c
Add Xprint
2005-08-17 19:03:18 +00:00
Kevin E Martin 86529c07d6 Fix distcheck for server 2005-07-28 23:28:34 +00:00
Kevin E Martin 7bd6b0640e Add #include <dmx-config.h> for building dmx/glxProxy in the modular tree. 2005-07-27 08:16:35 +00:00
Søren Sandmann Pedersen 562acf2e69 Add -I$(top_builddir)/hw/xfree86/dixmods/extmod to Xext/Makefile.am Patch
from Stefan Dirsch
2005-07-14 23:41:15 +00:00
Adam Jackson 23d25a656d Remove references to DDX-specific extensions 2005-07-13 23:41:21 +00:00
Alan Coopersmith f86562540d Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2325
<https://bugs.freedesktop.org/attachment.cgi?id=2325> Avoid 38
    gcc-3.4.2 warnings: suggest parentheses around assignment used as truth
    value suggest explicit braces to avoid ambiguous `else' suggest
    parentheses around && within || suggest parentheses around arithmetic
    in operand of ^ "/*" within comment (Peter Breitenlohner)
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2326
    <https://bugs.freedesktop.org/attachment.cgi?id=2326> This patch
    removes these 2 gcc-3.4.3 warnings: missing braces around initializer
    implicit declaration of function `XpOidTrayMediumListHasTray' (Peter
    Breitenlohner)
2005-07-07 02:47:06 +00:00
Daniel Stone 0bb669638f Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". 2005-07-03 08:53:54 +00:00
Daniel Stone e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone 826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone 9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Daniel Stone ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00
Adam Jackson 988ffddfe0 Bug #2799: Input shape. (Keith Packard) 2005-06-10 04:01:14 +00:00
Adam Jackson cdc15e2294 Bug #1846: Add intentionally undocumented -disablexineramaextension flag to
the server to work around ignorant clients on large display walls.
    (Kevin E. Martin)
2005-06-09 02:29:42 +00:00