kc3-lang/libxkbcommon/test/xkey.sh

• Show log

  Commit

• Hash : 0d8874d0
  Author :
  Date : 2012-02-26T00:03:24
  

  makekeys: update to match the rest of libX11 makekeys This integrates two commits from libX11: ebd6ef0a4db0ddef0ae17ad14571518ccdeea5ba XStringToKeysym: Special case for XF86 keysyms Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being XF86foo. So, if we get to the bottom of XStringToKeysym and haven't found our XF86_foo, try it again as XF86foo. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 00175397480b76d32bf82b0c7c94c91a2a95954e makekeys: Scan vendor keysyms as well as core Since we can't really live without vendor keysyms, scan them all in to generate ks_tables.h, rather than only doing the core ones, and leaving the vendor syms to be manually synchronised with XKeysymDB. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Notice that the xkey.sh test is changed to match libX11 behavior, i.e. XKeysymToString(0x1008FE20) -> "XF86Ungrab" as opposed to "XF86_Ungrab". Signed-off-by: Ran Benita <ran234@gmail.com>

Download

• test/xkey.sh

• #!/bin/sh
  
  srcdir=${srcdir-.}
  builddir=${builddir-.}
  
  name=xkey
  prog="$builddir/$name$EXEEXT"
  log="$builddir/$name.log"
  
  check_error()
  {
      if [ "$2" != "$3" ]; then
          echo "error checking $1" >&2
          echo "  expected: $2" >&2
          echo "  received: $3" >&2
          return 1
      fi
  }
  
  check_string()
  {
      echo "$prog -s '$1'" >>"$log"
      val=`$prog -s "$1"` &&
          echo "$val" >>"$log" &&
          check_error "$1" "$2" "$val" >>"$log" 2>&1 ||
          exit $?
  }
  
  check_key()
  {
      echo "$prog -k '$1'" >>"$log"
      val=`$prog -k "$1"` && \
          echo "$val" >>"$log" &&
          check_error "$1" "$2" "$val" >>"$log" 2>&1 || \
          exit $?
  }
  
  rm -f "$log"
  
  check_string Undo 0xFF65
  check_key 0x1008FF56 XF86Close
  check_string ThisKeyShouldNotExist NoSymbol
  check_key 0x0 NoSymbol
  check_string XF86_Switch_VT_5 0x1008FE05
  check_key 0x1008FE20 XF86Ungrab
  check_string VoidSymbol 0xFFFFFF
  check_key 0x01001234 U1234
  check_string U4567 0x1004567
  check_string 0x10203040 0x10203040
  

Download