summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/xkbcommon/src/atom.c
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2018-11-16 17:07:33 +0100
committerGatis Paeglis <gatis.paeglis@qt.io>2018-11-30 09:47:03 +0000
commitc3a963da1f9e7b1d37e63eedded61da4fbdaaf9a (patch)
treeabe3ac72e69cd6e85ec3a4cfb587405151076493 /src/3rdparty/xkbcommon/src/atom.c
parent1f1dc3fc4c2e5e2d94e86dfc7235a4b762da2e72 (diff)
src/3rdparty: remove xkbcommon
The only reason why we bundled this library ~6 years ago was because it was not available on distributions that we supported at the time, but library was a hard dependency for XCB plugin. See: 2122e731abdb619249df89642c0800640b2fa428 Later more and more projects started to depend on it (compose input context plugin, libinput, mir, wayland). The configuration had become too complex, because some projects used bundled and some used the version from the system. Having libxkbcommon in 3rdparty sources is not necessary anymore, after RHEL 6.6 was removed from the list of supported platforms for Qt 5.12. Ubuntu 16.04 - 0.5.0 Ubuntu 18.04 - 0.8.0 openSUSE 42.3 - 0.6.1 RHEL-7.4 - 0.7.1 This will also simplify further development, e.g. QTBUG-42181 Bumped the minimal required version 0.4.1 -> 0.5.0. The patch also contains a code marked with "TRANSITION HACK", which is temporary needed so we can update the dependent wayland module. [ChangeLog][Third-Party Code] Removed xkbcommon from bundled sources. This library is present on all supported platforms. The minimal required version now is 0.5.0. Task-number: QTBUG-65503 Change-Id: Iec50829bb6f8fbb19f3c4e4ad62e332beb837de5 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/3rdparty/xkbcommon/src/atom.c')
-rw-r--r--src/3rdparty/xkbcommon/src/atom.c225
1 files changed, 0 insertions, 225 deletions
diff --git a/src/3rdparty/xkbcommon/src/atom.c b/src/3rdparty/xkbcommon/src/atom.c
deleted file mode 100644
index 044f56681a..0000000000
--- a/src/3rdparty/xkbcommon/src/atom.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/***********************************************************
- * Copyright 1987, 1998 The Open Group
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of The Open Group shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from The Open Group.
- *
- *
- * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Digital not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- *
- * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- ******************************************************************/
-
-/************************************************************
- * Copyright 1994 by Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of Silicon Graphics not be
- * used in advertising or publicity pertaining to distribution
- * of the software without specific prior written permission.
- * Silicon Graphics makes no representation about the suitability
- * of this software for any purpose. It is provided "as is"
- * without any express or implied warranty.
- *
- * SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- * GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
- * THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- ********************************************************/
-
-#include "utils.h"
-#include "atom.h"
-
-struct atom_node {
- xkb_atom_t left, right;
- xkb_atom_t atom;
- unsigned int fingerprint;
- char *string;
-};
-
-struct atom_table {
- xkb_atom_t root;
- darray(struct atom_node) table;
-};
-
-struct atom_table *
-atom_table_new(void)
-{
- struct atom_table *table;
-
- table = calloc(1, sizeof(*table));
- if (!table)
- return NULL;
-
- darray_init(table->table);
- /* The original throw-away root is here, at the illegal atom 0. */
- darray_resize0(table->table, 1);
-
- return table;
-}
-
-void
-atom_table_free(struct atom_table *table)
-{
- struct atom_node *node;
-
- if (!table)
- return;
-
- darray_foreach(node, table->table)
- free(node->string);
- darray_free(table->table);
- free(table);
-}
-
-const char *
-atom_text(struct atom_table *table, xkb_atom_t atom)
-{
- if (atom == XKB_ATOM_NONE || atom >= darray_size(table->table))
- return NULL;
-
- return darray_item(table->table, atom).string;
-}
-
-static bool
-find_atom_pointer(struct atom_table *table, const char *string, size_t len,
- xkb_atom_t **atomp_out, unsigned int *fingerprint_out)
-{
- xkb_atom_t *atomp = &table->root;
- unsigned int fingerprint = 0;
- bool found = false;
-
- for (size_t i = 0; i < (len + 1) / 2; i++) {
- fingerprint = fingerprint * 27 + string[i];
- fingerprint = fingerprint * 27 + string[len - 1 - i];
- }
-
- while (*atomp != XKB_ATOM_NONE) {
- struct atom_node *node = &darray_item(table->table, *atomp);
-
- if (fingerprint < node->fingerprint) {
- atomp = &node->left;
- }
- else if (fingerprint > node->fingerprint) {
- atomp = &node->right;
- }
- else {
- /* Now start testing the strings. */
- const int cmp = strncmp(string, node->string, len);
- if (cmp < 0 || (cmp == 0 && len < strlen(node->string))) {
- atomp = &node->left;
- }
- else if (cmp > 0) {
- atomp = &node->right;
- }
- else {
- found = true;
- break;
- }
- }
- }
-
- if (fingerprint_out)
- *fingerprint_out = fingerprint;
- if (atomp_out)
- *atomp_out = atomp;
- return found;
-}
-
-xkb_atom_t
-atom_lookup(struct atom_table *table, const char *string, size_t len)
-{
- xkb_atom_t *atomp;
-
- if (!string)
- return XKB_ATOM_NONE;
-
- if (!find_atom_pointer(table, string, len, &atomp, NULL))
- return XKB_ATOM_NONE;
-
- return *atomp;
-}
-
-/*
- * If steal is true, we do not strdup @string; therefore it must be
- * dynamically allocated, NUL-terminated, not be free'd by the caller
- * and not be used afterwards. Use to avoid some redundant allocations.
- */
-xkb_atom_t
-atom_intern(struct atom_table *table, const char *string, size_t len,
- bool steal)
-{
- xkb_atom_t *atomp;
- struct atom_node node;
- unsigned int fingerprint;
-
- if (!string)
- return XKB_ATOM_NONE;
-
- if (find_atom_pointer(table, string, len, &atomp, &fingerprint)) {
- if (steal)
- free(UNCONSTIFY(string));
- return *atomp;
- }
-
- if (steal) {
- node.string = UNCONSTIFY(string);
- }
- else {
- node.string = strndup(string, len);
- if (!node.string)
- return XKB_ATOM_NONE;
- }
-
- node.left = node.right = XKB_ATOM_NONE;
- node.fingerprint = fingerprint;
- node.atom = darray_size(table->table);
- /* Do this before the append, as it may realloc and change the offsets. */
- *atomp = node.atom;
- darray_append(table->table, node);
-
- return node.atom;
-}