Commit Graph

38 Commits

Author SHA1 Message Date
matthieu
a1bae26b21 Code to configure the xkb layout and options from wscons setup
has moved to the X server wscons hotplug driver.

Tested by many, ok oga@
2011-06-29 20:00:23 +00:00
matthieu
8c4c507ccd Let fr.dvorak kbdtype select the bepo xkb layout.
Tested by Manuel Giraud. Thanks.
2011-06-14 11:47:33 +00:00
matthieu
0b4ee08508 xkeyboard-config is using "base" not "xorg" as default rules.
While there remove references to the unmaintained PC98 settings.
2011-06-11 08:38:35 +00:00
shadchin
89a8ad0171 If you do not have XkbOptions in xorg.conf, it is automatically set to
"terminate: ctrl_alt_bksp" (only if XENOCARA_USE_XKEYBOARD_CONFIG=Yes)

tested ajacoutot@, ok matthieu@
2011-05-30 10:52:57 +00:00
shadchin
ec4b63b61e update to xf86-input-keyboard 1.6.0
ok matthieu@
2011-04-22 18:33:36 +00:00
matthieu
2cc47a1202 add a new build switch 'XENOCARA_USE_XKEYBOARD_CONFIG' to enable
the use of xkeyboard-config xkb definitions instead of the old xkbdata.
This will make testing easier. No changes in default builds.
ok shadchin@
2011-03-08 07:59:23 +00:00
matthieu
da250ff15b update to xf86-input-keyboard 1.5.0
Tested by ajacoutot@, shadchin@, jasper@ and landry@. Thanks.
2010-11-27 14:41:06 +00:00
claudio
21c462b41f Add a nasty little hack to make keyboard selection work for Swiss keyboard
encodings and the Canadian French one. The way XkbLayout and XkbVariant
work for this encodings changed some long time ago and the result was
that you would end up with no keyboard at all in X. Now XkbVariant includes
part of the layout selection which is about as ugly and makes the wscons
mapping a bit tricky.
OK matthieu@, maja@
2010-11-26 16:53:00 +00:00
matthieu
b1ae736ef2 Commit the right version of the file: we want to remove XkbLayout from
the defaults, no XkbModel.
2010-08-04 22:28:36 +00:00
matthieu
42e5cee579 Fix the fix of the fix.
Previous iteration would again ignore wscons keyboard.encoding setting.
Now no default xkbLayout is set, unless keyboard.encoding=user.
2010-08-04 21:45:32 +00:00
matthieu
7cfab8f596 Don't set xkblayout from wscons setting if specified in xorg.conf.
Problem noticed, and patch provided by  Mike Belopuhov. Thanks.
2010-08-04 19:27:52 +00:00
matthieu
4fc63f1770 Missed one added file in previous update to xf86-input-keyboard 1.4.0 2010-07-31 07:38:20 +00:00
naddy
988f34c0b9 terminate xf86Msg() string with newline; ok matthieu@ 2010-07-28 19:47:40 +00:00
matthieu
439d2f36f3 Additional fix for the wscons keyboard layout detection code.
If the layout is 'user', fall back to the "us" layout.

Problem spotted by naddy@.
2010-07-27 19:33:03 +00:00
matthieu
3fa6fbc913 Update to xf86-input-keyboard 1.4.0. tested by many with xserver 1.8.
ok oga@, todd@.
2010-07-27 19:06:44 +00:00
oga
80bba657d4 split the KB_VARTAB code in wscons autodetection so that it understands
both XkbOptions and XkbVariant. now we can understand the .dvorak,
.nodeadkeys and .swapctrlcaps wscons variants and pass them correctly onto XKB.
Means that xmodmap or setxkbmap magic isn't needed in those cases
anymore.

"no objections" matthieu@. Diff from Tobias Ulmer (tobiasu at tmux dot
org); thanks!
2009-12-07 19:28:53 +00:00
matthieu
7740bac7cb update to xf86-input-keyboard 1.3.2 2009-05-03 14:57:17 +00:00
matthieu
044bf903cc regen 2008-08-27 20:01:07 +00:00
matthieu
d1a95433ea xf86-input-keyboard 1.3.1 2008-08-27 20:00:22 +00:00
maja
d802806210 Convert some wscons keyboard layouts to correct X names. -moj
ok @johan @oga and @matthieu
2008-05-04 22:45:35 +00:00
matthieu
cd2e1b318d If the wskbd map is 'user' don't try to set the xkb layout.
Tested by okan@ ok oga@.
2008-04-20 19:28:14 +00:00
matthieu
11509342cd When running without an xorg.conf file, use the current wscons keymap
to setup XkbLayout and XkbOptions. Idea and original code from reyk@,
some tweaks by me. ok oga@.
2008-04-16 19:45:22 +00:00
matthieu
7830df18ed Regen with autoconf 2.59-p2, with AM_SANITY check zapped. 2008-03-15 18:08:24 +00:00
matthieu
2a2c29e078 - Restore some local OpenBSD changes that got lost when the file moved to
xf86-input-keyboard: privsep support, LK[24]01 support.
- fix parameters order in printWsType().
2007-12-12 21:38:01 +00:00
matthieu
2162166047 merge xf86-input-keyboard 1.2.2 2007-11-24 19:09:38 +00:00
matthieu
9d62481cc1 xf86-input-keyboard 1.2.2 2007-11-24 18:51:53 +00:00
matthieu
0f1f38e9f0 regen 2007-07-29 10:27:00 +00:00
matthieu
00a847b3f8 regen with libtool 1.5.22p9 2007-03-25 13:02:54 +00:00
matthieu
6637a9a36e regen with automake 1.9.6p2 2007-03-18 22:29:12 +00:00
matthieu
7ebff42819 regen 2007-03-16 01:32:18 +00:00
matthieu
161a0bb55b OpenBSD modifications: no special treatement of sparc keyboard. 2006-11-28 20:31:31 +00:00
matthieu
cd9eb53273 regen 2006-11-28 19:02:33 +00:00
matthieu
df4cfb3429 Remove RCS Ids 2006-11-28 12:15:32 +00:00
matthieu
78e2e44741 $Xenocara$ -> $OpenBSD$ 2006-11-27 19:27:25 +00:00
matthieu
99f184625d regenerate with OpenBSD autotools 2006-11-27 14:55:05 +00:00
matthieu
81519edd65 regen with OpenBSD autotools 2006-11-27 00:01:31 +00:00
matthieu
0bb378f0f2 Build infrastructure for driver 2006-11-26 23:05:50 +00:00
matthieu
aae1b1b00c Importing xf86-input-keyboard 1.1.1 2006-11-26 19:52:58 +00:00