Commit Graph

5062 Commits

Author SHA1 Message Date
Peter Hutterer
5cb38a3fca xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.

This is an addon to 6d22a9615a, an attempt to
fix Bug 14418.

X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
(cherry picked from commit 9ab4e2fd8e)
2008-07-16 10:32:46 +09:30
Julien Cristau
2b3faf2a75 Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.
(cherry picked from commit 9111944b29)
2008-07-15 10:37:31 -04:00
Peter Hutterer
5b546f1c49 xfree86: append, not prepent, new input devices to xf86InputDevs.
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.

RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
(cherry picked from commit 11ee0ae939)
2008-07-14 12:53:28 +09:30
Julien Cristau
5659f6d31b Export xkbfile.h in the SDK
It's needed by xkbsrv.h
(cherry picked from commit d8af9d9ab1)
2008-07-13 15:14:41 +02:00
Ander Conselvan de Oliveira
e135a77b8b Fix incorrect test regarding keyboard map.
In the map stored in each keyboard device, the first line refers to minimum
keycode, i.e., the 0th line refers to keycode 8. When not using XKB the wrong
test caused some keys to be interpreted as locks ('m' for instance). The had
to be pressed twice to generate both KeyPress and KeyRelease events.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2008-07-13 21:30:46 +09:30
Sascha Hlusiak
c30f36c8c1 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway.

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
2008-07-03 21:42:10 +02:00
Dave Airlie
5144158ced dri2: bump libdrm numbers as 2.3.1 is released without ttm interface 2008-07-03 20:01:28 +10:00
Dave Airlie
793ff6754e modes: check the crtc is valid before using its desired modes.
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
(cherry picked from commit 1771edcb44)
2008-07-03 19:01:44 +10:00
Dave Airlie
e9f83740e3 cursor: don't dereference NULL pointer is devPrivates not yet set.
This fixes a bug on server recycle with ati zaphod.
2008-07-03 18:46:38 +10:00
Alan Hourihane
8081eda696 Set driverPriv immediately on CreatePixmap.
If it's NULL anyway, we bail, if not, it lets
ModifyPixmapHeader know about the private.
(cherry picked from commit 528b4e36ad)
2008-07-02 11:27:26 -04:00
Adam Jackson
a18551cad1 Fix GLX in Xvfb and kdrive.
(cherry picked from commit 689292e58c)
2008-07-02 11:26:10 -04:00
Julien Cristau
81e6ab4851 autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
(cherry picked from commit fbad87f2ae)
2008-07-01 13:27:54 -04:00
Aaron Plattner
75b5e999f0 Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
RandR 1.1 has a physical size for each mode.  It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration.  The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.

With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode.  The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes.  Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.

This change works around this problem by ignoring the DIX and querying the real
size from the driver.
(cherry picked from commit 2e8daee053)
2008-07-01 09:08:36 -07:00
Adam Jackson
9ab88bb9b1 Don't try to load DRI2 if built without it.
(cherry picked from commit e2bbf2d248)
2008-07-01 12:02:18 -04:00
Simon Thum
ccb373f2fb input: change dxremaind, dyremaind to floats for better acceleration #9156
X.Org Bug 9156 <http://bugs.freedesktop.org/show_bug.cgi?id=9156>

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>

(cherry picked from commit 0050165a67)
2008-07-01 09:46:34 -04:00
Adam Jackson
0617653277 xserver 1.5RC5 2008-06-30 16:11:32 -04:00
Adam Jackson
bee463bd8a XInput ABI is 2.1, not 3.1.
(cherry picked from commit 76576c87b0)
2008-06-30 16:11:04 -04:00
Keith Packard
795d293d76 Wrap AddTraps in exa and damage.
This fine (and unused) function wasn't ever wrapped which made it not work
under exa.
(cherry picked from commit 06e7e1d048)
2008-06-30 13:50:57 -04:00
Adam Jackson
32cd2c5109 xserver 1.5RC4.
Remember kids, distcheck before you tag.
2008-06-30 11:18:27 -04:00
Adam Jackson
6ec12077ef Distcheck fixes. 2008-06-30 11:17:53 -04:00
Adam Jackson
6a2ee7e0bb xserver 1.5RC3. 2008-06-30 10:40:50 -04:00
Adam Jackson
6e8ed1398d Bump ABI minor numbers for the devPrivate ABI functions.
(cherry picked from commit 211e2bdcc6)
2008-06-30 10:31:55 -04:00
Eamon Walsh
39cc11b005 Fix a leak of window devPrivates in window.c/CrushTree().
(cherry picked from commit 7ddfb2f158)
2008-06-27 23:11:29 -04:00
Dan Nicholson
8017c99901 Actually enable building GLX without Mesa source
(cherry picked from commit e837244947)
2008-06-26 16:14:52 -04:00
George Sapountzis
90f2a82ba5 glx: fix forgotten swrast -> SWRast
(cherry picked from commit 21a8052fdc)
2008-06-26 16:14:52 -04:00
George Sapountzis
6e278e3944 glx: missing swrast is fatal
(cherry picked from commit 877e6c35ff)
2008-06-26 16:14:52 -04:00
George Sapountzis
0845476521 glx: drop stray glcore.h include
(cherry picked from commit 1345c93ad4)
2008-06-26 16:14:52 -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
Kristian Høgsberg
a194718e9d Move GL/glx on level up now that it's the only thing left under GL.
(cherry picked from commit c3eb5b80d8)
2008-06-26 16:14:52 -04:00
Kristian Høgsberg
cb402b4112 Move the windows GL files to the xwin DDX.
(cherry picked from commit a8a9b40e55)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
0234d3d48f Get out of the mesa symlinking business.
This copies over the files generated from mesa/src/mesa/glapi.  There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.

The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.

The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
(cherry picked from commit e5aad4bc08)
2008-06-26 16:14:51 -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
Kristian Høgsberg
d325a207c8 Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
(cherry picked from commit f558c7d4d1)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
bd81faff8c Drop glcore GLX provider.
Obsoleted by the DRI swrast driver.
(cherry picked from commit 77ff8fd507)
2008-06-26 16:14:51 -04:00
Jeremy Huddleston
d88da6638e Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f3289)
(cherry picked from commit d09c520b32)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
500463f728 Stop symlinking glcontextmodes.[ch] from mesa.
(cherry picked from commit 61eaef2235)
2008-06-26 16:14:51 -04:00
Jeremy Huddleston
a569beba4c XQuartz: Compile in missing glx source that we still need
(cherry picked from commit c611335dee)
(cherry picked from commit 63853e4ad2)
2008-06-26 16:14:51 -04:00
Ben Byer
46e0bb6211 xquartz: remove vestigial aglGlx.c
(cherry picked from commit 40bd041e42)
(cherry picked from commit 3685b171da)
2008-06-26 16:14:51 -04:00
Ben Byer
e8a1eda65d add missing DARWIN_GLX_LIBS in configure.ac
(cherry picked from commit a033c0b3db)
(cherry picked from commit 744d0cfda7)
2008-06-26 16:14:51 -04:00
George Sapountzis
17ac93b23b glx: drop drm.h, sareaHandle from swrast loader
(cherry picked from commit 88f43e5d06)
2008-06-26 16:14:51 -04:00
George Sapountzis
988b1b8df3 Add loader for the swrast dri driver.
(cherry picked from commit 6ff6465931)
2008-06-26 16:14:51 -04:00
George Sapountzis
1efc0329b1 glcore: drop GLcore (files)
(cherry picked from commit a88c6b6646)
2008-06-26 16:14:50 -04:00
George Sapountzis
9b4d5b6521 glcore: drop GLcore (build system)
(cherry picked from commit dd7a53f8f2)
2008-06-26 16:14:50 -04:00
George Sapountzis
1ea2e69cfc glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
(cherry picked from commit 567d389d47)
2008-06-26 16:14:50 -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
Alan Coopersmith
9029748f89 Don't log null device name in XkbDDXLoadKeymapByNames
(cherry picked from 7ce6dcef11 commit)
2008-06-25 18:22:41 -07:00
Eamon Walsh
5d66908975 Fix a leak in the code that parses the protocol names.
Also added some comments.
Reported by Ben Gamari (bug #16492).
(cherry picked from commit a3ec226273)
2008-06-24 22:03:30 -04:00
Roland Bär
7351c07ae8 Bug #11857: Avoid running off the end of a MAXCLIENTS-sized array.
(cherry picked from commit 249c892784)
2008-06-24 14:13:30 -04:00
Adam Jackson
429b2a97a0 Bug #11842: Fix emulation of int1A PCI BIOS services.
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
(cherry picked from commit 9e5b3deafb)
2008-06-24 14:10:12 -04:00
Owen Taylor
3dfe90fe6c Bug #15369: Don't reduce Over to Src for transform + RepeatNone.
Only do no-src-alpha optimizations for a RepeatNone source if we can
easily probe that we won't sample outside the edges of the source.
(cherry picked from commit 574c62e305)
2008-06-24 12:42:38 -04:00