8190ef8754
Merge branch 'master' into mpx
...
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
2008-04-22 18:04:05 +09:30
a7e3ad1c6b
Remove NDEBUG (assert() disable) define from the X Server.
...
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
2008-04-10 10:35:14 -07:00
fd06e8f8c1
Merge branch 'master' into dcdc_rework
...
Conflicts:
Xext/xevie.c
dix/dispatch.c
2008-04-07 07:56:41 +09:30
f028e245a7
Bug #10016 : Implement WM_CLASS hints in Xephyr.
2008-03-24 16:06:33 -04:00
cdadd2ff9b
[Xephyr/DRI] correctly route motion events targeted at GL drawable
2008-03-18 14:02:41 +01:00
aa231f28d5
Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
2008-03-14 18:43:41 -07:00
a955c3b587
Xephyr: Distribute ephyrdriext.h in tarballs.
2008-03-14 18:43:40 -07:00
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
d74b0327e8
[Xephyr/GL] unbreak the build
...
Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
2008-02-27 09:48:53 +01:00
69f7826767
Match Xephyr DRI definitions to the ones in xf86dri.h
2008-02-22 16:04:35 -05:00
24bebdded4
fbFillRegionTiled() is now dead code.
...
Only ever called from the old PaintWindow* screen hooks, but those are
gone now. As a pleasant side effect, fb loses its #ifdef PANORAMIX.
2008-02-22 15:22:38 -05:00
c14fd2a5cb
[Xephyr/GL] properly route expose event on GL drawables
...
When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
2008-02-21 15:33:02 +01:00
437c78ef9f
[Xephyr/GL] don't crash when the host returns a NULL server string
2008-02-21 15:29:27 +01:00
74628d6397
dix: change GetEventList to return length of list and set parameter in place.
...
Changing DDXs to use new prototype too.
2008-02-19 16:53:15 +10:30
3fe64d8d27
Move input event list initialisation and storage from DDX to DIX.
...
Rather than letting the DDX allocate the events, allocate them once in the DIX
and just pass it around when needed.
DDX should call GetEventList() to obtain this list and then pass it into
Get{Pointer|Keyboard}Events.
2008-02-18 18:46:01 +10:30
f3b3b37ec6
Use strerror instead of errno values in user strings.
2008-02-14 07:52:02 +11:00
6c38682084
kdrive: AddInputClient takes a ClientPtr.
2008-01-31 15:51:32 +10:30
0ac1755977
Merge branch 'master' into mpx
...
Conflicts:
Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
e85130c85f
Xephyr: One-time keyboard leak fix
...
Don't leak the originally-allocated keysym map.
2008-01-17 18:43:06 +11:00
7a0d16ef0a
Removed some warnings.
2008-01-15 03:27:16 -02:00
315d6a2b1d
Fix Xephyr compilation without GLX.
2008-01-15 02:59:56 -02:00
38bf01bd1c
Merge branch 'master' into mpx
2008-01-10 13:38:46 +10:30
c31aead0fe
[Kdrive] make XCalibrate 'orientation aware'
2008-01-08 12:31:47 +01:00
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
941058f8da
KDrive: Xephyr: Don't leak screen damage structure
2007-12-28 15:51:36 +02:00
8673033700
kdrive/ati: use operating system input devices
2007-12-14 13:15:27 +02:00
e110255501
kdrive/vesa: use operating system input devices
2007-12-14 13:15:27 +02:00
863ba390e9
kdrive/fbdev: use operating system input devices
2007-12-14 13:15:27 +02:00
1c1a4bc970
devPrivates rework: more cleanup from previous merge operation.
2007-12-13 19:51:40 -05:00
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
28b93d74a1
ephyr: miPointerWarpCursor needs the device parameter.
...
Thanks to Mitchell Quille for spotting it.
2007-12-03 14:35:33 +10:30
be0cbe5a33
kaa: update kaaCreatePixmap to support the new usage_int
2007-11-20 15:39:49 +01:00
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
4c9cc82fc4
For some reason "-nozap" appeared twice. Weird.
2007-11-15 01:46:11 -02:00
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01: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
868e303630
Xephyr: fix a crash when using xrandr twice
...
* hw/kdrive/ephyr/ephyr.c:
(ephyrScreenFini): don't forget to
free shadowfb data (if necessary) upon server is reset.
2007-11-06 16:24:46 +01: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
632c33c5c1
pull 'master'
2007-11-05 17:53:04 +01:00
6ff79ea5f7
Xephyr: fix some DRI build breakage
2007-11-05 16:46:49 +01:00
caf5450634
KDrive: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00: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
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
f2da10f7bc
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
2007-10-17 10:51:02 +08:00
ab11bad547
Xephyr: remove a potential crasher
...
* hw/kdrive/ephyr/hostx.c:
(hostx_has_dri): be more defensive.
2007-10-04 13:05:29 +02:00
06c8977966
Xephyr: better handling of the -nodri option
...
* hw/kdrive/ephyr/ephyr.c:
(ephyrInitScreen): try and detect when the host has no
DRI support. In that case, switch to the -nodri behaviour.
When in the -nodri case, make sure not to skip glx visual
initialisation.
2007-10-04 13:01:24 +02:00
ea94f59e9b
Xephyr: don't disable glx visual init by default
...
* hw/kdrive/ephyr/ephyrinit.c:
(ddxProcessArgument): disabling visual init here
is bad because it gets disabled even when we want
to use software GL, leading to Xephyr :1 -nodri
crashing in mesa.
2007-10-04 12:54:26 +02:00
a7f210e6fc
Xephyr: fix a compiler warning
2007-10-04 12:51:08 +02:00
5d6eac1251
Xephyr: remove an unused variable
2007-10-04 12:47:05 +02:00
Peter Hutterer
Eric Anholt
Peter Hutterer
David Nusinow
Dodji Seketeli
Donnie Berkholz
Dodji Seketeli
Adam Jackson
Benjamin Tissoires
Daniel Stone
Tiago Vignatti
Richard Purdie
Otavio Salvador
Eamon Walsh
Aaron Plattner
Keith Packard