Added sourceview language detected to statusbar. Added app->langname …

…to hold detected language name to avoid repeated calls to gtk_source_language_get_name.
drankinatty · Jul 18, 2018 · 953c73f · 953c73f
1 parent 2095560
commit 953c73f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/gtk_appdata.c b/gtk_appdata.c
@@ -71,15 +71,16 @@ g_print ("app->exename    : %s\n"
     app->poscurend      = FALSE;        /* (bug with Quit) remove trailing ws on save */
 #ifdef HAVESOURCEVIEW
     app->langmgr        = gtk_source_language_manager_get_default();
-    app->language       = NULL;
+    app->language       = NULL;         /* sourceview langmgr language */
+    app->langname       = NULL;         /* language name (owned by mgr, do not free) */
 //     app->schememgr      = gtk_source_style_scheme_manager_get_default();
 //     app->schemeids      = gtk_source_style_scheme_manager_get_scheme_ids (app->schememgr);
     app->highlight      = TRUE;         /* show syntax highlight */
     app->lineno         = FALSE;        /* show line numbers (sourceview) */
     app->linehghlt      = TRUE;         /* highlight current line */
     app->laststyle      = NULL;
     app->comment_single     = NULL;     /* single line comment  |   all are   */
-    app->comment_blk_beg    = NULL;     /* blobk comment begin  |   literals  */
+    app->comment_blk_beg    = NULL;     /* block comment begin  |   literals  */
     app->comment_blk_end    = NULL;     /* block comment end    | do not free */
 #endif
 #ifndef HAVEMSWIN

diff --git a/gtk_appdata.h b/gtk_appdata.h
@@ -139,6 +139,7 @@ typedef struct {
     GtkSourceBuffer *buffer;
     GtkSourceLanguageManager    *langmgr;
     GtkSourceLanguage           *language;
+    const gchar     *langname;          /* name of language from sourceview guess */
 //     GtkSourceStyleSchemeManager *schememgr;
 //     const gchar * const *schemeids;
     GtkWidget       *stylelist;

diff --git a/gtk_sourceview.c b/gtk_sourceview.c
@@ -117,8 +117,10 @@ GtkSourceLanguage *sourcelanguage_lookup (const gchar *name, gpointer data)
                                                          lang_ids[i]);
         lmname = gtk_source_language_get_name (lang);
 
-        if (*lmname == *name && g_strcmp0 (lmname, name) == 0)
+        if (*lmname == *name && g_strcmp0 (lmname, name) == 0) {
+            app->langname = lmname;
             return ((app->language = lang));
+        }
     }
 
     return NULL;
@@ -530,6 +532,9 @@ void sourceview_guess_language (kwinst *app)
                                         app->filename, content_type);
     gtk_source_buffer_set_language (app->buffer, app->language);
 
+    if (app->language)
+        app->langname = gtk_source_language_get_name (app->language);
+
     sourceview_set_comment_syntax (app);
 
     if (app->laststyle)

diff --git a/gtk_statusbar.c b/gtk_statusbar.c
@@ -77,10 +77,26 @@ void status_set_default (kwinst *app)
     app->lines = gtk_text_buffer_get_line_count (buffer);
     app->col = gtk_text_iter_get_line_offset (&iter);
 
+#ifdef HAVESOURCEVIEW
+    if (app->langname) {
+        status = g_strdup_printf (" line:%5d / %d  col:%4d  |  %s  |  %s  |  %s  |  %s",
+                                app->line + 1, app->lines, app->col + 1,
+                                app->overwrite ? "OVR" : "INS",
+                                app->eolnm[app->eol], bomstr[app->bom],
+                                app->langname);
+    }
+    else {
+        status = g_strdup_printf (" line:%5d / %d  col:%4d  |  %s  |  %s  |  %s",
+                                app->line + 1, app->lines, app->col + 1,
+                                app->overwrite ? "OVR" : "INS",
+                                app->eolnm[app->eol], bomstr[app->bom]);
+    }
+#else
     status = g_strdup_printf (" line:%5d / %d  col:%4d  |  %s  |  %s  |  %s",
-                              app->line + 1, app->lines, app->col + 1,
-                              app->overwrite ? "OVR" : "INS",
-                              app->eolnm[app->eol], bomstr[app->bom]);
+                            app->line + 1, app->lines, app->col + 1,
+                            app->overwrite ? "OVR" : "INS",
+                            app->eolnm[app->eol], bomstr[app->bom]);
+#endif
 
     if (app->cid)               /* pop previous statusbar entry */
         gtk_statusbar_pop (GTK_STATUSBAR (app->statusbar), app->cid);