* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include <unistd.h>
#include <limits.h>
#include <errno.h>
+#include <sys/mman.h>
#include "gdk.h"
#include "gdkwayland.h"
#include "gdkprivate-wayland.h"
#include "gdkinternals.h"
-#include "gdkdisplay-wayland.h"
#include "gdkkeysprivate.h"
-#include <X11/extensions/XKBcommon.h>
+#include <xkbcommon/xkbcommon.h>
typedef struct _GdkWaylandKeymap GdkWaylandKeymap;
typedef struct _GdkWaylandKeymapClass GdkWaylandKeymapClass;
struct _GdkWaylandKeymap
{
GdkKeymap parent_instance;
- GdkModifierType modmap[8];
- struct xkb_desc *xkb;
+
+ struct xkb_keymap *xkb_keymap;
+ struct xkb_state *xkb_state;
};
struct _GdkWaylandKeymapClass
static gboolean
gdk_wayland_keymap_get_caps_lock_state (GdkKeymap *keymap)
{
- return FALSE;
+ return xkb_state_led_name_is_active (GDK_WAYLAND_KEYMAP (keymap)->xkb_state,
+ XKB_LED_NAME_CAPS);
}
static gboolean
gdk_wayland_keymap_get_num_lock_state (GdkKeymap *keymap)
{
- return FALSE;
+ return xkb_state_led_name_is_active (GDK_WAYLAND_KEYMAP (keymap)->xkb_state,
+ XKB_LED_NAME_NUM);
}
static gboolean
GdkKeymapKey **keys,
gint *n_keys)
{
- GArray *retval;
- uint32_t keycode;
- struct xkb_desc *xkb;
-
- xkb = GDK_WAYLAND_KEYMAP (keymap)->xkb;
- keycode = xkb->min_key_code;
-
- retval = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
-
- for (keycode = xkb->min_key_code; keycode <= xkb->max_key_code; keycode++)
+ if (n_keys)
+ *n_keys = 1;
+ if (keys)
{
- gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode);
-
- gint group = 0;
- gint level = 0;
- gint total_syms = XkbKeyNumSyms (xkb, keycode);
- gint i = 0;
- uint32_t *entry;
-
- /* entry is an array with all syms for group 0, all
- * syms for group 1, etc. and for each group the
- * shift level syms are in order
- */
- entry = XkbKeySymsPtr (xkb, keycode);
-
- for (i = 0; i < total_syms; i++)
- {
- /* check out our cool loop invariant */
- g_assert (i == (group * max_shift_levels + level));
-
- if (entry[i] == keyval)
- {
- /* Found a match */
- GdkKeymapKey key;
-
- key.keycode = keycode;
- key.group = group;
- key.level = level;
-
- g_array_append_val (retval, key);
-
- g_assert (XkbKeySymEntry (xkb, keycode, level, group) ==
- keyval);
- }
-
- level++;
-
- if (level == max_shift_levels)
- {
- level = 0;
- group++;
- }
- }
+ *keys = g_new0 (GdkKeymapKey, 1);
+ (*keys)->keycode = keyval;
}
- *n_keys = retval->len;
- *keys = (GdkKeymapKey *) g_array_free (retval, FALSE);
-
- return *n_keys > 0;
+ return TRUE;
}
static gboolean
guint **keyvals,
gint *n_entries)
{
- GArray *key_array;
- GArray *keyval_array;
- struct xkb_desc *xkb;
- gint max_shift_levels;
- gint group = 0;
- gint level = 0;
- gint total_syms;
- gint i;
- uint32_t *entry;
-
- g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
- g_return_val_if_fail (n_entries != NULL, FALSE);
-
- xkb = GDK_WAYLAND_KEYMAP (keymap)->xkb;
-
- if (hardware_keycode < xkb->min_key_code ||
- hardware_keycode > xkb->max_key_code)
- {
- if (keys)
- *keys = NULL;
- if (keyvals)
- *keyvals = NULL;
-
- *n_entries = 0;
- return FALSE;
- }
-
- if (keys)
- key_array = g_array_new (FALSE, FALSE, sizeof (GdkKeymapKey));
- else
- key_array = NULL;
-
- if (keyvals)
- keyval_array = g_array_new (FALSE, FALSE, sizeof (guint));
- else
- keyval_array = NULL;
-
- /* See sec 15.3.4 in XKB docs */
- max_shift_levels = XkbKeyGroupsWidth (xkb, hardware_keycode);
- total_syms = XkbKeyNumSyms (xkb, hardware_keycode);
-
- /* entry is an array with all syms for group 0, all
- * syms for group 1, etc. and for each group the
- * shift level syms are in order
- */
- entry = XkbKeySymsPtr (xkb, hardware_keycode);
-
- for (i = 0; i < total_syms; i++)
- {
- /* check out our cool loop invariant */
- g_assert (i == (group * max_shift_levels + level));
-
- if (key_array)
- {
- GdkKeymapKey key;
-
- key.keycode = hardware_keycode;
- key.group = group;
- key.level = level;
-
- g_array_append_val (key_array, key);
- }
-
- if (keyval_array)
- g_array_append_val (keyval_array, entry[i]);
-
- ++level;
-
- if (level == max_shift_levels)
- {
- level = 0;
- ++group;
- }
- }
-
- *n_entries = 0;
-
+ if (n_entries)
+ *n_entries = 1;
if (keys)
{
- *n_entries = key_array->len;
- *keys = (GdkKeymapKey*) g_array_free (key_array, FALSE);
+ *keys = g_new0 (GdkKeymapKey, 1);
+ (*keys)->keycode = hardware_keycode;
}
-
if (keyvals)
{
- *n_entries = keyval_array->len;
- *keyvals = (guint*) g_array_free (keyval_array, FALSE);
+ *keyvals = g_new0 (guint, 1);
+ (*keyvals)[0] = hardware_keycode;
}
-
- return *n_entries > 0;
+ return TRUE;
}
static guint
gdk_wayland_keymap_lookup_key (GdkKeymap *keymap,
const GdkKeymapKey *key)
{
- struct xkb_desc *xkb;
-
- xkb = GDK_WAYLAND_KEYMAP (keymap)->xkb;
-
- return XkbKeySymEntry (xkb, key->keycode, key->level, key->group);
-}
-
-/* This is copied straight from XFree86 Xlib, to:
- * - add the group and level return.
- * - change the interpretation of mods_rtrn as described
- * in the docs for gdk_keymap_translate_keyboard_state()
- * It's unchanged for ease of diff against the Xlib sources; don't
- * reformat it.
- */
-static int
-MyEnhancedXkbTranslateKeyCode(struct xkb_desc * xkb,
- KeyCode key,
- unsigned int mods,
- unsigned int * mods_rtrn,
- uint32_t * keysym_rtrn,
- int * group_rtrn,
- int * level_rtrn)
-{
- struct xkb_key_type *type;
- int col,nKeyGroups;
- unsigned preserve,effectiveGroup;
- uint32_t *syms;
-
- if (mods_rtrn!=NULL)
- *mods_rtrn = 0;
-
- nKeyGroups= XkbKeyNumGroups(xkb,key);
- if ((!XkbKeycodeInRange(xkb,key))||(nKeyGroups==0)) {
- if (keysym_rtrn!=NULL)
- *keysym_rtrn = 0;
- return 0;
- }
-
- syms = XkbKeySymsPtr(xkb,key);
-
- /* find the offset of the effective group */
- col = 0;
- effectiveGroup= XkbGroupForCoreState(mods);
- if ( effectiveGroup>=nKeyGroups ) {
- unsigned groupInfo= XkbKeyGroupInfo(xkb,key);
- switch (XkbOutOfRangeGroupAction(groupInfo)) {
- default:
- effectiveGroup %= nKeyGroups;
- break;
- case XkbClampIntoRange:
- effectiveGroup = nKeyGroups-1;
- break;
- case XkbRedirectIntoRange:
- effectiveGroup = XkbOutOfRangeGroupNumber(groupInfo);
- if (effectiveGroup>=nKeyGroups)
- effectiveGroup= 0;
- break;
- }
- }
- col= effectiveGroup*XkbKeyGroupsWidth(xkb,key);
- type = XkbKeyKeyType(xkb,key,effectiveGroup);
-
- preserve= 0;
- if (type->map) { /* find the column (shift level) within the group */
- register int i;
- struct xkb_kt_map_entry *entry;
- /* ---- Begin section modified for GDK ---- */
- int found = 0;
-
- for (i=0,entry=type->map;i<type->map_count;i++,entry++) {
- if (mods_rtrn) {
- int bits = 0;
- unsigned long tmp = entry->mods.mask;
- while (tmp) {
- if ((tmp & 1) == 1)
- bits++;
- tmp >>= 1;
- }
- /* We always add one-modifiers levels to mods_rtrn since
- * they can't wipe out bits in the state unless the
- * level would be triggered. But return other modifiers
- *
- */
- if (bits == 1 || (mods&type->mods.mask)==entry->mods.mask)
- *mods_rtrn |= entry->mods.mask;
- }
-
- if (!found&&entry->active&&((mods&type->mods.mask)==entry->mods.mask)) {
- col+= entry->level;
- if (type->preserve)
- preserve= type->preserve[i].mask;
-
- if (level_rtrn)
- *level_rtrn = entry->level;
-
- found = 1;
- }
- }
- /* ---- End section modified for GDK ---- */
- }
-
- if (keysym_rtrn!=NULL)
- *keysym_rtrn= syms[col];
- if (mods_rtrn) {
- /* ---- Begin section modified for GDK ---- */
- *mods_rtrn &= ~preserve;
- /* ---- End section modified for GDK ---- */
-
- /* ---- Begin stuff GDK comments out of the original Xlib version ---- */
- /* This is commented out because xkb_info is a private struct */
-
-#if 0
- /* The Motif VTS doesn't get the help callback called if help
- * is bound to Shift+<whatever>, and it appears as though it
- * is XkbTranslateKeyCode that is causing the problem. The
- * core X version of XTranslateKey always OR's in ShiftMask
- * and LockMask for mods_rtrn, so this "fix" keeps this behavior
- * and solves the VTS problem.
- */
- if ((xkb->dpy)&&(xkb->dpy->xkb_info)&&
- (xkb->dpy->xkb_info->xlib_ctrls&XkbLC_AlwaysConsumeShiftAndLock)) { *mods_rtrn|= (ShiftMask|LockMask);
- }
-#endif
-
- /* ---- End stuff GDK comments out of the original Xlib version ---- */
- }
-
- /* ---- Begin stuff GDK adds to the original Xlib version ---- */
-
- if (group_rtrn)
- *group_rtrn = effectiveGroup;
-
- /* ---- End stuff GDK adds to the original Xlib version ---- */
-
- return (syms[col] != 0);
+ return key->keycode;
}
static gboolean
gint *level,
GdkModifierType *consumed_modifiers)
{
- GdkWaylandKeymap *wayland_keymap;
- uint32_t tmp_keyval = 0;
- guint tmp_modifiers;
- struct xkb_desc *xkb;
-
g_return_val_if_fail (keymap == NULL || GDK_IS_KEYMAP (keymap), FALSE);
g_return_val_if_fail (group < 4, FALSE);
- wayland_keymap = GDK_WAYLAND_KEYMAP (keymap);
- xkb = wayland_keymap->xkb;
-
if (keyval)
- *keyval = 0;
+ *keyval = hardware_keycode;
if (effective_group)
*effective_group = 0;
if (level)
if (consumed_modifiers)
*consumed_modifiers = 0;
- if (hardware_keycode < xkb->min_key_code ||
- hardware_keycode > xkb->max_key_code)
- return FALSE;
-
-
- /* replace bits 13 and 14 with the provided group */
- state &= ~(1 << 13 | 1 << 14);
- state |= group << 13;
-
- MyEnhancedXkbTranslateKeyCode (xkb,
- hardware_keycode,
- state,
- &tmp_modifiers,
- &tmp_keyval,
- effective_group,
- level);
-
- if (state & ~tmp_modifiers & XKB_COMMON_LOCK_MASK)
- tmp_keyval = gdk_keyval_to_upper (tmp_keyval);
-
- /* We need to augment the consumed modifiers with LockMask, since
- * we handle that ourselves, and also with the group bits
- */
- tmp_modifiers |= XKB_COMMON_LOCK_MASK | 1 << 13 | 1 << 14;
-
-
- if (consumed_modifiers)
- *consumed_modifiers = tmp_modifiers;
-
- if (keyval)
- *keyval = tmp_keyval;
-
- return tmp_keyval != 0;
-}
-
-
-static void
-update_modmap (GdkWaylandKeymap *wayland_keymap)
-{
- static struct {
- const gchar *name;
- uint32_t atom;
- GdkModifierType mask;
- } vmods[] = {
- { "Meta", 0, GDK_META_MASK },
- { "Super", 0, GDK_SUPER_MASK },
- { "Hyper", 0, GDK_HYPER_MASK },
- { NULL, 0, 0 }
- };
-
- gint i, j, k;
-
- if (!vmods[0].atom)
- for (i = 0; vmods[i].name; i++)
- vmods[i].atom = xkb_intern_atom(vmods[i].name);
-
- for (i = 0; i < 8; i++)
- wayland_keymap->modmap[i] = 1 << i;
-
- for (i = 0; i < XkbNumVirtualMods; i++)
- {
- for (j = 0; vmods[j].atom; j++)
- {
- if (wayland_keymap->xkb->names->vmods[i] == vmods[j].atom)
- {
- for (k = 0; k < 8; k++)
- {
- if (wayland_keymap->xkb->server->vmods[i] & (1 << k))
- wayland_keymap->modmap[k] |= vmods[j].mask;
- }
- }
- }
- }
+ return TRUE;
}
static void
gdk_wayland_keymap_add_virtual_modifiers (GdkKeymap *keymap,
GdkModifierType *state)
{
- GdkWaylandKeymap *wayland_keymap;
- int i;
-
- wayland_keymap = GDK_WAYLAND_KEYMAP (keymap);
-
- for (i = 3; i < 8; i++)
- {
- if ((1 << i) & *state)
- {
- if (wayland_keymap->modmap[i] & GDK_MOD1_MASK)
- *state |= GDK_MOD1_MASK;
- if (wayland_keymap->modmap[i] & GDK_SUPER_MASK)
- *state |= GDK_SUPER_MASK;
- if (wayland_keymap->modmap[i] & GDK_HYPER_MASK)
- *state |= GDK_HYPER_MASK;
- if (wayland_keymap->modmap[i] & GDK_META_MASK)
- *state |= GDK_META_MASK;
- }
- }
+ return;
}
static gboolean
gdk_wayland_keymap_map_virtual_modifiers (GdkKeymap *keymap,
GdkModifierType *state)
{
- const guint vmods[] = {
- GDK_SUPER_MASK, GDK_HYPER_MASK, GDK_META_MASK
- };
- int i, j;
- gboolean retval;
- GdkWaylandKeymap *wayland_keymap;
- struct xkb_desc *xkb;
-
- wayland_keymap = GDK_WAYLAND_KEYMAP (keymap);
- xkb = wayland_keymap->xkb;
-
- for (j = 0; j < 3; j++)
- {
- if (*state & vmods[j])
- {
- for (i = 3; i < 8; i++)
- {
- if (wayland_keymap->modmap[i] & vmods[j])
- {
- if (*state & (1 << i))
- retval = FALSE;
- else
- *state |= 1 << i;
- }
- }
- }
- }
-
return TRUE;
}
}
GdkKeymap *
-_gdk_wayland_keymap_new (GdkDisplay *display)
+_gdk_wayland_keymap_new ()
{
GdkWaylandKeymap *keymap;
+ struct xkb_context *context;
struct xkb_rule_names names;
keymap = g_object_new (_gdk_wayland_keymap_get_type(), NULL);
- GDK_KEYMAP (keymap)->display = display;
+
+ context = xkb_context_new (0);
names.rules = "evdev";
names.model = "pc105";
names.layout = "us";
names.variant = "";
names.options = "";
- keymap->xkb = xkb_compile_keymap_from_rules(&names);
- update_modmap (keymap);
+ keymap->xkb_keymap = xkb_keymap_new_from_names (context, &names, 0);
+ keymap->xkb_state = xkb_state_new (keymap->xkb_keymap);
+ xkb_context_unref (context);
return GDK_KEYMAP (keymap);
}
-struct xkb_desc *_gdk_wayland_keymap_get_xkb_desc (GdkKeymap *keymap)
+GdkKeymap *
+_gdk_wayland_keymap_new_from_fd (uint32_t format,
+ uint32_t fd, uint32_t size)
+{
+ GdkWaylandKeymap *keymap;
+ struct xkb_context *context;
+ char *map_str;
+
+ keymap = g_object_new (_gdk_wayland_keymap_get_type(), NULL);
+
+ context = xkb_context_new (0);
+
+ map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+ if (map_str == MAP_FAILED) {
+ close(fd);
+ return NULL;
+ }
+
+ keymap->xkb_keymap = xkb_keymap_new_from_string (context, map_str, format, 0);
+ munmap (map_str, size);
+ close (fd);
+ keymap->xkb_state = xkb_state_new (keymap->xkb_keymap);
+ xkb_context_unref (context);
+
+ return GDK_KEYMAP (keymap);
+}
+
+struct xkb_keymap *_gdk_wayland_keymap_get_xkb_keymap (GdkKeymap *keymap)
+{
+ return GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
+}
+
+struct xkb_state *_gdk_wayland_keymap_get_xkb_state (GdkKeymap *keymap)
{
- return GDK_WAYLAND_KEYMAP (keymap)->xkb;
+ return GDK_WAYLAND_KEYMAP (keymap)->xkb_state;
}
projects / ~andy / gtk / blobdiff