Ticket #7964: Keymap_add_Apple_Aluminum_submenu_2.diff

build/jam/HaikuImage

@@ -499 +499 @@
 AddSymlinkToHaikuImage system data Keymaps : Slovene : Croatian ;
 AddSymlinkToHaikuImage system data Keymaps : US-International : Brazilian ;
 
+# Copy Keyboard Layout files to the image one-by-one
 local keyboardLayoutsDir
     = [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
-local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
-AddFilesToHaikuImage system data KeyboardLayouts : $(keyboardLayouts) ;
+local keyboardLayoutFiles =
+    $(keyboardLayoutsDir)/"Generic 104-key"
+    $(keyboardLayoutsDir)/"Generic 105-key International"
+    $(keyboardLayoutsDir)/"IBM Laptop International"
+    $(keyboardLayoutsDir)/"Kinesis Advantage"
+    $(keyboardLayoutsDir)/"Kinesis Ergo Elan International"
+    $(keyboardLayoutsDir)/"TypeMatrix 2030" ;
+AddDirectoryToHaikuImage system data KeyboardLayouts ;
+AddFilesToHaikuImage system data KeyboardLayouts
+    : $(keyboardLayoutFiles) ;
+
+local appleAluminumDir
+    = [ FDirName $(keyboardLayoutsDir) Apple\ Aluminum ] ;
+local appleAluminumFiles =
+    $(appleAluminumDir)/"Apple Aluminium Extended International"
+    $(appleAluminumDir)/"Apple Aluminium International"
+    $(appleAluminumDir)/"Apple Aluminum (US)"
+    $(appleAluminumDir)/"Apple Aluminum Extended (US)" ;
+AddDirectoryToHaikuImage system data KeyboardLayouts Apple\ Aluminum ;
+AddFilesToHaikuImage system data KeyboardLayouts Apple\ Aluminum
+    : $(appleAluminumFiles) ;
 
 local driverSettingsFiles = <driver-settings>kernel ;
 SEARCH on $(driverSettingsFiles)

deleted file data/system/data/KeyboardLayouts/Apple

@@ -1 @@
-name = Apple aluminium
-
-# Size shortcuts
-default-size = 10,10
-$back = 17,10
-$fn = 10.5,6
-$lshift = 13,10
-$ctrl = 14,10
-$alt = 12,10
-$cmd = 14,10
-$b = 5,10
-$d = 15,10
-$e = l12,20,8
-$f = 10,20
-$two = 20,10
-
-# Key rows
-[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; d$fn:0x00; 5,6:-; 10,6:0x04+2; 5,6:-;
-    10,6:+4 ]
-[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; d:+3; $b:-; d:+1; d:0x6a; d:0x23+1 ]
-[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
-[ 0,26; 4,5:led-caps; # integrated into caps key
-    d17,10:0x3b; :+11; :0x33; 50,10:-; :0x48-0x4a; d:0x3a ]
-[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; 15,10:-; d:+1; 
-    15,10:-; :+3; d$f:+1 ]
-[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67;
-    d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ]

new file data/system/data/KeyboardLayouts/Apple

@@ +1 @@
+name = Apple Aluminium Extended International
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$lshift = 13,10
+$ctrl = 14,10
+$alt = 12,10
+$cmd = 14,10
+$b = 5,10
+$d = 15,10
+$e = l12,20,8
+$f = 10,20
+$two = 20,10
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ]
+[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ]
+[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+    d17,10:0x3b; :+11; :0x33; 50,10:-; :0x48-0x4a; d:0x3a ]
+[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; 15,10:-; d:+1; 
+    15,10:-; :+3; d$f:+1 ]
+[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67;
+    d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ]

new file data/system/data/KeyboardLayouts/Apple

@@ +1 @@
+name = Apple Aluminium International
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$lshift = 13,10
+$b = 2,12
+$d = 15,10
+$e = l12,20,8
+$f = 10,20
+$two = 20,10
+$last = 10,12
+$cmd = 14,12
+$arrow = 10,6
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; ]
+[ 0,6;  4,5:-; :0x11+12; d$back:+; ]
+[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+    d17,10:0x3b; :+11; :0x33; ]
+[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; ]
+[ 0,46; 4,5:-; d$last:-; # fn key
+    d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67;
+    d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ]
+[ 121,52; d$arrow:0x61+2; ]

new file data/system/data/KeyboardLayouts/Apple

@@ +1 @@
+name = Apple Aluminum (US)
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$b = 2,12
+$f = 10,20
+$two = 20,10
+$last = 10,12
+$cmd = 14,12
+$arrow = 10,6
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; ]
+[ 0,6;  4,5:-; :0x11+12; d$back:+; ]
+[ 0,16; 4,5:-; d17,10:0x26; :+13; ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+    d19,10:0x3b; :+11; d18,10:0x47; ]
+[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; ]
+[ 0,46; 4,5:-; d$last:-; # fn key
+    d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67;
+    d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ]
+[ 121,52; d$arrow:0x61+2; ]

new file data/system/data/KeyboardLayouts/Apple

@@ +1 @@
+name = Apple Aluminum Extended (US)
+
+# Size shortcuts
+default-size = 10,10
+$back = 17,10
+$fn = 10.5,6
+$shift = 24,10
+$ctrl = 14,10
+$alt = 12,10
+$cmd = 14,10
+$b = 5,10
+$f = 10,20
+$two = 20,10
+
+# Key rows
+[ 0,0;  4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ]
+[ 0,6;  4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ]
+[ 0,16; 4,5:-; 0,16; 4,5:-; d17,10:0x26; :+13; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ]
+[ 0,26; 4,5:led-caps; # integrated into caps key
+    d19,10:0x3b; :+11; d18,10:0x47; 40,10:-; :0x48-0x4a; d:0x3a ]
+[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; 15,10:-; d:+1; 15,10:-; :+3; d$f:+1 ]
+[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67;
+    d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ]

src/preferences/keymap/KeymapWindow.cpp

@@ -375 +375 @@
 KeymapWindow::_CreateMenu()
 {
     BMenuBar* menuBar = new BMenuBar(Bounds(), "menubar");
-    BMenuItem* item;
 
     // Create the File menu
     BMenu* menu = new BMenu(B_TRANSLATE("File"));
@@ -391 +390 @@
 
     // Create keyboard layout menu
     fLayoutMenu = new BMenu(B_TRANSLATE("Layout"));
-    fLayoutMenu->SetRadioMode(true);
-    fLayoutMenu->AddItem(item = new BMenuItem(
-        fKeyboardLayoutView->GetKeyboardLayout()->Name(),
-        new BMessage(kChangeKeyboardLayout)));
-    item->SetMarked(true);
-
     _AddKeyboardLayouts(fLayoutMenu);
     menuBar->AddItem(fLayoutMenu);
 
@@ -537 +530 @@
                 if (menu->FindItem(ref.name) != NULL)
                     continue;
 
-                BMessage* message = new BMessage(kChangeKeyboardLayout);
-                message->AddRef("ref", &ref);
+                BDirectory subdirectory;
+                subdirectory.SetTo(&ref);
+                if (subdirectory.InitCheck() == B_OK) {
+                    // item is a submenu, add children menuitems to submenu
+                    // then add the submenu to menu
+                    BMenu* submenu = new BMenu(ref.name);
+
+                    entry_ref subref;
+                    while (subdirectory.GetNextRef(&subref) == B_OK) {
+                        if (submenu->FindItem(subref.name) != NULL)
+                            continue;
 
-                menu->AddItem(new BMenuItem(ref.name, message));
+                        BMessage* message = new BMessage(kChangeKeyboardLayout);
+                        message->AddRef("ref", &subref);
+
+                        submenu->AddItem(new BMenuItem(subref.name, message));
+                    }
+                    menu->AddItem(submenu);
+                } else {
+                    // item is a menuitem, add to menu
+                    BMessage* message = new BMessage(kChangeKeyboardLayout);
+                    message->AddRef("ref", &ref);
+
+                    menu->AddItem(new BMenuItem(ref.name, message));
+                }
             }
         }
     }
@@ -550 +564 @@
 status_t
 KeymapWindow::_SetKeyboardLayout(const char* path)
 {
-    status_t status = B_OK;
+    status_t status = fKeyboardLayoutView->GetKeyboardLayout()->Load(path);
+    BMenuItem* item = NULL;
+    BMessage* message = NULL;
+    entry_ref ref;
 
-    if (path != NULL && path[0] != '\0') {
-        status = fKeyboardLayoutView->GetKeyboardLayout()->Load(path);
-        if (status == B_OK) {
-            // select item
-            for (int32 i = fLayoutMenu->CountItems(); i-- > 0;) {
-                BMenuItem* item = fLayoutMenu->ItemAt(i);
-                BMessage* message = item->Message();
-                entry_ref ref;
+    // mark a menu item
+    for (int32 i = fLayoutMenu->CountItems(); i-- > 0;) {
+        item = fLayoutMenu->ItemAt(i);
+        if (item == NULL)
+            continue;
+
+        // Set the item as marked initially
+        item->SetMarked(false);
+
+        BMenu* submenu = item->Submenu();
+        if (submenu != NULL) {
+            // item is a submenu
+            BMenuItem* subitem = NULL;
+
+            for (int32 j = submenu->CountItems(); j-- > 0;) {
+                subitem = submenu->ItemAt(j);
+                if (subitem == NULL)
+                    continue;
+
+                subitem->SetMarked(false);
+                message = subitem->Message();
                 if (message->FindRef("ref", &ref) == B_OK) {
                     BPath layoutPath(&ref);
-                    if (layoutPath == path) {
-                        item->SetMarked(true);
-                        break;
-                    }
+                    if (path != NULL && path[0] != '\0' && layoutPath == path)
+                        subitem->SetMarked(true);
                 }
             }
+        } else {
+            // item is a menuitem
+            message = item->Message();
+            if (message->FindRef("ref", &ref) == B_OK) {
+                BPath layoutPath(&ref);
+                if (path != NULL && path[0] != '\0' && layoutPath == path)
+                    item->SetMarked(true);
+            }
         }
     }
 
-    if (path == NULL || status != B_OK) {
+    if (path == NULL || path[0] == '\0' || status != B_OK) {
         fKeyboardLayoutView->GetKeyboardLayout()->SetDefault();
-        fLayoutMenu->ItemAt(0)->SetMarked(true);
+        item = fLayoutMenu->FindItem(
+            fKeyboardLayoutView->GetKeyboardLayout()->Name());
+        if (item != NULL)
+            item->SetMarked(true);
     }
 
     // Refresh currently set layout
@@ -933 +972 @@
     BMessage settings('keym');
     settings.AddRect("window frame", Frame());
 
-    BMenuItem* item = fLayoutMenu->FindMarked();
+    BMenuItem* item = NULL;
     entry_ref ref;
-    if (item != NULL && item->Message()->FindRef("ref", &ref) == B_OK) {
-        BPath path(&ref);
-        if (path.InitCheck() == B_OK)
-            settings.AddString("keyboard layout", path.Path());
+
+    for (int32 i = fLayoutMenu->CountItems(); i-- > 0;) {
+        item = fLayoutMenu->ItemAt(i);
+        if (item == NULL)
+            continue;
+
+        BMenu* submenu = item->Submenu();
+        if (submenu != NULL) {
+            // item is a submenu
+            BMenuItem* subitem = NULL;
+
+            for (int32 j = submenu->CountItems(); j-- > 0;) {
+                subitem = submenu->ItemAt(j);
+                if (subitem != NULL && subitem->IsMarked()
+                     && subitem->Message()->FindRef("ref", &ref) == B_OK) {
+                    BPath path(&ref);
+                    if (path.InitCheck() == B_OK) {
+                        settings.AddString("keyboard layout", path.Path());
+                        goto done;
+                    }
+                }
+            }
+        } else {
+            // item is a menuitem
+            if (item->IsMarked()
+                && item->Message()->FindRef("ref", &ref) == B_OK) {
+                BPath path(&ref);
+                if (path.InitCheck() == B_OK) {
+                    settings.AddString("keyboard layout", path.Path());
+                    goto done;
+                }
+            }
+        }
     }
 
+done:
     return settings.Flatten(&file);
 }