Move gobgen installation source to MELPA

Woo!

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "gobgen"]
-	path = gobgen
-	url = git://github.com/gergelypolonkai/gobgen.el.git

elpa/gobgen-20160928.2013/gobgen-autoloads.el

@@ -0,0 +1,21 @@
+;;; gobgen-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
+
+;;;### (autoloads nil "gobgen" "gobgen.el" (22514 20100 637300 679000))
+;;; Generated autoloads from gobgen.el
+
+(autoload 'gobgen "gobgen" "\
+Create widgets window for GObject creation
+
+\(fn)" t nil)
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; End:
+;;; gobgen-autoloads.el ends here

elpa/gobgen-20160928.2013/gobgen-pkg.el

@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "gobgen" "20160928.2013" "Generate GObject descendants using a detailed form" '((emacs "24.4")) :keywords '("gobject" "glib" "gtk" "helper" "utilities"))

elpa/gobgen-20160928.2013/gobgen.el

@@ -0,0 +1,436 @@
+;;; gobgen.el --- Generate GObject descendants using a detailed form -*- lexical-binding: nil; -*-
+
+;; Copyright (C) 2015 Gergely Polonkai
+
+;; Author: Gergely Polonkai <gergely@polonkai.eu>
+;; Keywords: gobject, glib, gtk, helper, utilities
+;; Package-Version: 20160928.2013
+;; Version: 0.0.1
+;; Package-Requires: ((emacs "24.4"))
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Generator code is highly based on Gustavo Sverzut Barbieri's
+;; gobject-class.el
+
+;;; Code:
+
+(require 'widget)
+(require 'wid-edit)
+(require 'subr-x)
+
+(defvar-local gobgen-widget-name nil
+  "Widget for the class name.")
+(defvar-local gobgen-widget-prefix nil
+  "Widget for the class prefix. It is auto-filled, but changeable.")
+(defvar-local gobgen-widget-parent-name nil
+  "Widget for the name of the parent class.")
+(defvar-local gobgen-widget-parent-prefix nil
+  "Widget for the prefix of the parent class. It is auto-filled, but changeable.")
+(defvar-local gobgen-widget-recent nil
+  "Checkbox field for the recent GLib option.")
+(defvar-local gobgen-widget-private nil
+  "Checkbox field for the private structure option.")
+
+(defun gobject-get-prefix (class-name)
+  (car (split-string class-name "_")))
+
+(defun gobgen-gen-header (CLASS_FULL_NAME
+                          CLASS_PREFIX
+                          CLASS_NAME
+                          ClassFullName
+                          func-prefix
+                          parent_prefix
+                          ParentPrefix
+                          ParentName
+                          parent-header
+                          recent-glib
+                          need-private)
+  "Generate the contents of a GObject header file."
+
+  (concat
+   "#ifndef __"
+   CLASS_FULL_NAME
+   "_H__\n"
+
+   "#define __"
+   CLASS_FULL_NAME
+   "_H__\n"
+
+   "\n"
+
+   (if (string-equal "g" parent_prefix)
+       "#include <glib-object.h>"
+     (if (string-equal "gtk" parent_prefix)
+         "#include <gtk/gtk.h>"
+       (concat "// You might want to revise this\n"
+               "#include <"
+               parent-header
+               ">")))
+   "\n"
+
+   "\n"
+
+   "G_BEGIN_DECLS\n"
+
+   "\n"
+
+   "#define " CLASS_PREFIX "_TYPE_" CLASS_NAME "         (" func-prefix "_get_type())\n"
+
+   "#define " CLASS_FULL_NAME "(o)           (G_TYPE_CHECK_INSTANCE_CAST((o), " CLASS_PREFIX "_TYPE_" CLASS_NAME ", " ClassFullName "))\n"
+
+   "#define " CLASS_FULL_NAME "_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), " CLASS_PREFIX "_TYPE_" CLASS_NAME ", " ClassFullName "Class))\n"
+
+   "#define " CLASS_PREFIX "_IS_" CLASS_NAME "(o)        (G_TYPE_CHECK_INSTANCE_TYPE((o), " CLASS_PREFIX "_TYPE_" CLASS_NAME "))\n"
+
+   "#define " CLASS_PREFIX "_IS_" CLASS_NAME "_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE((k), " CLASS_PREFIX "_TYPE_" CLASS_NAME "))\n"
+
+   "#define " CLASS_FULL_NAME"_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), " CLASS_PREFIX "_TYPE_" CLASS_NAME ", " ClassFullName "Class))\n"
+
+   "\n"
+
+   "typedef struct _" ClassFullName "      " ClassFullName ";\n"
+
+   "typedef struct _" ClassFullName "Class " ClassFullName "Class;\n"
+
+   (if (and (not recent-glib) need-private)
+       (concat "typedef struct _" ClassFullName "Private " ClassFullName "Private;\n"))
+
+   "\n"
+
+   "struct _" ClassFullName " {\n"
+
+   "    /* Parent instance structure */\n"
+
+   "    " ParentPrefix ParentName " parent_instance;\n"
+
+   "\n"
+
+   "    /* Instance members */\n"
+
+   (if (and (not recent-glib) need-private)
+       (concat "\n"
+               "    /*< private >*/\n"
+               "    " ClassFullName "Private *priv;\n"))
+
+   "};\n"
+
+   "\n"
+
+   "struct _" ClassFullName "Class {\n"
+
+   "    " ParentPrefix ParentName "Class parent_class;\n"
+
+   "};\n"
+
+   "\n"
+
+   "GType " func-prefix "_get_type(void) G_GNUC_CONST;\n"
+
+   "\n"
+
+   "G_END_DECLS\n"
+
+   "\n"
+
+   "#endif /* __"
+   CLASS_FULL_NAME
+   "_H__ */\n"))
+
+(defun gobgen-gen-code (CLASS_FULL_NAME
+                        CLASS_PREFIX
+                        CLASS_NAME
+                        class_name
+                        ClassFullName
+                        func-prefix
+                        file-name-header
+                        PARENT_PREFIX
+                        PARENT_NAME
+                        recent-glib
+                        need-private)
+  "Generate the contents of a GObject source file."
+
+  (concat
+   "#include \"" file-name-header "\"\n"
+
+   "\n"
+
+   (if need-private
+       (concat
+        (if (not recent-glib)
+            (concat
+             "#define " CLASS_FULL_NAME "_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE( \\\n"
+             "            (o), \\\n"
+             "            " CLASS_PREFIX "_TYPE_" CLASS_NAME ", \\\n"
+             "            " ClassFullName "Private \\\n"
+             "        ))\n"
+             "\n"))
+
+        (if recent-glib "typedef ")
+
+        "struct _" ClassFullName "Private {\n"
+        "    /* TODO: You must add something here, or GLib will produce warnings! */\n"
+        "}"
+
+        (if recent-glib
+            (concat " " ClassFullName "Private"))
+
+        ";\n"
+        "\n"))
+
+   "G_DEFINE_TYPE"
+
+   (if (and recent-glib need-private)
+       "_WITH_PRIVATE")
+
+   "(" ClassFullName ", " func-prefix ", " PARENT_PREFIX "_TYPE_" PARENT_NAME ");\n"
+
+   "\n"
+
+   "static void\n"
+   func-prefix "_finalize(GObject *gobject)\n"
+   "{\n"
+   "    g_signal_handlers_destroy(gobject);\n"
+   "    G_OBJECT_CLASS(" func-prefix "_parent_class)->finalize(gobject);\n"
+   "}\n"
+
+   "\n"
+
+   "static void\n"
+   func-prefix "_class_init(" ClassFullName "Class *klass)\n"
+   "{\n"
+   "    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);\n"
+   "\n"
+
+   (if (and (not recent-glib) need-private)
+       (concat
+        "    g_type_class_add_private(klass, sizeof(" ClassFullName "Private));\n"
+        "\n"))
+
+   "    gobject_class->finalize = " func-prefix "_finalize;\n"
+
+   "}\n"
+
+   "\n"
+
+   "static void\n"
+   func-prefix "_init(" ClassFullName " *" class_name ")\n"
+   "{\n"
+
+   (if (and (not recent-glib) need-private)
+       (concat
+        "    " class_name "->priv = " CLASS_FULL_NAME "_GET_PRIVATE(" class_name ");\n"))
+
+   "}\n"))
+
+(defun gobgen-generator (class-prefix
+                         class-name
+                         parent-prefix
+                         parent-name
+                         recent-glib
+                         need-private)
+  "Generate the header definition for a GObject derived clas."
+
+  (let* ((parent-prefix        (downcase parent-prefix))
+         (parent-name          (downcase parent-name))
+         (class-prefix         (downcase class-prefix))
+         (class-name           (downcase class-name))
+         (parent-prefix-length (length parent-prefix))
+         (class-prefix-length  (length class-prefix)))
+
+    (if (not (string-prefix-p (concat parent-prefix "_") parent-name))
+        (message (concat "Parent (" parent-name ") and parent prefix (" parent-prefix ") don't match"))
+
+      (if (not (string-prefix-p (concat class-prefix "_") class-name))
+          (message (concat "Class (" class-name ") and class prefix (" class-prefix ") don't match"))
+
+        (let* ((parent-name (substring parent-name (+ parent-prefix-length 1)))
+               (class-name  (substring class-name (+ class-prefix-length 1)))
+               (parent-prefix-pcs (split-string parent-prefix "_"))
+               (parent-name-pcs   (split-string parent-name "_"))
+               (class-prefix-pcs  (split-string class-prefix "_"))
+               (class-name-pcs    (split-string class-name "_"))
+               (parent_prefix     (string-join parent-prefix-pcs "_"))
+               (ParentPrefix      (mapconcat 'capitalize parent-prefix-pcs ""))
+               (PARENT_PREFIX     (upcase parent_prefix))
+               (parent_name       (string-join parent-name-pcs "_"))
+               (ParentName        (mapconcat 'capitalize parent-name-pcs ""))
+               (PARENT_NAME       (upcase parent_name))
+               (class_prefix      (string-join class-prefix-pcs "_"))
+               (ClassPrefix       (mapconcat 'capitalize class-prefix-pcs ""))
+               (CLASS_PREFIX      (upcase class_prefix))
+               (class_name        (string-join class-name-pcs "_"))
+               (ClassName         (mapconcat 'capitalize class-name-pcs ""))
+               (CLASS_NAME        (upcase class_name))
+               (func-prefix       (concat class_prefix "_" class_name))
+               (ClassFullName     (concat ClassPrefix ClassName))
+               (CLASS_FULL_NAME   (concat CLASS_PREFIX "_" CLASS_NAME))
+               (parent-header     (concat (string-join (append parent-prefix-pcs parent-name-pcs) "-") ".h"))
+               (file-name-base    (string-join (append class-prefix-pcs class-name-pcs) "-"))
+               (file-name-code    (concat file-name-base ".c"))
+               (file-name-header  (concat file-name-base ".h")))
+
+          (delete-other-windows)
+          (split-window-vertically)
+          (other-window 1)
+          (find-file file-name-header)
+          (insert (gobgen-gen-header CLASS_FULL_NAME
+                                     CLASS_PREFIX
+                                     CLASS_NAME
+                                     ClassFullName
+                                     func-prefix
+                                     parent_prefix
+                                     ParentPrefix
+                                     ParentName
+                                     parent-header
+                                     recent-glib
+                                     need-private))
+
+          (split-window-vertically)
+          (other-window 1)
+          (find-file file-name-code)
+          (insert (gobgen-gen-code CLASS_FULL_NAME
+                                   CLASS_PREFIX
+                                   CLASS_NAME
+                                   class_name
+                                   ClassFullName
+                                   func-prefix
+                                   file-name-header
+                                   PARENT_PREFIX
+                                   PARENT_NAME
+                                   recent-glib
+                                   need-private)))))))
+
+;;;###autoload
+(defun gobgen ()
+  "Create widgets window for GObject creation"
+
+  (interactive)
+
+  (switch-to-buffer "*GObject Creator*")
+
+  (kill-all-local-variables)
+
+  (let ((inhibit-read-only t))
+    (erase-buffer))
+
+  (remove-overlays)
+
+  (widget-insert "GObject Creator\n\n")
+
+  (widget-insert "Generate a GObject class skeleton.\n\n")
+
+  (setq gobgen-widget-name
+        (widget-create 'editable-field
+                       :size 25
+                       :format "Name:   %v"
+                       :notify (lambda (widget _child &optional event)
+                                 (save-excursion
+                                   (widget-value-set gobgen-widget-prefix
+                                                     (gobject-get-prefix (widget-value widget)))))
+                       :doc "The name of the new class, with its prefix included"
+                       "gtk_example_object"))
+
+  (widget-insert " ")
+
+  (setq gobgen-widget-prefix
+        (widget-create 'editable-field
+                       :size 10
+                       :format "Prefix: %v\n"
+                       :doc "Prefix of the new class. It updates automatically based on the name, so unless you need a namespace that consists of multiple parts (like my_ns), you should not touch this."
+                       "gtk"))
+
+  (setq gobgen-widget-parent-name
+        (widget-create 'editable-field
+                       :size 25
+                       :format "Parent: %v"
+                       :notify (lambda (widget _child &optional event)
+                                 (save-excursion
+                                   (widget-value-set gobgen-widget-parent-prefix
+                                                     (gobject-get-prefix (widget-value widget)))))
+                       :doc "Name of the parent class. Use g_object if you don't want to derive from something specific."
+                       "g_object"))
+
+  (widget-insert " ")
+
+  (setq gobgen-widget-parent-prefix
+        (widget-create 'editable-field
+                       :size 10
+                       :format "Prefix: %v\n"
+                       :doc "Prefix of the parent class. Its automatically set value should suffice most of the time"
+                       "g"))
+
+  (widget-insert "\n")
+
+  (setq gobgen-widget-recent
+        (widget-create 'checkbox
+                       :doc "Use recent GLib's features, like defining a class with a private struct. Usually you would want this on."
+                       t))
+
+  (widget-insert " GLib >= 2.38\n")
+
+  (setq gobgen-widget-private
+        (widget-create 'checkbox
+                       :doc "Add a private struct for the object."
+                       nil))
+
+  (widget-insert " Has private members\n")
+
+  (widget-insert "\n\n")
+
+  (widget-create 'push-button
+                 :notify (lambda (widget _child &optional event)
+                           (let ((class-name    (widget-value gobgen-widget-name))
+                                 (class-prefix  (widget-value gobgen-widget-prefix))
+                                 (parent-name   (widget-value gobgen-widget-parent-name))
+                                 (parent-prefix (widget-value gobgen-widget-parent-prefix))
+                                 (recent-glib   (widget-value gobgen-widget-recent))
+                                 (need-private  (widget-value gobgen-widget-private)))
+                             (gobgen-generator class-prefix
+                                               class-name
+                                               parent-prefix
+                                               parent-name
+                                               recent-glib
+                                               need-private)))
+                 "Generate")
+
+  (widget-insert " ")
+
+  (widget-create 'push-button
+                 :notify (lambda (widget _child &optional event)
+                           (widget-value-set gobgen-widget-name "gtk_example_object")
+                           (widget-value-set gobgen-widget-prefix "gtx")
+                           (widget-value-set gobgen-widget-parent-name "g_object")
+                           (widget-value-set gobgen-widget-parent-prefix "g")
+                           (widget-value-set gobgen-widget-recent t)
+                           (widget-value-set gobgen-widget-private nil))
+                 "Reset form")
+
+  (widget-insert " ")
+
+  (widget-create 'push-button
+                 :notify (lambda (widget _child &optional event)
+                           (kill-buffer "*GObject Creator*"))
+                 "Close")
+
+  (goto-char (point-min))
+
+  (use-local-map widget-keymap)
+  (widget-setup))
+
+(provide 'gobgen)
+
+;;; gobgen.el ends here

gobgen

@@ -1 +0,0 @@
-Subproject commit 20ac2dff2eab2184c487393f334d5c8a660c4151

init.el

@@ -68,7 +68,7 @@
      ("e6h" . "http://www.e6h.org/packages/"))))
  '(package-selected-packages
    (quote
-    (wakatime-mode command-log-mode magithub nyan-prompt zone-nyan helm-google helm-projectile helm-spotify helm-swoop helm-unicode id-manager identica-mode mc-extras multiple-cursors electric-spacing flycheck-clojure flycheck-pkg-config focus git-messenger gitconfig github-notifier gnome-calendar gnugo google helm-chrome helm-company helm-flycheck clojure-quick-repls electric-case emamux flycheck drag-stuff django-manage clojure-mode hyde org-jekyll smart-mode-line-powerline-theme yaml-mode xlicense vala-mode sass-mode nyan-mode muse markdown-mode mark magit-gerrit json-mode js2-mode jinja2-mode helm-make helm-gtags helm-flyspell helm-ag go-mode gitignore-mode gitconfig-mode git-gutter ggtags fiplr erlang django-mode company-shell company-quickhelp company-c-headers coffee-mode buffer-move ag)))
+    (gobgen goto-last-change wakatime-mode command-log-mode magithub nyan-prompt zone-nyan helm-google helm-projectile helm-spotify helm-swoop helm-unicode id-manager identica-mode mc-extras multiple-cursors electric-spacing flycheck-clojure flycheck-pkg-config focus git-messenger gitconfig github-notifier gnome-calendar gnugo google helm-chrome helm-company helm-flycheck clojure-quick-repls electric-case emamux flycheck drag-stuff django-manage clojure-mode hyde org-jekyll smart-mode-line-powerline-theme yaml-mode xlicense vala-mode sass-mode nyan-mode muse markdown-mode mark magit-gerrit json-mode js2-mode jinja2-mode helm-make helm-gtags helm-flyspell helm-ag go-mode gitignore-mode gitconfig-mode git-gutter ggtags fiplr erlang django-mode company-shell company-quickhelp company-c-headers coffee-mode buffer-move ag)))
  '(safe-local-variable-values
    (quote
     ((company-clang-arguments "-I.." "-I/home/polesz/jhbuild/install/include/atk-1.0" "-I/home/polesz/jhbuild/install/include/at-spi-2.0" "-I/home/polesz/jhbuild/install/include/at-spi2-atk/2.0" "-I/home/polesz/jhbuild/install/include/cairo" "-I/home/polesz/jhbuild/install/include/gdk-pixbuf-2.0" "-I/home/polesz/jhbuild/install/include/gio-unix-2.0/" "-I/home/polesz/jhbuild/install/include/glib-2.0" "-I/home/polesz/jhbuild/install/include/gtk-3.0" "-I/home/polesz/jhbuild/install/include/harfbuzz" "-I/home/polesz/jhbuild/install/include/libgda-5.0" "-I/home/polesz/jhbuild/install/include/libgda-5.0/libgda" "-I/home/polesz/jhbuild/install/include/librsvg-2.0" "-I/home/polesz/jhbuild/install/include/libsoup-2.4" "-I/home/polesz/jhbuild/install/include/pango-1.0" "-I/home/polesz/jhbuild/install/include/swe-glib" "-I/home/polesz/jhbuild/install/include/webkitgtk-4.0" "-I/home/polesz/jhbuild/install/lib/glib-2.0/include" "-I/usr/include/dbus-1.0" "-I/usr/include/freetype2" "-I/usr/include/libdrm" "-I/usr/include/libpng16" "-I/usr/include/libxml2" "-I/usr/include/pixman-1" "-I/usr/lib64/dbus-1.0/include")
@@ -101,7 +101,6 @@
 ;; Load some custom libraries
 (require 'whitespace)
 (require 'thingatpt)
-(add-hook 'after-init-hook (lambda () (require 'gobgen)))
 (require 'helm-config)
 (require 'xlicense)
 (require 'multiple-cursors)
@@ -150,10 +149,6 @@
      (define-key company-mode-map (kbd "C-:") 'helm-company)
      (define-key company-active-map (kbd "C-:") 'helm-company)))
 
-;; Add gobgen to the load path. It’s temporary until gobgen finally
-;; gets to MELPA
-(add-to-list 'load-path (concat user-emacs-directory "gobgen"))
-
 ; Nyanyanyanyanya
 (add-hook 'after-init-hook 'nyan-mode)