Commit Graph

22 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult 08614fc33e xkb: make XkbFreeGeomColors() static
Only used within one source file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult a5d973b909 xkb: make XkbFreeGeomKeyAliases() static
Only used within one source file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult e90440d683 xkb: rename XkbAllocGeometry() to SrvXkbAllocGeometry()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 9bcc5de027 xkb: rename XkbAddGeomShape() to SrvXkbAddGeomShape()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 938b536223 xkb: rename XkbAddGeomSection() to SrvXkbAddGeomSection()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 04cbc6d134 xkb: rename XkbAddGeomRow() to SrvXkbAddGeomRow()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 9dd5637d68 xkb: rename XkbAddGeomProperty() to SrvXkbAddGeomProperty()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult d19cb7e6a7 xkb: rename XkbAddGeomOverlayKey() to SrvXkbAddGeomOverlayKey()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult b133d8fa2d xkb: rename XkbAddGeomOverlayRow() to SrvXkbAddGeomOverlayRow()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult d0e2eb4015 xkb: rename XkbAddGeomOverlay() to SrvXkbAddGeomOverlay()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult cb3a805538 xkb: rename XkbAddGeomOutline() to SrvXkbAddGeomOutline()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 0df6506f75 xkb: rename XkbAddGeomKey() to SrvXkbAddGeomKey()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 329a4e3b57 xkb: rename XkbAddGeomDoodad() to SrvXkbAddGeomDoodad()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 2a4410a655 xkb: rename XkbAddGeomColor() to SrvXkbAddGeomColor()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Enrico Weigelt, metux IT consult 12f4832d82 xkb: rename XkbAddGeomKeyAlias() to SrvXkbAddGeomKeyAlias()
Instead of doing dirty preprocessor trick, directly rename the function itself.
(the renaming itself is necessary since libX11 has the same symbol)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-04-02 17:35:42 +00:00
Peter Hutterer 732fd7e571 Drop trailing whitespaces
sed -i "s/[ ]\+$//g" **/*.(c|h)

happy reviewing...
git diff -w is an empty diff.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-11-12 10:25:00 +10:00
Daniel Stone 06e4ba8b26 XKB: Geom: Remove unused code
These codepaths were never called by anyone.  Shame there weren't more
of them.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 00:42:09 -07:00
Keith Packard 9838b7032e Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:

	-bap
	-psl
	-T PrivatePtr
	-T pmWait
	-T _XFUNCPROTOBEGIN
	-T _XFUNCPROTOEND
	-T _X_EXPORT

The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.

The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.

The comparison was done with this script:

dir1=$1
dir2=$2

for dir in $dir1 $dir2; do
	(cd $dir && find . -name '*.o' | while read file; do
		dir=`dirname $file`
		base=`basename $file .o`
		dump=$dir/$base.dump
		objdump -d $file > $dump
	done)
done

find $dir1 -name '*.dump' | while read dump; do
	otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
	diff -u $dump $otherdump
done

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-03-21 13:54:42 -07:00
Rami Ylimäki 29d63ba175 xkb: Introduce helper function to handle similar reallocations.
This is preparation for a memory leak fix and doesn't contain any
functional changes.

Note that two variables are generally used for reallocation and
clearing of arrays: geom->sz_elems (reallocation) and geom->num_elems
(clearing). The interface of XkbGeomRealloc is deliberately kept
simple and it only accepts geom->sz_elems as argument, because that is
needed to determine whether the array needs to be resized. When the
array is cleared, we just assume that either geom->sz_elems and
geom->num_elems are synchronized to be equal or that unused elements
are cleared whenever geom->num_elems is set to be less than
geom->sz_elems without reallocation.

Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-04-04 09:55:04 +10:00
Peter Hutterer 0e31d3906d xkb: remove some now-useless XFUNCPROTOBEGIN
We bring them back if we start rewriting the server in C++, promise.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-08 14:28:44 +10:00
Daniel Stone 1332343910 XKB: Remove usage of client-side types
Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
2008-02-17 22:52:07 +02:00
Daniel Stone 68bd7ac193 XKB: Move headers into the server tree
We need to start breaking the XKB API to enforce sanity, so drag whichever
headers we need to do so into the server tree, as the client API is set in
stone, being part of Xlib.
2008-02-17 22:52:07 +02:00