Peter Hutterer
35b14519b4
config: add parsing for input.x11_options.XkbOptions. #16874
...
X.Org Bug 16874 <http://bugs.freedesktop.org/show_bug.cgi?id=16784 >
2008-08-04 15:14:05 +09:30
Peter Hutterer
3575d9584e
config: note that HAL options must be strings.
...
Only strings are parsed by the server, all others are ignored. Doesn't matter,
specifying int options as strings works fine anyway.
2008-07-28 09:06:02 +09:30
Daniel Stone
b8dd07f855
HAL: Remove grotesque open-coded strcasestr
...
Not only was this pretty ugly, but it didn't even work on systems
without strcasestr anyway, due to the define not being in dix-config.h.
Lack of strcasestr is handled transparently with the version from
FreeBSD now anyway, so, huzzah.
2008-07-16 03:02:20 +03:00
Daniel Stone
441f084bfe
config: Don't attempt to use D-Bus when not strictly necessary
...
If we have D-Bus but have explicitly disabled it, don't build it.
2008-07-16 03:02:04 +03:00
Peter Hutterer
5ebe76f13f
config: init dev to NULL to shut up a valgrind warning.
2008-06-02 10:26:03 +09:30
Adam Jackson
f52f6c5c7e
Fix hal shutdown crash.
...
Removing the device invalidates its ->next pointer. Copy it aside before
destroying the device.
2008-05-16 09:49:20 -04:00
Alan Coopersmith
ed65e8b4f0
Check for strcasestr and workaround it on systems without it
2008-05-12 18:50:04 -07:00
Peter Hutterer
ff013b0da4
config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
...
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 fc35d1e3be
)
2008-05-09 10:09:35 +09:30
Peter Hutterer
901978ebe0
config: remove trailing whitespaces.
...
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
(cherry picked from commit 1f54c05cf8
)
2008-05-09 10:09:25 +09:30
Sascha Hlusiak
47eb658e80
Support to pass arbitrary options via HAL hotplugging
...
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.
2008-03-25 17:37:25 +01:00
Eamon Walsh
27bcf40cda
XACE: Fix instances of DixUnknownAccess at hook callsites.
2008-02-28 16:43:43 -05:00
Peter Hutterer
975ab11799
config: don't reset connection info on disconnect.
...
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 210eeef495
)
2008-01-29 09:13:25 +10:30
Peter Hutterer
7dde5a694a
config: check connection != NULL before getting dbus' dispatch status.
...
(cherry picked from commit d232665223
)
2008-01-29 09:13:25 +10:30
Peter Hutterer
f0ba770716
config: only shutdown libhal if the connection is valid.
...
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 fb07fab2c0
)
2008-01-29 09:13:25 +10:30
Peter Hutterer
2cb0ebec2b
config: add a debug message, fix a whitespace error.
...
(cherry picked from commit 7732898aaa
)
2008-01-29 09:13:25 +10:30
Daniel Stone
190a050624
Config: HAL: Don't leak options on failure to add device
...
This showed up in Xephyr in particular, which denies new device requests.
2007-12-28 15:51:36 +02:00
Daniel Stone
f44fd3f9e4
Config: D-Bus: Don't leak timers
...
TimerCancel doesn't free the timer: you need TimerFree for that.
2007-12-28 15:51:36 +02:00
Fatih Aşıcı
009f1e4e55
Config: Don't forget to add xkb_rules option
2007-12-26 02:08:12 +01:00
Fatih Aşıcı
389e8917f6
Config: Fix a memory leak
2007-12-26 02:07:52 +01: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
Kanru Chen
a8e27a108a
Config: HAL: Fix XKB option parsing
...
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
2007-12-05 18:29:54 +00: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
Elvis Pranskevichus
ddce48ede0
Config: D-Bus: Fix dbus_bus_request_name failure check
...
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-06 09:40:36 +00: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
Markku Vire
3f1b6765aa
Config: HAL: Touchpads are pointers too
...
Treat touchpads -- not just mice -- as pointer devices.
2007-11-04 16:46:21 +00:00
Eamon Walsh
5c03d13181
xace: add new hooks + access controls: XInput extension.
...
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
2007-09-28 08:02:00 -04:00
Aaron Plattner
3a965fdadc
Don't segfault on shutdown if we never managed to connect to dbus.
2007-09-20 16:22:24 -07:00
Peter Hutterer
3f42af8c0e
config: Use [config/dbus] consistently for error messages.
2007-08-31 15:03:02 +09:30
Peter Hutterer
0fcde83d94
config: return BadValue to caller if add/remove doesn't have parameters.
...
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-31 15:03:02 +09:30
Julien Cristau
6ef4ecd826
config: fix default xkb model (pc105, not keyboard)
2007-08-21 18:17:35 +02:00
Daniel Stone
30259d5a4e
Hotplug: HAL: Fix error handling
...
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-08 01:34:59 +03:00
Daniel Stone
aef255425a
Config: HAL: Use input.xkb namespace
...
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
2007-08-08 01:34:59 +03:00
Daniel Stone
6d6bc93b0a
Build system: Add missing files
...
A couple of headers weren't added to the build.
2007-08-01 08:11:22 +03:00
Daniel Stone
0bd6fe7401
Config: Add missing include
2007-08-01 07:27:30 +03:00
Daniel Stone
48b3034d13
Config: Add current FDI file
...
Add the FDI file we're using at the moment, until it gets into upstream HAL.
2007-08-01 07:01:51 +03:00
Daniel Stone
82b720cf3e
Config: Fix merge detritus
2007-08-01 06:57:11 +03:00
Daniel Stone
0a31db14b7
Config: D-Bus core: Fix hook removal
...
Make sure we properly initialise the entire hook when adding it, and
bust out when we're done removing.
2007-08-01 03:33:05 +03:00
Daniel Stone
1150969b82
Convert all my license statements to the standard form
...
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-01 01:53:31 +03:00
Daniel Stone
8658f5d923
Hotplug: Add HAL support
...
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-01 01:53:31 +03:00
Daniel Stone
aa75b34817
Hotplug: D-Bus: Dispatch harder
...
Dispatch until we've got nothing left to dispatch, since apparently
dispatching will only ever fire a single message ...
2007-08-01 01:53:31 +03:00
Daniel Stone
9ac7e8a559
Hotplug: D-Bus: API version 2
...
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-01 01:53:31 +03:00
Daniel Stone
1cdadc2f43
Hotplug: Separate D-Bus into core and hotplug API components
...
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-08-01 01:53:31 +03:00
Adam Jackson
27845fe197
libconfig shouldn't be an installed library.
2007-07-26 09:32:16 -04:00
Peter Hutterer
e1f0b3e70b
config: Return errors as negative numbers, device ids as positive numbers.
...
Update dbus-api documentation.
2007-04-19 18:12:22 +09:30
Peter Hutterer
c6972c8933
Change dbus 'listDevices' call to not require an argument.
...
Update dbus-api documentation, plug memory leak on dbus reply error.
2007-04-19 18:12:11 +09:30
Remigiusz Marcinkiewicz
0910540e43
Config: Extend D-BUS API
...
Return device ID where available.
Add listDevices call, which does what it says on the box.
2007-04-11 01:09:26 +03:00
Magnus Vigerlöf
20674dcbb2
Config: Fix memory leaks
...
Fix memory leaks that could occur along the error path.
2007-04-10 23:58:20 +03:00
Magnus Vigerlöf
82962bbae2
Input: Add DeleteInputDeviceRequest
...
Add DIDR, which asks the DDX to remove a device, analogous to
NewInputDeviceRequest. Only implemented for XFree86 at the moment.
2007-04-10 23:58:20 +03:00
Stefan Huehner
1f6741db19
Bug #10560 : Code-Cleanup: function declarations () -> (void)
...
X.Org Bugzilla #10560 : <https://bugs.freedesktop.org/show_bug.cgi?id=10560 >
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511 >
2007-04-09 14:33:15 -07:00
Daniel Stone
e9a2cc7d9f
config: error message cleanup
...
Demote failure to connect from ErrorF to DebugF.
2007-02-17 20:35:39 +02:00
Eric Anholt
228b9f7769
Include sys/select.h to get FD_ISSET.
2006-12-19 10:56:08 -08:00
Daniel Stone
4ea6dfb984
whitespace police
2006-12-06 23:24:39 +02:00
Daniel Stone
4cba1a1ebf
config: bus reconnect support
...
Add support for reconnecting to the bus when it restarts.
2006-12-06 23:24:24 +02:00
Daniel Stone
2f0a800ffd
config: move to block/wakeup handler
2006-12-06 23:24:24 +02:00
Daniel Stone
988757a441
config: error messages non-fatal, and before we free them
...
Move error messages before we free the error structure, and make them all
non-fatal.
2006-11-08 15:30:03 +02:00
Eric Anholt
5a40448f2d
A couple more cases of error message before freeing strings.
2006-11-07 15:48:29 -08:00
Eric Anholt
3e7e0e3509
Report the error before freeing the error strings.
2006-11-07 14:13:23 -08:00
Daniel Stone
a8a0abdbea
config/dbus: always unref the connection, not close
2006-10-20 00:43:10 +03:00
Daniel Stone
205c6788d7
config/dbus: properly initialise vtable
...
Properly initialise the vtable, so we don't end up with an unregister_function
pointing to god knows where.
2006-10-20 00:42:47 +03:00
Daniel Stone
acd8419948
config: unref connection, don't close it
...
Just unref the connection instead of explicitly closing it (thanks, Rob
McQueen).
Add a commented-out unregister_object_path call: unfortunately, when we
call it, libdbus segfaults. But if we don't unregister the path, we
can't register it again. So regenerations are broken either way, but a
little less violently like this.
2006-10-15 20:42:31 +03:00
Daniel Stone
ec35e7198d
config: add replies and dbus api documentation
...
Add replies, which use standard X error values, to the two currently-supported
input configuration requests.
Document the D-BUS API we use.
Make sure we free everything when we encounter an error.
Add a _source option to all incoming requests, noting that it came from a
client.
Reject all requests to add a device where an option name contains an
underscore.
2006-10-15 19:44:49 +03:00
Daniel Stone
97030b6c6b
config: fix compilation
...
Accidentally built with --disable-config, didn't notice that the previous
commit to clean up the debugging broke things horribly.
2006-10-08 17:07:05 +03:00
Daniel Stone
cfc3e9ede2
config: remove excessive debugging
2006-10-08 15:27:52 +03:00
Daniel Stone
4e37c07ba6
config: clean up debugging messages, make failure to acquire name fatal
...
Bomb with FatalError when we can't acquire the bus and name.
Clean up a bunch of debugging ErrorFs to be hidden behind #ifdef DEBUG.
2006-08-24 23:16:17 +03:00
Daniel Stone
7721ee308f
config client: fix minor race with event queue
...
Fix a small race whereby you could remove a device while events from it
were still in the queue, by calling ProcessInputEvents immediately before
RemoveDevice, to (hopefully) flush the event queue.
2006-08-07 23:03:02 +03:00
Daniel Stone
02a9531156
add basic D-BUS configuration mechanism
...
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
2006-07-21 15:19:49 -04:00