diff options
| author | Alexandr Shadchin <alexandr.shadchin@gmail.com> | 2011-02-16 13:21:03 +0500 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-17 08:30:12 +1000 |
| commit | a02757d7c3d8018f44c63553578763fcef41bcca (patch) | |
| tree | b83f08da4dd80b3b96c38188c585a420ae8762dc | |
| parent | f45f3dbcf1f2a54d7d6a51d6e9884820cff4be12 (diff) | |
Cleanup set the value of CustomKeycodes
Also, do not print values of variables CustomKeycodes twice.
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/bsd_kbd.c | 1 | ||||
| -rw-r--r-- | src/hurd_kbd.c | 1 | ||||
| -rw-r--r-- | src/kbd.c | 15 | ||||
| -rw-r--r-- | src/sun_kbd.c | 2 |
4 files changed, 2 insertions, 17 deletions
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c index 3b45e22..710470a 100644 --- a/src/bsd_kbd.c +++ b/src/bsd_kbd.c @@ -443,7 +443,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo) pKbd->RemapScanCode = NULL; pKbd->OpenKeyboard = OpenKeyboard; - pKbd->CustomKeycodes = FALSE; pKbd->private = calloc(sizeof(BsdKbdPrivRec), 1); if (pKbd->private == NULL) { diff --git a/src/hurd_kbd.c b/src/hurd_kbd.c index dde5fbb..8c0cd60 100644 --- a/src/hurd_kbd.c +++ b/src/hurd_kbd.c @@ -158,7 +158,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo) pKbd->KbdGetMapping = KbdGetMapping; pKbd->RemapScanCode = ATScancode; pKbd->OpenKeyboard = OpenKeyboard; - pKbd->CustomKeycodes = FALSE; pKbd->private = NULL; pInfo->read_input = ReadInput; return TRUE; @@ -85,7 +85,6 @@ static const char *kbdDefaults[] = { "XkbRules", "base", "XkbModel", "pc105", "XkbLayout", "us", - "CustomKeycodes", "off", NULL }; @@ -94,7 +93,6 @@ static const char *kbd98Defaults[] = { "XkbRules", "xfree98", "XkbModel", "pc98", "XkbLayout", "jp", - "CustomKeycodes", "off", NULL }; @@ -143,7 +141,6 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) #endif { KbdDevPtr pKbd; - MessageType from = X_DEFAULT; char *s; const char **defaults; int rc = Success; @@ -212,16 +209,8 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) xkb_variant = xf86SetStrOption(pInfo->options, "XkbVariant", NULL); xkb_options = xf86SetStrOption(pInfo->options, "XkbOptions", NULL); - pKbd->CustomKeycodes = FALSE; - from = X_DEFAULT; - if (xf86FindOption(pInfo->options, "CustomKeycodes")) { - pKbd->CustomKeycodes = xf86SetBoolOption(pInfo->options, "CustomKeycodes", - pKbd->CustomKeycodes); - from = X_CONFIG; - } - - xf86Msg(from, "%s: CustomKeycodes %s\n", - pInfo->name, pKbd->CustomKeycodes ? "enabled" : "disabled"); + pKbd->CustomKeycodes = xf86SetBoolOption(pInfo->options, "CustomKeycodes", + FALSE); out: return rc; diff --git a/src/sun_kbd.c b/src/sun_kbd.c index 05d1bd9..a240087 100644 --- a/src/sun_kbd.c +++ b/src/sun_kbd.c @@ -518,8 +518,6 @@ xf86OSKbdPreInit(InputInfoPtr pInfo) pKbd->OpenKeyboard = OpenKeyboard; - pKbd->CustomKeycodes = FALSE; - pKbd->private = calloc(sizeof(sunKbdPrivRec), 1); if (pKbd->private == NULL) { xf86Msg(X_ERROR,"can't allocate keyboard OS private data\n"); |