996b621bec
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
2007-11-26 15:59:44 -05:00
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -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
20fd478324
Small static cleanups on dix/
2007-11-15 17:01:33 -05:00
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -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
d7c5e8bfc1
Modified performance patches from Arjan van de Ven <arjan@infradead.org>
...
Subject: [PATCH] fix some performance gaps in Xace
The XaceHook function is used in several hotpaths.
The problem with it (performance wise) is twofold:
* The XaceHook function has a big switch() statement for the hook number in it
* The XaceHook function uses varargs to reassemble the final dispatch arguments again
Both are expensive operations... for something that is known at compile time
This patch turns the hotpath XaceHook call into a direct call to avoid
the switch and varargs; this gives me over 10% performance gain
on the x11perf benchmark.
2007-11-06 16:26:09 -05:00
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
83e5d9e75d
DIX: Remove last alloca call
...
Replace with heap allocations.
2007-11-05 14:36:54 +00:00
6e4f5cf83f
changing ALLOCATE_LOCAL to xalloc to prevent stack overflow
2007-11-05 05:53:34 -08:00
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
825f09dffd
xace: Still more changes to selection code. Removed the SelectionPtr from
...
the hook - the hook only needs the Atom to control access to the selection
object. Upgraded the SelectionCallback to take a client argument and
additional type codes so that it can be used for redirection.
2007-10-23 17:12:57 -04:00
12e889d202
xace: Bug fixes, name changes to selection access hooks and fields.
2007-10-19 18:43:38 -04:00
50551ec693
xace: remove obsoleted DRAWABLE_ACCESS hook.
2007-09-28 15:04:33 -04:00
9bd04055a2
xace: change prototype of VALIDATE_DRAWABLE_AND_GC macro to allow access
...
mode to be passed to dixLookupDrawable.
2007-09-25 09:33:51 -04:00
82f7195a62
xace: modifications to ChangeWindowAttributes special case: separate
...
Receive and SetAttr. Refer to 963e69b8ef
2007-09-20 09:17:09 -04:00
963e69b8ef
xace: add special-case for just setting the event mask on a window,
...
this should only check "receive" permission, not "setattr" permission.
2007-09-19 11:11:41 -04:00
0003ccfcdf
xace: add new fields to resource access hook to allow parent resource objects
...
to be passed in at create time. Also added a missing devPrivates initializer.
2007-09-05 11:18:36 -04:00
cda92bbf12
xace: add hooks + new access codes: XFixes extension.
...
Required a new name argument to the selection access hook to handle
XFixesSelectSelectionInput.
2007-08-30 11:48:45 -04: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
0a994d4f85
xace: add hooks + new access codes: core protocol selection requests
2007-08-16 12:54:35 -04:00
3ef2e9e623
xace: add hooks + new access codes: core protocol pixmap requests
2007-08-16 12:27:48 -04:00
fe9bc481ef
xace: add hooks + new access codes: core protocol font requests
2007-08-16 12:19:49 -04:00
e89301c879
xace: add hooks + new access codes: core protocol client requests
2007-08-16 10:57:49 -04:00
b82557c9fb
xace: add hooks + new access codes: core protocol screensaver requests
2007-08-16 10:36:05 -04:00
568ae737d1
xace: add hooks + new access codes: core protocol server requests
2007-08-16 10:33:58 -04:00
3c9553ac2c
xace: rename hostlist security hook to "server" as this hook will be used
...
for other types of server access besides just the host list.
2007-08-15 14:14:25 -04:00
dc84bb3418
xace: add hooks + new access codes: core protocol cursor requests
2007-08-15 14:13:53 -04:00
42d6112ec2
xace: add hooks + new access codes: core protocol GC requests
2007-08-14 13:09:38 -04:00
9a183d7ba5
dix: remove caching of drawables and graphics contexts. The security checks
...
simply bypass the cached values so they are unused.
2007-08-14 11:39:26 -04:00
2763056ab5
xace: add hooks + new access codes: core protocol window requests
2007-08-13 13:44:33 -04:00
d744df32a1
xace: add hooks + new access codes: core protocol colormap requests
2007-08-06 12:23:21 -04: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
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
dfbe32b5b8
Remove the old Kerberos 5 authentication code.
...
Before you complain, this code hasn't seen material change since at least
X11R6. It certainly does not build with any modern version of Kerberos.
Anybody wanting krb5 auth to their X server should probably be using
GSSAPI instead of internal krb5 API anyway.
2007-06-04 18:07:00 -04:00
9cee4ec5e6
xace: change the semantics of the return value of XACE hooks to allow
...
arbitrary X status codes instead of just TRUE/FALSE.
The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however. There is more error propagation
work to do.
2007-04-17 16:01:56 -04:00
1f06d32ef5
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/privates.c
2007-04-17 12:10:22 -04:00
d4dad6f84f
Merge branch 'master' into mpx
...
Conflicts:
configure.ac
dix/events.c
hw/xfree86/common/xf86Xinput.c
2007-04-12 11:11:03 +09:30
1f6741db19
Bug #10560 : Code-Cleanup: function declarations () -> (void)
...
X.Org Bugzilla #10560 : <https://bugs.freedesktop.org/show_bug.cgi?id=10560 >
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511 >
2007-04-09 14:33:15 -07:00
63e46e4fc3
devPrivates rework: properly free devPrivates on compatibility structures,
...
excluding pixmap.
2007-04-04 15:59:51 -04:00
e8777a91f3
Merge branch 'master' into mpx
...
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
2007-04-02 15:36:26 +09:30
0331c6a8fc
Merge branch 'master' into XACE-SELINUX
2007-03-26 10:28:05 -04:00
f7c5aa0dc0
Remove dead NEED_DBE_BUF_BITS code.
2007-03-26 10:21:44 -04:00
4b5802ddbd
General DIX static and dead code cleanup.
2007-03-25 17:57:54 -04:00
9a0f25de7c
Static cleanups, dead code deletion.
2007-03-25 12:27:01 -04:00
a3296d111d
xace: add access_mode argument to selection hook.
2007-03-21 17:01:26 -04:00
4c1fb8069d
dix: add new selection fields supporting redirection.
...
This is a minor ABI break.
2007-03-21 16:18:09 -04:00
9c144f8ac5
xace: add XACE_SELECTION_ACCESS hook for selection redirection/access.
2007-03-21 14:39:00 -04:00
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
015d728bcd
Merge branch 'master' into mpx
...
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
2007-03-19 09:42:56 +10:30
63169ce52d
dix: remove 'register' keyword for all variables.
2007-03-08 17:50:25 +10:30
e43b8a4e40
dix: Add ClientPointer to client, used for picking which pointer to use in
...
ambiguious request. PickPointer and PickKeyboard are used for getting
the appropriate pointer when situation is unclear.
Fix some issues with InitializeSprite.
dix, xfree86: Remove last traces of InitSprite.
2007-03-02 15:21:46 +10:30
4b8b0e377a
Xi: Add access control request handling.
...
dix: New file access.c to handle all access control for devices.
2007-02-22 20:00:59 +10:30
cd0af7a785
Xi, dix: Only one client at a time can change the pointer-keyboard pairing,
...
using xRegisterPairingClient request.
2007-02-21 10:08:41 +10:30
d9e079d2a3
Zero out client devPrivates on allocation.
2006-12-22 13:07:09 -05:00
ab1d5b0c31
Convert callers of LookupClient() to dixLookupClient().
2006-12-15 17:26:58 -05:00
25d5e0a629
Convert callers of SecurityLookupWindow() to dixLookupWindow().
2006-12-15 15:50:46 -05:00
00f0705b3b
Remove instances of macros SECURITY_VERIFY_GEOMETRABLE and SECURITY_VERIFY_GC.
2006-12-14 19:15:21 -05:00
5e334f06a1
Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC.
2006-12-14 18:27:09 -05:00
51b69ff499
Remove instances of macro SECURITY_VERIFY_DRAWABLE.
2006-12-14 17:53:43 -05:00
6c46645cfc
Naming change: Security*Access -> Dix*Access
2006-12-14 14:45:42 -05:00
0c5dab5c8e
config: move config.h to hotplug.h
...
Also, move configInitialise to after OsInit, since the next commit will
make it use a timer.
2006-12-06 23:24:24 +02:00
2f0a800ffd
config: move to block/wakeup handler
2006-12-06 23:24:24 +02:00
f44f14fe56
Define calls away when not building XACE, allowing ifdef's to be removed.
2006-12-01 21:15:41 -05:00
ae58d349c1
CreateColormap: fix return value (bug #7083 )
...
Return BadMatch when an unsupported visual type is given, not BadValue --
this is correct according to the spec.
2006-11-08 15:29:15 +02:00
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
49a26681b2
Add DTrace probe points for X server <-> client communications
...
See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 12:54:43 -08:00
335b503c5e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-13 18:10:45 +03:00
cec392656c
Zero out newly allocated ClientRec structures.
...
This is required to initialize the devPrivates to a known state.
2006-09-08 15:24:23 -04:00
13c6713c82
Add four new XACE hooks: auditing, key event notification, window init
2006-08-25 18:17:01 -04:00
52ba722e4c
Merge branch 'XACE-modular' into my-XACE-modular
2006-08-21 18:49:31 -04:00
c2535f6792
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-10 10:37:59 -07:00
96e45626c4
Rebase Security extension to use devPrivates for storing security state.
2006-08-02 20:29:59 -04:00
3c23dec596
Call ClientStateCallback on serverClient devPrivates initialization.
2006-08-02 13:39:49 -04:00
7465010d59
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:05:41 -04:00
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
02a9531156
add basic D-BUS configuration mechanism
...
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
2006-07-21 15:19:49 -04:00
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
3e098efa35
Correct ifdef - should be XACE, not XCSECURITY
2006-06-21 16:21:03 -07:00
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
d44b2a0a57
Move Xserver API for security extension to securitysrv.h
2006-06-20 18:22:51 -07:00
37f0ae0245
Replace XC-SECURITY code with XACE security hooks
...
(cherry picked from 8526cd6395
2006-06-19 17:09:37 -07:00
8f5aa38abf
fix compiler warning about XKB_IN_SERVER redefinition
2006-06-07 12:33:44 -07:00
a9ed5a8790
Kill LBX, too.
2006-06-01 22:06:41 +00:00
f105b8da11
Mark everything in dixsym.c as _X_EXPORT.
2006-02-15 20:44:13 +00:00
c3d6799cee
Bug #594 : CAN-2005-2495: Fix exploitable integer overflow in pixmap
...
creation, where we could create a far smaller pixmap than we thought,
allowing changes to arbitrary chunks of memory. (Søren Sandmann
Pedersen)
2005-09-13 01:33:19 +00:00
ead37b0869
Mark variables modified in signal handlers as volatile (part of Sun bug id
...
4496504)
2005-07-16 20:52:25 +00:00
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
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
988ffddfe0
Bug #2799 : Input shape. (Keith Packard)
2005-06-10 04:01:14 +00:00
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
8d0e520721
xc/programs/Xserver/dix/atom.c
...
xc/programs/Xserver/dix/colormap.c
xc/programs/Xserver/dix/cursor.c
xc/programs/Xserver/dix/devices.c
xc/programs/Xserver/dix/dispatch.c
xc/programs/Xserver/dix/dixfonts.c
xc/programs/Xserver/dix/dixutils.c
xc/programs/Xserver/dix/events.c
xc/programs/Xserver/dix/extension.c
xc/programs/Xserver/dix/gc.c
xc/programs/Xserver/dix/glyphcurs.c
xc/programs/Xserver/dix/grabs.c
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/pixmap.c
xc/programs/Xserver/dix/privates.c
xc/programs/Xserver/dix/property.c
xc/programs/Xserver/dix/resource.c
xc/programs/Xserver/dix/swaprep.c
xc/programs/Xserver/dix/swapreq.c
//bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037
(https://bugs.freedesktop.org/attachment.cgi?id=2037 ) ANSI-fy
Xserver/dix code. The conversion preserves the comments which annotate
variables. These have been moved into doxygen(esque?) "stubs" above
each function. Patch by Mike Owens <etc@filespanker.com>.
2005-03-07 23:02:59 +00:00
a3aa6a2d86
Unregistering events in XSelectInput() when unregistering IM filter
...
callbacks may be a bad idea as others may be interested in this event.
Removed the call to XSelectInput() altogether as we are in root window
anyway (Lubos Lunak).
Fix size of a variable that gets assigned the value of SmartScheduleTime
(long) to long. This should help to prevent smart scheduler lockup on
64 bit systems due to overruns (Andreas Schwab).
2004-09-15 09:05:22 +00:00
326729ebca
- Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge
...
- Add missing XCSECURITY ifdef.
- Sync some whitespace to xserver CVS and surrounding style.
2004-07-31 01:48:27 +00:00
0bca00e120
Integration of DAMAGE-XFIXES branch to trunk
...
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: dispatch.c dixutils.c events.c window.c
2004-07-29 18:43:58 +00:00
ed7f92e791
Bug 778: add ddxBeforeReset
2004-06-21 13:44:14 +00:00
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
d568221710
XFree86 4.3.0.1
2003-11-14 16:49:22 +00:00
ded6147bfb
R6.6 is the Xorg base-line
2003-11-14 15:54:54 +00:00
Eamon Walsh
Adam Jackson
Peter Hutterer
Daniel Stone
Ben Byer
Aaron Plattner
Adam Jackson
Stefan Huehner
Laurence Withers
Alan Coopersmith
Adam Jackson
Eamon Walsh
Greg Kroah-Hartman
Adam Jackson
Roland Mainz
Egbert Eich
Eric Anholt
Stuart Kreitman
Alexander Gottwald
Kaleb Keithley