From 74e21f951a8a1c11445cab7accce2ace6c1acef5 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 31 Jan 2010 12:30:46 +0000 Subject: Updated to xkeyboard-config-1.8 --- xorg-server/xkbdata.src/types/Makefile.am | 2 +- xorg-server/xkbdata.src/types/Makefile.in | 7 ++++--- xorg-server/xkbdata.src/types/nokia | 14 ++++++++++++++ xorg-server/xkbdata.src/types/types.dir | 13 +++++++------ 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 xorg-server/xkbdata.src/types/nokia (limited to 'xorg-server/xkbdata.src/types') diff --git a/xorg-server/xkbdata.src/types/Makefile.am b/xorg-server/xkbdata.src/types/Makefile.am index 43bd2c6b6..6da3ccb78 100644 --- a/xorg-server/xkbdata.src/types/Makefile.am +++ b/xorg-server/xkbdata.src/types/Makefile.am @@ -3,7 +3,7 @@ typesdir = $(xkb_base)/types dist_types_DATA = \ basic cancel caps \ complete default extra \ -iso9995 level5 mousekeys numpad \ +iso9995 level5 mousekeys nokia numpad \ pc README dir_data = $(dist_types_DATA) diff --git a/xorg-server/xkbdata.src/types/Makefile.in b/xorg-server/xkbdata.src/types/Makefile.in index d1ba36e04..78bcfee37 100644 --- a/xorg-server/xkbdata.src/types/Makefile.in +++ b/xorg-server/xkbdata.src/types/Makefile.in @@ -112,6 +112,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -173,7 +174,7 @@ typesdir = $(xkb_base)/types dist_types_DATA = \ basic cancel caps \ complete default extra \ -iso9995 level5 mousekeys numpad \ +iso9995 level5 mousekeys nokia numpad \ pc README dir_data = $(dist_types_DATA) @@ -192,9 +193,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu types/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign types/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu types/Makefile + $(AUTOMAKE) --foreign types/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/types/nokia b/xorg-server/xkbdata.src/types/nokia new file mode 100644 index 000000000..f77d8868a --- /dev/null +++ b/xorg-server/xkbdata.src/types/nokia @@ -0,0 +1,14 @@ +partial default xkb_types "default" { + + // Some types that are used by Nokia devices and keyboard. + virtual_modifiers LevelThree; + + type "PC_FN_LEVEL2" { + modifiers = LevelThree; + map[None] = Level1; + map[LevelThree] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Fn"; + }; + +}; diff --git a/xorg-server/xkbdata.src/types/types.dir b/xorg-server/xkbdata.src/types/types.dir index 746d2f4d2..7f218d6f5 100644 --- a/xorg-server/xkbdata.src/types/types.dir +++ b/xorg-server/xkbdata.src/types/types.dir @@ -1,18 +1,19 @@ +-dp----- -------- pc(default) -dp----- -------- mousekeys(default) --p----- -------- caps(internal) --p----- -------- caps(internal_nocancel) --p----- -------- caps(shift) --p----- -------- caps(shift_nocancel) --d------ -------- default(default) --d------ -------- complete(complete) --dp----- -------- iso9995(default) --d------ -------- basic(basic) --dp----- -------- level5(default) --dp----- -------- pc(default) -dp----- -------- extra(default) --p----- -------- extra(keypad) --p----- -------- extra(mac_keypad) +-d------ -------- default(default) +-dp----- -------- iso9995(default) +-d------ -------- complete(complete) +-dp----- -------- level5(default) -dp----- -------- cancel(Shift_Cancels_Caps) +-dp----- -------- nokia(default) +-d------ -------- basic(basic) -dp----- -------- numpad(pc) --p----- -------- numpad(mac) --p----- -------- numpad(microsoft) -- cgit v1.2.3