Martin von Gagern
992a7168f0
Bug #17858 : Fix Xvesa build on newer kernels.
...
Not cherry picked from master, Xvesa is gone there.
2008-11-05 11:44:03 -05:00
Adam Jackson
b468eacf51
kdrive: Hardcode a different wrong value for number of mouse buttons
...
This should really come from the input driver directly, but, kdrive.
(cherry picked from commit 3eb52de7f2 )
2008-10-27 09:46:46 -04:00
Dodji Seketeli
c217cb96dc
[Xephyr] Fix #15839
...
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
(cherry picked from commit 5de1867fbb )
2008-07-23 13:50:48 -04:00
Peter Hutterer
0baf677da6
kdrive: don't post motion event if there was no motion. #16179
...
Based on the patch by Tomas Janousek. Backported version.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179 >
(cherry picked from commit 26e7e69ab8 )
2008-07-17 08:44:39 +09:30
Peter Hutterer
a75cbabc25
Revert "kdrive: don't post motion event if there was no motion. #16179 "
...
Just because it compiles on my machine doesn't make it right. Needs backported
patch from http://bugs.freedesktop.org/show_bug.cgi?id=16179 .
This reverts commit a08ea64ded .
2008-07-17 08:40:54 +09:30
Peter Hutterer
a08ea64ded
kdrive: don't post motion event if there was no motion. #16179
...
Based on the patch by Tomas Janousek.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179 >
(cherry picked from commit 26e7e69ab8 )
2008-07-16 21:43:22 +09:30
Adam Jackson
a18551cad1
Fix GLX in Xvfb and kdrive.
...
(cherry picked from commit 689292e58c )
2008-07-02 11:26:10 -04:00
George Sapountzis
6f18c5d703
kdrive: need not export symbols for glx anymore
...
(cherry picked from commit ae0504d34d )
2008-06-26 16:14:52 -04:00
Dan Nicholson
d3a2e060bf
Fix up paths for GL/glx -> glx renaming
...
(cherry picked from commit c76fddeea2 )
2008-06-26 16:14:51 -04:00
Donnie Berkholz
f2c30a57e3
glcore: prepare for dynamic loading
...
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
DLOPEN_LIBS - to dlopen the glcore dso
LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
(cherry picked from commit efb723e166 )
Conflicts:
configure.ac
2008-06-26 16:14:50 -04:00
Julien Cristau
f2278a882f
kdrive: allow disabling Composite
...
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
(cherry picked from commit 9dfb525f6c )
2008-05-11 23:38:03 +02:00
David Nusinow
2d312eaf4f
Bug #10016 : Implement WM_CLASS hints in Xephyr.
...
(cherry picked from commit f028e245a7 )
2008-03-24 16:59:22 -04:00
Dodji Seketeli
21dc186245
[Xephyr/DRI] correctly route motion events targeted at GL drawable
...
(cherry picked from commit cdadd2ff9b )
2008-03-24 10:18:52 -04:00
Donnie Berkholz
a399b77e8f
Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
...
(cherry picked from commit aa231f28d5 )
2008-03-24 10:08:47 -04:00
Donnie Berkholz
c81a8c3eac
Xephyr: Distribute ephyrdriext.h in tarballs.
...
(cherry picked from commit a955c3b587 )
2008-03-24 10:08:40 -04:00
Dodji Seketeli
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
Adam Jackson
69f7826767
Match Xephyr DRI definitions to the ones in xf86dri.h
2008-02-22 16:04:35 -05:00
Adam Jackson
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
Dodji Seketeli
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
Dodji Seketeli
437c78ef9f
[Xephyr/GL] don't crash when the host returns a NULL server string
2008-02-21 15:29:27 +01:00
Adam Jackson
f3b3b37ec6
Use strerror instead of errno values in user strings.
2008-02-14 07:52:02 +11:00
Daniel Stone
e85130c85f
Xephyr: One-time keyboard leak fix
...
Don't leak the originally-allocated keysym map.
2008-01-17 18:43:06 +11:00
Tiago Vignatti
7a0d16ef0a
Removed some warnings.
2008-01-15 03:27:16 -02:00
Tiago Vignatti
315d6a2b1d
Fix Xephyr compilation without GLX.
2008-01-15 02:59:56 -02:00
Richard Purdie
c31aead0fe
[Kdrive] make XCalibrate 'orientation aware'
2008-01-08 12:31:47 +01:00
Daniel Stone
941058f8da
KDrive: Xephyr: Don't leak screen damage structure
2007-12-28 15:51:36 +02:00
Otavio Salvador
8673033700
kdrive/ati: use operating system input devices
2007-12-14 13:15:27 +02:00
Otavio Salvador
e110255501
kdrive/vesa: use operating system input devices
2007-12-14 13:15:27 +02:00
Otavio Salvador
863ba390e9
kdrive/fbdev: use operating system input devices
2007-12-14 13:15:27 +02:00
Eamon Walsh
1c1a4bc970
devPrivates rework: more cleanup from previous merge operation.
2007-12-13 19:51:40 -05:00
Eamon Walsh
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
Dodji Seketeli
be0cbe5a33
kaa: update kaaCreatePixmap to support the new usage_int
2007-11-20 15:39:49 +01: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
Tiago Vignatti
4c9cc82fc4
For some reason "-nozap" appeared twice. Weird.
2007-11-15 01:46:11 -02: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
Dodji Seketeli
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01:00
Dodji Seketeli
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
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
Dodji Seketeli
632c33c5c1
pull 'master'
2007-11-05 17:53:04 +01:00
Dodji Seketeli
6ff79ea5f7
Xephyr: fix some DRI build breakage
2007-11-05 16:46:49 +01:00
Daniel Stone
caf5450634
KDrive: Remove usage of alloca
...
Replace with heap allocations.
2007-11-05 14:34:42 +00: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
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Keith Packard
f2da10f7bc
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
2007-10-17 10:51:02 +08:00
Dodji Seketeli
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
Dodji Seketeli
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
Dodji Seketeli
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
Dodji Seketeli
a7f210e6fc
Xephyr: fix a compiler warning
2007-10-04 12:51:08 +02:00
Dodji Seketeli
5d6eac1251
Xephyr: remove an unused variable
2007-10-04 12:47:05 +02:00
Dodji Seketeli
8018733c39
Xephyr: better compilation without GLX
...
* hw/kdrive/ephyr/ephyrinit.c: protect GLX related code with GLXEXT
macro
2007-10-04 12:06:19 +02:00