aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesalib/src/glsl/glsl_parser.yy10
-rw-r--r--mesalib/src/glsl/ir_clone.cpp2
-rw-r--r--mesalib/src/glsl/link_functions.cpp32
-rw-r--r--mesalib/src/glsl/link_varyings.cpp225
-rw-r--r--mesalib/src/glsl/link_varyings.h3
-rw-r--r--pixman/configure.ac4
-rw-r--r--xorg-server/configure.ac2
-rwxr-xr-x[-rw-r--r--]xorg-server/dix/dispatch.c23
-rw-r--r--xorg-server/hw/kdrive/src/kinput.c2
-rw-r--r--xorg-server/xkeyboard-config/geometry/dell4
-rw-r--r--xorg-server/xkeyboard-config/geometry/hhk2
-rw-r--r--xorg-server/xkeyboard-config/geometry/hp23
-rw-r--r--xorg-server/xkeyboard-config/geometry/kinesis4
-rw-r--r--xorg-server/xkeyboard-config/geometry/macintosh5
-rw-r--r--xorg-server/xkeyboard-config/geometry/microsoft8
-rw-r--r--xorg-server/xkeyboard-config/geometry/pc7
-rw-r--r--xorg-server/xkeyboard-config/geometry/sun1
-rw-r--r--xorg-server/xkeyboard-config/geometry/typematrix62
-rw-r--r--xorg-server/xkeyboard-config/symbols/bd4
-rw-r--r--xorg-server/xkeyboard-config/symbols/be4
-rw-r--r--xorg-server/xkeyboard-config/symbols/ee2
-rw-r--r--xorg-server/xkeyboard-config/symbols/fr8
-rw-r--r--xorg-server/xkeyboard-config/symbols/ge2
-rw-r--r--xorg-server/xkeyboard-config/symbols/in10
-rw-r--r--xorg-server/xkeyboard-config/symbols/ir6
-rw-r--r--xorg-server/xkeyboard-config/symbols/keypad113
-rw-r--r--xorg-server/xkeyboard-config/symbols/la2
-rw-r--r--xorg-server/xkeyboard-config/symbols/macintosh_vndr/us4
-rw-r--r--xorg-server/xkeyboard-config/symbols/mv8
-rw-r--r--xorg-server/xkeyboard-config/symbols/nec_vndr/jp2
-rw-r--r--xorg-server/xkeyboard-config/symbols/np2
-rw-r--r--xorg-server/xkeyboard-config/symbols/rs4
-rw-r--r--xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x004
-rw-r--r--xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh2
-rw-r--r--xorg-server/xkeyboard-config/symbols/srvr_ctrl31
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/ca4
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/ch8
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/cz2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/fi2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/gb2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/jp2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/lt2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/nl2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/pt2
-rw-r--r--xorg-server/xkeyboard-config/symbols/sun_vndr/sk2
-rw-r--r--xorg-server/xkeyboard-config/symbols/vn2
-rw-r--r--xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga4
-rw-r--r--xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt6
49 files changed, 355 insertions, 314 deletions
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index d8e589d49..fa6e2053a 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -1714,13 +1714,17 @@ struct_declaration_list:
;
struct_declaration:
- type_specifier struct_declarator_list ';'
+ fully_specified_type struct_declarator_list ';'
{
void *ctx = state;
- ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();
+ ast_fully_specified_type *const type = $1;
type->set_location(yylloc);
- type->specifier = $1;
+ if (type->qualifier.flags.i != 0)
+ _mesa_glsl_error(&@1, state,
+ "only precision qualifiers may be applied to "
+ "structure members");
+
$$ = new(ctx) ast_declarator_list(type);
$$->set_location(yylloc);
diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp
index 9d4178de8..a75b3b762 100644
--- a/mesalib/src/glsl/ir_clone.cpp
+++ b/mesalib/src/glsl/ir_clone.cpp
@@ -59,6 +59,8 @@ ir_variable::clone(void *mem_ctx, struct hash_table *ht) const
var->explicit_binding = this->explicit_binding;
var->has_initializer = this->has_initializer;
var->depth_layout = this->depth_layout;
+ var->assigned = this->assigned;
+ var->used = this->used;
var->num_state_slots = this->num_state_slots;
if (this->state_slots) {
diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp
index 6b3e15448..dd6f24716 100644
--- a/mesalib/src/glsl/link_functions.cpp
+++ b/mesalib/src/glsl/link_functions.cpp
@@ -173,6 +173,38 @@ public:
return visit_continue;
}
+ virtual ir_visitor_status visit_leave(ir_call *ir)
+ {
+ /* Traverse list of function parameters, and for array parameters
+ * propagate max_array_access. Otherwise arrays that are only referenced
+ * from inside functions via function parameters will be incorrectly
+ * optimized. This will lead to incorrect code being generated (or worse).
+ * Do it when leaving the node so the children would propagate their
+ * array accesses first.
+ */
+
+ const exec_node *formal_param_node = ir->callee->parameters.get_head();
+ if (formal_param_node) {
+ const exec_node *actual_param_node = ir->actual_parameters.get_head();
+ while (!actual_param_node->is_tail_sentinel()) {
+ ir_variable *formal_param = (ir_variable *) formal_param_node;
+ ir_rvalue *actual_param = (ir_rvalue *) actual_param_node;
+
+ formal_param_node = formal_param_node->get_next();
+ actual_param_node = actual_param_node->get_next();
+
+ if (formal_param->type->is_array()) {
+ ir_dereference_variable *deref = actual_param->as_dereference_variable();
+ if (deref && deref->var && deref->var->type->is_array()) {
+ deref->var->max_array_access =
+ MAX2(formal_param->max_array_access, deref->var->max_array_access);
+ }
+ }
+ }
+ }
+ return visit_continue;
+ }
+
virtual ir_visitor_status visit(ir_dereference_variable *ir)
{
if (hash_table_find(locals, ir->var) == NULL) {
diff --git a/mesalib/src/glsl/link_varyings.cpp b/mesalib/src/glsl/link_varyings.cpp
index 4ceb1d33e..081a51da5 100644
--- a/mesalib/src/glsl/link_varyings.cpp
+++ b/mesalib/src/glsl/link_varyings.cpp
@@ -41,6 +41,118 @@
/**
+ * Validate the types and qualifiers of an output from one stage against the
+ * matching input to another stage.
+ */
+static void
+cross_validate_types_and_qualifiers(struct gl_shader_program *prog,
+ const ir_variable *input,
+ const ir_variable *output,
+ GLenum consumer_type,
+ GLenum producer_type)
+{
+ /* Check that the types match between stages.
+ */
+ const glsl_type *type_to_match = input->type;
+ if (consumer_type == GL_GEOMETRY_SHADER) {
+ assert(type_to_match->is_array()); /* Enforced by ast_to_hir */
+ type_to_match = type_to_match->element_type();
+ }
+ if (type_to_match != output->type) {
+ /* There is a bit of a special case for gl_TexCoord. This
+ * built-in is unsized by default. Applications that variable
+ * access it must redeclare it with a size. There is some
+ * language in the GLSL spec that implies the fragment shader
+ * and vertex shader do not have to agree on this size. Other
+ * driver behave this way, and one or two applications seem to
+ * rely on it.
+ *
+ * Neither declaration needs to be modified here because the array
+ * sizes are fixed later when update_array_sizes is called.
+ *
+ * From page 48 (page 54 of the PDF) of the GLSL 1.10 spec:
+ *
+ * "Unlike user-defined varying variables, the built-in
+ * varying variables don't have a strict one-to-one
+ * correspondence between the vertex language and the
+ * fragment language."
+ */
+ if (!output->type->is_array()
+ || (strncmp("gl_", output->name, 3) != 0)) {
+ linker_error(prog,
+ "%s shader output `%s' declared as type `%s', "
+ "but %s shader input declared as type `%s'\n",
+ _mesa_glsl_shader_target_name(producer_type),
+ output->name,
+ output->type->name,
+ _mesa_glsl_shader_target_name(consumer_type),
+ input->type->name);
+ return;
+ }
+ }
+
+ /* Check that all of the qualifiers match between stages.
+ */
+ if (input->centroid != output->centroid) {
+ linker_error(prog,
+ "%s shader output `%s' %s centroid qualifier, "
+ "but %s shader input %s centroid qualifier\n",
+ _mesa_glsl_shader_target_name(producer_type),
+ output->name,
+ (output->centroid) ? "has" : "lacks",
+ _mesa_glsl_shader_target_name(consumer_type),
+ (input->centroid) ? "has" : "lacks");
+ return;
+ }
+
+ if (input->invariant != output->invariant) {
+ linker_error(prog,
+ "%s shader output `%s' %s invariant qualifier, "
+ "but %s shader input %s invariant qualifier\n",
+ _mesa_glsl_shader_target_name(producer_type),
+ output->name,
+ (output->invariant) ? "has" : "lacks",
+ _mesa_glsl_shader_target_name(consumer_type),
+ (input->invariant) ? "has" : "lacks");
+ return;
+ }
+
+ if (input->interpolation != output->interpolation) {
+ linker_error(prog,
+ "%s shader output `%s' specifies %s "
+ "interpolation qualifier, "
+ "but %s shader input specifies %s "
+ "interpolation qualifier\n",
+ _mesa_glsl_shader_target_name(producer_type),
+ output->name,
+ output->interpolation_string(),
+ _mesa_glsl_shader_target_name(consumer_type),
+ input->interpolation_string());
+ return;
+ }
+}
+
+/**
+ * Validate front and back color outputs against single color input
+ */
+static void
+cross_validate_front_and_back_color(struct gl_shader_program *prog,
+ const ir_variable *input,
+ const ir_variable *front_color,
+ const ir_variable *back_color,
+ GLenum consumer_type,
+ GLenum producer_type)
+{
+ if (front_color != NULL && front_color->assigned)
+ cross_validate_types_and_qualifiers(prog, input, front_color,
+ consumer_type, producer_type);
+
+ if (back_color != NULL && back_color->assigned)
+ cross_validate_types_and_qualifiers(prog, input, back_color,
+ consumer_type, producer_type);
+}
+
+/**
* Validate that outputs from one stage match inputs of another
*/
void
@@ -48,10 +160,6 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
gl_shader *producer, gl_shader *consumer)
{
glsl_symbol_table parameters;
- const char *const producer_stage =
- _mesa_glsl_shader_target_name(producer->Type);
- const char *const consumer_stage =
- _mesa_glsl_shader_target_name(consumer->Type);
/* Find all shader outputs in the "producer" stage.
*/
@@ -79,85 +187,32 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
if ((input == NULL) || (input->mode != ir_var_shader_in))
continue;
- ir_variable *const output = parameters.get_variable(input->name);
- if (output != NULL) {
- /* Check that the types match between stages.
- */
- const glsl_type *type_to_match = input->type;
- if (consumer->Type == GL_GEOMETRY_SHADER) {
- assert(type_to_match->is_array()); /* Enforced by ast_to_hir */
- type_to_match = type_to_match->element_type();
+ if (strcmp(input->name, "gl_Color") == 0 && input->used) {
+ const ir_variable *const front_color =
+ parameters.get_variable("gl_FrontColor");
+
+ const ir_variable *const back_color =
+ parameters.get_variable("gl_BackColor");
+
+ cross_validate_front_and_back_color(prog, input,
+ front_color, back_color,
+ consumer->Type, producer->Type);
+ } else if (strcmp(input->name, "gl_SecondaryColor") == 0 && input->used) {
+ const ir_variable *const front_color =
+ parameters.get_variable("gl_FrontSecondaryColor");
+
+ const ir_variable *const back_color =
+ parameters.get_variable("gl_BackSecondaryColor");
+
+ cross_validate_front_and_back_color(prog, input,
+ front_color, back_color,
+ consumer->Type, producer->Type);
+ } else {
+ ir_variable *const output = parameters.get_variable(input->name);
+ if (output != NULL) {
+ cross_validate_types_and_qualifiers(prog, input, output,
+ consumer->Type, producer->Type);
}
- if (type_to_match != output->type) {
- /* There is a bit of a special case for gl_TexCoord. This
- * built-in is unsized by default. Applications that variable
- * access it must redeclare it with a size. There is some
- * language in the GLSL spec that implies the fragment shader
- * and vertex shader do not have to agree on this size. Other
- * driver behave this way, and one or two applications seem to
- * rely on it.
- *
- * Neither declaration needs to be modified here because the array
- * sizes are fixed later when update_array_sizes is called.
- *
- * From page 48 (page 54 of the PDF) of the GLSL 1.10 spec:
- *
- * "Unlike user-defined varying variables, the built-in
- * varying variables don't have a strict one-to-one
- * correspondence between the vertex language and the
- * fragment language."
- */
- if (!output->type->is_array()
- || (strncmp("gl_", output->name, 3) != 0)) {
- linker_error(prog,
- "%s shader output `%s' declared as type `%s', "
- "but %s shader input declared as type `%s'\n",
- producer_stage, output->name,
- output->type->name,
- consumer_stage, input->type->name);
- return;
- }
- }
-
- /* Check that all of the qualifiers match between stages.
- */
- if (input->centroid != output->centroid) {
- linker_error(prog,
- "%s shader output `%s' %s centroid qualifier, "
- "but %s shader input %s centroid qualifier\n",
- producer_stage,
- output->name,
- (output->centroid) ? "has" : "lacks",
- consumer_stage,
- (input->centroid) ? "has" : "lacks");
- return;
- }
-
- if (input->invariant != output->invariant) {
- linker_error(prog,
- "%s shader output `%s' %s invariant qualifier, "
- "but %s shader input %s invariant qualifier\n",
- producer_stage,
- output->name,
- (output->invariant) ? "has" : "lacks",
- consumer_stage,
- (input->invariant) ? "has" : "lacks");
- return;
- }
-
- if (input->interpolation != output->interpolation) {
- linker_error(prog,
- "%s shader output `%s' specifies %s "
- "interpolation qualifier, "
- "but %s shader input specifies %s "
- "interpolation qualifier\n",
- producer_stage,
- output->name,
- output->interpolation_string(),
- consumer_stage,
- input->interpolation_string());
- return;
- }
}
}
}
@@ -172,8 +227,8 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
* will fail to find any matching variable.
*/
void
-tfeedback_decl::init(struct gl_context *ctx, struct gl_shader_program *prog,
- const void *mem_ctx, const char *input)
+tfeedback_decl::init(struct gl_context *ctx, const void *mem_ctx,
+ const char *input)
{
/* We don't have to be pedantic about what is a valid GLSL variable name,
* because any variable with an invalid name can't exist in the IR anyway.
@@ -443,7 +498,7 @@ parse_tfeedback_decls(struct gl_context *ctx, struct gl_shader_program *prog,
char **varying_names, tfeedback_decl *decls)
{
for (unsigned i = 0; i < num_names; ++i) {
- decls[i].init(ctx, prog, mem_ctx, varying_names[i]);
+ decls[i].init(ctx, mem_ctx, varying_names[i]);
if (!decls[i].is_varying())
continue;
diff --git a/mesalib/src/glsl/link_varyings.h b/mesalib/src/glsl/link_varyings.h
index 302ab5c26..6264ef05b 100644
--- a/mesalib/src/glsl/link_varyings.h
+++ b/mesalib/src/glsl/link_varyings.h
@@ -91,8 +91,7 @@ struct tfeedback_candidate
class tfeedback_decl
{
public:
- void init(struct gl_context *ctx, struct gl_shader_program *prog,
- const void *mem_ctx, const char *input);
+ void init(struct gl_context *ctx, const void *mem_ctx, const char *input);
static bool is_same(const tfeedback_decl &x, const tfeedback_decl &y);
bool assign_location(struct gl_context *ctx,
struct gl_shader_program *prog);
diff --git a/pixman/configure.ac b/pixman/configure.ac
index 5b9512ca5..daf4062b6 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -631,8 +631,8 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#ifndef __IWMMXT__
#error "IWMMXT not enabled (with -march=iwmmxt)"
#endif
-#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
-#error "Need GCC >= 4.5 for IWMMXT intrinsics"
+#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 8))
+#error "Need GCC >= 4.8 for IWMMXT intrinsics"
#endif
#include <mmintrin.h>
int main () {
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index d27ca2392..515942063 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -47,7 +47,7 @@ XORG_WITH_XSLTPROC
XORG_ENABLE_UNIT_TESTS
XORG_LD_WRAP([optional])
-m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
+m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install font-util 1.1 or later before running autoconf/autogen])])
XORG_FONT_MACROS_VERSION(1.1)
dnl this gets generated by autoheader, and thus contains all the defines. we
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index d3aa7cfec..f37b5d71f 100644..100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -2908,18 +2908,25 @@ ProcCreateCursor(ClientPtr client)
return rc;
}
- rc = dixLookupResourceByType((pointer *) &msk, stuff->mask, RT_PIXMAP,
- client, DixReadAccess);
- if (rc != Success) {
- if (stuff->mask != None) {
+ if (src->drawable.depth != 1)
+ return (BadMatch);
+
+ /* Find and validate cursor mask pixmap, if one is provided */
+ if (stuff->mask != None) {
+ rc = dixLookupResourceByType((pointer *) &msk, stuff->mask, RT_PIXMAP,
+ client, DixReadAccess);
+ if (rc != Success) {
client->errorValue = stuff->mask;
return rc;
}
+
+ if (src->drawable.width != msk->drawable.width
+ || src->drawable.height != msk->drawable.height
+ || src->drawable.depth != 1 || msk->drawable.depth != 1)
+ return BadMatch;
}
- else if (src->drawable.width != msk->drawable.width
- || src->drawable.height != msk->drawable.height
- || src->drawable.depth != 1 || msk->drawable.depth != 1)
- return BadMatch;
+ else
+ msk = NULL;
width = src->drawable.width;
height = src->drawable.height;
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 0190cdd72..0c6ce1936 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -241,7 +241,7 @@ KdUnregisterFd(void *closure, int fd, Bool do_close)
if (do_close)
close(kdInputFds[i].fd);
kdNumInputFds--;
- for (j = i; j < kdNumInputFds; j++)
+ for (j = i; j < (kdNumInputFds - 1); j++)
kdInputFds[j] = kdInputFds[j + 1];
break;
}
diff --git a/xorg-server/xkeyboard-config/geometry/dell b/xorg-server/xkeyboard-config/geometry/dell
index cb635ef60..5d3f9702f 100644
--- a/xorg-server/xkeyboard-config/geometry/dell
+++ b/xorg-server/xkeyboard-config/geometry/dell
@@ -619,7 +619,7 @@ xkb_geometry "latitude" {
section "Arrows" {key.color="grey"; priority=110; top=112; left=240; width=43; height=31;
row {top=0; left=18; keys {{<UP>, "ARROW", 0}};};
row {top=16; left=0; keys {{<LEFT>, "ARROW", 0}, {<DOWN>, "ARROW", 1}, {<RGHT>, "ARROW", 1}};};
- }; // End of "Arrows" section
+ }; // End of "Arrows" section
shape "LEDS" {corner=3, {[25,7]}};
solid "leds" {shape="LEDS"; top=5.7; left=69; color="grey"; priority=10;};
@@ -640,5 +640,5 @@ xkb_geometry "latitude" {
section "Topbuttons" {key.color="grey"; priority=110; top=2; left=100;
row {top=2; left=0; keys {{<VLUP>, "ROUND", 0}, {<VLDN>, "ROUND", 3}, {<MUTE>, "ROUND", 3}};};
row {top=0; left=45; keys {{<POWR>, "POWER", 0}};};
- }; // End of "TopButtons" section
+ }; // End of "TopButtons" section
};
diff --git a/xorg-server/xkeyboard-config/geometry/hhk b/xorg-server/xkeyboard-config/geometry/hhk
index de6fe6f53..97b7d7402 100644
--- a/xorg-server/xkeyboard-config/geometry/hhk
+++ b/xorg-server/xkeyboard-config/geometry/hhk
@@ -191,7 +191,7 @@ xkb_geometry "jp4" {
};
};
-// Basic layout for non-swictchable keys
+// Basic layout for non-switchable keys
partial hidden xkb_geometry "basic" {
description = "Happy Hacking Keyboard";
diff --git a/xorg-server/xkeyboard-config/geometry/hp b/xorg-server/xkeyboard-config/geometry/hp
index 8cb07b480..caab94fcc 100644
--- a/xorg-server/xkeyboard-config/geometry/hp
+++ b/xorg-server/xkeyboard-config/geometry/hp
@@ -273,7 +273,7 @@ xkb_geometry "hil" {
};
}; // End of "Keypad" section
-}; // End of "default" geometry
+};
// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
@@ -563,7 +563,7 @@ xkb_geometry "dv5" {
height=118.4;
width=310.6;
- description = "HP Pavilion dv5";
+ description = "HP Pavilion dv5";
shape.cornerRadius = 1;
@@ -610,10 +610,10 @@ xkb_geometry "dv5" {
};
};
- section "Alpha" {
+ section "Alpha" {
top = 17.9;
key.shape = "NORM";
- left = 3;
+ left = 3;
row {
top = 0;
@@ -646,29 +646,28 @@ xkb_geometry "dv5" {
{ <RTSH>, "RTSH" }
};
};
- }; // End of "Alpha" section
+ }; // End of "Alpha" section
- section "Controls" {
+ section "Controls" {
top = 95.9;
key.shape = "CTLS";
- left = 3;
-
+ left = 3;
row {
top = 0;
keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
<RALT>, <MENU>, {<RCTL>, "RCTL"}
};
};
- };
+ };
- section "Edition" {
+ section "Editing" {
top = 16.5;
- left = 289.9;
+ left = 289.9;
key.shape = "EDIT";
key.gap = 1.4;
row {
top = 0;
- vertical = true;
+ vertical = true;
keys {
<HOME>, <PGUP>, <PGDN>, <END>
};
diff --git a/xorg-server/xkeyboard-config/geometry/kinesis b/xorg-server/xkeyboard-config/geometry/kinesis
index f71cec8c5..1e1b8233b 100644
--- a/xorg-server/xkeyboard-config/geometry/kinesis
+++ b/xorg-server/xkeyboard-config/geometry/kinesis
@@ -159,7 +159,7 @@ default xkb_geometry "model100" {
left= 39;
keys { <LALT>, <HOME>, <END> };
};
- }; // End of "RightEdit" section
+ }; // End of "LeftEdit" section
section "RightEdit" {
top= 109;
@@ -182,7 +182,7 @@ default xkb_geometry "model100" {
overlay "KPAD" {
<SPCE>= <KP0>
};
- }; // End of "Keypad" section
+ }; // End of "RightEdit" section
alias <AC00> = <CAPS>;
alias <AA00> = <LCTL>;
diff --git a/xorg-server/xkeyboard-config/geometry/macintosh b/xorg-server/xkeyboard-config/geometry/macintosh
index 1e0e125d7..b6251b4f0 100644
--- a/xorg-server/xkeyboard-config/geometry/macintosh
+++ b/xorg-server/xkeyboard-config/geometry/macintosh
@@ -149,7 +149,6 @@ default xkb_geometry "macintosh" {
};
}; // End of "Editing" section
- // Begin of "Keypad" section
section "Keypad" {
top = 87;
left = 380;
@@ -301,7 +300,6 @@ xkb_geometry "applepro" {
};
}; // End of "Editing" section
- // Begin of "Keypad" section
section "Keypad" {
top = 48;
left = 370;
@@ -544,7 +542,6 @@ xkb_geometry "macbook79" {
<KPEN>
};
};
-
}; // End of "Alpha" section
key.shape= "ARRO";
@@ -565,7 +562,7 @@ xkb_geometry "macbook79" {
alias <AC00> = <CAPS>;
alias <AA00> = <LCTL>;
-}; // End of "default" geometry
+};
// Aluminium Keyboard, ANSI model (United States, 109 keys)
diff --git a/xorg-server/xkeyboard-config/geometry/microsoft b/xorg-server/xkeyboard-config/geometry/microsoft
index e7f8d7515..4dd4f5416 100644
--- a/xorg-server/xkeyboard-config/geometry/microsoft
+++ b/xorg-server/xkeyboard-config/geometry/microsoft
@@ -255,11 +255,11 @@ default xkb_geometry "natural" {
//
// Modified by Pavel Kurashov <pavell@mail.ru> Mon Oct 8 22:08:20 NOVST 2007
//
-// * Function, editing and navigation keys are reduced height
-// * Navigation keys are repositioned in two column
+// * Function, editing and navigation keys are reduced in height
+// * Navigation keys are repositioned in two columns
// * Leds are enlarged for better look
-// * "BKSP" alligned with "BKSL" and "RTRN"
-// * Ouline Edges slightly modified
+// * "BKSP" is aligned with "BKSL" and "RTRN"
+// * Outline edges are slightly modified
//
xkb_geometry "elite" {
diff --git a/xorg-server/xkeyboard-config/geometry/pc b/xorg-server/xkeyboard-config/geometry/pc
index 86f546228..c4869a726 100644
--- a/xorg-server/xkeyboard-config/geometry/pc
+++ b/xorg-server/xkeyboard-config/geometry/pc
@@ -665,8 +665,7 @@ xkb_geometry "pc105" {
}; // End of "pc105" geometry
-// Added for japanese 106 keyboard
-// by tsuka@kawalab.dnj.ynu.ac.jp .
+// Added for Japanese 106 keyboard by <tsuka(at)kawalab.dnj.ynu.ac.jp>.
xkb_geometry "jp106" {
description= "Japanese 106";
@@ -828,7 +827,7 @@ xkb_geometry "jp106" {
}; // End of "jp106" geometry
-// Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br)
+// Added for Brazilian ABNT2 by Ricardo Y. Igarashi <iga(at)that.com.br>.
xkb_geometry "abnt2" {
include "pc(pc105)"
@@ -1565,4 +1564,4 @@ xkb_geometry "pc104alt" {
alias <AC00> = <CAPS>;
alias <AA00> = <LCTL>;
-}; // End of "pc104" geometry
+}; // End of "pc104alt" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sun b/xorg-server/xkeyboard-config/geometry/sun
index 23bd3bf02..fc6d5a639 100644
--- a/xorg-server/xkeyboard-config/geometry/sun
+++ b/xorg-server/xkeyboard-config/geometry/sun
@@ -194,7 +194,6 @@ xkb_geometry "t6" {
text "ScrollLockLabel" { left= 262; text="Scroll\nLock"; };
text "NumLockLabel" { left= 224; text="Num\nLock"; };
-
};
xkb_geometry "t6tuv" {
diff --git a/xorg-server/xkeyboard-config/geometry/typematrix b/xorg-server/xkeyboard-config/geometry/typematrix
index d86976f8f..46f72cb9d 100644
--- a/xorg-server/xkeyboard-config/geometry/typematrix
+++ b/xorg-server/xkeyboard-config/geometry/typematrix
@@ -20,11 +20,11 @@ xkb_geometry "tm2020" {
// Keyboard total size :
width = 308;
height = 152;
- // background / foreground colours :
+ // Background / foreground colours
baseColor = "white";
labelColor = "black";
- // Key shapes : base key = 16 mm each side
+ // Key shapes: base key = 16 mm each side
shape "NORM" { cornerRadius=1, { [16, 16] }, { [1, 1], [15, 15] }};
shape "ALPL" { cornerRadius=1, { [24.25, 16] }, { [1, 1], [23, 15] }};
shape "DHAL" { cornerRadius=1, { [24.25, 32.5] }, { [1, 1], [23, 31.5] }};
@@ -35,7 +35,6 @@ xkb_geometry "tm2020" {
shape "LED" { cornerRadius=2, { [4, 4] }};
shape "DECO" { cornerRadius=1, { [3, 18] }};
- // Function keys row
section "Function" {
left = 4;
top = 24;
@@ -58,7 +57,6 @@ xkb_geometry "tm2020" {
};
};
- // Alpha-numeric keys rows
section "Alpha" {
left = 4;
top = 36.5;
@@ -119,7 +117,6 @@ xkb_geometry "tm2020" {
};
};
- // Control keys rows
section "Control" {
left = 4;
top = 102.5;
@@ -152,7 +149,7 @@ xkb_geometry "tm2020" {
};
};
- // Diods
+ // Leds
indicator.top = 12;
indicator.onColor = "green";
indicator.offColor = "grey10";
@@ -168,7 +165,7 @@ xkb_geometry "tm2020" {
text "Logo" { left = 29; top = 10; text="TypeMatrix™"; };
- // other decorations : drawings
+ // Other decorations: drawings
solid "rainure1" { shape = "DECO"; top = 1; left = 110; color = "grey10";};
solid "rainure2" { shape = "DECO"; top = 1; left = 115; color = "grey10";};
solid "rainure3" { shape = "DECO"; top = 1; left = 120; color = "grey10";};
@@ -189,11 +186,11 @@ xkb_geometry "tm2030_shape" {
// Keyboard total size
width = 320;
height = 130;
- // background / foreground colours :
+ // Background / foreground colours
baseColor = "white";
labelColor = "black";
- // Key shapes : base key = 20 mm each side
+ // Key shapes: base key = 20 mm each side
shape "NORM" { cornerRadius=1, { [18, 18] }, { [1.5, 1.5], [16.5, 14] } };
shape "FUNC" { cornerRadius=1, { [18, 12] }, { [2.5, 0], [15.5, 10] } };
shape "LFSH" { cornerRadius=1, { [18, 36.5] }, { [2.5, 0], [15.5, 30] } };
@@ -204,7 +201,7 @@ xkb_geometry "tm2030_shape" {
shape "PAN1" { cornerRadius=1, { [27, 126.5] } };
shape "PAN2" { cornerRadius=1, { [92, 13] } };
- // other decorations : panels
+ // Other decorations: panels
solid "panneau1" {
shape = "PAN1";
left = 0;
@@ -218,8 +215,7 @@ xkb_geometry "tm2030_shape" {
color = "grey40";
};
- // Diods (Indicators) : they have to be put after panels, either the panels
- // overwrites them.
+ // Leds: they must be put after panels, otherwise the panels overwrite them
indicator.left = 6;
indicator.onColor = "green";
indicator.offColor = "grey10";
@@ -236,31 +232,31 @@ xkb_geometry "tm2030_shape" {
text "SrollLockLabel" { top = 44; text="scroll"; };
}; // geometry tm2030_shape
+
xkb_geometry "tm2030_MiscDiod_dvk" {
text "ModeLabel" { left = 12; top = 58; color = "black"; text="Dvorak"; };
-}; // geometry tm2030_MiscDiod_dvk
+};
xkb_geometry "tm2030_MiscDiod_102" {
text "ModeLabel" { left = 12; top = 58; color = "black"; text="102"; };
-}; // geometry tm2030_MiscDiod_102
+};
xkb_geometry "tm2030_MiscDiod_106" {
text "ModeLabel" { left = 12; top = 58; color = "black"; text="106"; };
-}; // geometry tm2030_MiscDiod_106
+};
xkb_geometry "tm2030_MiscDiod_off" {
indicator "Misc" { left = 6; top = 60.5; shape = "LED";
offColor = "grey10"; onColor = "grey10"; };
-}; // geometry tm2030_MiscDiod_off
+};
xkb_geometry "tm2030_MiscDiod_on" {
indicator "Misc" { left = 6; top = 60.5; shape = "LED";
offColor = "green"; onColor = "green"; };
-}; // geometry tm2030_MiscDiod_on
+};
xkb_geometry "tm2030USB_func" {
- // Function keys rows
section "Function" {
left = 27;
top = 1.5;
@@ -280,7 +276,6 @@ xkb_geometry "tm2030USB_func" {
xkb_geometry "tm2030USB_alpha" {
- // Alpha-numeric keys rows
section "Alpha" {
left = 27;
top = 14;
@@ -340,7 +335,6 @@ xkb_geometry "tm2030USB_alpha" {
xkb_geometry "tm2030USB_ctrl" {
- // Control keys rows
section "Control" {
left = 27;
top = 0;
@@ -387,7 +381,6 @@ xkb_geometry "tm2030PS2" {
description = "TypeMatrix EZ-Reach 2030 PS2";
- // Function keys row
section "Function" {
left = 27;
top = 1.5;
@@ -423,7 +416,6 @@ xkb_geometry "tm2030PS2" {
};
};
- // Alpha-numeric keys rows
section "Alpha" {
left = 27;
top = 14;
@@ -502,9 +494,8 @@ xkb_geometry "tm2030PS2" {
left = 74;
keys { { <SPCE>, "SPCE" } };
};
- }; // end section "Alpha"
+ };
- // Control keys rows
section "Control" {
left = 27;
top = 0;
@@ -558,7 +549,7 @@ xkb_geometry "tm2030PS2" {
vertical = true;
keys { <CAPS>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
};
- }; // end section "Control"
+ };
}; // geometry tm2030PS2
@@ -575,8 +566,8 @@ xkb_geometry "tm2030USB" {
}; // geometry tm2030USB
-// European 102/105 keys mode :
-// Same as the standard keyboard, except for one key, Play becomes LSGT
+// European 102/105 keys mode.
+// Same as the standard keyboard, except for one key: Play becomes LSGT.
xkb_geometry "tm2030USB-102" {
include "typematrix(tm2030_shape)"
include "typematrix(tm2030_MiscDiod_102)"
@@ -587,7 +578,6 @@ xkb_geometry "tm2030USB-102" {
include "typematrix(tm2030USB_func)"
include "typematrix(tm2030USB_alpha)"
- // Control keys rows
section "Control" {
left = 27;
top = 0;
@@ -627,17 +617,17 @@ xkb_geometry "tm2030USB-102" {
}; // geometry tm2030USB-102
-// Japan / Korean 106 keys mode :
-// Same as the standard keyboard, except for following keys :
+// Japan / Korean 106 keys mode.
+// Same as the standard keyboard, except for the following keys:
// – <TLDE> is replaced by <HZTG>
// – WWW key becomes <HKTG>
// — Calc key becomes <AE13>
-// — Mail key becomes <BKSL>, and <BKSL> key becomes <AB11>
+// — <BKSL> key becomes <AB11>
+// — and Mail key becomes <BKSL>
-// about Controls:
-// NFER/MEHU and XFER/KANJ : TMx keeps LWIN (and RWIN if it happend to exist)
-// HKTG/HIRA : TMx keeps MENU/COMP, but locates this key in alpha section
-// (see upper).
+// About control keys:
+// NFER/MEHU and XFER/KANJ: TMx keeps LWIN (and RWIN if it happens to exist).
+// HKTG/HIRA: TMx keeps MENU/COMP, but locates this key in alpha section (see above).
xkb_geometry "tm2030USB-106" {
include "typematrix(tm2030_shape)"
@@ -648,7 +638,6 @@ xkb_geometry "tm2030USB-106" {
include "typematrix(tm2030USB_func)"
- // Alpha-numeric keys rows
section "Alpha" {
left = 27;
top = 14;
@@ -705,7 +694,6 @@ xkb_geometry "tm2030USB-106" {
};
};
- // Control keys rows
section "Control" {
left = 27;
top = 0;
diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd
index 34879eb72..d4be36871 100644
--- a/xorg-server/xkeyboard-config/symbols/bd
+++ b/xorg-server/xkeyboard-config/symbols/bd
@@ -20,7 +20,7 @@ xkb_symbols "basic" {
key <ESC> { [ Escape ] };
// numbers
- key <TLDE> { [ quoteleft, asciitilde, voidsymbol, voidsymbol ] };
+ key <TLDE> { [ grave, asciitilde, voidsymbol, voidsymbol ] };
key <AE01> { [ 0x10009E7, exclam, 0x10009F4, voidsymbol ] };
key <AE02> { [ 0x10009E8, at, 0x10009F5, voidsymbol ] };
key <AE03> { [ 0x10009E9, numbersign, 0x10009F6, voidsymbol ] };
@@ -63,7 +63,7 @@ xkb_symbols "basic" {
key <AC08> { [ 0x10009A4, 0x10009A5, 0x10009CE, voidsymbol ] };
key <AC09> { [ 0x10009A6, 0x10009A7, 0x100098C, 0x10009E1 ] };
key <AC10> { [ semicolon, colon, voidsymbol, voidsymbol ] };
- key <AC11> { [ quoteright, quotedbl, voidsymbol, voidsymbol ] };
+ key <AC11> { [ apostrophe, quotedbl, voidsymbol, voidsymbol ] };
// shift, z to /
// key <LFSH> { [ Shift_L ] };
diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index c89a9338c..c82cb7d6f 100644
--- a/xorg-server/xkeyboard-config/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
@@ -212,8 +212,8 @@ xkb_symbols "nodeadkeys" {
key <AD11> { [asciicircum, diaeresis, bracketleft, bracketleft] };
key <AD12> { [ dollar, asterisk, bracketright, macron ] };
key <AC10> { [ m, M, acute, doubleacute ] };
- key <AC11> { [ ugrave, percent, quoteright, quoteright ] };
- key <BKSL> { [ mu, sterling, quoteleft, quoteleft ] };
+ key <AC11> { [ ugrave, percent, apostrophe, apostrophe ] };
+ key <BKSL> { [ mu, sterling, grave, grave ] };
key <AB07> { [ comma, question, cedilla, masculine ] };
key <AB10> { [ equal, plus, asciitilde, asciitilde ] };
};
diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee
index 67c484447..eb26d50bc 100644
--- a/xorg-server/xkeyboard-config/symbols/ee
+++ b/xorg-server/xkeyboard-config/symbols/ee
@@ -90,7 +90,7 @@ xkb_symbols "us" {
// š, Š
key <AC02> { [ s, S, scaron, Scaron ] };
key <AC10> { [ semicolon, colon, odiaeresis, Odiaeresis ] };
- key <AC11> { [ quoteright, quotedbl, adiaeresis, Adiaeresis ] };
+ key <AC11> { [ apostrophe, quotedbl, adiaeresis, Adiaeresis ] };
key <AD11> { [ bracketleft, braceleft, udiaeresis, Udiaeresis ] };
key <AD12> { [ bracketright, braceright, otilde, Otilde ] };
// £
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 418ff5200..1bf007e77 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -372,8 +372,8 @@ xkb_symbols "latin9" {
key <AD07> { [ u, U, ucircumflex, udiaeresis ] };
key <AD08> { [ i, I, icircumflex, idiaeresis ] };
key <AD09> { [ o, O, ocircumflex, odiaeresis ] };
- key <AD10> { [ p, P, paragraph, quoteleft ] };
- key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, quoteright ] };
+ key <AD10> { [ p, P, paragraph, grave ] };
+ key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, apostrophe ] };
key <AD12> { [ dollar, sterling, ecircumflex, ediaeresis ] };
key <AC01> { [ q, Q, Acircumflex, Adiaeresis ] };
@@ -417,7 +417,7 @@ xkb_symbols "latin9_Sundeadkeys" {
key <AE01> { [ ampersand, 1, dead_acute, periodcentered ] };
key <AE07> { [ egrave, 7, dead_grave, Egrave ] };
- key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, quoteright ] };
+ key <AD11> { [ dead_circumflex, dead_diaeresis, dead_tilde, apostrophe ] };
};
@@ -441,7 +441,7 @@ xkb_symbols "latin9_nodeadkeys" {
key <AE01> { [ ampersand, 1, apostrophe, periodcentered ] };
key <AE07> { [ egrave, 7, grave, Egrave ] };
key <AE12> { [ equal, plus, braceright ] };
- key <AD11> { [ asciicircum, diaeresis, asciitilde, quoteright ] };
+ key <AD11> { [ asciicircum, diaeresis, asciitilde, apostrophe ] };
};
// Bépo : Improved ergonomic french keymap using Dvorak method.
diff --git a/xorg-server/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge
index d188d4822..57c02a0d6 100644
--- a/xorg-server/xkeyboard-config/symbols/ge
+++ b/xorg-server/xkeyboard-config/symbols/ge
@@ -149,7 +149,7 @@ xkb_symbols "mess" {
name[Group1]= "Georgian (MESS)";
- key <TLDE> { [ 0x010010ed, backslash, quoteleft ] };
+ key <TLDE> { [ 0x010010ed, backslash, grave ] };
key <AE01> { [ 1, exclam, apostrophe ] };
key <AE02> { [ 2, at, asciitilde ] };
key <AE03> { [ 3, 0x01002116, numbersign ] };
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index 64c3ea1dd..5336232d1 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -292,7 +292,7 @@ xkb_symbols "ben_probhat" {
key <AC08> { [ U0995, U0996 ] };
key <AC09> { [ U09B2, U0982 ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
// shift, z to /
// key <LFSH> { [ Shift_L ] };
@@ -369,7 +369,7 @@ xkb_symbols "ben_baishakhi" {
key <AC08> { [ 0x1000995, 0x1000996 ] };
key <AC09> { [ 0x10009B2, 0x1000964, 0x100098C ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
// shift, z to /
// key <LFSH> { [ Shift_L ] };
@@ -471,7 +471,7 @@ xkb_symbols "ben_gitanjali" {
// numbers
key <TLDE> { [ colon, question ] };
key <AE01> { [ 0x10009E7, 0x10009CE ] };
- key <AE02> { [ 0x10009E8, quoteright ] };
+ key <AE02> { [ 0x10009E8, apostrophe ] };
key <AE03> { [ 0x10009E9, numbersign ] };
key <AE04> { [ 0x10009EA, 0x10009F3 ] };
key <AE05> { [ 0x10009EB, slash ] };
@@ -590,7 +590,7 @@ xkb_symbols "ben_bornona" {
key <AC08> { [ 0x1000995, 0x1000996 ] };
key <AC09> { [ 0x10009B2, 0x1000964 ] };
key <AC10> { [ semicolon, 0x100003A ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
// shift, z to /
// key <LFSH> { [ Shift_L ] };
@@ -1643,7 +1643,7 @@ xkb_symbols "hin-wx" {
key <AC08> { [ 0x1000915, 0x1000916 ] };
key <AC09> { [ 0x1000932, 0x1000962, 0x1000933, 0x100090C] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <AB01> { [ 0x1000901, 0x100093C, 0x100093D, 0x1000950] };
key <AB02> { [ 0x1000926, 0x1000927 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 0414d02d7..519708d75 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -39,7 +39,7 @@ partial hidden alphanumeric_keys
xkb_symbols "pes_part_basic" {
// Persian digits
- key <AE01> { [ Farsi_1, exclam, quoteleft ] };
+ key <AE01> { [ Farsi_1, exclam, grave ] };
key <AE02> { [ Farsi_2, 0x100066c, at ] };
key <AE03> { [ Farsi_3, 0x100066b, numbersign ] };
key <AE04> { [ Farsi_4, 0x100fdfc, dollar ] };
@@ -99,7 +99,7 @@ partial hidden alphanumeric_keys
xkb_symbols "pes_part_ext" {
// Persian and ASCII digits
- key <AE01> { [ 0x10006f1, exclam, quoteleft, 1 ] };
+ key <AE01> { [ 0x10006f1, exclam, grave, 1 ] };
key <AE02> { [ 0x10006f2, 0x100066c, at, 2 ] };
key <AE03> { [ 0x10006f3, 0x100066b, numbersign, 3 ] };
key <AE04> { [ 0x10006f4, 0x100fdfc, dollar, 4 ] };
@@ -186,7 +186,7 @@ xkb_symbols "ku_ara" {
key <BKSL> { [ backslash, bar, ccedilla, Ccedilla ] };
// Digits
- key <AE01> { [ 1, exclam, 0x10006f1, quoteleft ] };
+ key <AE01> { [ 1, exclam, 0x10006f1, grave ] };
key <AE02> { [ 2, at, 0x10006f2, at ] };
key <AE03> { [ 3, numbersign, 0x10006f3, 0x100066b ] };
key <AE04> { [ 4, dollar, 0x10006f4, 0x100fdfc ] };
diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad
index 85d4d6e20..6c41f134f 100644
--- a/xorg-server/xkeyboard-config/symbols/keypad
+++ b/xorg-server/xkeyboard-config/symbols/keypad
@@ -6,8 +6,6 @@ xkb_symbols "overlay" {
partial hidden keypad_keys
xkb_symbols "overlay1" {
- // Begin "Keypad" section
-
key <KP7> { [ KP_Home ], overlay1=<KO7> };
key <KP8> { [ KP_Up ], overlay1=<KO8> };
key <KP9> { [ KP_Prior ], overlay1=<KO9> };
@@ -21,7 +19,7 @@ xkb_symbols "overlay1" {
key <KP3> { [ KP_Next ], overlay1=<KO3> };
key <KP0> { [ KP_Insert ], overlay1=<KO0> };
- key <KPDL> { [ KP_Delete ], overlay1=<KODL> };
+ key <KPDL> { [ KP_Delete ], overlay1=<KODL> };
key <KO7> { [ KP_7 ] };
key <KO8> { [ KP_8 ] };
@@ -36,16 +34,12 @@ xkb_symbols "overlay1" {
key <KO3> { [ KP_3 ] };
key <KO0> { [ KP_0 ] };
- key <KODL> { [ KP_Decimal ] };
-
- // End "Keypad" section
+ key <KODL> { [ KP_Decimal ] };
};
partial hidden keypad_keys
xkb_symbols "overlay2" {
- // Begin "Keypad" section
-
key <KP7> { [ KP_Home ], overlay2=<KO7> };
key <KP8> { [ KP_Up ], overlay2=<KO8> };
key <KP9> { [ KP_Prior ], overlay2=<KO9> };
@@ -59,7 +53,7 @@ xkb_symbols "overlay2" {
key <KP3> { [ KP_Next ], overlay2=<KO3> };
key <KP0> { [ KP_Insert ], overlay2=<KO0> };
- key <KPDL> { [ KP_Delete ], overlay2=<KODL> };
+ key <KPDL> { [ KP_Delete ], overlay2=<KODL> };
key <KO7> { [ KP_7 ] };
key <KO8> { [ KP_8 ] };
@@ -74,41 +68,40 @@ xkb_symbols "overlay2" {
key <KO3> { [ KP_3 ] };
key <KO0> { [ KP_0 ] };
- key <KODL> { [ KP_Decimal ] };
-
- // End "Keypad" section
+ key <KODL> { [ KP_Decimal ] };
};
-partial hidden default keypad_keys
-xkb_symbols "x11" {
-// Ungrab cancels server/keyboard/pointer grabs
+partial hidden keypad_keys
+xkb_symbols "operators" {
+ // Puts some commands to control the X server on
+ // the fifth level of the keypad's operator keys.
key <KPDV> {
- type="CTRL+ALT",
+ type="CTRL+ALT", // Ungrab cancels server/keyboard/pointer grabs
symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
};
-
-// ClsGrb kills whichever client has a grab in effect
key <KPMU> {
- type="CTRL+ALT",
+ type="CTRL+ALT", // ClsGrb kills whichever client has a grab in effect
symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
};
-
-// -VMode switches to the previous video mode
key <KPSU> {
- type="CTRL+ALT",
+ type="CTRL+ALT", // -VMode switches to the previous video mode
symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
};
+ key <KPAD> {
+ type="CTRL+ALT", // +VMode switches to the next video mode
+ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
+ };
+};
+
+partial hidden default keypad_keys
+xkb_symbols "x11" {
+
+ include "keypad(operators)"
key <KP7> { [ KP_Home, KP_7 ] };
key <KP8> { [ KP_Up, KP_8 ] };
key <KP9> { [ KP_Prior, KP_9 ] };
-// +VMode switches to the next video mode
- key <KPAD> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
- };
-
key <KP4> { [ KP_Left, KP_4 ] };
key <KP5> { [ KP_Begin, KP_5 ] };
key <KP6> { [ KP_Right, KP_6 ] };
@@ -116,12 +109,12 @@ xkb_symbols "x11" {
key <KP1> { [ KP_End, KP_1 ] };
key <KP2> { [ KP_Down, KP_2 ] };
key <KP3> { [ KP_Next, KP_3 ] };
- key <KPEN> { [ KP_Enter ] };
- key <KPEQ> { [ KP_Equal ] };
+ key <KPEN> { [ KP_Enter ] };
+ key <KPEQ> { [ KP_Equal ] };
key <KP0> { [ KP_Insert, KP_0 ] };
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
- key <KPPT> { [ KP_Decimal, KP_Decimal ] };
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+ key <KPPT> { [ KP_Decimal, KP_Decimal ] };
};
@@ -247,7 +240,6 @@ xkb_symbols "legacymath" {
key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
key <KPAD> { [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
-
};
@@ -272,8 +264,8 @@ xkb_symbols "ossmath" {
key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, VoidSymbol, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab>
key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, VoidSymbol, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab>
key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode>
- key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
+ key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
};
@@ -333,19 +325,19 @@ xkb_symbols "ossmath_latin9" {
// Legacy keypad number area
// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
//
-// ┏━━━━━┱ ⇱ Home
-// ┃Num ┃ ⇲ End
-// ┃Lock⇭┃ ⇞ Page up
-// ┡━━━━━╃─────┼─────┼ ⇟ Page down
-// │ 7 │ 8 │ 9 │ ⇞ Page up
+// ┏━━━━━┱
+// ┃Num ┃ ⇱ Home
+// ┃Lock⇭┃ ⇲ End
+// ┡━━━━━╃─────┼─────┼ ⇞ Page up
+// │ 7 │ 8 │ 9 │ ⇟ Page down
// │ ⇱ │ ⇧ │ ⇞ │ ⎀ Insert
// ├─────┼─────┼─────┤ ␥ Delete
// │ 4 │ 5 │ 6 │ ⇦⇧⇨⇩ Directions
// │ ⇦ │ │ ⇨ │
// ├─────┼─────┼─────╆
// │ 1 │ 2 │ 3 ┃
-// │ ⇲ │ ⇩ │ ⇟ ┃ 1 None
-// ├─────┴─────┼─────┨ 2 Num Lock ⇭
+// │ ⇲ │ ⇩ │ ⇟ ┃ 1 None
+// ├─────┴─────┼─────┨ 2 Num Lock ⇭
// │ 0 │
// │ ⎀ │
// └───────────┴
@@ -375,11 +367,11 @@ xkb_symbols "legacynumber" {
// This is actually a three-level keypad, declared as four-level
// to avoid defining a new type
//
-// ┏━━━━━┱ ⇱ Home
-// ┃Num ┃ ⇲ End
-// ┃Lock⇭┃ ⇞ Page up
-// ┡━━━━━╃─────┼─────┼ ⇟ Page down
-// │ 7 │ 8 │ 9 │ ⇞ Page up
+// ┏━━━━━┱
+// ┃Num ┃ ⇱ Home
+// ┃Lock⇭┃ ⇲ End
+// ┡━━━━━╃─────┼─────┼ ⇞ Page up
+// │ 7 │ 8 │ 9 │ ⇟ Page down
// │ ⇱ < │ ⇧ > │ ⇞ ^ │ ⎀ Insert
// ├─────┼─────┼─────┤ ␥ Delete
// │ 4 │ 5 │ 6 │ ⇦⇧⇨⇩ Directions
@@ -415,15 +407,15 @@ xkb_symbols "legacynumber_wang" {
// Keypad number area with arrow symbols
// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
//
-// ┏━━━━━┱ ⇱ Home
-// ┃Num ┃ ⇲ End
-// ┃Lock⇭┃ ⇞ Page up
-// ┡━━━━━╃─────┼─────┼ ⇟ Page down
-// │ 7 ⇖ │ 8 ⇑ │ 9 ⇗ │ ⇞ Page up
+// ┏━━━━━┱
+// ┃Num ┃ ⇱ Home
+// ┃Lock⇭┃ ⇲ End
+// ┡━━━━━╃─────┼─────┼ ⇞ Page up
+// │ 7 ⇖ │ 8 ⇑ │ 9 ⇗ │ ⇟ Page down
// │ ⇱ ↖ │ ⇧ ↑ │ ⇞ ↗ │ ⎀ Insert
// ├─────┼─────┼─────┤ ␥ Delete
-// │ 4 ⇐ │ 5 ⇔ │ 6 ⇗ │ ⇦⇧⇨⇩ Directions
-// │ ⇦ ← │ ↔ │ ⇨ ↗ │ ⍽ narrow no-break space
+// │ 4 ⇐ │ 5 ⇔ │ 6 ⇒ │ ⇦⇧⇨⇩ Directions
+// │ ⇦ ← │ ↔ │ ⇨ → │ ⍽ narrow no-break space
// ├─────┼─────┼─────╆
// │ 1 ⇙ │ 2 ⇓ │ 3 ⇘ ┃
// │ ⇲ ↙ │ ⇩ ↓ │ ⇟ ↘ ┃ 1 None
@@ -455,11 +447,11 @@ xkb_symbols "ossnumber" {
// Wang 725-3771-ae and 725-3771-uk keypad number area with additional arrow symbols
// Copyright © 2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
//
-// ┏━━━━━┱ ⇱ Home
-// ┃Num ┃ ⇲ End
-// ┃Lock⇭┃ ⇞ Page up
-// ┡━━━━━╃─────┼─────┼ ⇟ Page down
-// │ 7 ↖ │ 8 ↑ │ 9 ↗ │ ⇞ Page up
+// ┏━━━━━┱
+// ┃Num ┃ ⇱ Home
+// ┃Lock⇭┃ ⇲ End
+// ┡━━━━━╃─────┼─────┼ ⇞ Page up
+// │ 7 ↖ │ 8 ↑ │ 9 ↗ │ ⇟ Page down
// │ ⇱ < │ ⇧ > │ ⇞ ^ │ ⎀ Insert
// ├─────┼─────┼─────┤ ␥ Delete
// │ 4 ← │ 5 ↔ │ 6 → │ ⇦⇧⇨⇩ Directions
@@ -530,7 +522,7 @@ partial keypad_keys
xkb_symbols "hex" {
key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD" ;
- // None NumLock AltGr
+ // None NumLock AltGr
// symbol row
key <KPDV> { [ NoSymbol, NoSymbol, parenleft ] };
key <KPMU> { [ NoSymbol, NoSymbol, parenright ] };
@@ -579,9 +571,10 @@ xkb_symbols "atm" {
partial modifier_keys
xkb_symbols "pointerkeys" {
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
};
+
// Only numbers, operators and decimal separator,
// as seen on keypad overlay on Japanese keyboard.
// ┌─┬─┬─┬─┐
diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la
index 269cb2618..dc101bc22 100644
--- a/xorg-server/xkeyboard-config/symbols/la
+++ b/xorg-server/xkeyboard-config/symbols/la
@@ -58,7 +58,7 @@ xkb_symbols "basic" {
key <AB05> { [ 0x1000eb6 ]};
key <AB06> { [ 0x1000eb7 ]};
key <AB07> { [ 0x1000e97, 0x1000ec6 ]};
- key <AB08> { [ 0x1000ea1, quoteleft ]};
+ key <AB08> { [ 0x1000ea1, grave ]};
key <AB09> { [ 0x1000ec3, dollar ]};
key <AB10> { [ 0x1000e9d, parenright ]};
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index 36f4429cc..d0cf5600b 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
@@ -6,7 +6,7 @@ xkb_symbols "extended" {
key <ESC> { [ Escape ] };
// Alphanumeric section
- key <TLDE> { [ quoteleft, asciitilde ] };
+ key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
key <AE03> { [ 3, numbersign ] };
@@ -44,7 +44,7 @@ xkb_symbols "extended" {
key <AC08> { [ k, K ] };
key <AC09> { [ l, L ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <AB01> { [ z, Z ] };
key <AB02> { [ x, X ] };
diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv
index ee9a7986b..e82b1e873 100644
--- a/xorg-server/xkeyboard-config/symbols/mv
+++ b/xorg-server/xkeyboard-config/symbols/mv
@@ -8,9 +8,7 @@ xkb_symbols "basic" {
name[Group1]="Dhivehi";
-// The key <TLDE> should have the same values as US_en keyboard
-
- key <TLDE> { [ quoteleft, asciitilde ] };
+ key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
key <AE03> { [ 3, numbersign ] };
@@ -50,9 +48,7 @@ xkb_symbols "basic" {
key <AC08> { [ 0x1000786, 0x100079A ] };
key <AC09> { [ 0x100078D, 0x1000785 ] };
key <AC10> { [ semicolon, colon ] };
-//I used singleloquotemark- if this is the wrong name, please replace with the name for the
-//standard US_en keyboard format- its the same in the Thaana phonetic keyboard
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <BKSL> { [ backslash, bar ] };
key <LSGT> { [ bar, brokenbar ] };
diff --git a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
index 29b279c9f..6a9c32832 100644
--- a/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/nec_vndr/jp
@@ -40,7 +40,7 @@ default xkb_symbols "pc98" {
key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] };
key <AE10> { [ 0 ], [ kana_WA, kana_WO ] };
key <AE11> { [ minus, equal ], [ kana_HO ] };
- key <AE12> { [ asciicircum, quoteleft ], [ kana_HE ] };
+ key <AE12> { [ asciicircum, grave ], [ kana_HE ] };
key <BKSL> { [ backslash, bar ], [ prolongedsound ] };
key <BKSP> { [ BackSpace ] };
diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np
index eb8e54ad7..ed7c2077a 100644
--- a/xorg-server/xkeyboard-config/symbols/np
+++ b/xorg-server/xkeyboard-config/symbols/np
@@ -47,7 +47,7 @@ xkb_symbols "basic" {
key <AC08> { [ 0x1000915, 0x1000916 ] };
key <AC09> { [ 0x1000932, 0x1000933 ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <BKSL> { [ 0x1000950, 0x1000903 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index baa7a345a..0a08c6211 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -5,7 +5,7 @@
//
// Original authors:
// Danilo Segan (Данило Шеган) <danilo@kvota.net>
-// Chusslove Illich (Часлав Илић) <chaslav@sezampro.yu>
+// Chusslove Illich (Часлав Илић) <caslav.ilic@gmx.net>
//
// Danilo Segan <danilo@kvota.net>:
// - Modified for inclusion in XFree86
@@ -56,7 +56,7 @@ xkb_symbols "common" {
key.type[Group1] = "FOUR_LEVEL";
- key <TLDE> { [ quoteleft, asciitilde, any,any ] }; //
+ key <TLDE> { [ grave, asciitilde, any,any ] }; //
key <AE01> { [ 1, exclam, any,any ] }; //
key <AE02> { [ 2, quotedbl, any,any ] }; //
key <AE03> { [ 3, numbersign, any,any ] }; //
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00
index d1dca0cb9..d72f9f9f9 100644
--- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00
@@ -12,7 +12,7 @@ xkb_symbols "basic" {
key <AE04> { [ 4, dollar ] };
key <AE05> { [ 5, percent ] };
key <AE06> { [ 6, ampersand ] };
- key <AE07> { [ 7, quoteright ] };
+ key <AE07> { [ 7, apostrophe ] };
key <AE08> { [ 8, parenleft ] };
key <AE09> { [ 9, parenright ] };
key <AE10> { [ 0, asciitilde ] };
@@ -34,7 +34,7 @@ xkb_symbols "basic" {
key <AC01> { [ a, A ] };
key <AC02> { [ s, S ] };
- key <AC03> { [ d, D, quoteleft ] };
+ key <AC03> { [ d, D, grave ] };
key <AC04> { [ f, F, backslash ] };
key <AC05> { [ g, G, semicolon ] };
key <AC06> { [ h, H, colon ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh
index 7c3d98fdf..575058ea7 100644
--- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
key <AE04> { [ 4, dollar ] };
key <AE05> { [ 5, percent ] };
key <AE06> { [ 6, ampersand ] };
- key <AE07> { [ 7, quoteright, quoteleft ] };
+ key <AE07> { [ 7, apostrophe, grave ] };
key <AE08> { [ 8, parenleft, braceleft ] };
key <AE09> { [ 9, parenright, braceright ] };
key <AE10> { [ 0 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh
index d287eb528..57a075171 100644
--- a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
key <AE04> { [ 4, dollar ] };
key <AE05> { [ 5, percent ] };
key <AE06> { [ 6, ampersand ] };
- key <AE07> { [ 7, quoteright, quoteleft ] };
+ key <AE07> { [ 7, apostrophe, grave ] };
key <AE08> { [ 8, parenleft, braceleft ] };
key <AE09> { [ 9, parenright, braceright ] };
key <AE10> { [ 0 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/srvr_ctrl b/xorg-server/xkeyboard-config/symbols/srvr_ctrl
index 73b5af2de..52b4eb9a0 100644
--- a/xorg-server/xkeyboard-config/symbols/srvr_ctrl
+++ b/xorg-server/xkeyboard-config/symbols/srvr_ctrl
@@ -2,39 +2,10 @@
partial keypad_keys function_keys
xkb_symbols "xfree86" {
- include "srvr_ctrl(stdkeypad)"
+ include "keypad(operators)"
include "srvr_ctrl(fkey2vt)"
};
-partial keypad_keys
-xkb_symbols "stdkeypad" {
-
-// Ungrab cancels server/keyboard/pointer grabs
- key <KPDV> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
- };
-
-// ClsGrb kills whichever client has a grab in effect
- key <KPMU> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
- };
-
-// -VMode switches to the previous video mode
- key <KPSU> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
- };
-
-// +VMode switches to the next video mode
- key <KPAD> {
- type="CTRL+ALT",
- symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode]
- };
-
-};
-
partial function_keys
xkb_symbols "fkey2vt" {
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 114ef3a7a..7e5a666da 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -63,9 +63,9 @@ xkb_symbols "sun_type6" {
key <AB01> { [ z, Z, guillemotleft ]};
key <AB02> { [ x, X, guillemotright ]};
key <AB07> { [ m, M, mu ]};
- key <AB08> { [ comma, quoteright, less ]};
+ key <AB08> { [ comma, apostrophe, less ]};
key <AB09> { [ period, quotedbl, greater ]};
- key <AB10> { [ eacute, Eacute, quoteleft ]};
+ key <AB10> { [ eacute, Eacute, grave ]};
include "level3(ralt_switch)"
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index 213b4f08e..b75c14885 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
@@ -44,8 +44,8 @@ xkb_symbols "sun_type6_de" {
key <AE07> { [ 7, slash, brokenbar ] };
key <AE08> { [ 8, parenleft, cent ] };
key <AE09> { [ 9, parenright ] };
- key <AE10> { [ 0, equal, quoteleft ] };
- key <AE11> { [ quoteright, question, dead_acute ] };
+ key <AE10> { [ 0, equal, grave ] };
+ key <AE11> { [ apostrophe, question, dead_acute ] };
key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] };
key <AD03> { [ e, E, EuroSign ] };
@@ -84,8 +84,8 @@ xkb_symbols "sun_type6_fr" {
key <AE07> { [ 7, slash, brokenbar ] };
key <AE08> { [ 8, parenleft, cent ] };
key <AE09> { [ 9, parenright ] };
- key <AE10> { [ 0, equal, quoteleft ] };
- key <AE11> { [ quoteright, question, dead_acute ] };
+ key <AE10> { [ 0, equal, grave ] };
+ key <AE11> { [ apostrophe, question, dead_acute ] };
key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] };
key <AD03> { [ e, E, EuroSign ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index 0818c9ab0..41fa9a972 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
@@ -35,7 +35,7 @@ xkb_symbols "sun_type6" {
include "sun_vndr/us(sun_type6)"
- key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] };
+ key <TLDE> { [ semicolon, dead_abovering, grave, asciitilde ] };
key <AE01> { [ plus, 1, exclam, asciitilde ] };
key <AE02> { [ ecaron, 2, at, dead_caron ] };
key <AE03> { [ scaron, 3, numbersign, dead_circumflex ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index 13e822c8f..c1ac1176a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
@@ -52,7 +52,7 @@ xkb_symbols "sun_type6" {
key <AD12> { [ dead_diaeresis, asciicircum, asciitilde ] };
key <AC10> { [ odiaeresis, Odiaeresis ] };
key <AC11> { [ adiaeresis, Adiaeresis ] };
- key <BKSL> { [ apostrophe, asterisk, quoteleft ] };
+ key <BKSL> { [ apostrophe, asterisk, grave ] };
key <LSGT> { [ less, greater, bar ] };
key <AB08> { [ comma, semicolon ] };
key <AB09> { [ period, colon ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index f329c5fd5..20d50eb98 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -34,7 +34,7 @@ xkb_symbols "sun_type6" {
include "sun_vndr/us(sun_type6)"
- key <TLDE> { [ quoteleft, notsign, brokenbar ] };
+ key <TLDE> { [ grave, notsign, brokenbar ] };
key <AE02> { [ 2, quotedbl ] };
key <AE03> { [ 3, sterling ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index c30d31e38..e72d84386 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
@@ -57,7 +57,7 @@ xkb_symbols "sun_type6_suncompat" {
key <AD08> { [ i, I ], [ kana_NI ] };
key <AD09> { [ o, O ], [ kana_RA ] };
key <AD10> { [ p, P ], [ kana_SE ] };
- key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD11> { [ at, grave ], [ voicedsound ] };
key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
key <AC01> { [ a, A ], [ kana_CHI ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index b333622d9..78800499e 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -34,7 +34,7 @@ xkb_symbols "sun_type6" {
include "sun_vndr/us(sun_type6)"
- key <TLDE> { [ quoteleft, asciitilde, notsign, brokenbar ] };
+ key <TLDE> { [ grave, asciitilde, notsign, brokenbar ] };
key <AE01> { [ aogonek, Aogonek, 1, exclam ] };
key <AE02> { [ ccaron, Ccaron, 2, at ] };
key <AE03> { [ eogonek, Eogonek, 3, numbersign ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 8f7a69de0..6d59bc2f4 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -44,7 +44,7 @@ xkb_symbols "sun_type6" {
key <AE07> { [ 7, underscore, sterling ] };
key <AE08> { [ 8, parenleft, braceleft ] };
key <AE09> { [ 9, parenright, braceright ] };
- key <AE10> { [ 0, quoteright, quoteleft ] };
+ key <AE10> { [ 0, apostrophe, grave ] };
key <AE11> { [ slash, question, backslash ] };
key <AE12> { [ degree, dead_tilde, dead_cedilla ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index b6797bb94..4e00113cd 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
@@ -45,7 +45,7 @@ xkb_symbols "sun_type6" {
key <AE08> { [ 8, parenleft, bracketleft ] };
key <AE09> { [ 9, parenright, bracketright ] };
key <AE10> { [ 0, equal, braceright ] };
- key <AE11> { [ quoteright, question, quoteleft ] };
+ key <AE11> { [ apostrophe, question, grave ] };
key <AE12> { [ guillemotleft, guillemotright ] };
key <AD03> { [ e, E, EuroSign ] };
key <AD11> { [ plus, asterisk, dead_diaeresis ] };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index e3507f0c4..18696bb3f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
@@ -34,7 +34,7 @@ xkb_symbols "sun_type6" {
include "sun_vndr/us(sun_type6)"
- key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] };
+ key <TLDE> { [ semicolon, dead_abovering, grave asciitilde ] };
key <AE01> { [ plus, 1, exclam, asciitilde ] };
key <AE02> { [ lcaron, 2, at, dead_caron ] };
key <AE03> { [ scaron, 3, numbersign, dead_circumflex ] };
diff --git a/xorg-server/xkeyboard-config/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn
index 397a28126..c5e4c118b 100644
--- a/xorg-server/xkeyboard-config/symbols/vn
+++ b/xorg-server/xkeyboard-config/symbols/vn
@@ -16,7 +16,7 @@ xkb_symbols "basic" {
name[Group1]= "Vietnamese";
// Alphanumeric section
- key <TLDE> { [ quoteleft, asciitilde ] };
+ key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ abreve, Abreve ] };
key <AE02> { [ acircumflex, Acircumflex ] };
key <AE03> { [ ecircumflex, Ecircumflex ] };
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
index e9d43ff60..46d48a27e 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/amiga
@@ -17,7 +17,7 @@ default xkb_symbols "usa1" {
// End "Function" section
// Alphanumeric section
- key <TLDE> { [ quoteleft, asciitilde ] };
+ key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
key <AE03> { [ 3, numbersign ] };
@@ -60,7 +60,7 @@ default xkb_symbols "usa1" {
key <AC08> { [ k, K ] };
key <AC09> { [ l, L ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <LFSH> { [ Shift_L ] };
key <AB01> { [ z, Z ] };
diff --git a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
index 813311dcf..65048bde4 100644
--- a/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
+++ b/xorg-server/xkeyboard-config/symbols/xfree68_vndr/ataritt
@@ -16,7 +16,7 @@ default xkb_symbols "us" {
key <AE10> { [ 0, parenright ] };
key <AE11> { [ minus, underscore ] };
key <AE12> { [ equal, plus ] };
- key <TLDE> { [ quoteleft, asciitilde ] };
+ key <TLDE> { [ grave, asciitilde ] };
key <BKSP> { [ BackSpace ] };
key <TAB> { [ Tab, ISO_Left_Tab ] };
@@ -46,7 +46,7 @@ default xkb_symbols "us" {
key <AC08> { [ k, K ] };
key <AC09> { [ l, L ] };
key <AC10> { [ semicolon, colon ] };
- key <AC11> { [ quoteright, quotedbl ] };
+ key <AC11> { [ apostrophe, quotedbl ] };
key <BKSL> { [ backslash, bar ] };
key <LFSH> { [ Shift_L ] };
@@ -133,7 +133,7 @@ xkb_symbols "de" {
key <AE09> { [ 9, parenright ] };
key <AE10> { [ 0, equal ] };
key <AE11> { [ ssharp, question ] };
- key <AE12> { [ quoteright, quoteleft ] };
+ key <AE12> { [ apostrophe, grave ] };
key <TLDE> { [ numbersign, asciicircum ] };
key <AD06> { [ z, Z ] };