summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)AuthorFilesLines
2008-06-23Check for strcasestr and workaround it on systems without itAlan Coopersmith1-0/+13
(cherry picked from ed65e8b4f02a6da7f1c5d85984a9ccf6a94d0181 commit)
2008-06-11config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.Peter Hutterer1-15/+89
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user specifies a X-specific {rmlv}, then this is overridden through the use of input.x11_options.Xkb{RMLV}. However, the way how the server parses options--by ignoring capitalisation, underscores and spaces--the HAL and the x11_options would override each other. So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and only actually add them to the device after parsing _all_ options. * rmlv ... rules, model, layout, variant See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037> (cherry picked from commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17) (cherry picked from commit ff013b0da4e6d33b2b69ce1212e9bd62050574e1)
2008-06-11config: remove trailing whitespaces.Peter Hutterer1-26/+26
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc. (cherry picked from commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8) (cherry picked from commit 901978ebe0f446532255701cd536e246e805a55b)
2008-06-11Support to pass arbitrary options via HAL hotpluggingSascha Hlusiak2-85/+171
Parse "input.x11_options" and pass every key/name pair to the driver. Remove check for input.capabilities, because that's part of the fdi files. Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch. (cherry picked from commit 47eb658e802775021e3efec109f95431cca188ca)
2008-05-16Fix hal shutdown crash.Adam Jackson1-3/+5
Removing the device invalidates its ->next pointer. Copy it aside before destroying the device. (cherry picked from commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d)
2008-02-28XACE: Fix instances of DixUnknownAccess at hook callsites.Eamon Walsh1-1/+1
2008-01-29config: don't reset connection info on disconnect.Peter Hutterer1-3/+2
If dbus is restarted, we try to connect again and this is difficult if the busname and/or busobject is not set. (cherry picked from commit 210eeef495770c1883c842ff003c28ce25f279d4)
2008-01-29config: check connection != NULL before getting dbus' dispatch status.Peter Hutterer1-2/+3
(cherry picked from commit d23266522390a4ef7203ae7c062b2b920e45f9d7)
2008-01-29config: only shutdown libhal if the connection is valid.Peter Hutterer1-5/+7
Thanks to libdbus' extensive use of assert we won't just get an error, it'll bring the whole server down for us. (cherry picked from commit fb07fab2c07e7b0834724541dc47bfba02ba8574)
2008-01-29config: add a debug message, fix a whitespace error.Peter Hutterer1-2/+3
(cherry picked from commit 7732898aaa70e076000f6e6aa9420482896ed996)
2007-12-28Config: HAL: Don't leak options on failure to add deviceDaniel Stone1-1/+10
This showed up in Xephyr in particular, which denies new device requests.
2007-12-28Config: D-Bus: Don't leak timersDaniel Stone1-1/+4
TimerCancel doesn't free the timer: you need TimerFree for that.
2007-12-26Config: Don't forget to add xkb_rules optionFatih Aşıcı1-0/+2
2007-12-26Config: Fix a memory leakFatih Aşıcı1-0/+2
2007-12-13Merge branch 'master' into XACE-SELINUXEamon Walsh1-2/+3
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-05Config: HAL: Fix XKB option parsingKanru Chen1-2/+3
Actually combine the XKB options into a string, rather than just repeatedly writing a comma.
2007-11-14Merge branch 'master' into XACE-SELINUXEamon Walsh1-2/+2
Conflicts: Xext/xace.c Xext/xace.h
2007-11-06Config: D-Bus: Fix dbus_bus_request_name failure checkElvis Pranskevichus1-2/+2
The code in connect_hook incorrectly checks for dbus_bus_request_name failure. The dbus_bus_request_name error indicator is -1, not 0. This leads to subsequent assertion failure in libdbus.
2007-11-05Merge branch 'master' into XACE-SELINUXEamon Walsh1-1/+2
Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c
2007-11-04Config: HAL: Touchpads are pointers tooMarkku Vire1-1/+2
Treat touchpads -- not just mice -- as pointer devices.
2007-09-28xace: add new hooks + access controls: XInput extension.Eamon Walsh1-1/+1
Introduces new dix API to lookup a device, dixLookupDevice(), which replaces LookupDeviceIntRec and LookupDevice.
2007-09-20Don't segfault on shutdown if we never managed to connect to dbus.Aaron Plattner1-1/+2
2007-08-31config: Use [config/dbus] consistently for error messages.Peter Hutterer1-4/+4
2007-08-31config: return BadValue to caller if add/remove doesn't have parameters.Peter Hutterer1-4/+6
If message iterator cannot be created, the caller didn't supply any parameters. Return BadValue, instead of dying a horrible death while being stuck in an endless loop.
2007-08-21config: fix default xkb model (pc105, not keyboard)Julien Cristau1-1/+1
2007-08-08Hotplug: HAL: Fix error handlingDaniel Stone1-18/+17
Don't use our DBusError for property getting, because we simply don't care: this fixes D-Bus error spew to stderr. Thanks Michel Dänzer for debugging and testing.
2007-08-08Config: HAL: Use input.xkb namespaceDaniel Stone2-10/+10
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
2007-08-01Build system: Add missing filesxorg-server-1.3.99.0Daniel Stone1-1/+1
A couple of headers weren't added to the build.
2007-08-01Config: Add missing includeDaniel Stone1-0/+1
2007-08-01Config: Add current FDI fileDaniel Stone1-0/+31
Add the FDI file we're using at the moment, until it gets into upstream HAL.
2007-08-01Config: Fix merge detritusDaniel Stone1-1/+0
2007-08-01Config: D-Bus core: Fix hook removalDaniel Stone1-1/+5
Make sure we properly initialise the entire hook when adding it, and bust out when we're done removing.
2007-08-01Convert all my license statements to the standard formDaniel Stone5-86/+96
Convert all my license statements to the standard, accepted form: cf. <20070717142307.GD13478@fooishbar.org> http://lists.freedesktop.org/archives/xorg/2007-July/026451.html keithp's license on configure.ac changed with his verbal permission.
2007-08-01Hotplug: Add HAL supportDaniel Stone4-3/+392
Add support for HAL-based hotplugging, in which we just get the list of input devices and properties from HAL. Requires an FDI which is not yet in mainline HAL.
2007-08-01Hotplug: D-Bus: Dispatch harderDaniel Stone1-2/+6
Dispatch until we've got nothing left to dispatch, since apparently dispatching will only ever fire a single message ...
2007-08-01Hotplug: D-Bus: API version 2Daniel Stone2-18/+53
Use uint32s instead of int32s where practical, and add an API version request. Also, try to return all devices added, not just the first, and box device arguments.
2007-08-01Hotplug: Separate D-Bus into core and hotplug API componentsDaniel Stone5-480/+719
Break up D-Bus into two components: a D-Bus core that can be used by any part of the server (for the moment, just the D-Bus hotplug API, and the forthcoming HAL hotplug API), and the old D-Bus hotplug API.
2007-07-26libconfig shouldn't be an installed library.Adam Jackson1-1/+1
2007-04-19config: Return errors as negative numbers, device ids as positive numbers.Peter Hutterer2-11/+12
Update dbus-api documentation.
2007-04-19Change dbus 'listDevices' call to not require an argument.Peter Hutterer2-13/+24
Update dbus-api documentation, plug memory leak on dbus reply error.
2007-04-11Config: Extend D-BUS APIRemigiusz Marcinkiewicz1-15/+71
Return device ID where available. Add listDevices call, which does what it says on the box.
2007-04-10Config: Fix memory leaksMagnus Vigerlöf1-15/+12
Fix memory leaks that could occur along the error path.
2007-04-10Input: Add DeleteInputDeviceRequestMagnus Vigerlöf1-1/+1
Add DIDR, which asks the DDX to remove a device, analogous to NewInputDeviceRequest. Only implemented for XFree86 at the moment.
2007-04-09Bug #10560: Code-Cleanup: function declarations () -> (void)Stefan Huehner1-2/+2
X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560> Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
2007-02-17config: error message cleanupDaniel Stone1-3/+3
Demote failure to connect from ErrorF to DebugF.
2006-12-19Include sys/select.h to get FD_ISSET.Eric Anholt1-0/+1
2006-12-06whitespace policeDaniel Stone1-1/+1
2006-12-06config: bus reconnect supportDaniel Stone1-37/+118
Add support for reconnecting to the bus when it restarts.
2006-12-06config: move to block/wakeup handlerDaniel Stone1-47/+65
2006-11-08config: error messages non-fatal, and before we free themDaniel Stone1-10/+12
Move error messages before we free the error structure, and make them all non-fatal.