comparison src/xfns.c @ 34911:4cdfcac861d7

(Fx_backspace_delete_keys_p): Check library and server XKB versions. Call XkbFreeKeyboard with 2nd arg 0.

34910:fb1262412e0e

#ifdef HAVE_XKBGETKEYBOARD
  XkbDescPtr kb;
  struct frame *f = check_x_frame (frame);
  Display *dpy = FRAME_X_DISPLAY (f);
  Lisp_Object have_keys;

  have_keys = Qnil;

  BLOCK_INPUT;
  kb = XkbGetKeyboard (dpy, XkbAllComponentsMask, XkbUseCoreKbd);
  if (kb)
    {
      int delete_keycode = 0, backspace_keycode = 0, i;
      

	    delete_keycode = i;
	  else if (bcmp ("BKSP", kb->names->keys[i].name, 4) == 0)
	    backspace_keycode = i;
	}

      XkbFreeKeyboard (kb, XkbAllComponentsMask, True);
  
      if (delete_keycode
	  && backspace_keycode
	  && XKeysymToKeycode (dpy, XK_Delete) == delete_keycode
	  && XKeysymToKeycode (dpy, XK_BackSpace) == backspace_keycode)

34911:4cdfcac861d7

#ifdef HAVE_XKBGETKEYBOARD
  XkbDescPtr kb;
  struct frame *f = check_x_frame (frame);
  Display *dpy = FRAME_X_DISPLAY (f);
  Lisp_Object have_keys;
  int major, minor, op, event, error;

  BLOCK_INPUT;

  /* Check library version in case we're dynamically linked.  */
  major = XkbMajorVersion;
  minor = XkbMinorVersion;
  if (!XkbLibraryVersion (&major, &minor))
    return Qnil;

  /* Check that the server supports XKB.  */
  major = XkbMajorVersion;
  minor = XkbMinorVersion;
  if (!XkbQueryExtension (dpy, &op, &event, &error, &major, &minor))
    return Qnil;
  
  have_keys = Qnil;
  kb = XkbGetKeyboard (dpy, XkbAllComponentsMask, XkbUseCoreKbd);
  if (kb)
    {
      int delete_keycode = 0, backspace_keycode = 0, i;
      

	    delete_keycode = i;
	  else if (bcmp ("BKSP", kb->names->keys[i].name, 4) == 0)
	    backspace_keycode = i;
	}

      XkbFreeKeyboard (kb, 0, True);
  
      if (delete_keycode
	  && backspace_keycode
	  && XKeysymToKeycode (dpy, XK_Delete) == delete_keycode
	  && XKeysymToKeycode (dpy, XK_BackSpace) == backspace_keycode)