Peter Hutterer
4f2cd0ed96
Merge branch 'master' into mpx
...
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
2008-03-04 18:11:10 +10:30
Adam Jackson
7c0709a736
requestingClient is an xprintism, hide it for other servers.
2008-02-14 07:11:52 +11:00
Adam Jackson
2ce35f6d45
Simplify critical output flushing.
2008-02-14 07:07:51 +11:00
Eamon Walsh
0d492b2166
XACE: Move the selection access hook to its own function.
2008-02-12 19:59:10 -05:00
Eamon Walsh
de16a8c530
XACE: Correct some protocol error values in the colormap routines.
2008-02-07 20:14:16 -05:00
Peter Hutterer
0ac1755977
Merge branch 'master' into mpx
...
Conflicts:
Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
Eamon Walsh
7724c30a75
XACE: Stop using fake requestVectors in favor of a simple hook call.
2008-01-25 17:28:17 -05:00
Peter Hutterer
883811c2be
dix: remove inputInfo.pointer reference in TryClientEvents.
...
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
2008-01-18 18:48:46 +10:30
Peter Hutterer
38bf01bd1c
Merge branch 'master' into mpx
2008-01-10 13:38:46 +10:30
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
Alan Coopersmith
895073f6b4
Restore include & typedef needed by dtrace
...
996b621bec
deleted a couple lines too many
2008-01-02 18:09:26 -08:00
Peter Hutterer
004876355b
dix: Remove RegisterPairingClient and UnregisterPairingClient.
2007-12-03 14:32:23 +10:30
Eamon Walsh
8503072e1c
registry: add missing include statement.
2007-11-26 16:54:33 -05:00
Eamon Walsh
996b621bec
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
2007-11-26 15:59:44 -05:00
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
Adam Jackson
20fd478324
Small static cleanups on dix/
2007-11-15 17:01:33 -05:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -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
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
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
83e5d9e75d
DIX: Remove last alloca call
...
Replace with heap allocations.
2007-11-05 14:36:54 +00:00
Ben Byer
6e4f5cf83f
changing ALLOCATE_LOCAL to xalloc to prevent stack overflow
2007-11-05 05:53:34 -08: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
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
Eamon Walsh
12e889d202
xace: Bug fixes, name changes to selection access hooks and fields.
2007-10-19 18:43:38 -04:00
Eamon Walsh
50551ec693
xace: remove obsoleted DRAWABLE_ACCESS hook.
2007-09-28 15:04:33 -04:00
Eamon Walsh
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
Eamon Walsh
82f7195a62
xace: modifications to ChangeWindowAttributes special case: separate
...
Receive and SetAttr. Refer to 963e69b8ef
2007-09-20 09:17:09 -04:00
Eamon Walsh
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
Eamon Walsh
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
Eamon Walsh
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
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
0a994d4f85
xace: add hooks + new access codes: core protocol selection requests
2007-08-16 12:54:35 -04:00
Eamon Walsh
3ef2e9e623
xace: add hooks + new access codes: core protocol pixmap requests
2007-08-16 12:27:48 -04:00
Eamon Walsh
fe9bc481ef
xace: add hooks + new access codes: core protocol font requests
2007-08-16 12:19:49 -04:00
Eamon Walsh
e89301c879
xace: add hooks + new access codes: core protocol client requests
2007-08-16 10:57:49 -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
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
Eamon Walsh
dc84bb3418
xace: add hooks + new access codes: core protocol cursor requests
2007-08-15 14:13:53 -04:00
Eamon Walsh
42d6112ec2
xace: add hooks + new access codes: core protocol GC requests
2007-08-14 13:09:38 -04:00
Eamon Walsh
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
Eamon Walsh
2763056ab5
xace: add hooks + new access codes: core protocol window requests
2007-08-13 13:44:33 -04:00
Eamon Walsh
d744df32a1
xace: add hooks + new access codes: core protocol colormap requests
2007-08-06 12:23:21 -04: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
Eamon Walsh
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
Adam Jackson
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
Eamon Walsh
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
Eamon Walsh
1f06d32ef5
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/privates.c
2007-04-17 12:10:22 -04:00