diff options
122 files changed, 207 insertions, 107 deletions
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 9b056d016..b16ec6fdb 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -105,7 +105,7 @@ GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader not started GL_ARB_texture_buffer_object_rgb32 DONE (i965, softpipe) GL_ARB_texture_cube_map_array DONE (i965, softpipe) -GL_ARB_texture_gather started (Maxence, Chris) +GL_ARB_texture_gather DONE (i965) GL_ARB_transform_feedback2 DONE GL_ARB_transform_feedback3 DONE diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp index 72054e0fe..df735ef31 100644 --- a/mesalib/src/glsl/builtin_functions.cpp +++ b/mesalib/src/glsl/builtin_functions.cpp @@ -262,6 +262,13 @@ texture_query_lod(const _mesa_glsl_parse_state *state) state->ARB_texture_query_lod_enable; } +static bool +texture_gather(const _mesa_glsl_parse_state *state) +{ + return state->is_version(400, 0) || + state->ARB_texture_gather_enable; +} + /* Desktop GL or OES_standard_derivatives + fragment shader only */ static bool fs_oes_derivatives(const _mesa_glsl_parse_state *state) @@ -1816,6 +1823,34 @@ builtin_builder::create_builtins() _texture(ir_txd, shader_texture_lod_and_rect, glsl_type::vec4_type, glsl_type::sampler2DRectShadow_type, glsl_type::vec4_type, TEX_PROJECT), NULL); + add_function("textureGather", + _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type), + _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type), + _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type), + + _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type), + _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type), + _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type), + + _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::samplerCube_type, glsl_type::vec3_type), + _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isamplerCube_type, glsl_type::vec3_type), + _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usamplerCube_type, glsl_type::vec3_type), + + _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::samplerCubeArray_type, glsl_type::vec4_type), + _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isamplerCubeArray_type, glsl_type::vec4_type), + _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usamplerCubeArray_type, glsl_type::vec4_type), + NULL); + + add_function("textureGatherOffset", + _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::sampler2D_type, glsl_type::vec2_type, TEX_OFFSET), + _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isampler2D_type, glsl_type::vec2_type, TEX_OFFSET), + _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usampler2D_type, glsl_type::vec2_type, TEX_OFFSET), + + _texture(ir_tg4, texture_gather, glsl_type::vec4_type, glsl_type::sampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET), + _texture(ir_tg4, texture_gather, glsl_type::ivec4_type, glsl_type::isampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET), + _texture(ir_tg4, texture_gather, glsl_type::uvec4_type, glsl_type::usampler2DArray_type, glsl_type::vec3_type, TEX_OFFSET), + NULL); + F(dFdx) F(dFdy) F(fwidth) diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y index 6eaa5f95e..c7ad3e958 100644 --- a/mesalib/src/glsl/glcpp/glcpp-parse.y +++ b/mesalib/src/glsl/glcpp/glcpp-parse.y @@ -1248,6 +1248,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) if (extensions->EXT_shader_integer_mix) add_builtin_define(parser, "GL_EXT_shader_integer_mix", 1); + + if (extensions->ARB_texture_gather) + add_builtin_define(parser, "GL_ARB_texture_gather", 1); } } diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 4f2f2893a..7368a7156 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -522,6 +522,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(ARB_gpu_shader5, true, false, ARB_gpu_shader5), EXT(AMD_vertex_shader_layer, true, false, AMD_vertex_shader_layer), EXT(EXT_shader_integer_mix, true, true, EXT_shader_integer_mix), + EXT(ARB_texture_gather, true, false, ARB_texture_gather), }; #undef EXT diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 4833436a3..5c3733d6e 100755 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -278,6 +278,8 @@ struct _mesa_glsl_parse_state { bool ARB_fragment_coord_conventions_warn; bool ARB_texture_rectangle_enable; bool ARB_texture_rectangle_warn; + bool ARB_texture_gather_enable; + bool ARB_texture_gather_warn; bool EXT_texture_array_enable; bool EXT_texture_array_warn; bool ARB_shader_texture_lod_enable; diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index b0f92cb3f..81c6380ca 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -1374,7 +1374,7 @@ ir_dereference::is_lvalue() const } -static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod" }; +static const char *tex_opcode_strs[] = { "tex", "txb", "txl", "txd", "txf", "txf_ms", "txs", "lod", "tg4" }; const char *ir_texture::opcode_string() { diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 6c5630b09..885837a7a 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -1559,7 +1559,8 @@ enum ir_texture_opcode { ir_txf, /**< Texel fetch with explicit LOD */ ir_txf_ms, /**< Multisample texture fetch */ ir_txs, /**< Texture size */ - ir_lod /**< Texture lod query */ + ir_lod, /**< Texture lod query */ + ir_tg4 /**< Texture gather */ }; @@ -1584,6 +1585,7 @@ enum ir_texture_opcode { * <type> <sampler> <coordinate> <sample_index>) * (txs <type> <sampler> <lod>) * (lod <type> <sampler> <coordinate>) + * (tg4 <type> <sampler> <coordinate> 0) */ class ir_texture : public ir_rvalue { public: diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp index fb303b0b7..fe531a8e3 100644 --- a/mesalib/src/glsl/ir_clone.cpp +++ b/mesalib/src/glsl/ir_clone.cpp @@ -248,6 +248,7 @@ ir_texture::clone(void *mem_ctx, struct hash_table *ht) const switch (this->op) { case ir_tex: case ir_lod: + case ir_tg4: break; case ir_txb: new_tex->lod_info.bias = this->lod_info.bias->clone(mem_ctx, ht); diff --git a/mesalib/src/glsl/ir_hv_accept.cpp b/mesalib/src/glsl/ir_hv_accept.cpp index 76a607d17..3877e721c 100644 --- a/mesalib/src/glsl/ir_hv_accept.cpp +++ b/mesalib/src/glsl/ir_hv_accept.cpp @@ -214,6 +214,7 @@ ir_texture::accept(ir_hierarchical_visitor *v) switch (this->op) { case ir_tex: case ir_lod: + case ir_tg4: break; case ir_txb: s = this->lod_info.bias->accept(v); diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp index b5183108d..2c06b95f6 100644 --- a/mesalib/src/glsl/ir_print_visitor.cpp +++ b/mesalib/src/glsl/ir_print_visitor.cpp @@ -266,7 +266,7 @@ void ir_print_visitor::visit(ir_texture *ir) printf(" "); } - if (ir->op != ir_txf && ir->op != ir_txf_ms && ir->op != ir_txs) { + if (ir->op != ir_txf && ir->op != ir_txf_ms && ir->op != ir_txs && ir->op != ir_tg4) { if (ir->projector) ir->projector->accept(this); else @@ -285,6 +285,7 @@ void ir_print_visitor::visit(ir_texture *ir) { case ir_tex: case ir_lod: + case ir_tg4: break; case ir_txb: ir->lod_info.bias->accept(this); diff --git a/mesalib/src/glsl/ir_reader.cpp b/mesalib/src/glsl/ir_reader.cpp index f0318ea21..8038b8f5d 100644 --- a/mesalib/src/glsl/ir_reader.cpp +++ b/mesalib/src/glsl/ir_reader.cpp @@ -947,6 +947,8 @@ ir_reader::read_texture(s_expression *expr) { "txf_ms", s_type, s_sampler, s_coord, s_sample_index }; s_pattern txs_pattern[] = { "txs", s_type, s_sampler, s_lod }; + s_pattern tg4_pattern[] = + { "tg4", s_type, s_sampler, s_coord, s_offset }; s_pattern other_pattern[] = { tag, s_type, s_sampler, s_coord, s_offset, s_proj, s_shadow, s_lod }; @@ -960,6 +962,8 @@ ir_reader::read_texture(s_expression *expr) op = ir_txf_ms; } else if (MATCH(expr, txs_pattern)) { op = ir_txs; + } else if (MATCH(expr, tg4_pattern)) { + op = ir_tg4; } else if (MATCH(expr, other_pattern)) { op = ir_texture::get_opcode(tag->value()); if (op == -1) @@ -1010,7 +1014,7 @@ ir_reader::read_texture(s_expression *expr) } } - if (op != ir_txf && op != ir_txf_ms && op != ir_txs && op != ir_lod) { + if (op != ir_txf && op != ir_txf_ms && op != ir_txs && op != ir_lod && op != ir_tg4) { s_int *proj_as_int = SX_AS_INT(s_proj); if (proj_as_int && proj_as_int->value() == 1) { tex->projector = NULL; diff --git a/mesalib/src/glsl/ir_rvalue_visitor.cpp b/mesalib/src/glsl/ir_rvalue_visitor.cpp index 8eb1c62c3..4c3d81320 100644 --- a/mesalib/src/glsl/ir_rvalue_visitor.cpp +++ b/mesalib/src/glsl/ir_rvalue_visitor.cpp @@ -57,6 +57,7 @@ ir_rvalue_base_visitor::rvalue_visit(ir_texture *ir) switch (ir->op) { case ir_tex: case ir_lod: + case ir_tg4: break; case ir_txb: handle_rvalue(&ir->lod_info.bias); diff --git a/mesalib/src/glsl/ir_set_program_inouts.cpp b/mesalib/src/glsl/ir_set_program_inouts.cpp index 1267d6d71..ab23538c3 100644 --- a/mesalib/src/glsl/ir_set_program_inouts.cpp +++ b/mesalib/src/glsl/ir_set_program_inouts.cpp @@ -59,6 +59,7 @@ public: virtual ir_visitor_status visit_enter(ir_function_signature *); virtual ir_visitor_status visit_enter(ir_expression *); virtual ir_visitor_status visit_enter(ir_discard *); + virtual ir_visitor_status visit_enter(ir_texture *); virtual ir_visitor_status visit(ir_dereference_variable *); private: @@ -319,6 +320,14 @@ ir_set_program_inouts_visitor::visit_enter(ir_discard *) return visit_continue; } +ir_visitor_status +ir_set_program_inouts_visitor::visit_enter(ir_texture *ir) +{ + if (ir->op == ir_tg4) + prog->UsesGather = true; + return visit_continue; +} + void do_set_program_inouts(exec_list *instructions, struct gl_program *prog, GLenum shader_type) diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp index 9aceb134d..03b920d8a 100644 --- a/mesalib/src/glsl/opt_tree_grafting.cpp +++ b/mesalib/src/glsl/opt_tree_grafting.cpp @@ -275,6 +275,7 @@ ir_tree_grafting_visitor::visit_enter(ir_texture *ir) switch (ir->op) { case ir_tex: case ir_lod: + case ir_tg4: break; case ir_txb: if (do_graft(&ir->lod_info.bias)) diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp index 6dec205f7..b03734c06 100644 --- a/mesalib/src/glsl/standalone_scaffolding.cpp +++ b/mesalib/src/glsl/standalone_scaffolding.cpp @@ -105,6 +105,7 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api) ctx->Extensions.ARB_texture_multisample = true; ctx->Extensions.ARB_texture_query_lod = true; ctx->Extensions.ARB_gpu_shader5 = true; + ctx->Extensions.ARB_texture_gather = true; ctx->Const.GLSLVersion = 120; diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_gather.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_gather.xml new file mode 100644 index 000000000..41714aced --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_gather.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_texture_gather" number="72"> + + <enum name="MIN_PROGRAM_TEXTURE_GATHER_OFFSET" value="0x8E5E"/> + <enum name="MAX_PROGRAM_TEXTURE_GATHER_OFFSET" value="0x8E5F"/> + + <!-- This exists only in the ARB extension; not in GL4 --> + <enum name="MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB" value="0x8F9F"/> + +</category> + +</OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 9b9b99505..6bb2f1ec7 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -111,6 +111,7 @@ API_XML = \ ARB_texture_buffer_range.xml \ ARB_texture_compression_rgtc.xml \ ARB_texture_float.xml \ + ARB_texture_gather.xml \ ARB_texture_rg.xml \ ARB_texture_storage.xml \ ARB_vertex_array_object.xml \ diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index c65dd3cef..c78d7b9bb 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8189,7 +8189,7 @@ <!-- 70. GL_ARB_sample_shading --> <xi:include href="ARB_texture_cube_map_array.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- 72. GL_ARB_texture_gather --> +<xi:include href="ARB_texture_gather.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <!-- 73. GL_ARB_texture_query_lod --> <!-- ARB extension number 74 is a WGL extension. --> diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 310518c92..0d1f71c71 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -652,6 +652,10 @@ _mesa_init_constants(struct gl_context *ctx) ctx->Const.MinProgramTexelOffset = -8; ctx->Const.MaxProgramTexelOffset = 7; + /* GL_ARB_texture_gather */ + ctx->Const.MinProgramTextureGatherOffset = -8; + ctx->Const.MaxProgramTextureGatherOffset = 7; + /* GL_ARB_robustness */ ctx->Const.ResetStrategy = GL_NO_RESET_NOTIFICATION_ARB; diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 51a8051e2..c0f17c5fd 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -142,6 +142,7 @@ static const struct extension extension_table[] = { { "GL_ARB_texture_env_crossbar", o(ARB_texture_env_crossbar), GLL, 2001 }, { "GL_ARB_texture_env_dot3", o(ARB_texture_env_dot3), GLL, 2001 }, { "GL_ARB_texture_float", o(ARB_texture_float), GL, 2004 }, + { "GL_ARB_texture_gather", o(ARB_texture_gather), GL, 2009 }, { "GL_ARB_texture_mirrored_repeat", o(dummy_true), GLL, 2001 }, { "GL_ARB_texture_multisample", o(ARB_texture_multisample), GL, 2009 }, { "GL_ARB_texture_non_power_of_two", o(ARB_texture_non_power_of_two), GL, 2003 }, diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index 7af5f5591..89b3bf09d 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -366,6 +366,7 @@ EXTRA_EXT(ARB_map_buffer_alignment); EXTRA_EXT(ARB_texture_cube_map_array); EXTRA_EXT(ARB_texture_buffer_range); EXTRA_EXT(ARB_texture_multisample); +EXTRA_EXT(ARB_texture_gather); static const int extra_ARB_color_buffer_float_or_glcore[] = { diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py index 8147dd0b8..e80a23c11 100644 --- a/mesalib/src/mesa/main/get_hash_params.py +++ b/mesalib/src/mesa/main/get_hash_params.py @@ -716,6 +716,12 @@ descriptor=[ # GL_ARB_texture_cube_map_array [ "TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB", "LOC_CUSTOM, TYPE_INT, TEXTURE_CUBE_ARRAY_INDEX, extra_ARB_texture_cube_map_array" ], + +# GL_ARB_texture_gather + [ "MIN_PROGRAM_TEXTURE_GATHER_OFFSET", "CONTEXT_INT(Const.MinProgramTextureGatherOffset), extra_ARB_texture_gather"], + [ "MAX_PROGRAM_TEXTURE_GATHER_OFFSET", "CONTEXT_INT(Const.MaxProgramTextureGatherOffset), extra_ARB_texture_gather"], + [ "MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", "CONTEXT_INT(Const.MaxProgramTextureGatherComponents), extra_ARB_texture_gather"], + ]}, # Enums restricted to OpenGL Core profile diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index d82672dc9..514f81048 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1963,6 +1963,8 @@ struct gl_program GLbitfield SamplersUsed; /**< Bitfield of which samplers are used */ GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */ + GLboolean UsesGather; /**< Does this program use gather4 at all? */ + /** Named parameters, constants, etc. from program text */ struct gl_program_parameter_list *Parameters; @@ -3081,6 +3083,11 @@ struct gl_constants /** GL_EXT_gpu_shader4 */ GLint MinProgramTexelOffset, MaxProgramTexelOffset; + /** GL_ARB_texture_gather */ + GLuint MinProgramTextureGatherOffset; + GLuint MaxProgramTextureGatherOffset; + GLuint MaxProgramTextureGatherComponents; + /* GL_ARB_robustness */ GLenum ResetStrategy; @@ -3210,6 +3217,7 @@ struct gl_extensions GLboolean ARB_texture_env_crossbar; GLboolean ARB_texture_env_dot3; GLboolean ARB_texture_float; + GLboolean ARB_texture_gather; GLboolean ARB_texture_multisample; GLboolean ARB_texture_non_power_of_two; GLboolean ARB_texture_query_lod; diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index b08107b1c..f180a7f64 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -2066,6 +2066,9 @@ ir_to_mesa_visitor::visit(ir_texture *ir) case ir_lod: assert(!"Unexpected ir_lod opcode"); break; + case ir_tg4: + assert(!"Unexpected ir_tg4 opcode"); + break; } const glsl_type *sampler_type = ir->sampler->type; diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af index 265c18e87..972769b36 100644 --- a/xorg-server/xkeyboard-config/symbols/af +++ b/xorg-server/xkeyboard-config/symbols/af @@ -10,7 +10,7 @@ // // 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net> -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Afghani"; diff --git a/xorg-server/xkeyboard-config/symbols/al b/xorg-server/xkeyboard-config/symbols/al index ff3388647..a8d6ec715 100644 --- a/xorg-server/xkeyboard-config/symbols/al +++ b/xorg-server/xkeyboard-config/symbols/al @@ -3,7 +3,7 @@ // done by Pablo Saratxaga <pablo@mandrakesoft.com> // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type3)" diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am index 9b092f4d6..b7cc6f69e 100644 --- a/xorg-server/xkeyboard-config/symbols/am +++ b/xorg-server/xkeyboard-config/symbols/am @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/am' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Armenian"; diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl index ebc4115e6..4262d2480 100644 --- a/xorg-server/xkeyboard-config/symbols/apl +++ b/xorg-server/xkeyboard-config/symbols/apl @@ -38,7 +38,7 @@ // better than using the "common" one. Choosing the complete Dyalog layout is not useful to non-Dyalog // users. -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "apl(dyalog_base)" // forward reference good APL keyboard without Dyalogs extras diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index 5ecffa4c3..71b50daa5 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/ar' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Arabic"; diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az index cfdc93cea..02330bc43 100644 --- a/xorg-server/xkeyboard-config/symbols/az +++ b/xorg-server/xkeyboard-config/symbols/az @@ -1,7 +1,7 @@ // Symbols definition for a very simple Azerbaidjani keyboard layout. // 2001 - Pablo Saratxaga <pablo@mandrakesoft.com> -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "latin" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba index 7345cc340..9a27cbd96 100644 --- a/xorg-server/xkeyboard-config/symbols/ba +++ b/xorg-server/xkeyboard-config/symbols/ba @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]="Bosnian"; diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd index d4be36871..6a70d51a7 100644 --- a/xorg-server/xkeyboard-config/symbols/bd +++ b/xorg-server/xkeyboard-config/symbols/bd @@ -14,7 +14,7 @@ // 3 Conjunct characters are not included // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Bengali"; key <ESC> { [ Escape ] }; diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be index ffb89e420..5e0eee515 100644 --- a/xorg-server/xkeyboard-config/symbols/be +++ b/xorg-server/xkeyboard-config/symbols/be @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/be' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg index 3b7fd4be0..994380c80 100644 --- a/xorg-server/xkeyboard-config/symbols/bg +++ b/xorg-server/xkeyboard-config/symbols/bg @@ -44,7 +44,7 @@ // Describes Bulgarian keyboard "BDS" modified according to the // the new state standard BDS 5237:2006 and extended with symbols in // levels 3 and 4. -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "bds" { name[Group1]= "Bulgarian"; diff --git a/xorg-server/xkeyboard-config/symbols/brai b/xorg-server/xkeyboard-config/symbols/brai index 036b56ff9..66364e60e 100644 --- a/xorg-server/xkeyboard-config/symbols/brai +++ b/xorg-server/xkeyboard-config/symbols/brai @@ -1,5 +1,5 @@ // 10-dot patterns on the home row + v and n -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "home_row" { include "brai(keypad)" diff --git a/xorg-server/xkeyboard-config/symbols/bt b/xorg-server/xkeyboard-config/symbols/bt index f76f13a4c..c02505e98 100644 --- a/xorg-server/xkeyboard-config/symbols/bt +++ b/xorg-server/xkeyboard-config/symbols/bt @@ -13,7 +13,7 @@ // Version 1.0 2004-07-29 Some correction by Pema Geyleg <pema_geyleg@druknet.bt> ///////////////////////////////////////////////////////////////// -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Dzongkha"; diff --git a/xorg-server/xkeyboard-config/symbols/bw b/xorg-server/xkeyboard-config/symbols/bw index 29fdc1c02..48de2e2df 100644 --- a/xorg-server/xkeyboard-config/symbols/bw +++ b/xorg-server/xkeyboard-config/symbols/bw @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "tswana" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/by b/xorg-server/xkeyboard-config/symbols/by index 443a76426..00ecd6a8d 100644 --- a/xorg-server/xkeyboard-config/symbols/by +++ b/xorg-server/xkeyboard-config/symbols/by @@ -5,7 +5,7 @@ // Added third level with russian symbols // See freedesktop.org bug #23604 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "ru(winkeys)" name[Group1]= "Belarusian"; diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca index b039c48ff..c4d37ad5c 100644 --- a/xorg-server/xkeyboard-config/symbols/ca +++ b/xorg-server/xkeyboard-config/symbols/ca @@ -1,4 +1,4 @@ -default partial +default partial xkb_symbols "fr" { name[Group1] = "French (Canada)"; diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock index 8b315c6f1..337c5efd2 100644 --- a/xorg-server/xkeyboard-config/symbols/capslock +++ b/xorg-server/xkeyboard-config/symbols/capslock @@ -1,4 +1,4 @@ -default partial hidden modifier_keys +default partial hidden modifier_keys xkb_symbols "capslock" { replace key <CAPS> { [ Caps_Lock ] }; modifier_map Lock { Caps_Lock }; diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in index e5b09e8a3..a87c749aa 100644 --- a/xorg-server/xkeyboard-config/symbols/cd.in +++ b/xorg-server/xkeyboard-config/symbols/cd.in @@ -1,7 +1,7 @@ // based on us_intl keyboard map file and a Sinhala keyboard map // version 0.3 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "French (Democratic Republic of the Congo)"; diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch index 671c3c5e8..54663f1fa 100644 --- a/xorg-server/xkeyboard-config/symbols/ch +++ b/xorg-server/xkeyboard-config/symbols/ch @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm index cdc8577e0..6404c97aa 100644 --- a/xorg-server/xkeyboard-config/symbols/cm +++ b/xorg-server/xkeyboard-config/symbols/cm @@ -36,8 +36,7 @@ // == Cameroon Dvorak == // Cameroon Dvorak is uses a similar system to Cameroon QWERTY. -default -partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]="English (Cameroon)"; diff --git a/xorg-server/xkeyboard-config/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn index 75ebbf66a..e6b2c525e 100644 --- a/xorg-server/xkeyboard-config/symbols/cn +++ b/xorg-server/xkeyboard-config/symbols/cn @@ -1,7 +1,7 @@ // // Default Chinese is the same as American // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "us(basic)" diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz index 3d3170029..20af4b281 100644 --- a/xorg-server/xkeyboard-config/symbols/cz +++ b/xorg-server/xkeyboard-config/symbols/cz @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // This layout conforms to a new cz compromise standard designed diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk index 4619357a6..34667fc48 100644 --- a/xorg-server/xkeyboard-config/symbols/dk +++ b/xorg-server/xkeyboard-config/symbols/dk @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/dk' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type2)" diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee index 61d865cf1..9384bee83 100644 --- a/xorg-server/xkeyboard-config/symbols/ee +++ b/xorg-server/xkeyboard-config/symbols/ee @@ -2,7 +2,7 @@ // Estonian XKB-keymap by Ville Hallik <ville@linux.ee> // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US diff --git a/xorg-server/xkeyboard-config/symbols/empty b/xorg-server/xkeyboard-config/symbols/empty index cae330310..acdd6776d 100644 --- a/xorg-server/xkeyboard-config/symbols/empty +++ b/xorg-server/xkeyboard-config/symbols/empty @@ -1,4 +1,4 @@ -default partial alphanumeric_keys modifier_keys +default partial alphanumeric_keys modifier_keys xkb_symbols "basic" { name[Group1]= "Empty"; }; diff --git a/xorg-server/xkeyboard-config/symbols/epo b/xorg-server/xkeyboard-config/symbols/epo index ae738359f..1f7f3fc7c 100644 --- a/xorg-server/xkeyboard-config/symbols/epo +++ b/xorg-server/xkeyboard-config/symbols/epo @@ -7,7 +7,7 @@ // Benno Schulenberg (Beno Sĥilenberĥ) <bensberg@justemail.net> // Chusslove Illich (Ĉaslavo Iliĉo) <caslav.ilic@gmx.net> -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Esperanto"; diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es index b9066fb01..62e2b2c6a 100644 --- a/xorg-server/xkeyboard-config/symbols/es +++ b/xorg-server/xkeyboard-config/symbols/es @@ -1,6 +1,6 @@ // Modified for a real Spanish keyboard by Jon Tombs. -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type4)" diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et index a591a77a4..35dc27955 100644 --- a/xorg-server/xkeyboard-config/symbols/et +++ b/xorg-server/xkeyboard-config/symbols/et @@ -5,7 +5,7 @@ // 2007 Sergey Udaltsov <svu@gnome.org> // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "et(olpc)" name[Group1]="Amharic"; diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi index 4778f7d16..4fdcc2a25 100644 --- a/xorg-server/xkeyboard-config/symbols/fi +++ b/xorg-server/xkeyboard-config/symbols/fi @@ -6,7 +6,7 @@ // Eliminate deadkeys alternative sent by Linus Torvalds // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "kotoistus" { // Official keymap for Finland based on SFS 5966 standard diff --git a/xorg-server/xkeyboard-config/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo index 283e13d6d..dc9fa6b45 100644 --- a/xorg-server/xkeyboard-config/symbols/fo +++ b/xorg-server/xkeyboard-config/symbols/fo @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type2)" diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index e5e83eff4..3898b1c57 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb index 135583356..7bf071cca 100644 --- a/xorg-server/xkeyboard-config/symbols/gb +++ b/xorg-server/xkeyboard-config/symbols/gb @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/gb' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US diff --git a/xorg-server/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge index 5a5c69dae..8c2e2e9a0 100644 --- a/xorg-server/xkeyboard-config/symbols/ge +++ b/xorg-server/xkeyboard-config/symbols/ge @@ -15,7 +15,7 @@ // 1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch> // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Georgian"; diff --git a/xorg-server/xkeyboard-config/symbols/gh b/xorg-server/xkeyboard-config/symbols/gh index 995abb829..bd31a0b39 100644 --- a/xorg-server/xkeyboard-config/symbols/gh +++ b/xorg-server/xkeyboard-config/symbols/gh @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/gn b/xorg-server/xkeyboard-config/symbols/gn index 7f796c541..40aa1e365 100644 --- a/xorg-server/xkeyboard-config/symbols/gn +++ b/xorg-server/xkeyboard-config/symbols/gn @@ -1,7 +1,7 @@ // based on us_intl keyboard map file and a Sinhala keyboard map // version 0.3 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]="French (Guinea)"; diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr index ba04d9f8a..adfe2edf6 100644 --- a/xorg-server/xkeyboard-config/symbols/gr +++ b/xorg-server/xkeyboard-config/symbols/gr @@ -7,7 +7,7 @@ // Originally converted to single group form by: // Ivan Pascal <pascal@info.tsu.ru> -default partial alphanumeric_keys alternate_group +default partial alphanumeric_keys alternate_group xkb_symbols "basic" { include "gr(simple)" diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr index 8275259c4..bda2afd22 100644 --- a/xorg-server/xkeyboard-config/symbols/hr +++ b/xorg-server/xkeyboard-config/symbols/hr @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]="Croatian"; diff --git a/xorg-server/xkeyboard-config/symbols/hu b/xorg-server/xkeyboard-config/symbols/hu index 21913a330..75b17fee5 100644 --- a/xorg-server/xkeyboard-config/symbols/hu +++ b/xorg-server/xkeyboard-config/symbols/hu @@ -25,7 +25,7 @@ // Default layout -default partial +default partial xkb_symbols "basic" { include "hu(102_qwertz_comma_dead)" name[Group1] = "Hungarian"; diff --git a/xorg-server/xkeyboard-config/symbols/ie b/xorg-server/xkeyboard-config/symbols/ie index 3e39d57f9..48f7232f0 100644 --- a/xorg-server/xkeyboard-config/symbols/ie +++ b/xorg-server/xkeyboard-config/symbols/ie @@ -22,7 +22,7 @@ // without use of a deadkey. -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Modern keyboard for Irish and English diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il index 91da6db7a..fa7564fb5 100644 --- a/xorg-server/xkeyboard-config/symbols/il +++ b/xorg-server/xkeyboard-config/symbols/il @@ -4,7 +4,7 @@ // It does not implement changes to the English layout ("Alt-English"), // as I believe that it is not the job of this layout to modify the English // layout. -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // uses the kbd layout in use in Israel. diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index 9f0594928..68f63e528 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -25,7 +25,7 @@ // based on a keyboard map from an 'xkb/symbols/dev' file // Devangari is the default. Kill me if I am wrong:) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "deva" { // March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu> name[Group1]="Indian"; diff --git a/xorg-server/xkeyboard-config/symbols/iq b/xorg-server/xkeyboard-config/symbols/iq index 597690d25..9a5dd3760 100644 --- a/xorg-server/xkeyboard-config/symbols/iq +++ b/xorg-server/xkeyboard-config/symbols/iq @@ -2,7 +2,7 @@ // 3-Level layout -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "ara(basic)" name[Group1]= "Iraqi"; diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir index 85396b915..d0a11b749 100644 --- a/xorg-server/xkeyboard-config/symbols/ir +++ b/xorg-server/xkeyboard-config/symbols/ir @@ -12,7 +12,7 @@ // Author: Behnam Esfahbod <behnam@esfahbod.info> // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "pes" { name[Group1]= "Persian"; diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is index 17f78e027..5137e2d71 100644 --- a/xorg-server/xkeyboard-config/symbols/is +++ b/xorg-server/xkeyboard-config/symbols/is @@ -7,7 +7,7 @@ // Some positions are according to IST ISO/IEC 9995-3:1994 // Added nobreakspace -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type4)" diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it index 7b9183a82..3e402c98a 100644 --- a/xorg-server/xkeyboard-config/symbols/it +++ b/xorg-server/xkeyboard-config/symbols/it @@ -1,7 +1,7 @@ // based on a keyboard map from an 'xkb/symbols/it' file // 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type4)" diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index deac93c7c..189228e57 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -1,6 +1,6 @@ // Symbols for Japanese 106-keys keyboards (by tsuka@kawalab.dnj.ynu.ac.jp). -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "106" { include "jp(common)" diff --git a/xorg-server/xkeyboard-config/symbols/ke b/xorg-server/xkeyboard-config/symbols/ke index ec2ffd05e..74e8c2dd2 100644 --- a/xorg-server/xkeyboard-config/symbols/ke +++ b/xorg-server/xkeyboard-config/symbols/ke @@ -3,7 +3,7 @@ // Please notify any corrections or omissions to // Kevin Donnelly (kevin@dotmon.com) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "swa" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad index 51ea3f679..bc47a90e9 100644 --- a/xorg-server/xkeyboard-config/symbols/keypad +++ b/xorg-server/xkeyboard-config/symbols/keypad @@ -93,7 +93,7 @@ xkb_symbols "operators" { }; }; -default partial hidden keypad_keys +default partial hidden keypad_keys xkb_symbols "x11" { include "keypad(operators)" diff --git a/xorg-server/xkeyboard-config/symbols/kg b/xorg-server/xkeyboard-config/symbols/kg index 1c2706017..95ef26287 100644 --- a/xorg-server/xkeyboard-config/symbols/kg +++ b/xorg-server/xkeyboard-config/symbols/kg @@ -18,7 +18,7 @@ // Kyrgyz standard keyboard -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Kyrgyz"; diff --git a/xorg-server/xkeyboard-config/symbols/kh b/xorg-server/xkeyboard-config/symbols/kh index b25cf1330..ee58abf2f 100644 --- a/xorg-server/xkeyboard-config/symbols/kh +++ b/xorg-server/xkeyboard-config/symbols/kh @@ -24,7 +24,7 @@ // but with a leading 'XK_' // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Khmer (Cambodia)"; diff --git a/xorg-server/xkeyboard-config/symbols/kz b/xorg-server/xkeyboard-config/symbols/kz index 276305693..9f6260238 100644 --- a/xorg-server/xkeyboard-config/symbols/kz +++ b/xorg-server/xkeyboard-config/symbols/kz @@ -10,7 +10,7 @@ // RST KazSSR 903-90 // levels 3 and 4 are non-standard extensions -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1] = "Kazakh"; diff --git a/xorg-server/xkeyboard-config/symbols/la b/xorg-server/xkeyboard-config/symbols/la index cd24a4e3e..20c36c559 100644 --- a/xorg-server/xkeyboard-config/symbols/la +++ b/xorg-server/xkeyboard-config/symbols/la @@ -1,6 +1,6 @@ // Lao keymap, by Anousak Souphavanh <anousak@muanglao.com> -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // This keymap describes the Lao keyboard standard, diff --git a/xorg-server/xkeyboard-config/symbols/latam b/xorg-server/xkeyboard-config/symbols/latam index 4a30d6d4e..47c8976e7 100644 --- a/xorg-server/xkeyboard-config/symbols/latam +++ b/xorg-server/xkeyboard-config/symbols/latam @@ -1,7 +1,7 @@ // based on a keyboard // Modified for a real Latin American Keyboard by Fabian Mandelbaum -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type4)" diff --git a/xorg-server/xkeyboard-config/symbols/latin b/xorg-server/xkeyboard-config/symbols/latin index 8cabe73e3..25a7d736a 100644 --- a/xorg-server/xkeyboard-config/symbols/latin +++ b/xorg-server/xkeyboard-config/symbols/latin @@ -1,6 +1,6 @@ // Common Latin alphabet layout -default partial +default partial xkb_symbols "basic" { key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; diff --git a/xorg-server/xkeyboard-config/symbols/level3 b/xorg-server/xkeyboard-config/symbols/level3 index 01fa28a63..b15e24d53 100644..100755 --- a/xorg-server/xkeyboard-config/symbols/level3 +++ b/xorg-server/xkeyboard-config/symbols/level3 @@ -3,7 +3,7 @@ // The default behaviour: // the right Alt key (AltGr) chooses the third symbol engraved on a key. -default partial modifier_keys +default partial modifier_keys xkb_symbols "ralt_switch" { key <RALT> { type[Group1]="ONE_LEVEL", @@ -15,8 +15,8 @@ xkb_symbols "ralt_switch" { // Ensure a mapping to a real modifier for LevelThree. partial modifier_keys xkb_symbols "modifier_mapping" { - key.type[Group1] = "ONE_LEVEL"; replace key <LVL3> { + type[Group1] = "ONE_LEVEL", symbols[Group1] = [ ISO_Level3_Shift ] }; modifier_map Mod5 { <LVL3> }; diff --git a/xorg-server/xkeyboard-config/symbols/level5 b/xorg-server/xkeyboard-config/symbols/level5 index 97cd96822..1ae2e6d3b 100644..100755 --- a/xorg-server/xkeyboard-config/symbols/level5 +++ b/xorg-server/xkeyboard-config/symbols/level5 @@ -34,8 +34,8 @@ xkb_symbols "ralt_switch" { // Ensure a mapping to a real modifier for LevelFive. partial modifier_keys xkb_symbols "modifier_mapping" { - key.type[Group1] = "ONE_LEVEL"; replace key <MDSW> { + type[Group1] = "ONE_LEVEL", symbols[Group1] = [ ISO_Level5_Shift ] }; modifier_map Mod3 { <MDSW> }; diff --git a/xorg-server/xkeyboard-config/symbols/lk b/xorg-server/xkeyboard-config/symbols/lk index b88dcdf1e..9f3b7c7b7 100644 --- a/xorg-server/xkeyboard-config/symbols/lk +++ b/xorg-server/xkeyboard-config/symbols/lk @@ -28,7 +28,7 @@ // rayanna = r // yayanna = y -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "sin_phonetic" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt index 5610e6797..8b6b80e5f 100644 --- a/xorg-server/xkeyboard-config/symbols/lt +++ b/xorg-server/xkeyboard-config/symbols/lt @@ -7,7 +7,7 @@ // // If you want two layouts, use: // Option "XkbLayout" "lt,lt(us)" -default partial alphanumeric_keys modifier_keys +default partial alphanumeric_keys modifier_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv index f0b63368c..8b0e9d719 100644 --- a/xorg-server/xkeyboard-config/symbols/lv +++ b/xorg-server/xkeyboard-config/symbols/lv @@ -44,7 +44,7 @@ // Latvian QWERTY layout // http://en.wikipedia.org/wiki/QWERTY // -default partial alphanumeric_keys modifier_keys +default partial alphanumeric_keys modifier_keys xkb_symbols "basic" { name[Group1]= "Latvian"; diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma index 2e3f4b1a3..2d128837e 100644 --- a/xorg-server/xkeyboard-config/symbols/ma +++ b/xorg-server/xkeyboard-config/symbols/ma @@ -1,5 +1,5 @@ // Arabic AZERTY with modern Latin digits -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "arabic" { include "ara(azerty)" diff --git a/xorg-server/xkeyboard-config/symbols/mao b/xorg-server/xkeyboard-config/symbols/mao index 4edc3b988..bf3482679 100644 --- a/xorg-server/xkeyboard-config/symbols/mao +++ b/xorg-server/xkeyboard-config/symbols/mao @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Adds the macrons needed for the Maori language to diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md index c23d1184d..1664da9cd 100644 --- a/xorg-server/xkeyboard-config/symbols/md +++ b/xorg-server/xkeyboard-config/symbols/md @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "ro" diff --git a/xorg-server/xkeyboard-config/symbols/me b/xorg-server/xkeyboard-config/symbols/me index 54d63e130..acb37e76d 100644 --- a/xorg-server/xkeyboard-config/symbols/me +++ b/xorg-server/xkeyboard-config/symbols/me @@ -3,7 +3,7 @@ // Initially, a copy of Serbian variants // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "rs(latin)" name[Group1]= "Montenegrin"; diff --git a/xorg-server/xkeyboard-config/symbols/mk b/xorg-server/xkeyboard-config/symbols/mk index 456c81c85..40075848a 100644 --- a/xorg-server/xkeyboard-config/symbols/mk +++ b/xorg-server/xkeyboard-config/symbols/mk @@ -2,7 +2,7 @@ // Author: Damjan Georgievski <penguinista AT mail.net.mk> // Revision: 1.5 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Macedonian"; diff --git a/xorg-server/xkeyboard-config/symbols/ml b/xorg-server/xkeyboard-config/symbols/ml index e310a0189..c9223bc21 100644 --- a/xorg-server/xkeyboard-config/symbols/ml +++ b/xorg-server/xkeyboard-config/symbols/ml @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "fr(basic)" diff --git a/xorg-server/xkeyboard-config/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm index 9738ce911..a680a3153 100644 --- a/xorg-server/xkeyboard-config/symbols/mm +++ b/xorg-server/xkeyboard-config/symbols/mm @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Burmese"; diff --git a/xorg-server/xkeyboard-config/symbols/mn b/xorg-server/xkeyboard-config/symbols/mn index f455dee8c..0f471d9e3 100644 --- a/xorg-server/xkeyboard-config/symbols/mn +++ b/xorg-server/xkeyboard-config/symbols/mn @@ -3,7 +3,7 @@ // Author Sanlig Badral <badral@chinggis.com> // 2002/12/7 Version 1.0 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Mongolian"; diff --git a/xorg-server/xkeyboard-config/symbols/mt b/xorg-server/xkeyboard-config/symbols/mt index 8a0cec3f9..f6027472f 100644 --- a/xorg-server/xkeyboard-config/symbols/mt +++ b/xorg-server/xkeyboard-config/symbols/mt @@ -1,7 +1,7 @@ // Maltese keyboard map (based on MSA Standard DMS100) // by Ramon Casha (ramon.casha@linux.org.mt) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv index e34e063b4..cb05b8b3c 100644 --- a/xorg-server/xkeyboard-config/symbols/mv +++ b/xorg-server/xkeyboard-config/symbols/mv @@ -1,6 +1,6 @@ // Keymap for Thaana/Dhivehi script (Dhivehi language). -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]="Dhivehi"; diff --git a/xorg-server/xkeyboard-config/symbols/ng b/xorg-server/xkeyboard-config/symbols/ng index 313941a91..ea1fca278 100644 --- a/xorg-server/xkeyboard-config/symbols/ng +++ b/xorg-server/xkeyboard-config/symbols/ng @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl index ed25af68f..ff60dbba7 100644 --- a/xorg-server/xkeyboard-config/symbols/nl +++ b/xorg-server/xkeyboard-config/symbols/nl @@ -8,7 +8,7 @@ // based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no index 6ecdb9a7a..5bba1959e 100644 --- a/xorg-server/xkeyboard-config/symbols/no +++ b/xorg-server/xkeyboard-config/symbols/no @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/no' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Describes the differences between a very simple en_US diff --git a/xorg-server/xkeyboard-config/symbols/np b/xorg-server/xkeyboard-config/symbols/np index 5cebac4c8..69175f5fa 100644 --- a/xorg-server/xkeyboard-config/symbols/np +++ b/xorg-server/xkeyboard-config/symbols/np @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/dev' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Nepali"; diff --git a/xorg-server/xkeyboard-config/symbols/pc b/xorg-server/xkeyboard-config/symbols/pc index e95e2406e..996324d2c 100644 --- a/xorg-server/xkeyboard-config/symbols/pc +++ b/xorg-server/xkeyboard-config/symbols/pc @@ -1,4 +1,4 @@ -default partial alphanumeric_keys modifier_keys +default partial alphanumeric_keys modifier_keys xkb_symbols "pc105" { key <ESC> { [ Escape ] }; diff --git a/xorg-server/xkeyboard-config/symbols/ph b/xorg-server/xkeyboard-config/symbols/ph index 3aff18e24..6b3defa7b 100644 --- a/xorg-server/xkeyboard-config/symbols/ph +++ b/xorg-server/xkeyboard-config/symbols/ph @@ -41,7 +41,7 @@ // ┃Ctrl ┃Super ┃Alt ┃ ␣ Space Space ␣ ┃AltGr ⇮┃Meta ┃Menu ┃Ctrl ┃ // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹─────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛ // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Filipino"; diff --git a/xorg-server/xkeyboard-config/symbols/pk b/xorg-server/xkeyboard-config/symbols/pk index b53e3aa3c..b85d887a3 100644 --- a/xorg-server/xkeyboard-config/symbols/pk +++ b/xorg-server/xkeyboard-config/symbols/pk @@ -6,7 +6,7 @@ // Alt-key combinations are yet to be put in. The unavailable keys are // those which do not have a corresponding glyph in Unicode. -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "urd-phonetic" { name[Group1]= "Urdu (Pakistan)"; diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl index 885a82afa..a448e2baa 100644 --- a/xorg-server/xkeyboard-config/symbols/pl +++ b/xorg-server/xkeyboard-config/symbols/pl @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/pl' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // Visualisation and description: http://podziemie.net/xkb/pl diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt index 4b85598a5..db3dde907 100644 --- a/xorg-server/xkeyboard-config/symbols/pt +++ b/xorg-server/xkeyboard-config/symbols/pt @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/pt' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type4)" diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro index 01fb8485c..80d9afce2 100644 --- a/xorg-server/xkeyboard-config/symbols/ro +++ b/xorg-server/xkeyboard-config/symbols/ro @@ -16,7 +16,7 @@ // v 1.4 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // This RO_US/Programmers layout, although the secondary layout in the // Romanian standard, has always been the "de facto" standard in the diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs index b0d69ac18..22ff2dae8 100644 --- a/xorg-server/xkeyboard-config/symbols/rs +++ b/xorg-server/xkeyboard-config/symbols/rs @@ -13,7 +13,7 @@ // and Slovenian in xkeyboard-config // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Serbian"; diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index d39f92672..c48637637 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -5,7 +5,7 @@ // 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru> // Windows layout -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "winkeys" { include "ru(common)" diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se index d015d4015..a498f693d 100644 --- a/xorg-server/xkeyboard-config/symbols/se +++ b/xorg-server/xkeyboard-config/symbols/se @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/se' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin(type2)" include "se(se)" diff --git a/xorg-server/xkeyboard-config/symbols/si b/xorg-server/xkeyboard-config/symbols/si index 7503bce1e..6733d2bd1 100644 --- a/xorg-server/xkeyboard-config/symbols/si +++ b/xorg-server/xkeyboard-config/symbols/si @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]="Slovenian"; diff --git a/xorg-server/xkeyboard-config/symbols/sk b/xorg-server/xkeyboard-config/symbols/sk index 075281320..b48e5aa8d 100644 --- a/xorg-server/xkeyboard-config/symbols/sk +++ b/xorg-server/xkeyboard-config/symbols/sk @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { // This layout conforms to a new sk compromise standard designed diff --git a/xorg-server/xkeyboard-config/symbols/sn b/xorg-server/xkeyboard-config/symbols/sn index 77495ad4d..47c093b43 100644 --- a/xorg-server/xkeyboard-config/symbols/sn +++ b/xorg-server/xkeyboard-config/symbols/sn @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/sy b/xorg-server/xkeyboard-config/symbols/sy index a539f4019..fb4d45d9c 100644 --- a/xorg-server/xkeyboard-config/symbols/sy +++ b/xorg-server/xkeyboard-config/symbols/sy @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "ara(basic)" name[Group1]= "Arabic (Syria)"; diff --git a/xorg-server/xkeyboard-config/symbols/terminate b/xorg-server/xkeyboard-config/symbols/terminate index 60c24795c..a43f2b979 100644 --- a/xorg-server/xkeyboard-config/symbols/terminate +++ b/xorg-server/xkeyboard-config/symbols/terminate @@ -1,4 +1,4 @@ -default partial modifier_keys +default partial modifier_keys xkb_symbols "ctrl_alt_bksp" { key <BKSP> { type="CTRL+ALT", diff --git a/xorg-server/xkeyboard-config/symbols/th b/xorg-server/xkeyboard-config/symbols/th index 63fd281b5..9cdde53cd 100644 --- a/xorg-server/xkeyboard-config/symbols/th +++ b/xorg-server/xkeyboard-config/symbols/th @@ -1,6 +1,6 @@ // based on a keyboard map from an 'xkb/symbols/th' file -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1]= "Thai"; diff --git a/xorg-server/xkeyboard-config/symbols/tj b/xorg-server/xkeyboard-config/symbols/tj index 76086056d..38a7cd257 100644 --- a/xorg-server/xkeyboard-config/symbols/tj +++ b/xorg-server/xkeyboard-config/symbols/tj @@ -11,7 +11,7 @@ // -------------------------------------------------------------------- // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { name[Group1] = "Tajik"; diff --git a/xorg-server/xkeyboard-config/symbols/tm b/xorg-server/xkeyboard-config/symbols/tm index ad520a6df..8d84f9a85 100644 --- a/xorg-server/xkeyboard-config/symbols/tm +++ b/xorg-server/xkeyboard-config/symbols/tm @@ -1,7 +1,7 @@ // Nazar Annagurban <nazar_xg@hotmail.com>, 2009 // Default layout (based on Vista Turkmen layout) -default partial +default partial xkb_symbols "basic" { name[Group1]="Turkmen"; diff --git a/xorg-server/xkeyboard-config/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr index 72bf590f3..1c288524b 100644 --- a/xorg-server/xkeyboard-config/symbols/tr +++ b/xorg-server/xkeyboard-config/symbols/tr @@ -4,7 +4,7 @@ // Nilgün Belma Bugüner <nilgun@belgeler.org>, 2005 //Default Layout (Turkish Q) -default partial +default partial xkb_symbols "basic" { include "latin" diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw index e136319c1..8ea31dda6 100644 --- a/xorg-server/xkeyboard-config/symbols/tw +++ b/xorg-server/xkeyboard-config/symbols/tw @@ -1,4 +1,4 @@ -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "tw" { name[Group1]= "Taiwanese"; diff --git a/xorg-server/xkeyboard-config/symbols/typo b/xorg-server/xkeyboard-config/symbols/typo index 02de5f7aa..9462f2722 100644 --- a/xorg-server/xkeyboard-config/symbols/typo +++ b/xorg-server/xkeyboard-config/symbols/typo @@ -8,7 +8,7 @@ // http://ilyabirman.ru/projects/typography-layout/ // default layout -default partial +default partial xkb_symbols "base" { // 1st keyboard row key <TLDE> { [NoSymbol, NoSymbol, NoSymbol, approxeq] }; diff --git a/xorg-server/xkeyboard-config/symbols/tz b/xorg-server/xkeyboard-config/symbols/tz index 60ff033be..7b57af6df 100644 --- a/xorg-server/xkeyboard-config/symbols/tz +++ b/xorg-server/xkeyboard-config/symbols/tz @@ -3,7 +3,7 @@ // Please notify any corrections or omissions to // Kevin Donnelly (kevin@dotmon.com) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "swa" { name[Group1]= "Swahili (Tanzania)"; diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua index 331cbfcb3..e286f4835 100644 --- a/xorg-server/xkeyboard-config/symbols/ua +++ b/xorg-server/xkeyboard-config/symbols/ua @@ -5,7 +5,7 @@ // Unicode - 3d level added with some Unicode symbols (typographic quotes, m-dash, n-dash etc), // some often used cyrillics from other slavic languages and some ASCII symbols used often (slash, brackets...) -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "unicode" { include "ua(winkeys)" diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index b70cb016a..357aea16a 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -1,5 +1,4 @@ -default -partial alphanumeric_keys modifier_keys +default partial alphanumeric_keys modifier_keys xkb_symbols "basic" { name[Group1]= "English (US)"; diff --git a/xorg-server/xkeyboard-config/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz index d4cf48fbf..e88741b73 100644 --- a/xorg-server/xkeyboard-config/symbols/uz +++ b/xorg-server/xkeyboard-config/symbols/uz @@ -30,7 +30,7 @@ // apostrophe is replaced with U02BB. // -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "cyrillic" { name[Group1]= "Uzbek"; diff --git a/xorg-server/xkeyboard-config/symbols/vn b/xorg-server/xkeyboard-config/symbols/vn index 10a6d2634..1a002e612 100644 --- a/xorg-server/xkeyboard-config/symbols/vn +++ b/xorg-server/xkeyboard-config/symbols/vn @@ -8,7 +8,7 @@ // July 2009 -default partial alphanumeric_keys +default partial alphanumeric_keys xkb_symbols "basic" { include "us" diff --git a/xorg-server/xkeyboard-config/symbols/za b/xorg-server/xkeyboard-config/symbols/za index 74abc8271..75f6d9a27 100644 --- a/xorg-server/xkeyboard-config/symbols/za +++ b/xorg-server/xkeyboard-config/symbols/za @@ -1,6 +1,6 @@ // based on the Latvian and GB keyboard maps -default partial alphanumeric_keys modifier_keys +default partial alphanumeric_keys modifier_keys xkb_symbols "basic" { // Describes the differences between an en_US |