Commits December 2013

commits@lists.geany.org

1 participants
26 discussions

[geany/geany] dec7b9: Autotools: always put object files in the source file's directory
by Colomban Wendling 17 Dec '13

17 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 17 Dec 2013 14:42:34 UTC Commit: dec7b939fb07dd29bd61d9625a88503183ab14b6 https://github.com/geany/geany/commit/dec7b939fb07dd29bd61d9625a88503183ab1… Log Message: ----------- Autotools: always put object files in the source file's directory Enable Automake option "subdir-object" to put all object files next to their source file rather than in the directory containing the Makefile. This is quite expected, and will be the future behavior of Automake in all cases, so enabling it now avoids future unexpected change. Modified Paths: -------------- configure.ac Modified: configure.ac 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,7 @@ AC_INIT([Geany], [1.24], AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests]) +AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests subdir-objects]) AC_CONFIG_HEADERS([config.h]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -26,6 +26,7 @@ AC_USE_SYSTEM_EXTENSIONS m4_ifdef([AM_PROG_AR],[AM_PROG_AR]) AC_PROG_CC AC_PROG_CC_C99 +AM_PROG_CC_C_O AC_PROG_CXX # check for C++ compiler explicitly and fail if none is found, do this check -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0592b4: Autotools: enable Automake warnings
by Colomban Wendling 17 Dec '13

17 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 17 Dec 2013 14:41:22 UTC Commit: 0592b4410cd24eaad3ebb6547620dbc0b8b4d1c1 https://github.com/geany/geany/commit/0592b4410cd24eaad3ebb6547620dbc0b8b4d… Log Message: ----------- Autotools: enable Automake warnings Modified Paths: -------------- configure.ac Modified: configure.ac 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,7 @@ AC_INIT([Geany], [1.24], AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 parallel-tests]) +AM_INIT_AUTOMAKE([1.11 -Wall parallel-tests]) AC_CONFIG_HEADERS([config.h]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -23,6 +23,7 @@ fi # why do we use this? AC_USE_SYSTEM_EXTENSIONS +m4_ifdef([AM_PROG_AR],[AM_PROG_AR]) AC_PROG_CC AC_PROG_CC_C99 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-themes] 2a6bb2: Update solarized-dark.conf
by Dan 12 Dec '13

12 Dec '13

Branch: refs/heads/master Author: Dan <me(a)haengebruegge.de> Committer: Dan <me(a)haengebruegge.de> Date: Thu, 12 Dec 2013 11:49:07 UTC Commit: 2a6bb28dd05689bc1b8bc839880246f722645854 https://github.com/geany/geany-themes/commit/2a6bb28dd05689bc1b8bc839880246… Log Message: ----------- Update solarized-dark.conf In geany there is an addon that shows on doubleclick all matched elements. With this change, in solarized colors, it will the display the matched elements in a better way than before. Modified Paths: -------------- colorschemes/solarized-dark.conf Modified: colorschemes/solarized-dark.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -71,7 +71,7 @@ fold_symbol_highlight=base02 indent_guide=base01 caret=base3 marker_line=; -marker_search=; +marker_search=;base2 marker_mark=; call_tips=base0;base03 white_space=indent_guide -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 98b825: Plug a few possible small memory leaks
by Colomban Wendling 06 Dec '13

06 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Dec 2013 20:39:59 UTC Commit: 98b82550a8344c2615c986fb235096e7d517911a https://github.com/geany/geany/commit/98b82550a8344c2615c986fb235096e7d5179… Log Message: ----------- Plug a few possible small memory leaks Modified Paths: -------------- src/keyfile.c src/toolbar.c Modified: src/keyfile.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -843,7 +843,7 @@ static void load_dialog_prefs(GKeyFile *config) vte_info.dir = utils_get_setting_string(config, "VTE", "last_dir", NULL); if ((vte_info.dir == NULL || utils_str_equal(vte_info.dir, "")) && pw != NULL) /* last dir is not set, fallback to user's home directory */ - vte_info.dir = g_strdup(pw->pw_dir); + SETPTR(vte_info.dir, g_strdup(pw->pw_dir)); else if (vte_info.dir == NULL && pw == NULL) /* fallback to root */ vte_info.dir = g_strdup("/"); @@ -888,7 +888,7 @@ static void load_dialog_prefs(GKeyFile *config) cmd = utils_get_setting_string(config, "tools", "terminal_cmd", ""); if (EMPTY(cmd)) { - cmd = utils_get_setting_string(config, "tools", "term_cmd", ""); + SETPTR(cmd, utils_get_setting_string(config, "tools", "term_cmd", "")); if (!EMPTY(cmd)) { tmp_string = cmd; @@ -903,7 +903,7 @@ static void load_dialog_prefs(GKeyFile *config) g_free(tmp_string); } else - cmd = g_strdup(GEANY_DEFAULT_TOOLS_TERMINAL); + SETPTR(cmd, g_strdup(GEANY_DEFAULT_TOOLS_TERMINAL)); } tool_prefs.term_cmd = cmd; tool_prefs.browser_cmd = utils_get_setting_string(config, "tools", "browser_cmd", GEANY_DEFAULT_TOOLS_BROWSER); Modified: src/toolbar.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -794,7 +794,10 @@ static void tb_editor_drag_data_get_cb(GtkWidget *widget, GdkDragContext *contex gtk_tree_model_get(model, &iter, TB_EDITOR_COL_ACTION, &name, -1); if (G_UNLIKELY(EMPTY(name))) + { + g_free(name); return; + } atom = gdk_atom_intern(tb_editor_dnd_targets[0].target, FALSE); gtk_selection_data_set(data, atom, 8, (guchar*) name, strlen(name)); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ddf67a: VTE: properly use the default value for invalid configured colors
by Colomban Wendling 06 Dec '13

06 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Dec 2013 19:18:27 UTC Commit: ddf67a8586302e1dced6dbb6062e5f1797a18a9e https://github.com/geany/geany/commit/ddf67a8586302e1dced6dbb6062e5f1797a18… Log Message: ----------- VTE: properly use the default value for invalid configured colors Modified Paths: -------------- src/keyfile.c Modified: src/keyfile.c 18 files changed, 12 insertions(+), 6 deletions(-) =================================================================== @@ -688,6 +688,16 @@ void configuration_load_session_files(GKeyFile *config, gboolean read_recent_fil } +static void get_setting_color(GKeyFile *config, const gchar *section, const gchar *key, + GdkColor *color, const gchar *default_color) +{ + gchar *str = utils_get_setting_string(config, section, key, NULL); + if (str == NULL || ! utils_parse_color(str, color)) + utils_parse_color(default_color, color); + g_free(str); +} + + /* note: new settings should be added in init_pref_groups() */ static void load_dialog_prefs(GKeyFile *config) { @@ -854,12 +864,8 @@ static void load_dialog_prefs(GKeyFile *config) vc->skip_run_script = utils_get_setting_boolean(config, "VTE", "skip_run_script", FALSE); vc->cursor_blinks = utils_get_setting_boolean(config, "VTE", "cursor_blinks", FALSE); vc->scrollback_lines = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500); - tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff"); - utils_parse_color(tmp_string, &vc->colour_fore); - g_free(tmp_string); - tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000"); - utils_parse_color(tmp_string, &vc->colour_back); - g_free(tmp_string); + get_setting_color(config, "VTE", "colour_fore", &vc->colour_fore, "#ffffff"); + get_setting_color(config, "VTE", "colour_back", &vc->colour_back, "#000000"); } #endif /* templates */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4aff51: Remove unnecessary allocation for VTE color settings
by Colomban Wendling 06 Dec '13

06 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 05 Dec 2013 19:16:54 UTC Commit: 4aff511b018f43bcefa108269c78c974848b27c4 https://github.com/geany/geany/commit/4aff511b018f43bcefa108269c78c974848b2… Log Message: ----------- Remove unnecessary allocation for VTE color settings Modified Paths: -------------- src/keyfile.c src/prefs.c src/vte.c src/vte.h Modified: src/keyfile.c 10 files changed, 4 insertions(+), 6 deletions(-) =================================================================== @@ -517,10 +517,10 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_string(config, "VTE", "font", vc->font); g_key_file_set_string(config, "VTE", "image", vc->image); g_key_file_set_string(config, "VTE", "shell", vc->shell); - tmp_string = utils_get_hex_from_color(vc->colour_fore); + tmp_string = utils_get_hex_from_color(&vc->colour_fore); g_key_file_set_string(config, "VTE", "colour_fore", tmp_string); g_free(tmp_string); - tmp_string = utils_get_hex_from_color(vc->colour_back); + tmp_string = utils_get_hex_from_color(&vc->colour_back); g_key_file_set_string(config, "VTE", "colour_back", tmp_string); g_free(tmp_string); } @@ -854,13 +854,11 @@ static void load_dialog_prefs(GKeyFile *config) vc->skip_run_script = utils_get_setting_boolean(config, "VTE", "skip_run_script", FALSE); vc->cursor_blinks = utils_get_setting_boolean(config, "VTE", "cursor_blinks", FALSE); vc->scrollback_lines = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500); - vc->colour_fore = g_new0(GdkColor, 1); - vc->colour_back = g_new0(GdkColor, 1); tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff"); - utils_parse_color(tmp_string, vc->colour_fore); + utils_parse_color(tmp_string, &vc->colour_fore); g_free(tmp_string); tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000"); - utils_parse_color(tmp_string, vc->colour_back); + utils_parse_color(tmp_string, &vc->colour_back); g_free(tmp_string); } #endif Modified: src/prefs.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -764,10 +764,10 @@ static void prefs_init_dialog(void) gtk_font_button_set_font_name(GTK_FONT_BUTTON(widget), vc->font); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "color_fore"); - gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), vc->colour_fore); + gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &vc->colour_fore); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "color_back"); - gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), vc->colour_back); + gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &vc->colour_back); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); gtk_entry_set_text(GTK_ENTRY(widget), vc->image); Modified: src/vte.c 16 files changed, 5 insertions(+), 11 deletions(-) =================================================================== @@ -313,8 +313,6 @@ void vte_close(void) g_free(vc->shell); g_free(vc->image); g_free(vc->font); - g_free(vc->colour_back); - g_free(vc->colour_fore); g_free(vc->send_cmd_prefix); g_free(vc); g_free(gtk_menu_key_accel); @@ -487,9 +485,9 @@ void vte_apply_user_settings(void) vf->vte_terminal_set_scroll_on_output(VTE_TERMINAL(vc->vte), vc->scroll_on_out); vf->vte_terminal_set_emulation(VTE_TERMINAL(vc->vte), vc->emulation); vf->vte_terminal_set_font_from_string(VTE_TERMINAL(vc->vte), vc->font); - vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), vc->colour_fore); - vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), vc->colour_fore); - vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), vc->colour_back); + vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), &vc->colour_fore); + vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), &vc->colour_fore); + vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), &vc->colour_back); vf->vte_terminal_set_background_image_file(VTE_TERMINAL(vc->vte), vc->image); vf->vte_terminal_set_audible_bell(VTE_TERMINAL(vc->vte), prefs.beep_on_errors); vte_set_cursor_blink_mode(); @@ -761,17 +759,13 @@ G_MODULE_EXPORT void on_term_font_set(GtkFontButton *widget, gpointer user_data) G_MODULE_EXPORT void on_term_fg_color_set(GtkColorButton *widget, gpointer user_data) { - g_free(vc->colour_fore); - vc->colour_fore = g_new0(GdkColor, 1); - gtk_color_button_get_color(widget, vc->colour_fore); + gtk_color_button_get_color(widget, &vc->colour_fore); } G_MODULE_EXPORT void on_term_bg_color_set(GtkColorButton *widget, gpointer user_data) { - g_free(vc->colour_back); - vc->colour_back = g_new0(GdkColor, 1); - gtk_color_button_get_color(widget, vc->colour_back); + gtk_color_button_get_color(widget, &vc->colour_back); } Modified: src/vte.h 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -57,8 +57,8 @@ gchar *image; gchar *font; gchar *send_cmd_prefix; - GdkColor *colour_fore; - GdkColor *colour_back; + GdkColor colour_fore; + GdkColor colour_back; } VteConfig; extern VteConfig *vc; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 69f1cc: Remove useless rotate_rgb()
by Colomban Wendling 04 Dec '13

04 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 04 Dec 2013 14:49:47 UTC Commit: 69f1cc7136dcb44bba21c9d6a4a54c2c7219f27f https://github.com/geany/geany/commit/69f1cc7136dcb44bba21c9d6a4a54c2c7219f… Log Message: ----------- Remove useless rotate_rgb() Modified Paths: -------------- src/highlighting.c Modified: src/highlighting.c 11 files changed, 1 insertions(+), 10 deletions(-) =================================================================== @@ -319,15 +319,6 @@ static void get_keyfile_style(GKeyFile *config, GKeyFile *configh, } -/* Convert 0xRRGGBB to 0xBBGGRR, which scintilla expects. */ -static gint rotate_rgb(gint color) -{ - return ((color & 0xFF0000) >> 16) + - (color & 0x00FF00) + - ((color & 0x0000FF) << 16); -} - - static void convert_int(const gchar *int_str, gint *val) { gchar *end; @@ -671,7 +662,7 @@ static void styleset_common(ScintillaObject *sci, guint ft_id) /* Error indicator */ SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_ERROR, INDIC_SQUIGGLEPIXMAP); - SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR, invert(rotate_rgb(0xff0000))); + SSM(sci, SCI_INDICSETFORE, GEANY_INDICATOR_ERROR, invert(0x0000FF /* red, in BGR */)); /* Search indicator, used for 'Mark' matches */ SSM(sci, SCI_INDICSETSTYLE, GEANY_INDICATOR_SEARCH, INDIC_ROUNDBOX); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4ce640: Remove useless utils_invert_color()
by Colomban Wendling 04 Dec '13

04 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 04 Dec 2013 14:46:05 UTC Commit: 4ce6409e898b3b7d9b63f98b8e4017a138533dde https://github.com/geany/geany/commit/4ce6409e898b3b7d9b63f98b8e4017a138533… Log Message: ----------- Remove useless utils_invert_color() Modified Paths: -------------- src/highlighting.c src/utils.c src/utils.h Modified: src/highlighting.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -391,7 +391,7 @@ static void get_keyfile_ints(GKeyFile *config, GKeyFile *configh, const gchar *s static guint invert(guint icolour) { if (interface_prefs.highlighting_invert_all) - return utils_invert_color(icolour); + return 0xffffff - icolour; return icolour; } Modified: src/utils.c 12 files changed, 0 insertions(+), 12 deletions(-) =================================================================== @@ -872,18 +872,6 @@ gchar *utils_get_hex_from_color(GdkColor *color) } -guint utils_invert_color(guint color) -{ - guint r, g, b; - - r = 0xffffff - color; - g = 0xffffff - (color >> 8); - b = 0xffffff - (color >> 16); - - return (r | (g << 8) | (b << 16)); -} - - /* Get directory from current file in the notebook. * Returns dir string that should be freed or NULL, depending on whether current file is valid. * Returned string is in UTF-8 encoding */ Modified: src/utils.h 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -209,8 +209,6 @@ guint utils_string_regex_replace_all(GString *haystack, GRegex *regex, gchar *utils_get_hex_from_color(GdkColor *color); -guint utils_invert_color(guint color); - const gchar *utils_get_default_dir_utf8(void); gchar *utils_get_current_file_dir_utf8(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 898097: Unify color parsing
by Colomban Wendling 04 Dec '13

04 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 04 Dec 2013 14:31:17 UTC Commit: 898097063098b5ec73611f5d0359d963922b9dd3 https://github.com/geany/geany/commit/898097063098b5ec73611f5d0359d963922b9… Log Message: ----------- Unify color parsing Change utils_parse_color() to use gdk_color_parse() and follow its syntax, additionally supporting our "0x" prefix as a synonym for the "#" prefix; and use this everywhere. Also add utils_color_to_bgr() and utils_parse_color_to_bgr() to provide conversion to the 24 bits BGR format used by Scintilla. Modified Paths: -------------- src/highlighting.c src/keyfile.c src/prefs.c src/sciwrappers.c src/tools.c src/utils.c src/utils.h src/win32.c Modified: src/highlighting.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -230,7 +230,7 @@ static void parse_color(GKeyFile *kf, const gchar *str, gint *clr) if (named_color) str = named_color; - c = utils_parse_color(str); + c = utils_parse_color_to_bgr(str); if (c == -1) geany_debug("Bad color '%s'", str); else Modified: src/keyfile.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -857,10 +857,10 @@ static void load_dialog_prefs(GKeyFile *config) vc->colour_fore = g_new0(GdkColor, 1); vc->colour_back = g_new0(GdkColor, 1); tmp_string = utils_get_setting_string(config, "VTE", "colour_fore", "#ffffff"); - gdk_color_parse(tmp_string, vc->colour_fore); + utils_parse_color(tmp_string, vc->colour_fore); g_free(tmp_string); tmp_string = utils_get_setting_string(config, "VTE", "colour_back", "#000000"); - gdk_color_parse(tmp_string, vc->colour_back); + utils_parse_color(tmp_string, vc->colour_back); g_free(tmp_string); } #endif Modified: src/prefs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -477,7 +477,7 @@ static void prefs_init_dialog(void) } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); - gdk_color_parse(editor_prefs.long_line_color, &color); + utils_parse_color(editor_prefs.long_line_color, &color); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "long_line_color"); gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &color); Modified: src/sciwrappers.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -69,7 +69,7 @@ void sci_set_line_numbers(ScintillaObject *sci, gboolean set, gint extra_width) void sci_set_mark_long_lines(ScintillaObject *sci, gint type, gint column, const gchar *colour) { - glong colour_val = utils_parse_color(colour); /* Scintilla uses a "long" value */ + glong colour_val = utils_parse_color_to_bgr(colour); /* Scintilla uses a "long" value */ if (column == 0) type = 2; Modified: src/tools.c 12 files changed, 2 insertions(+), 10 deletions(-) =================================================================== @@ -980,7 +980,7 @@ void tools_color_chooser(const gchar *color) #ifdef G_OS_WIN32 win32_show_color_dialog(color); #else - gchar *c = (gchar*) color; + GdkColor gc; GtkWidget *colorsel; if (ui_widgets.open_colorsel == NULL) @@ -999,16 +999,8 @@ void tools_color_chooser(const gchar *color) else colorsel = gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(ui_widgets.open_colorsel)); /* if color is non-NULL set it in the dialog as preselected color */ - if (c != NULL && (c[0] == '0' || c[0] == '#')) + if (color != NULL && utils_parse_color(color, &gc)) { - GdkColor gc; - - if (c[0] == '0' && c[1] == 'x') - { /* we have a string of the format "0x00ff00" and we need it to "#00ff00" */ - c[1] = '#'; - c++; - } - gdk_color_parse(c, &gc); gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &gc); gtk_color_selection_set_previous_color(GTK_COLOR_SELECTION(colorsel), &gc); } Modified: src/utils.c 65 files changed, 27 insertions(+), 38 deletions(-) =================================================================== @@ -964,55 +964,44 @@ gchar *utils_make_human_readable_str(guint64 size, gulong block_size, } -static gboolean read_hex(const gchar *s, guint len, gint *h) +/* converts a color representation using gdk_color_parse(), with additional + * support of the "0x" prefix as a synonym for "#" */ +gboolean utils_parse_color(const gchar *spec, GdkColor *color) { - guint i; - *h = 0; - for (i = 0; i < len; i++) + gchar buf[64] = {0}; + + g_return_val_if_fail(spec != NULL, -1); + + if (spec[0] == '0' && (spec[1] == 'x' || spec[1] == 'X')) { - if (! g_ascii_isxdigit(s[i])) - return FALSE; - *h = (*h << 4) | g_ascii_xdigit_value(s[i]); + /* convert to # format for GDK to understand it */ + buf[0] = '#'; + strncpy(buf + 1, spec + 2, sizeof(buf) - 2); + spec = buf; } - return TRUE; + + return gdk_color_parse(spec, color); } -/* Converts a string containing an hex or HTML RGB color with 1 or 2 digits per - * channel (0x00ff11, 0x0f1, #00ff11, #0f1) to an integer. - * Returns an integer color in the format BBGGRR or -1 on failure. */ -gint utils_parse_color(const gchar *source) +/* converts a GdkColor to the packed 24 bits BGR format, as understood by Scintilla + * returns a 24 bits BGR color, or -1 on failure */ +gint utils_color_to_bgr(const GdkColor *c) { - gint r, g, b; - guint len; + g_return_val_if_fail(c != NULL, -1); + return (c->red / 256) | ((c->green / 256) << 8) | ((c->blue / 256) << 16); +} - g_return_val_if_fail(source != NULL, -1); - if (source[0] == '#') - source++; - else if (source[0] == '0' && (source[1] == 'x' || source[1] == 'X')) - source += 2; +/* parses @p spec using utils_parse_color() and convert it to 24 bits BGR using + * utils_color_to_bgr() */ +gint utils_parse_color_to_bgr(const gchar *spec) +{ + GdkColor color; + if (utils_parse_color(spec, &color)) + return utils_color_to_bgr(&color); else return -1; - - len = strlen(source); - if (len % 3 || len < 3 || len > 6) - return -1; - len /= 3; - - if (! read_hex(source, len, &r) || - ! read_hex(source + len, len, &g) || - ! read_hex(source + len * 2, len, &b)) - return -1; - - if (len < 2) - { - r |= r << 4; - g |= g << 4; - b |= b << 4; - } - - return (r | (g << 8) | (b << 16)); } Modified: src/utils.h 6 files changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -220,7 +220,11 @@ guint utils_string_regex_replace_all(GString *haystack, GRegex *regex, gchar *utils_make_human_readable_str(guint64 size, gulong block_size, gulong display_unit); -gint utils_parse_color(const gchar *source); +gboolean utils_parse_color(const gchar *spec, GdkColor *color); + +gint utils_color_to_bgr(const GdkColor *color); + +gint utils_parse_color_to_bgr(const gchar *spec); gchar *utils_get_current_time_string(void); Modified: src/win32.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -565,7 +565,7 @@ void win32_show_color_dialog(const gchar *colour) cc.lStructSize = sizeof(cc); cc.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window)); cc.lpCustColors = (LPDWORD) acr_cust_clr; - cc.rgbResult = (colour != NULL) ? utils_parse_color(colour) : 0; + cc.rgbResult = (colour != NULL) ? utils_parse_color_to_bgr(colour) : 0; cc.Flags = CC_FULLOPEN | CC_RGBINIT; if (ChooseColor(&cc)) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 159000: Remove an unnecessary allocation
by Colomban Wendling 04 Dec '13

04 Dec '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 04 Dec 2013 13:59:05 UTC Commit: 1590007862ce13b14e3af6e0f4f1d1b5afb73554 https://github.com/geany/geany/commit/1590007862ce13b14e3af6e0f4f1d1b5afb73… Log Message: ----------- Remove an unnecessary allocation Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 8 files changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -396,7 +396,7 @@ static void kb_init(void) static void prefs_init_dialog(void) { GtkWidget *widget; - GdkColor *color; + GdkColor color = {0}; /* Synchronize with Stash settings */ prefs_action(PREF_DISPLAY); @@ -477,11 +477,9 @@ static void prefs_init_dialog(void) } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); - color = g_new0(GdkColor, 1); - gdk_color_parse(editor_prefs.long_line_color, color); + gdk_color_parse(editor_prefs.long_line_color, &color); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "long_line_color"); - gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), color); - g_free(color); + gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &color); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_show_notebook_tabs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), interface_prefs.show_notebook_tabs); -------------- 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 December 2013