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
060a66b6e2
Normalize swapped dispatch for Fixes{ChangeSaveSet,SelectSelectionInput}
2008-02-22 15:25:26 -05:00
Eamon Walsh
019ad5acd2
XFixes: squash a pointer/integer size mismatch warning.
2008-02-05 15:48:40 -05:00
Peter Hutterer
521fdc28d8
xfixes: switch a few inputInfo.pointer to PickPointer
2008-01-03 18:43:18 +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
Eamon Walsh
bcad2a5a24
XACE: Too many arguments to selection access hook.
2007-12-18 20:20:31 -05:00
Eamon Walsh
e86852aff6
Revert "registry: Register XFixes extension protocol names."
...
This reverts commit 106758893b
.
Moving all the names into dix/registry.c
2007-11-20 18:44:56 -05:00
Eamon Walsh
106758893b
registry: Register XFixes extension protocol names.
2007-10-15 18:31:40 -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
1005b29cc6
xace: Correct some access modes.
2007-08-30 14:48:24 -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
dc84bb3418
xace: add hooks + new access codes: core protocol cursor requests
2007-08-15 14:13:53 -04:00
Peter Hutterer
f367285fd5
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
2007-08-12 15:31:10 +09:30
Adam Jackson
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
Peter Hutterer
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
Adam Jackson
9a0f25de7c
Static cleanups, dead code deletion.
2007-03-25 12:27:01 -04:00
Peter Hutterer
1f0075786f
Merge branch 'master' into mpx
...
Conflicts:
configure.ac
dix/getevents.c
hw/xfree86/ramdac/xf86Cursor.c
mi/mipointer.c
xkb/xkbUtils.c
2007-03-05 12:37:17 +10:30
Keith Packard
8a42af6a93
Check for clientGone before sending events from XFixes (bug #1753 ).
...
Freeing resources during client closedown can cause cursor changes which
attempt to send cursor events through the XFixes extension; a client in the
process of closing down has no file to send events to, causing a crash when
this path is hit.
2007-02-19 15:28:37 -08:00
Peter Hutterer
2d0a63126b
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
2006-12-19 10:31:40 +10:30
Eamon Walsh
25d5e0a629
Convert callers of SecurityLookupWindow() to dixLookupWindow().
2006-12-15 15:50:46 -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
6c46645cfc
Naming change: Security*Access -> Dix*Access
2006-12-14 14:45:42 -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
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
Adam Jackson
7e0aeebb8f
Bug #6786 : Use separate defines for server's Fixes support level.
2006-11-08 12:03:37 -05: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
Adam Jackson
5e106a71b9
Coverity #807 : Fix a memory leak in XFixesExpandRegion.
2006-03-15 16:49:04 +00:00
Adam Jackson
152090ce44
Coverity #487 : Check version number correctly.
2006-03-15 16:33:12 +00:00
Deron Johnson
450018f48b
Part 3 of 3 (Other parts are in proto and lib) Composite Version 0.3:
...
CompositeGetOverlayWindow, CompositeReleaseOverlayWindow Xfixes Version
4.0: XFixesHideCursor, XFixesShowCursor
2006-03-13 21:59:55 +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
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
46b64bd5c6
Fix more include paths; add dix-config.h to XKB code.
2005-07-03 07:37:35 +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
Markus Kuhn
44f4713a05
Encoding of numerous files changed to UTF-8
2004-12-04 00:43:13 +00:00
Eric Anholt
8763cca7f9
Update xfixes server code to major version 3 from xserver CVS, and perform
...
minor diff-reduction versus xserver CVS.
2004-07-31 07:26:50 +00:00
Stuart Kreitman
6ed1c38455
bugzilla 859 -merging DAMAGE-XFIXES into trunk
2004-07-29 14:33:43 +00:00