Commits January 2018

commits@lists.geany.org

1 participants
39 discussions

[geany/geany] dbd057: Fix comparison between signed and unsigned integers
by Matthew Brush 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 21 Dec 2017 01:22:50 UTC Commit: dbd0573dd6a5175ec9b536c4053bb66caac0f665 https://github.com/geany/geany/commit/dbd0573dd6a5175ec9b536c4053bb66caac0f… Log Message: ----------- Fix comparison between signed and unsigned integers Modified Paths: -------------- ctags/main/parse.c Modified: ctags/main/parse.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -316,7 +316,7 @@ static void initializeParserOne (langType lang) static void initializeParsers (void) { - int i; + unsigned int i; for (i = 0; i < LanguageCount; i++) initializeParserOne(i); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 81144d: Fix missing initializer for field warnings
by Matthew Brush 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Thu, 21 Dec 2017 01:22:50 UTC Commit: 81144dc4011e30870d652402b1c8852fb44af85e https://github.com/geany/geany/commit/81144dc4011e30870d652402b1c8852fb44af… Log Message: ----------- Fix missing initializer for field warnings This is basically a false-positive by GCC since static variables are unambiguously zeroed-out per the language standard, but the workaround is simple enough. Modified Paths: -------------- ctags/main/xtag.c Modified: ctags/main/xtag.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -27,18 +27,18 @@ static bool isPseudoTagsEnabled (xtagDesc *pdesc CTAGS_ATTR_UNUSED) static xtagDesc xtagDescs [] = { { true, 'F', "fileScope", - "Include tags of file scope" }, + "Include tags of file scope", NULL}, { false, 'f', "inputFile", - "Include an entry for the base file name of every input file"}, + "Include an entry for the base file name of every input file", NULL}, { false, 'p', "pseudo", "Include pseudo tags", isPseudoTagsEnabled}, { false, 'q', "qualified", - "Include an extra class-qualified tag entry for each tag"}, + "Include an extra class-qualified tag entry for each tag", NULL}, { false, 'r', "reference", - "Include reference tags"}, + "Include reference tags", NULL}, { false, 's', "subparser", - "Include tags generated by sub parsers"}, + "Include tags generated by sub parsers", NULL}, }; extern xtagDesc* getXtagDesc (xtagType type) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cc035a: Merge branch 'gcc-warnings'
by Matthew Brush 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 12 Jan 2018 22:07:49 UTC Commit: cc035ab99db99996d6667957a1a15cc93a555f2d https://github.com/geany/geany/commit/cc035ab99db99996d6667957a1a15cc93a555… Log Message: ----------- Merge branch 'gcc-warnings' Modified Paths: -------------- ctags/main/parse.c ctags/main/xtag.c ctags/parsers/actionscript.c ctags/parsers/cobol.c ctags/parsers/fortran.c ctags/parsers/html.c ctags/parsers/perl.c ctags/parsers/r.c src/build.c src/document.c src/editor.c src/encodings.c src/highlighting.c src/keybindings.c src/search.c src/tools.c Modified: ctags/main/parse.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -103,7 +103,7 @@ extern kindOption* getLanguageFileKind (const langType language) kind = LanguageTable [language]->fileKind; - Assert (kind != KIND_NULL); + Assert (kind != NULL); return kind; } @@ -316,7 +316,7 @@ static void initializeParserOne (langType lang) static void initializeParsers (void) { - int i; + unsigned int i; for (i = 0; i < LanguageCount; i++) initializeParserOne(i); } Modified: ctags/main/xtag.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -27,18 +27,18 @@ static bool isPseudoTagsEnabled (xtagDesc *pdesc CTAGS_ATTR_UNUSED) static xtagDesc xtagDescs [] = { { true, 'F', "fileScope", - "Include tags of file scope" }, + "Include tags of file scope", NULL}, { false, 'f', "inputFile", - "Include an entry for the base file name of every input file"}, + "Include an entry for the base file name of every input file", NULL}, { false, 'p', "pseudo", "Include pseudo tags", isPseudoTagsEnabled}, { false, 'q', "qualified", - "Include an extra class-qualified tag entry for each tag"}, + "Include an extra class-qualified tag entry for each tag", NULL}, { false, 'r', "reference", - "Include reference tags"}, + "Include reference tags", NULL}, { false, 's', "subparser", - "Include tags generated by sub parsers"}, + "Include tags generated by sub parsers", NULL}, }; extern xtagDesc* getXtagDesc (xtagType type) Modified: ctags/parsers/actionscript.c 20 lines changed, 10 insertions(+), 10 deletions(-) =================================================================== @@ -41,43 +41,43 @@ static tagRegexTable actionscriptTagRegexTable[] = { /* Functions */ {"^[ \t]*[(private|public|static|protected|internal|final|override)( \t)]*function[ \t]+([A-Za-z0-9_]+)[ \t]*\\(([^\\{]*)", - "\\1 (\\2", "f,function,functions,methods", NULL}, + "\\1 (\\2", "f,function,functions,methods", NULL, NULL}, /* Getters and setters */ {"^[ \t]*[(public|static|internal|final|override)( \t)]*function[ \t]+(set|get)[ \t]+([A-Za-z0-9_]+)[ \t]*\\(", - "\\2 \\1", "l,field,fields", NULL}, + "\\2 \\1", "l,field,fields", NULL, NULL}, /* Variables */ {"^[ \t]*[(private|public|static|protected|internal)( \t)]*var[ \t]+([A-Za-z0-9_]+)([ \t]*\\:[ \t]*([A-Za-z0-9_]+))*[ \t]*", - "\\1 \\: \\3", "v,variable,variables", NULL}, + "\\1 \\: \\3", "v,variable,variables", NULL, NULL}, /* Constants */ {"^[ \t]*[(private|public|static|protected|internal)( \t)]*const[ \t]+([A-Za-z0-9_]+)([ \t]*\\:[ \t]*([A-Za-z0-9_]+))*[ \t]*", - "\\1 : \\3", "m,macro,macros", NULL}, + "\\1 : \\3", "m,macro,macros", NULL, NULL}, /* Classes */ {"^[ \t]*[(private|public|static|dynamic|final|internal)( \t)]*class[ \t]+([A-Za-z0-9_]+)[ \t]*([^\\{]*)", - "\\1 (\\2)", "c,class,classes", NULL}, + "\\1 (\\2)", "c,class,classes", NULL, NULL}, /* Interfaces */ {"^[ \t]*[(private|public|static|dynamic|final|internal)( \t)]*interface[ \t]+([A-Za-z0-9_]+)[ \t]*([^\\{]*)", - "\\1 (\\2)", "i,interface,interfaces", NULL}, + "\\1 (\\2)", "i,interface,interfaces", NULL, NULL}, /* Packages */ {"^[ \t]*[(private|public|static)( \t)]*package[ \t]+([A-Za-z0-9_.]+)[ \t]*", - "\\1", "p,package", NULL}, + "\\1", "p,package", NULL, NULL}, /* Notes */ {"\\/\\/[ \t]*(NOTE|note|Note)[ \t]*\\:*(.*)", - "\\2", "o,other"}, + "\\2", "o,other", NULL, NULL}, /* Todos */ {"\\/\\/[ \t]*(TODO|todo|ToDo|Todo)[ \t]*\\:*(.*)", - "\\2", "o,other"}, + "\\2", "o,other", NULL, NULL}, /* Prototypes (Put this in for AS1 compatibility...) */ {".*\\.prototype\\.([A-Za-z0-9 ]+)[ \t]*\\=([ \t]*)function( [ \t]?)*\\(", - "\\1", "r,prototype"} + "\\1", "r,prototype", NULL, NULL} }; /* Modified: ctags/parsers/cobol.c 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -19,17 +19,17 @@ static tagRegexTable cobolTagRegexTable[] = { {"^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)[ \t]+(" "BLANK|OCCURS|IS|JUST|PIC|REDEFINES|RENAMES|SIGN|SYNC|USAGE|VALUE" ")", "\\1", - "d,data,data items", "i"}, + "d,data,data items", "i", NULL}, {"^[ \t]*[FSR]D[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "f,file,file descriptions (FD, SD, RD)", "i"}, + "f,file,file descriptions (FD, SD, RD)", "i", NULL}, {"^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "g,group,group items", "i"}, + "g,group,group items", "i", NULL}, {"^[ \t]*([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "p,paragraph,paragraphs", "i"}, + "p,paragraph,paragraphs", "i", NULL}, {"^[ \t]*PROGRAM-ID\\.[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "P,program,program ids", "i"}, + "P,program,program ids", "i", NULL}, {"^[ \t]*([A-Z0-9][A-Z0-9-]*)[ \t]+SECTION\\.", "\\1", - "s,section,sections", "i"}, + "s,section,sections", "i", NULL}, }; /* Modified: ctags/parsers/fortran.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -673,7 +673,7 @@ static int getFixedFormChar (void) Column = 6; break; } - /* fall through to next case */ + /* fall through */ case LTYPE_CONTINUATION: Column = 5; do @@ -1001,7 +1001,7 @@ static void readToken (tokenInfo *const token) skipLine (); Column = 0; } - /* fall through to newline case */ + /* fall through */ case '\n': token->type = TOKEN_STATEMENT_END; if (FreeSourceForm) Modified: ctags/parsers/html.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -20,9 +20,9 @@ static tagRegexTable htmlTagRegexTable [] = { {"<a" POSSIBLE_ATTRIBUTES "[ \t]+name=\"?([^>\"]+)\"?" POSSIBLE_ATTRIBUTES "[ \t]*>", "\\2", - "a,anchor,named anchors", "i"}, + "a,anchor,named anchors", "i", NULL}, {"^[ \t]*function[ \t]*([A-Za-z0-9_]+)[ \t]*\\(", "\\1", - "f,function,JavaScript functions", NULL}, + "f,function,JavaScript functions", NULL, NULL}, /* the following matches headings with tags inside like * <h1><a href="#id109"><i>Some Text</i></a></h1> @@ -34,13 +34,13 @@ static tagRegexTable htmlTagRegexTable [] = { ATTRS ">" SPACES "(<" ATTRS ">" SPACES ")*([^<]+).*" {"<h1" INNER_HEADING "</h1>", "\\2", - "n,namespace,H1 heading", "i"}, + "n,namespace,H1 heading", "i", NULL}, {"<h2" INNER_HEADING "</h2>", "\\2", - "c,class,H2 heading", "i"}, + "c,class,H2 heading", "i", NULL}, {"<h3" INNER_HEADING "</h3>", "\\2", - "v,variable,H3 heading", "i"}, + "v,variable,H3 heading", "i", NULL}, }; /* Modified: ctags/parsers/perl.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -138,9 +138,11 @@ static bool isSubroutineDeclaration (const unsigned char *cp) case ';': if (!nparens) return true; + /* fall through */ case '{': if (!nparens) return false; + /* fall through */ default: if (attr) { if (isIdentifier1(*cp)) { Modified: ctags/parsers/r.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -142,6 +142,7 @@ static void createRTags (void) break; } } + /* fall through */ case ' ': case '\x009': /* skip whitespace */ Modified: src/build.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2256,7 +2256,7 @@ static void build_load_menu_grp(GKeyFile *config, GeanyBuildCommand **dst, gint gsize prefixlen; /* NOTE prefixlen used in macros above */ GeanyBuildCommand *dstcmd; gchar *key; - static gchar cmdbuf[3] = " "; + static gchar cmdbuf[4] = " "; if (*dst == NULL) *dst = g_new0(GeanyBuildCommand, build_groups_count[grp]); Modified: src/document.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3701,7 +3701,7 @@ gboolean document_check_disk_status(GeanyDocument *doc, gboolean force) { gboolean ret = FALSE; gboolean use_gio_filemon; - time_t mtime; + time_t mtime = 0; gchar *locale_filename; FileDiskStatus old_status; Modified: src/editor.c 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -2391,6 +2391,8 @@ typedef struct #define CURSOR_PLACEHOLDER "_" /* Would rather use … but not all docs are unicode */ + + /* Replaces the internal cursor markers with the placeholder suitable for * display. Except for the first cursor if indicator_for_first is FALSE, * which is simply deleted. @@ -2400,10 +2402,9 @@ typedef struct static GSList *replace_cursor_markers(GeanyEditor *editor, GString *template, gboolean indicator_for_first) { - gssize cur_index = -1; gint i = 0; GSList *temp_list = NULL; - gint cursor_steps = 0, old_cursor = 0; + gint cursor_steps = 0; SelectionRange *sel; while (TRUE) @@ -2524,7 +2525,6 @@ void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint inser static gboolean find_next_snippet_indicator(GeanyEditor *editor, SelectionRange *sel) { ScintillaObject *sci = editor->sci; - gint val; gint pos = sci_get_current_position(sci); if (pos == sci_get_length(sci)) @@ -2552,7 +2552,6 @@ static gboolean find_next_snippet_indicator(GeanyEditor *editor, SelectionRange gboolean editor_goto_next_snippet_cursor(GeanyEditor *editor) { ScintillaObject *sci = editor->sci; - gint current_pos = sci_get_current_position(sci); SelectionRange sel; if (find_next_snippet_indicator(editor, &sel)) Modified: src/encodings.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -702,7 +702,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gss /* First check for preferred charset, if specified */ preferred_charset = file_prefs.default_open_encoding; - if (preferred_charset == encodings[GEANY_ENCODING_NONE].idx || + if (preferred_charset == (gint) encodings[GEANY_ENCODING_NONE].idx || preferred_charset < 0 || preferred_charset >= GEANY_ENCODINGS_MAX) { @@ -712,7 +712,7 @@ static gchar *encodings_convert_to_utf8_with_suggestion(const gchar *buffer, gss /* -1 means "Preferred charset" */ for (i = -1; i < GEANY_ENCODINGS_MAX; i++) { - if (G_UNLIKELY(i == encodings[GEANY_ENCODING_NONE].idx)) + if (G_UNLIKELY(i == (gint) encodings[GEANY_ENCODING_NONE].idx)) continue; if (check_suggestion) Modified: src/highlighting.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -284,10 +284,13 @@ static void parse_keyfile_style(GKeyFile *kf, gchar **list, { case 4: style->italic = utils_atob(list[3]); + /* fall through */ case 3: style->bold = utils_atob(list[2]); + /* fall through */ case 2: parse_color(kf, list[1], &style->background); + /* fall through */ case 1: parse_color(kf, list[0], &style->foreground); } Modified: src/keybindings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2614,8 +2614,8 @@ static gboolean cb_func_document_action(guint key_id) { gint line = sci_get_current_line(doc->editor->sci); editor_toggle_fold(doc->editor, line, 0); - break; } + break; case GEANY_KEYS_DOCUMENT_REMOVE_MARKERS: on_remove_markers1_activate(NULL, NULL); break; Modified: src/search.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1879,6 +1879,7 @@ static void search_finished(GPid child_pid, gint status, gpointer user_data) } case 1: msg = _("No matches found."); + /* fall through */ default: msgwin_msg_add_string(COLOR_BLUE, -1, NULL, msg); ui_set_statusbar(FALSE, "%s", msg); Modified: src/tools.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -648,6 +648,7 @@ static void word_count(gchar *text, guint *chars, guint *lines, guint *words) { case '\n': (*lines)++; + /* fall through */ case '\r': case '\f': case '\t': -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9e052a: Remove requirement to fail build on aggregate return
by elextr 12 Jan '18

12 Jan '18

Branch: refs/heads/elextr-patch-3 Author: elextr <elextr(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 12 Jan 2018 21:58:03 UTC Commit: 9e052ae0366f6c5c36b47ba7767b70d2e8e6c210 https://github.com/geany/geany/commit/9e052ae0366f6c5c36b47ba7767b70d2e8e6c… Log Message: ----------- Remove requirement to fail build on aggregate return Returning large aggregates as values is a potential performance problem, but preventing all aggregate returns is inappropriate because: 1. returning small aggregates that are mostly handled as complete objects as return values often makes code clearer. 2. Modern (well not so modern actually) ABIs allow for small aggregates to be returned in registers, so forcing all returns to memory is actually likely to be slower. 3. if code review does not notice a large aggregate return and nobody notices a performance issue then it doesn't matter Modified Paths: -------------- .travis.yml Modified: .travis.yml 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -21,7 +21,7 @@ install: - sudo apt-get install -y --no-install-recommends doxygen - sudo apt-get install -y python-lxml before_script: - - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=aggregate-return -Werror=implicit-function-declaration" + - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=implicit-function-declaration" script: - NOCONFIGURE=1 ./autogen.sh - > -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 662257: Fix double context menu in Terminal tab
by Matthew Brush 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 12 Jan 2018 21:55:07 UTC Commit: 6622574172a23993c19b3ce02e5190f252f01faf https://github.com/geany/geany/commit/6622574172a23993c19b3ce02e5190f252f01… Log Message: ----------- Fix double context menu in Terminal tab This was introduced in 1f71ccd because the VTE widget's existing button-press handler didn't return `TRUE` and so the event propogated up to the notebook showing both of their context menus. Modified Paths: -------------- src/vte.c Modified: src/vte.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -536,6 +536,7 @@ static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpo { gtk_widget_grab_focus(vc->vte); gtk_menu_popup(GTK_MENU(vc->menu), NULL, NULL, NULL, NULL, event->button, event->time); + return TRUE; } else if (event->button == 2) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7e1ab3: Return GdkColor via out parameter rather than return value
by Matthew Brush 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 12 Jan 2018 21:45:38 UTC Commit: 7e1ab31c18ab977f1756c7afa3eeb4061b9eb09e https://github.com/geany/geany/commit/7e1ab31c18ab977f1756c7afa3eeb4061b9eb… Log Message: ----------- Return GdkColor via out parameter rather than return value For some reason the TravisCI build has `-Waggregate-return` enabled as an error even though it's completely valid code. Also constify the input `color_name` argument to `load_color` function. Modified Paths: -------------- src/msgwindow.c Modified: src/msgwindow.c 21 lines changed, 9 insertions(+), 12 deletions(-) =================================================================== @@ -117,9 +117,8 @@ void msgwin_set_messages_dir(const gchar *messages_dir) } -GdkColor load_color(gchar *color_name) { - GdkColor color; - +void load_color(const gchar *color_name, GdkColor *color) +{ #if GTK_CHECK_VERSION(3, 0, 0) GdkRGBA rgba_color; GtkWidgetPath *path = gtk_widget_path_new(); @@ -131,9 +130,9 @@ GdkColor load_color(gchar *color_name) { gtk_style_context_set_path(ctx, path); gtk_style_context_get_color(ctx, gtk_style_context_get_state(ctx), &rgba_color); - color.red = 0xffff * rgba_color.red; - color.green = 0xffff * rgba_color.green; - color.blue = 0xffff * rgba_color.blue; + color->red = 0xffff * rgba_color.red; + color->green = 0xffff * rgba_color.green; + color->blue = 0xffff * rgba_color.blue; gtk_widget_path_unref(path); g_object_unref(ctx); @@ -142,12 +141,10 @@ GdkColor load_color(gchar *color_name) { GtkSettings *settings = gtk_settings_get_default(); GtkStyle *style = gtk_rc_get_style_by_paths(settings, path, NULL, GTK_TYPE_WIDGET); - color = style->fg[GTK_STATE_NORMAL]; + *color = style->fg[GTK_STATE_NORMAL]; g_free(path); #endif - - return color; } @@ -170,9 +167,9 @@ void msgwin_init(void) ui_widget_modify_font_from_string(msgwindow.scribble, interface_prefs.msgwin_font); g_signal_connect(msgwindow.scribble, "populate-popup", G_CALLBACK(on_scribble_populate), NULL); - color_error = load_color("geany-compiler-error"); - color_context = load_color("geany-compiler-context"); - color_message = load_color("geany-compiler-message"); + load_color("geany-compiler-error", &color_error); + load_color("geany-compiler-context", &color_context); + load_color("geany-compiler-message", &color_message); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6b973b: Theme improvements (#1382)
by Matthew Brush 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: elextr <elextr(a)gmail.com> Date: Fri, 12 Jan 2018 20:46:50 UTC Commit: 6b973bc70b6118c1d904d6d21626843b5e70beaa https://github.com/geany/geany/commit/6b973bc70b6118c1d904d6d21626843b5e70b… Log Message: ----------- Theme improvements (#1382) * Improve GTK+3 theme loading - Merge geany-3.0.css into geany.css - Load geany-3.20.css to override if runtime version dictates - Load geany.css from app->configdir if it exists. * Add initial documentation for GTK+ CSS theming * Add geany.css file to the `Tools->Configuration Files` menu Also mark such config files as changed if they don't already exist to force the user to save or discard any newly created config files. * Allow customizing message window using GTK+ themes * Improve GTK+3 CSS docs a bit State which classes are meant to be overridden by themes. * Go back to conditionally loading geany-3.0.css It can't be merged into geany.css since GTK+ CSS parser doesn't ignore invalid properties when prefixed with vendor extension (ie. -Gtk). * Don't mark unedited config files as changed They probably should be marked as changed since they don't exist on disk yet, but for the time being leave it how it was. * Fix misuse of CSS ID vs class in manual * Minor colour value tweaks Based on feedback from @b4n Modified Paths: -------------- data/geany-3.0.css data/geany-3.20.css data/geany.css data/geany.gtkrc doc/geany.txt src/msgwindow.c src/ui_utils.c Modified: data/geany-3.0.css 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,3 @@ -@import "geany.css"; - /* make close button on the editor's tabs smaller */ #geany-close-tab-button { -GtkWidget-focus-padding: 0; Modified: data/geany-3.20.css 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,3 @@ -@import "geany.css"; - /* make close button on the editor's tabs smaller */ #geany-close-tab-button { outline-offset: 0; Modified: data/geany.css 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -36,6 +36,17 @@ color: #007f00; } +/* compiler message colors */ +#geany-compiler-error { + color: #ff0000; +} +#geany-compiler-context { + color: #7f0000; +} +#geany-compiler-message { + color: #0000D0; +} + /* red "Terminal" label when terminal dirty */ #geany-terminal-dirty { color: #ff0000; Modified: data/geany.gtkrc 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -50,5 +50,22 @@ widget "*.geany-document-status-changed" style "geany-document-status-changed-st widget "*.geany-document-status-disk-changed" style "geany-document-status-disk-changed-style" widget "*.geany-document-status-readonly" style "geany-document-status-readonly-style" +# compiler message colors +style "geany-compiler-error-style" { + fg[NORMAL] = "#ffff00000000" + fg[ACTIVE] = "#ffff00000000" +} +style "geany-compiler-context-style" { + fg[NORMAL] = "#7f7f00000000" + fg[ACTIVE] = "#7f7f00000000" +} +style "geany-compiler-message-style" { + fg[NORMAL] = "#00000000D000" + fg[ACTIVE] = "#00000000D000" +} +widget "*.geany-compiler-error" style "geany-compiler-error-style" +widget "*.geany-compiler-context" style "geany-compiler-context-style" +widget "*.geany-compiler-message" style "geany-compiler-message-style" + # red "Terminal" label when terminal dirty widget "*.geany-terminal-dirty" style "geany-document-status-changed-style" Modified: doc/geany.txt 21 lines changed, 21 insertions(+), 0 deletions(-) =================================================================== @@ -494,6 +494,27 @@ An example of a simple ``.gtkrc-2.0``:: widget "GeanyPrefsDialog" style "geanyStyle" +Customizing Geany's appearance using GTK+ 3 CSS +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +To override GTK+ CSS styles, you can use traditional mechanisms or you +can create a file named ``geany.css`` in the user configuration directory +(usually ``~/.config/geany``) which will be loaded after other CSS styles +are applied to allow overriding the default styles. + +Geany offers a number of CSS IDs which can be used to taylor its +appearence. Among the more interesting include: + +* ``geany-compiler-context`` - the style used for build command output surrounding errors +* ``geany-compiler-error`` - the style used for build command errors +* ``geany-compiler-message`` - the style other output encountered while running build command +* ``geany-document-status-changed`` - the style for document tab labels when the document is changed +* ``geany-document-status-disk-changed`` - the style for document tab labels when the file on disk has changed +* ``geany-document-status-readyonly``` - the style for document tab labels when the document is read-only +* ``geany-search-entry-no-match`` - the style of find/replace diaog entries when no match is found +* ``geany-terminal-dirty`` - the style for the message window Terminal tab label when the terminal output has changed. + + Documents --------- Modified: src/msgwindow.c 53 lines changed, 45 insertions(+), 8 deletions(-) =================================================================== @@ -83,6 +83,11 @@ enum }; +static GdkColor color_error = {0, 0xFFFF, 0, 0}; +static GdkColor color_context = {0, 0x7FFF, 0, 0}; +static GdkColor color_message = {0, 0, 0, 0xD000}; + + static void prepare_msg_tree_view(void); static void prepare_status_tree_view(void); static void prepare_compiler_tree_view(void); @@ -112,6 +117,40 @@ void msgwin_set_messages_dir(const gchar *messages_dir) } +GdkColor load_color(gchar *color_name) { + GdkColor color; + +#if GTK_CHECK_VERSION(3, 0, 0) + GdkRGBA rgba_color; + GtkWidgetPath *path = gtk_widget_path_new(); + GtkStyleContext *ctx = gtk_style_context_new(); + + gtk_widget_path_append_type(path, GTK_TYPE_WINDOW); + gtk_widget_path_iter_set_name(path, -1, color_name); + gtk_style_context_set_screen(ctx, gdk_screen_get_default()); + gtk_style_context_set_path(ctx, path); + gtk_style_context_get_color(ctx, gtk_style_context_get_state(ctx), &rgba_color); + + color.red = 0xffff * rgba_color.red; + color.green = 0xffff * rgba_color.green; + color.blue = 0xffff * rgba_color.blue; + + gtk_widget_path_unref(path); + g_object_unref(ctx); +#else + gchar *path = g_strconcat("*.", color_name, NULL); + + GtkSettings *settings = gtk_settings_get_default(); + GtkStyle *style = gtk_rc_get_style_by_paths(settings, path, NULL, GTK_TYPE_WIDGET); + color = style->fg[GTK_STATE_NORMAL]; + + g_free(path); +#endif + + return color; +} + + void msgwin_init(void) { msgwindow.notebook = ui_lookup_widget(main_widgets.window, "notebook_info"); @@ -130,6 +169,10 @@ void msgwin_init(void) ui_widget_modify_font_from_string(msgwindow.scribble, interface_prefs.msgwin_font); g_signal_connect(msgwindow.scribble, "populate-popup", G_CALLBACK(on_scribble_populate), NULL); + + color_error = load_color("geany-compiler-error"); + color_context = load_color("geany-compiler-context"); + color_message = load_color("geany-compiler-message"); } @@ -262,19 +305,13 @@ static void prepare_compiler_tree_view(void) /*g_signal_connect(selection, "changed", G_CALLBACK(on_msg_tree_selection_changed), NULL);*/ } - -static const GdkColor color_error = {0, 65535, 0, 0}; - static const GdkColor *get_color(gint msg_color) { - static const GdkColor dark_red = {0, 65535 / 2, 0, 0}; - static const GdkColor blue = {0, 0, 0, 0xD000}; /* not too bright ;-) */ - switch (msg_color) { case COLOR_RED: return &color_error; - case COLOR_DARK_RED: return &dark_red; - case COLOR_BLUE: return &blue; + case COLOR_DARK_RED: return &color_context; + case COLOR_BLUE: return &color_message; default: return NULL; } } Modified: src/ui_utils.c 100 lines changed, 68 insertions(+), 32 deletions(-) =================================================================== @@ -2492,53 +2492,85 @@ void ui_init_builder(void) } -static void init_custom_style(void) -{ #if GTK_CHECK_VERSION(3, 0, 0) - const struct { - guint version; - const gchar *file; - } css_files[] = { - /* - * Keep these from newest to oldest, - * and make sure 0 remains last - */ - { 20, "geany-3.20.css" }, - { 0, "geany-3.0.css" }, - }; - guint gtk_version = gtk_get_minor_version(); - gsize i = 0; - gchar *css_file; - GtkCssProvider *css = gtk_css_provider_new(); +static void load_css_theme(const gchar *fn, guint priority) +{ + GtkCssProvider *provider = gtk_css_provider_new(); GError *error = NULL; - /* gtk_version will never be smaller than 0 */ - while (css_files[i].version > gtk_version) - ++i; - - css_file = g_build_filename(app->datadir, css_files[i].file, NULL); - if (! gtk_css_provider_load_from_path(css, css_file, &error)) + if (! gtk_css_provider_load_from_path(provider, fn, &error)) { g_warning("Failed to load custom CSS: %s", error->message); g_error_free(error); + return; } - else + + gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), + GTK_STYLE_PROVIDER(provider), priority); + geany_debug("Loaded GTK+ CSS theme '%s'", fn); + + g_object_unref(provider); +} + + +// see setup_gtk2_styles() in libmain.c for GTK+ 2-specific theme initialization +static void init_css_styles(void) +{ + gchar *theme_fn; + + // load the main geany.css file from system data dir + theme_fn = g_build_filename(app->datadir, "geany.css", NULL); + load_css_theme(theme_fn, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_free(theme_fn); + + // load themes to handle breakage between various GTK+ versions + const struct + { + guint min_version; + guint max_version; + const gchar *file; + } + css_files[] = + { + { 20, G_MAXUINT, "geany-3.20.css" }, + { 0, 19, "geany-3.0.css" }, + }; + + guint gtk_version = gtk_get_minor_version(); + for (guint i = 0; i < G_N_ELEMENTS(css_files); i++) { - gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), - GTK_STYLE_PROVIDER(css), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + if (gtk_version >= css_files[i].min_version && + gtk_version <= css_files[i].max_version) + { + theme_fn = g_build_filename(app->datadir, css_files[i].file, NULL); + load_css_theme(theme_fn, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_free(theme_fn); + } } - g_object_unref(css); - g_free(css_file); -#else - /* see setup_gtk2_styles() in main.c */ -#endif + // if the user provided a geany.css file in their config dir, try and load that + theme_fn = g_build_filename(app->configdir, "geany.css", NULL); + if (g_file_test(theme_fn, G_FILE_TEST_EXISTS)) + load_css_theme(theme_fn, GTK_STYLE_PROVIDER_PRIORITY_USER); + g_free(theme_fn); } +static void add_css_config_file_item(void) +{ + gchar *theme_fn; + theme_fn = g_build_filename(app->configdir, "geany.css", NULL); + ui_add_config_file_menu_item(theme_fn, NULL, NULL); + g_free(theme_fn); +} +#endif // GTK3 + + void ui_init(void) { - init_custom_style(); +#if GTK_CHECK_VERSION(3, 0, 0) + init_css_styles(); +#endif init_recent_files(); @@ -2585,7 +2617,11 @@ void ui_init(void) ui_init_toolbar_widgets(); init_document_widgets(); + create_config_files_menu(); +#if GTK_CHECK_VERSION(3, 0, 0) + add_css_config_file_item(); +#endif } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 385fff: Merge pull request #1642 from LarsGit223/NoActionCmd
by Colomban Wendling 12 Jan '18

12 Jan '18

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 12 Jan 2018 06:18:16 UTC Commit: 385fff7b270e1b9e4c43c01d7636158fd5cd294a https://github.com/geany/geany/commit/385fff7b270e1b9e4c43c01d7636158fd5cd2… Log Message: ----------- Merge pull request #1642 from LarsGit223/NoActionCmd Show status message on attempt to execute empty context action. Modified Paths: -------------- src/callbacks.c Modified: src/callbacks.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1500,6 +1500,10 @@ void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data) } g_free(command_line); } + else + { + ui_set_statusbar(TRUE, _("No context action set.")); + } g_free(word); g_free(command); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 01b0fc: Show status message on attempt to execute empty context action.
by LarsDW223 05 Jan '18

05 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Fri, 05 Jan 2018 08:41:56 UTC Commit: 01b0fc6a536441f88ec16c5371980507585472e8 https://github.com/geany/geany/commit/01b0fc6a536441f88ec16c537198050758547… Log Message: ----------- Show status message on attempt to execute empty context action. If a user selects "context action" from the context menu then now the status message 'No context action set.' will be shown. Closes #1641. Modified Paths: -------------- src/callbacks.c Modified: src/callbacks.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1500,6 +1500,10 @@ void on_context_action1_activate(GtkMenuItem *menuitem, gpointer user_data) } g_free(command_line); } + else + { + ui_set_statusbar(TRUE, _("No context action set.")); + } g_free(word); g_free(command); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2018