From 422dae672c227028af4280fbc069f9652fcf132e Mon Sep 17 00:00:00 2001 From: Simon Gomizelj Date: Tue, 19 Jun 2012 18:54:38 -0400 Subject: [PATCH] Add --version/-v flag --- Makefile | 2 ++ termite.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 45d63e0..380c64c 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +VERSION = $(shell git describe --tags) PREFIX = /usr/local GTK = gtk+-3.0 VTE = vte-2.90 @@ -16,6 +17,7 @@ CFLAGS := -std=c99 -O3 \ -Wbad-function-cast \ -Wunused-macros \ -Wwrite-strings \ + -DTERMITE_VERSION=\"${VERSION}\" \ ${shell pkg-config --cflags ${GTK} ${VTE}} \ ${CFLAGS} diff --git a/termite.c b/termite.c index d623a6c..d04a7c2 100644 --- a/termite.c +++ b/termite.c @@ -449,6 +449,7 @@ int main(int argc, char **argv) { GError *error = NULL; const char *term = "vte-256color"; gboolean dynamic_title = FALSE, urgent_on_bell = FALSE, clickable_url = FALSE; + gboolean version; GOptionContext *context = g_option_context_new(NULL); char *role = NULL, *geometry = NULL, *execute = NULL; @@ -456,6 +457,7 @@ int main(int argc, char **argv) { {"role", 'r', 0, G_OPTION_ARG_STRING, &role, "The role to use", "ROLE"}, {"geometry", 0, 0, G_OPTION_ARG_STRING, &geometry, "Window geometry", "GEOMETRY"}, {"exec", 'e', 0, G_OPTION_ARG_STRING, &execute, "Command to execute", "COMMAND"}, + {"version", 'v', 0, G_OPTION_ARG_NONE, &version, "Version info", NULL }, {NULL} }; g_option_context_add_main_entries(context, entries, NULL); @@ -466,6 +468,11 @@ int main(int argc, char **argv) { return 1; } + if (version) { + g_print("termite %s\n", TERMITE_VERSION); + return 0; + } + GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget *overlay = gtk_overlay_new(); GtkWidget *vte = vte_terminal_new();