symbols: remove pc(function), srvr_ctrl(fkey2vt) does the same

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/symbols/jp b/symbols/jp
index 5b5db62..3065883 100644 (file)
--- a/symbols/jp
+++ b/symbols/jp
@@ -118,7 +118,7 @@ xkb_symbols "OADG109A" {
 partial alphanumeric_keys
 xkb_symbols "kana86" {
 
-    include "pc(function)"
+    include "srvr_ctrl(fkey2vt)"
     include "pc(editing)"
     include "keypad(numoperdecsep)"
     include "altwin(menu)"

diff --git a/symbols/pc b/symbols/pc
index e9ff004..e1965ce 100644 (file)
--- a/symbols/pc
+++ b/symbols/pc
@@ -10,7 +10,7 @@ xkb_symbols "pc105" {
     key <BKSL> {       [ backslash,    bar             ]       };
     key <SPCE> {       [        space                  ]       };
 
-    include "pc(function)"
+    include "srvr_ctrl(fkey2vt)"
     include "pc(editing)"
     include "keypad(x11)"
 
@@ -66,58 +66,6 @@ xkb_symbols "pc105" {
 };
 
 partial hidden alphanumeric_keys
-xkb_symbols "function" {
-    key <FK01> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F1, XF86_Switch_VT_1 ]
-    };
-    key <FK02> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F2, XF86_Switch_VT_2 ]
-    };
-    key <FK03> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F3, XF86_Switch_VT_3 ]
-    };
-    key <FK04> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F4, XF86_Switch_VT_4 ]
-    };
-    key <FK05> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F5, XF86_Switch_VT_5 ]
-    };
-    key <FK06> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F6, XF86_Switch_VT_6 ]
-    };
-    key <FK07> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F7, XF86_Switch_VT_7 ]
-    };
-    key <FK08> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F8, XF86_Switch_VT_8 ]
-    };
-    key <FK09> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F9, XF86_Switch_VT_9 ]
-    };
-    key <FK10> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F10,        XF86_Switch_VT_10 ]
-    };
-    key <FK11> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F11,        XF86_Switch_VT_11 ]
-    };
-    key <FK12> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F12,        XF86_Switch_VT_12 ]
-    };
-};
-
-partial hidden alphanumeric_keys
 xkb_symbols "editing" {
     key <PRSC> {
        type= "PC_ALT_LEVEL2",

diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us
index 96875b0..f2689a8 100644 (file)
--- a/symbols/sun_vndr/us
+++ b/symbols/sun_vndr/us
@@ -79,7 +79,7 @@ xkb_symbols "sunbasic" {
     include "inet(evdev)"
 
     include "us(basic)"
-    include "pc(function)"
+    include "srvr_ctrl(fkey2vt)"
     include "pc(editing)"
     include "keypad(x11)"