Attachment 18051 Details for Bug 16874 – 0001-config-support-type-strlist-for-XkbOptions-property.patch

[patch] 0001-config-support-type-strlist-for-XkbOptions-property.patch

0001-config-support-type-strlist-for-XkbOptions-property.patch (text/plain), 3.45 KB, created by Peter Hutterer on 2008-07-31 22:08:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2008-07-31 22:08:46 UTC

Size: 3.45 KB

patch

obsolete

>From 2e7e6f6a74f955879404cf153a438a6cb7c6f05b Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Fri, 1 Aug 2008 14:24:54 +0930
>Subject: [PATCH] config: support type strlist for XkbOptions property.
>
>For backwards compatibility with server 1.4.
>---
> config/hal.c |   29 +++++++++++++++++++++++------
> 1 files changed, 23 insertions(+), 6 deletions(-)
>
>diff --git a/config/hal.c b/config/hal.c
>index a9451b7..a954af9 100644
>--- a/config/hal.c
>+++ b/config/hal.c
>@@ -132,9 +132,6 @@ get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
>     return ret;
> }
> 
>-/* this function is no longer used... keep it here in case its needed in
>- * the future. */
>-#if 0
> static char *
> get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
> {
>@@ -168,7 +165,6 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
> 
>     return ret;
> }
>-#endif
> 
> static void
> device_added(LibHalContext *hal_ctx, const char *udi)
>@@ -250,12 +246,12 @@ device_added(LibHalContext *hal_ctx, const char *udi)
> 
>             /* normal options first (input.x11_options.<propname>) */
>             if (!strncasecmp(psi_key, LIBHAL_PROP_KEY, sizeof(LIBHAL_PROP_KEY)-1)){
>+                char* tmp;
> 
>                 /* only support strings for all values */
>                 tmp_val = get_prop_string(hal_ctx, udi, psi_key);
> 
>                 if (tmp_val){
>-                    char* tmp;
> 
>                     /* xkb needs special handling. HAL specs include
>                      * input.xkb.xyz options, but the x11-input.fdi specifies
>@@ -298,14 +294,25 @@ device_added(LibHalContext *hal_ctx, const char *udi)
>                         add_option(&options, psi_key + sizeof(LIBHAL_PROP_KEY)-1, tmp_val);
>                         xfree(tmp_val);
>                     }
>+                } else
>+                {
>+                    /* server 1.4 had xkb_options as strlist. */
>+                    if ((tmp = strcasestr(psi_key, "xkb")) &&
>+                        (!strcasecmp(&tmp[3], "options")) &&
>+                        (tmp_val = get_prop_string_array(hal_ctx, udi, psi_key)))
>+                    {
>+                        if (xkb_opts.options)
>+                            xfree(xkb_opts.options);
>+                        xkb_opts.options = strdup(tmp_val);
>+                    }
>                 }
>             } else if (!strncasecmp(psi_key, LIBHAL_XKB_PROP_KEY, sizeof(LIBHAL_XKB_PROP_KEY)-1)){
>+                char* tmp;
> 
>                 /* only support strings for all values */
>                 tmp_val = get_prop_string(hal_ctx, udi, psi_key);
> 
>                 if (tmp_val){
>-                    char* tmp;
> 
>                     tmp = &psi_key[sizeof(LIBHAL_XKB_PROP_KEY) - 1];
> 
>@@ -331,6 +338,16 @@ device_added(LibHalContext *hal_ctx, const char *udi)
>                             xkb_opts.options = strdup(tmp_val);
>                     }
>                     xfree(tmp_val);
>+                } else
>+                {
>+                    /* server 1.4 had xkb options as strlist */
>+                    tmp_val = get_prop_string_array(hal_ctx, udi, psi_key);
>+                    if (tmp_val)
>+                    {
>+                        tmp = &psi_key[sizeof(LIBHAL_XKB_PROP_KEY) - 1];
>+                        if (!strcasecmp(tmp, ".options") && (!xkb_opts.options))
>+                            xkb_opts.options = strdup(tmp_val);
>+                    }
>                 }
>             }
>         }
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 16874: 17951 | 18051

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.