Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Statusbar Template enhancement: width specifier. #3221

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Statusbar Template enhancement: width specifier. #3221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68cf4e0
Statusbar Template enhancement: width specifier.
van-de-bugger Jun 16, 2022
343ed6d
Style fix.
van-de-bugger Jun 16, 2022
41a1e9c
Debug code dropped.
van-de-bugger Jun 16, 2022
d1718f1
Attempt to fix mingw build.
van-de-bugger Jun 16, 2022
1b3d77c
Allowed width range is extended to [-300..300] (status bar on the
van-de-bugger Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 17 additions & 10 deletions doc/geany.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,8 +2705,8 @@ The following format characters are available for the statusbar template:
============ ===========================================================
Placeholder Description
============ ===========================================================
``%l`` The current line number starting at 1
``%L`` The total number of lines
``%l`` The current line number starting at 1.
``%L`` The total number of lines.
``%c`` The current column number starting at 0, including virtual
space.
``%C`` The current column number starting at 1, including virtual
Expand All @@ -2716,21 +2716,28 @@ Placeholder Description
``%n`` The number of selected characters, even if only whole lines
are selected.
``%w`` Shows ``RO`` when the document is in read-only mode,
otherwise shows whether the editor is in overtype (OVR)
or insert (INS) mode.
``%t`` Shows the indentation mode, either tabs (TAB),
spaces (SP) or both (T/S).
``%m`` Shows whether the document is modified (MOD) or nothing.
otherwise shows whether the editor is in overtype (``OVR``)
or insert (``INS``) mode.
``%t`` Shows the indentation mode, either tabs (``TAB``),
spaces (``SP``) or both (``T/S``).
``%m`` Shows whether the document is modified (``MOD``) or nothing.
``%M`` The name of the document's line-endings (ex. ``Unix (LF)``)
``%e`` The name of the document's encoding (ex. UTF-8).
``%f`` The filetype of the document (ex. None, Python, C, etc).
``%e`` The name of the document's encoding (ex. ``UTF-8``).
``%f`` The filetype of the document (ex. ``None``, ``Python``,
``C``, etc).
``%S`` The name of the scope where the caret is located.
``%p`` The caret position in the entire document starting at 0.
``%r`` Shows whether the document is read-only (RO) or nothing.
``%r`` Shows whether the document is read-only (``RO``) or nothing.
``%Y`` The Scintilla style number at the caret position. This is
useful if you're debugging color schemes or related code.
============ ===========================================================

Every placeholder may also specify width, e. g. ``%3l``. Width is the minimum
number of characters to be shown. If the value to show is shorter than width,
the result is left-padded with spaces, or right-padded in case of negative
width. The value is not truncated even if the result is larger. Width should be
in range [-300..300], if width is out of the range, it will be clipped.

van-de-bugger marked this conversation as resolved.
Show resolved Hide resolved
Terminal (VTE) preferences
^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
77 changes: 42 additions & 35 deletions src/ui_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
#include <string.h>
#include <ctype.h>
#include <stdarg.h>
#include <stdlib.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>

Expand Down Expand Up @@ -191,7 +192,6 @@ static gchar *create_statusbar_statistics(GeanyDocument *doc,
const gchar *cur_tag;
const gchar *fmt;
const gchar *expos; /* % expansion position */
const gchar sp[] = " ";
GString *stats_str;
ScintillaObject *sci = doc->editor->sci;

Expand All @@ -206,24 +206,32 @@ static gchar *create_statusbar_statistics(GeanyDocument *doc,
{
/* append leading text before % char */
g_string_append_len(stats_str, fmt, expos - fmt);

switch (*++expos)
++expos; /* skip % */
/* parse integer number, if any */
long l = strtol(expos, (char**)&expos, 10);
int w = l > 300 ? 300 : l < -300 ? -300 : l;
/*
l may be too large, clip it just in case. Also, allowed width
range is documented, do not forget to update `geany.txt` in
case of change.
*/
switch (*expos)
{
case 'l':
g_string_append_printf(stats_str, "%d", line + 1);
g_string_append_printf(stats_str, "%*d", w, line + 1);
break;
case 'L':
g_string_append_printf(stats_str, "%d",
g_string_append_printf(stats_str, "%*d", w,
sci_get_line_count(doc->editor->sci));
break;
case 'c':
g_string_append_printf(stats_str, "%d", vcol);
g_string_append_printf(stats_str, "%*d", w, vcol);
break;
case 'C':
g_string_append_printf(stats_str, "%d", vcol + 1);
g_string_append_printf(stats_str, "%*d", w, vcol + 1);
break;
case 'p':
g_string_append_printf(stats_str, "%u", pos);
g_string_append_printf(stats_str, "%*u", w, pos);
break;
case 's':
{
Expand All @@ -233,74 +241,73 @@ static gchar *create_statusbar_statistics(GeanyDocument *doc,
sci_get_selection_start(sci)) != 0 ||
sci_get_col_from_position(sci,
sci_get_selection_end(sci)) != 0)
g_string_append_printf(stats_str, "%d", len);
g_string_append_printf(stats_str, "%*d", w, len);
else /* L = lines */
g_string_append_printf(stats_str, _("%dL"),
g_string_append_printf(stats_str, _("%*dL"), w,
sci_get_lines_selected(doc->editor->sci) - 1);
break;
}
case 'n' :
g_string_append_printf(stats_str, "%d",
g_string_append_printf(stats_str, "%*d", w,
sci_get_selected_text_length2(doc->editor->sci));
break;
case 'w':
/* RO = read-only */
g_string_append(stats_str, (doc->readonly) ? _("RO ") :
g_string_append_printf(stats_str, "%*s", w, (doc->readonly) ? _("RO") :
/* OVR = overwrite/overtype, INS = insert */
(sci_get_overtype(doc->editor->sci) ? _("OVR") : _("INS")));
break;
case 'r':
if (doc->readonly)
{
g_string_append(stats_str, _("RO ")); /* RO = read-only */
g_string_append(stats_str, sp + 1);
}
g_string_append_printf(stats_str, "%*s", w,
doc->readonly ? _("RO") : ""); /* RO = read-only */
break;
case 't':
{
switch (editor_get_indent_prefs(doc->editor)->type)
{
case GEANY_INDENT_TYPE_TABS:
g_string_append(stats_str, _("TAB"));
g_string_append_printf(stats_str, "%*s", w, _("TAB"));
break;
case GEANY_INDENT_TYPE_SPACES: /* SP = space */
g_string_append(stats_str, _("SP"));
g_string_append_printf(stats_str, "%*s", w, _("SP"));
break;
case GEANY_INDENT_TYPE_BOTH: /* T/S = tabs and spaces */
g_string_append(stats_str, _("T/S"));
g_string_append_printf(stats_str, "%*s", w, _("T/S"));
break;
}
break;
}
case 'm':
if (doc->changed)
{
g_string_append(stats_str, _("MOD")); /* MOD = modified */
g_string_append(stats_str, sp);
}
g_string_append_printf(stats_str, "%*s", w,
doc->changed ? _("MOD") : ""); /* MOD = modified */
break;
case 'M':
g_string_append(stats_str, utils_get_eol_short_name(sci_get_eol_mode(doc->editor->sci)));
g_string_append_printf(stats_str, "%*s", w,
utils_get_eol_short_name(sci_get_eol_mode(doc->editor->sci)));
break;
case 'e':
g_string_append(stats_str,
doc->encoding ? doc->encoding : _("unknown"));
if (encodings_is_unicode_charset(doc->encoding) && (doc->has_bom))
{
g_string_append_c(stats_str, ' ');
g_string_append(stats_str, _("(with BOM)")); /* BOM = byte order mark */
GString * encoding = g_string_sized_new(32);
g_string_append(encoding,
doc->encoding ? doc->encoding : _("unknown"));
if (encodings_is_unicode_charset(doc->encoding) && (doc->has_bom))
{
g_string_append_c(encoding, ' ');
g_string_append(encoding, _("(with BOM)")); /* BOM = byte order mark */
}
g_string_append_printf(stats_str, "%*s", w, encoding->str);
g_string_free(encoding, TRUE);
}
break;
case 'f':
g_string_append(stats_str, filetypes_get_display_name(doc->file_type));
g_string_append_printf(stats_str, "%*s", w, filetypes_get_display_name(doc->file_type));
break;
case 'S':
symbols_get_current_scope(doc, &cur_tag);
g_string_append(stats_str, cur_tag);
g_string_append_printf(stats_str, "%*s", w, cur_tag);
break;
case 'Y':
g_string_append_c(stats_str, ' ');
g_string_append_printf(stats_str, "%d",
g_string_append_printf(stats_str, "%*d", w,
sci_get_style_at(doc->editor->sci, pos));
break;
default:
Expand Down