Convert the mac key theme to css

2 files changed, 210 insertions, 3 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c8317c0f52..4db3a6d76a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -905,10 +905,10 @@ endif
 
 if USE_QUARTZ
 install-mac-key-theme:
-	$(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key
-	$(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+	$(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
+	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
 uninstall-mac-key-theme:
-	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
 else
 install-mac-key-theme:
 uninstall-mac-key-theme:
@@ -940,6 +940,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
 	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
 	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
 # this allows dist to pass.
@@ -1364,6 +1365,7 @@ EXTRA_DIST +=                   \
 	gtkrc.key.emacs		\
 	gtk-keys.css.emacs	\
 	gtkrc.key.mac		\
+	gtk-keys.css.mac	\
 	makefile.msc		\
 	makefile.msc.in		\
 	abicheck.sh		\
diff --git a/gtk/gtk-keys.css.mac b/gtk/gtk-keys.css.mac
new file mode 100644
index 0000000000..095d597f2d
--- /dev/null
+++ b/gtk/gtk-keys.css.mac
@@ -0,0 +1,205 @@
+@binding-set gtk-mac-alt-arrows
+{
+  bind "<alt>Right"           { "move-cursor" (words, 1, 0) };
+  bind "<alt>KP_Right"        { "move-cursor" (words, 1, 0) };
+  bind "<alt>Left"            { "move-cursor" (words, -1, 0) };
+  bind "<alt>KP_Left"         { "move-cursor" (words, -1, 0) };
+  bind "<shift><alt>Right"    { "move-cursor" (words, 1, 1) };
+  bind "<shift><alt>KP_Right" { "move-cursor" (words, 1, 1) };
+  bind "<shift><alt>Left"     { "move-cursor" (words, -1, 1) };
+  bind "<shift><alt>KP_Left"  { "move-cursor" (words, -1, 1) };
+};
+
+@binding-set gtk-mac-alt-delete
+{
+  bind "<alt>Delete" { "delete-from-cursor" (word-ends, 1) };
+  bind "<alt>KP_Delete" { "delete-from-cursor" (word-ends, 1) };
+  bind "<alt>BackSpace" { "delete-from-cursor" (word-ends, -1) };
+};
+
+@binding-set gtk-mac-cmd-c
+{
+  bind "<meta>x" { "cut-clipboard" () };
+  bind "<meta>c" { "copy-clipboard" () };
+  bind "<meta>v" { "paste-clipboard" () };
+  unbind "<ctrl>x";
+  unbind "<ctrl>c";
+  unbind "<ctrl>v";
+};
+
+@binding-set gtk-mac-text-view
+{
+  bind "<shift><meta>a" { "select-all" (0) };
+  bind "<meta>a" { "select-all" (1) };
+  unbind "<shift><ctrl>a";
+  unbind "<ctrl>a";
+};
+
+@binding-set gtk-mac-label
+{
+  bind "<meta>a" {
+    "move-cursor" (paragraph-ends, -1, 0)
+    "move-cursor" (paragraph-ends, 1, 1)
+  };
+  bind "<shift><meta>a" { "move-cursor" (paragraph-ends, 0, 0) };
+  bind "<meta>c" { "copy-clipboard" () };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+  unbind "<ctrl>c";
+};
+
+@binding-set gtk-mac-entry
+{
+  bind "<meta>a" {
+    "move-cursor" (buffer-ends, -1, 0)
+    "move-cursor" (buffer-ends, 1, 1)
+  };
+  bind "<shift><meta>a" { "move-cursor" (visual-positions, 0, 0) };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+};
+
+@binding-set gtk-mac-file-chooser
+{
+  bind "<meta>v" { "location-popup-on-paste" () };
+  unbind "<ctrl>v";
+
+  bind "<meta><shift>G" { "location-popup" () };
+  bind "<meta><shift>H" { "home-folder" () };
+  bind "<meta>Up" { "up-folder" () };
+};
+
+@binding-set gtk-mac-tree-view
+{
+  bind "<meta>a" { "select-all" () };
+  bind "<shift><meta>a" { "unselect-all" () };
+  bind "<meta>f" { "start-interactive-search" () };
+  bind "<meta>F" { "start-interactive-search" () }
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+  unbind "<ctrl>f";
+  unbind "<ctrl>F";
+};
+
+@binding-set gtk-mac-icon-view
+{
+  bind "<meta>a" { "select-all" () };
+  bind "<shift><meta>a" { "unselect-all" () };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+};
+
+@binding-set gtk-mac-alt-arrows
+{
+  bind "<alt>Right"           { "move-cursor" (words, 1, 0) };
+  bind "<alt>KP_Right"        { "move-cursor" (words, 1, 0) };
+  bind "<alt>Left"            { "move-cursor" (words, -1, 0) };
+  bind "<alt>KP_Left"         { "move-cursor" (words, -1, 0) };
+  bind "<shift><alt>Right"    { "move-cursor" (words, 1, 1) };
+  bind "<shift><alt>KP_Right" { "move-cursor" (words, 1, 1) };
+  bind "<shift><alt>Left"     { "move-cursor" (words, -1, 1) };
+  bind "<shift><alt>KP_Left"  { "move-cursor" (words, -1, 1) };
+};
+
+@binding-set gtk-mac-alt-delete
+{
+  bind "<alt>Delete" { "delete-from-cursor" (word-ends, 1) };
+  bind "<alt>KP_Delete" { "delete-from-cursor" (word-ends, 1) };
+  bind "<alt>BackSpace" { "delete-from-cursor" (word-ends, -1) };
+};
+
+@binding-set gtk-mac-cmd-c
+{
+  bind "<meta>x" { "cut-clipboard" () };
+  bind "<meta>c" { "copy-clipboard" () };
+  bind "<meta>v" { "paste-clipboard" () };
+  unbind "<ctrl>x";
+  unbind "<ctrl>c";
+  unbind "<ctrl>v";
+};
+
+@binding-set gtk-mac-text-view
+{
+  bind "<shift><meta>a" { "select-all" (0) };
+  bind "<meta>a" { "select-all" (1) };
+  unbind "<shift><ctrl>a";
+  unbind "<ctrl>a";
+};
+
+@binding-set gtk-mac-label
+{
+  bind "<meta>a" {
+    "move-cursor" (paragraph-ends, -1, 0)
+    "move-cursor" (paragraph-ends, 1, 1)
+  };
+  bind "<shift><meta>a" { "move-cursor" (paragraph-ends, 0, 0) };
+  bind "<meta>c" { "copy-clipboard" () };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+  unbind "<ctrl>c";
+};
+
+@binding-set gtk-mac-entry
+{
+  bind "<meta>a" {
+    "move-cursor" (buffer-ends, -1, 0)
+    "move-cursor" (buffer-ends, 1, 1)
+  };
+  bind "<shift><meta>a" { "move-cursor" (visual-positions, 0, 0) };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+};
+
+@binding-set gtk-mac-file-chooser
+{
+  bind "<meta>v" { "location-popup-on-paste" () };
+  unbind "<ctrl>v";
+
+  bind "<meta><shift>G" { "location-popup" () };
+  bind "<meta><shift>H" { "home-folder" () };
+  bind "<meta>Up" { "up-folder" () };
+};
+
+@binding-set gtk-mac-tree-view
+{
+  bind "<meta>a" { "select-all" () };
+  bind "<shift><meta>a" { "unselect-all" () };
+  bind "<meta>f" { "start-interactive-search" () };
+  bind "<meta>F" { "start-interactive-search" () };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+  unbind "<ctrl>f";
+  unbind "<ctrl>F";
+};
+
+@binding-set gtk-mac-icon-view
+{
+  bind "<meta>a" { "select-all" () };
+  bind "<shift><meta>a" { "unselect-all" () };
+  unbind "<ctrl>a";
+  unbind "<shift><ctrl>a";
+};
+
+GtkIconView {
+  gtk-key-bindings: gtk-mac-icon-view;
+}
+
+GtkTextView {
+  gtk-key-bindings: gtk-mac-alt-arrows, gtk-mac-alt-delete, gtk-mac-cmd-c, gtk-mac-text-view;
+}
+
+GtkEntry {
+  gtk-key-bindings: gtk-mac-alt-arrows, gtk-mac-alt-delete, gtk-mac-cmd-c, gtk-mac-entry;
+}
+
+GtkLabel {
+  gtk-key-bindings: gtk-mac-alt-arrows, gtk-mac-label;
+}
+
+GtkFileChooserDefault {
+  gtk-key-bindings: gtk-mac-file-chooser;
+}
+
+GtkTreeView {
+  gtk-key-bindings: gtk-mac-tree-view;
+}