Commits February 2025

commits@lists.geany.org

1 participants
48 discussions

[geany/geany] 8d47a6: regex: Remove unused variable
by Jiří Techet 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 06 Feb 2025 15:15:48 UTC Commit: 8d47a666b806351cb922a3671dd70e521a727e9a https://github.com/geany/geany/commit/8d47a666b806351cb922a3671dd70e521a727… Log Message: ----------- regex: Remove unused variable clang reports: ../ctags/gnu_regex/regex_internal.c:697:36: warning: variable 'q' set but not used [-Wunused-but-set-variable] 697 | const unsigned char *raw, *p, *q, *end; Modified Paths: -------------- ctags/gnu_regex/regex_internal.c Modified: ctags/gnu_regex/regex_internal.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -694,7 +694,7 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) if (pstr->is_utf8) { - const unsigned char *raw, *p, *q, *end; + const unsigned char *raw, *p, *end; /* Special case UTF-8. Multi-byte chars start with any byte other than 0x80 - 0xbf. */ @@ -723,13 +723,11 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags) unsigned char buf[6]; size_t mbclen; - q = p; if (BE (pstr->trans != NULL, 0)) { int i = mlen < 6 ? mlen : 6; while (--i >= 0) buf[i] = pstr->trans[p[i]]; - q = buf; } /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a949e6: Fix initial sensitivity of the inconsistent line end pref
by Colomban Wendling 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 30 Jan 2025 23:16:19 UTC Commit: a949e69524c6e467ed74075a0ffc7c12b3a510c8 https://github.com/geany/geany/commit/a949e69524c6e467ed74075a0ffc7c12b3a51… Log Message: ----------- Fix initial sensitivity of the inconsistent line end pref Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -590,6 +590,7 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); + on_check_line_end_toggled(GTK_TOGGLE_BUTTON(widget), NULL); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] be86af: Merge pull request #4221 from b4n/line-end-pref-sensitive
by Colomban Wendling 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: GitHub <noreply(a)github.com> Date: Thu, 06 Feb 2025 00:00:22 UTC Commit: be86af8f8012d9085dadc1fdf97f71038c39e5a7 https://github.com/geany/geany/commit/be86af8f8012d9085dadc1fdf97f71038c39e… Log Message: ----------- Merge pull request #4221 from b4n/line-end-pref-sensitive Fix initial sensitivity of the inconsistent line end pref Modified Paths: -------------- src/prefs.c Modified: src/prefs.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -590,6 +590,7 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_end"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), editor_prefs.show_line_endings); + on_check_line_end_toggled(GTK_TOGGLE_BUTTON(widget), NULL); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_line_endings_only_when_differ"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 416714: Merge pull request #4228 from techee/kr_fix
by Colomban Wendling 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 05 Feb 2025 23:49:11 UTC Commit: 416714a74b6e6e51430bd313003d8628d021557c https://github.com/geany/geany/commit/416714a74b6e6e51430bd313003d8628d0215… Log Message: ----------- Merge pull request #4228 from techee/kr_fix Fix some warnings on macOS with clang Modified Paths: -------------- ctags/gnu_regex/regcomp.c ctags/gnu_regex/regex.h ctags/gnu_regex/regexec.c ctags/parsers/geany_lcpp.c src/filetypes.c src/socket.c Modified: ctags/gnu_regex/regcomp.c 19 lines changed, 5 insertions(+), 14 deletions(-) =================================================================== @@ -212,10 +212,7 @@ const size_t __re_error_msgid_idx[] attribute_hidden = are set in BUFP on entry. */ const char * -re_compile_pattern (pattern, length, bufp) - const char *pattern; - size_t length; - struct re_pattern_buffer *bufp; +re_compile_pattern (const char *pattern, size_t length, struct re_pattern_buffer *bufp) { reg_errcode_t ret; @@ -253,8 +250,7 @@ reg_syntax_t re_syntax_options; defined in regex.h. We return the old syntax. */ reg_syntax_t -re_set_syntax (syntax) - reg_syntax_t syntax; +re_set_syntax (reg_syntax_t syntax) { reg_syntax_t ret = re_syntax_options; @@ -266,8 +262,7 @@ weak_alias (__re_set_syntax, re_set_syntax) #endif int -re_compile_fastmap (bufp) - struct re_pattern_buffer *bufp; +re_compile_fastmap (struct re_pattern_buffer *bufp) { re_dfa_t *dfa = (re_dfa_t *) bufp->buffer; char *fastmap = bufp->fastmap; @@ -465,10 +460,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, the return codes and their meanings.) */ int -regcomp (preg, pattern, cflags) - regex_t *__restrict preg; - const char *__restrict pattern; - int cflags; +regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags) { reg_errcode_t ret; reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED @@ -635,8 +627,7 @@ free_dfa_content (re_dfa_t *dfa) /* Free dynamically allocated space used by PREG. */ void -regfree (preg) - regex_t *preg; +regfree (regex_t *preg) { re_dfa_t *dfa = (re_dfa_t *) preg->buffer; if (BE (dfa != NULL, 1)) Modified: ctags/gnu_regex/regex.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -350,7 +350,7 @@ typedef enum #ifdef __USE_GNU # define __REPB_PREFIX(name) name #else -# define __REPB_PREFIX(name) __##name +# define __REPB_PREFIX(name) __priv_##name #endif struct re_pattern_buffer Modified: ctags/gnu_regex/regexec.c 80 lines changed, 25 insertions(+), 55 deletions(-) =================================================================== @@ -218,12 +218,8 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx) We return 0 if we find a match and REG_NOMATCH if not. */ int -regexec (preg, string, nmatch, pmatch, eflags) - const regex_t *__restrict preg; - const char *__restrict string; - size_t nmatch; - regmatch_t pmatch[]; - int eflags; +regexec (const regex_t *__restrict preg, const char *__restrict string, + size_t nmatch, regmatch_t pmatch[], int eflags) { reg_errcode_t err; int start, length; @@ -306,11 +302,8 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0); match was found and -2 indicates an internal error. */ int -re_match (bufp, string, length, start, regs) - struct re_pattern_buffer *bufp; - const char *string; - int length, start; - struct re_registers *regs; +re_match (struct re_pattern_buffer *bufp, const char *string, int length, + int start, struct re_registers *regs) { return re_search_stub (bufp, string, length, start, 0, length, regs, 1); } @@ -319,11 +312,7 @@ weak_alias (__re_match, re_match) #endif int -re_search (bufp, string, length, start, range, regs) - struct re_pattern_buffer *bufp; - const char *string; - int length, start, range; - struct re_registers *regs; +re_search (struct re_pattern_buffer *bufp, const char *string, int length, int start, int range, struct re_registers *regs) { return re_search_stub (bufp, string, length, start, range, length, regs, 0); } @@ -332,11 +321,9 @@ weak_alias (__re_search, re_search) #endif int -re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int length1, length2, start, stop; - struct re_registers *regs; +re_match_2 (struct re_pattern_buffer *bufp, const char *string1, + int length1, const char *string2, int length2, int start, + struct re_registers *regs, int stop) { return re_search_2_stub (bufp, string1, length1, string2, length2, start, 0, regs, stop, 1); @@ -346,11 +333,9 @@ weak_alias (__re_match_2, re_match_2) #endif int -re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int length1, length2, start, range, stop; - struct re_registers *regs; +re_search_2 (struct re_pattern_buffer *bufp, const char *string1, + int length1, const char *string2, int length2, int start, int range, + struct re_registers *regs, int stop) { return re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, stop, 0); @@ -360,12 +345,10 @@ weak_alias (__re_search_2, re_search_2) #endif static int -re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, - stop, ret_len) - struct re_pattern_buffer *bufp; - const char *string1, *string2; - int length1, length2, start, range, stop, ret_len; - struct re_registers *regs; +re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, + int length1, const char *string2, int length2, + int start, int range, struct re_registers *regs, + int stop, int ret_len) { const char *str; int rval; @@ -410,11 +393,9 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, otherwise the position of the match is returned. */ static int -re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) - struct re_pattern_buffer *bufp; - const char *string; - int length, start, range, stop, ret_len; - struct re_registers *regs; +re_search_stub (struct re_pattern_buffer *bufp, const char *string, + int length, int start, int range, int stop, struct re_registers *regs, + int ret_len) { reg_errcode_t result; regmatch_t *pmatch; @@ -501,10 +482,7 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) } static unsigned -re_copy_regs (regs, pmatch, nregs, regs_allocated) - struct re_registers *regs; - regmatch_t *pmatch; - int nregs, regs_allocated; +re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, int regs_allocated) { int rval = REGS_REALLOCATE; int i; @@ -570,11 +548,8 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated) freeing the old data. */ void -re_set_registers (bufp, regs, num_regs, starts, ends) - struct re_pattern_buffer *bufp; - struct re_registers *regs; - unsigned num_regs; - regoff_t *starts, *ends; +re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs, + unsigned num_regs, regoff_t *starts, regoff_t *ends) { if (num_regs) { @@ -621,13 +596,9 @@ re_exec (s) (START + RANGE >= 0 && START + RANGE <= LENGTH) */ static reg_errcode_t -re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch, - eflags) - const regex_t *preg; - const char *string; - int length, start, range, stop, eflags; - size_t nmatch; - regmatch_t pmatch[]; +re_search_internal (const regex_t *preg, const char *string, int length, + int start, int range, int stop, size_t nmatch, + regmatch_t pmatch[], int eflags) { reg_errcode_t err; const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer; @@ -940,8 +911,7 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch, } static reg_errcode_t -prune_impossible_nodes (mctx) - re_match_context_t *mctx; +prune_impossible_nodes (re_match_context_t *mctx) { const re_dfa_t *const dfa = mctx->dfa; int halt_node, match_last; Modified: ctags/parsers/geany_lcpp.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -646,11 +646,9 @@ static int skipToEndOfCxxRawLiteralString (void) static int skipToEndOfChar (void) { int c; - int count = 0; while ((c = getcAndCollect ()) != EOF) { - ++count; if (c == BACKSLASH) getcAndCollect (); /* throw away next character, too */ else if (c == SINGLE_QUOTE) Modified: src/filetypes.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -106,8 +106,6 @@ static GeanyFiletypeGroupID get_group(const gchar *name) static GeanyFiletypeGroupID get_filetype_group(const gchar *title, const gchar *name) { - GeanyFiletypeGroupID ret; - if (g_strcmp0(name, "None") == 0) return GEANY_FILETYPE_GROUP_NONE; Modified: src/socket.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -289,14 +289,14 @@ gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port, con #else gchar *display_name = NULL; const gchar *hostname = g_get_host_name(); - GdkDisplay *display = gdk_display_get_default(); gchar *p; /* On OS X with quartz backend gdk_display_get_name() returns hostname * using [NSHost currentHost] (it could return more or less whatever string * as display name is a X11 specific thing). This call can lead to network * query and block for several seconds so better skip it. */ #ifndef GDK_WINDOWING_QUARTZ + GdkDisplay *display = gdk_display_get_default(); if (display != NULL) display_name = g_strdup(gdk_display_get_name(display)); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 196659: Fix clang warning in regex.h
by Jiří Techet 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 05 Feb 2025 23:45:21 UTC Commit: 1966593193dffdd3d4c908b6fea42bffd7318c66 https://github.com/geany/geany/commit/1966593193dffdd3d4c908b6fea42bffd7318… Log Message: ----------- Fix clang warning in regex.h Without this patch, clang generates warnings like the below because of the clash with the __used attribute: ./gnu_regex/regex.h:367:3: warning: declaration does not declare anything [-Wmissing-declarations] 367 | unsigned long int __REPB_PREFIX(used); | ^~~~~~~~~~~~~~~~~ CC optlib/meson.lo Patch provided by Colomban Wendling, thanks! Modified Paths: -------------- ctags/gnu_regex/regex.h Modified: ctags/gnu_regex/regex.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -350,7 +350,7 @@ typedef enum #ifdef __USE_GNU # define __REPB_PREFIX(name) name #else -# define __REPB_PREFIX(name) __##name +# define __REPB_PREFIX(name) __priv_##name #endif struct re_pattern_buffer -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] eddaf3: Remove unused variables
by Jiří Techet 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 05 Feb 2025 23:36:37 UTC Commit: eddaf38690b7e0119e46b5576f5ac0cd3e5ea221 https://github.com/geany/geany/commit/eddaf38690b7e0119e46b5576f5ac0cd3e5ea… Log Message: ----------- Remove unused variables Modified Paths: -------------- ctags/parsers/geany_lcpp.c src/filetypes.c Modified: ctags/parsers/geany_lcpp.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -646,11 +646,9 @@ static int skipToEndOfCxxRawLiteralString (void) static int skipToEndOfChar (void) { int c; - int count = 0; while ((c = getcAndCollect ()) != EOF) { - ++count; if (c == BACKSLASH) getcAndCollect (); /* throw away next character, too */ else if (c == SINGLE_QUOTE) Modified: src/filetypes.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -106,8 +106,6 @@ static GeanyFiletypeGroupID get_group(const gchar *name) static GeanyFiletypeGroupID get_filetype_group(const gchar *title, const gchar *name) { - GeanyFiletypeGroupID ret; - if (g_strcmp0(name, "None") == 0) return GEANY_FILETYPE_GROUP_NONE; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 265e32: Avoid warning about unused variable when using quartz
by Jiří Techet 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 05 Feb 2025 23:36:37 UTC Commit: 265e32cc805d84db2f73b36325979c93ed791686 https://github.com/geany/geany/commit/265e32cc805d84db2f73b36325979c93ed791… Log Message: ----------- Avoid warning about unused variable when using quartz Modified Paths: -------------- src/socket.c Modified: src/socket.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -289,14 +289,14 @@ gint socket_init(gint argc, gchar **argv, G_GNUC_UNUSED gushort socket_port, con #else gchar *display_name = NULL; const gchar *hostname = g_get_host_name(); - GdkDisplay *display = gdk_display_get_default(); gchar *p; /* On OS X with quartz backend gdk_display_get_name() returns hostname * using [NSHost currentHost] (it could return more or less whatever string * as display name is a X11 specific thing). This call can lead to network * query and block for several seconds so better skip it. */ #ifndef GDK_WINDOWING_QUARTZ + GdkDisplay *display = gdk_display_get_default(); if (display != NULL) display_name = g_strdup(gdk_display_get_name(display)); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6f33ae: Merge pull request #4230 from b4n/string-plus-int
by Colomban Wendling 06 Feb '25

06 Feb '25

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 05 Feb 2025 23:30:01 UTC Commit: 6f33aefb7c51e99a7534de44ee97e91d8c23ddf2 https://github.com/geany/geany/commit/6f33aefb7c51e99a7534de44ee97e91d8c23d… Log Message: ----------- Merge pull request #4230 from b4n/string-plus-int Avoid clang string-plus-int warning Modified Paths: -------------- tests/test_encodings.c Modified: tests/test_encodings.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -137,7 +137,7 @@ static void test_encodings_convert_utf8_to_utf8_auto(void) G_STMT_START { \ gboolean has_bom = strncmp(str, UTF8_BOM, 3) == 0; \ g_assert(success == assert_convert_to_utf8_auto(str, G_N_ELEMENTS(str) - 1, G_N_ELEMENTS(str) - 1, \ - forced_enc, str + (has_bom ? 3 : 0), G_N_ELEMENTS(str) - 1 - (has_bom ? 3 : 0), \ + forced_enc, &str[has_bom ? 3 : 0], G_N_ELEMENTS(str) - 1 - (has_bom ? 3 : 0), \ forced_enc, has_bom, strlen(str) != G_N_ELEMENTS(str) - 1)); \ } G_STMT_END -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 10efab: Merge pull request #4205 from techee/win_dark_experiment
by Jiří Techet 05 Feb '25

05 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 05 Feb 2025 22:58:04 UTC Commit: 10efabbbc8151b384a9c1647b8079a6fe34d267e https://github.com/geany/geany/commit/10efabbbc8151b384a9c1647b8079a6fe34d2… Log Message: ----------- Merge pull request #4205 from techee/win_dark_experiment Use themed title bar on Windows Modified Paths: -------------- src/search.c src/ui_utils.c src/win32.c src/win32.h Modified: src/search.c 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -44,6 +44,7 @@ #include "toolbar.h" #include "ui_utils.h" #include "utils.h" +#include "win32.h" #include <unistd.h> #include <string.h> @@ -547,6 +548,10 @@ static void create_find_dialog(void) GTK_BUTTON_BOX(bbox)); gtk_container_add(GTK_CONTAINER(exp), bbox); gtk_container_add(GTK_CONTAINER(vbox), exp); + +#ifdef G_OS_WIN32 + win32_update_titlebar_theme(find_dlg.dialog); +#endif } @@ -731,6 +736,10 @@ static void create_replace_dialog(void) GTK_BUTTON_BOX(bbox)); gtk_container_add(GTK_CONTAINER(exp), bbox); gtk_container_add(GTK_CONTAINER(vbox), exp); + +#ifdef G_OS_WIN32 + win32_update_titlebar_theme(replace_dlg.dialog); +#endif } @@ -1029,6 +1038,10 @@ static void create_fif_dialog(void) G_CALLBACK(on_find_in_files_dialog_response), NULL); g_signal_connect(fif_dlg.dialog, "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL); + +#ifdef G_OS_WIN32 + win32_update_titlebar_theme(fif_dlg.dialog); +#endif } Modified: src/ui_utils.c 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -2521,6 +2521,11 @@ void ui_init_builder(void) widget = GTK_WIDGET(iter->data); +#ifdef G_OS_WIN32 + if (GTK_IS_WINDOW(widget)) + win32_update_titlebar_theme(widget); +#endif + name = ui_guess_object_name(G_OBJECT(widget)); if (! name) { Modified: src/win32.c 38 lines changed, 38 insertions(+), 0 deletions(-) =================================================================== @@ -53,12 +53,17 @@ #include <windows.h> #include <commdlg.h> +#include <dwmapi.h> #include <shellapi.h> #include <shlobj.h> #include <glib/gstdio.h> #include <gdk/gdkwin32.h> +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + /* Little wrapper for _waccess(), returns errno or 0 if there was no error */ gint win32_check_write_permission(const gchar *dir) @@ -327,4 +332,37 @@ gchar *win32_get_user_config_dir(void) return g_build_filename(g_get_user_config_dir(), "geany", NULL); } + +static void on_update_titlebar_theme_realized(GtkWidget *widget, gpointer data) +{ + GdkWindow *gdk_window = gtk_widget_get_window(widget); + + g_return_if_fail(gdk_window != NULL); + + HWND hwnd = (HWND)gdk_win32_window_get_handle(gdk_window); + if (hwnd) + { + BOOL use_dark_mode = TRUE; + DwmSetWindowAttribute(hwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, &use_dark_mode, sizeof(use_dark_mode)); + } +} + +/* Makes titlebar dark when using dark theme; call this before + * gtk_widget_show(window) to avoid titlebar color change */ +void win32_update_titlebar_theme(GtkWidget *window) +{ + const gchar *reg_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; + gboolean is_light_theme = TRUE; + DWORD val; + DWORD data_size = sizeof(val); + + g_return_if_fail(GTK_IS_WINDOW(window)); + + if (RegGetValueA(HKEY_CURRENT_USER, reg_path, "AppsUseLightTheme", RRF_RT_DWORD, NULL, &val, &data_size) == ERROR_SUCCESS) + is_light_theme = val; + + if (!is_light_theme) + g_signal_connect(window, "realize", G_CALLBACK(on_update_titlebar_theme_realized), NULL); +} + #endif Modified: src/win32.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -47,6 +47,8 @@ gchar *win32_expand_environment_variables(const gchar *str); gchar *win32_get_user_config_dir(void); +void win32_update_titlebar_theme(GtkWidget *window); + G_END_DECLS #endif /* G_OS_WIN32 */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 101bd5: Workaround incorrect scaling of "reverse arrow" cursor under Windows and HiDPI screens
by Jiří Techet 05 Feb '25

05 Feb '25

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 14 Jan 2025 21:21:24 UTC Commit: 101bd516de3da8f3e47056aa72cdbbaf5685fa60 https://github.com/geany/geany/commit/101bd516de3da8f3e47056aa72cdbbaf5685f… Log Message: ----------- Workaround incorrect scaling of "reverse arrow" cursor under Windows and HiDPI screens The GDK_RIGHT_PTR cursor is provided only by GTK - there's no native Windows cursor of this shape so GTK renders the cursor by itself from the cursor theme bitmap. The code doing this is apparently buggy and does not take into account HiDPI screens so on a screen with 300% scaling, the cursor is 3x smaller. Workaround this by using GDK_HAND2 which maps to a native Windows cursor that doesn't suffer from this problem. See https://sourceforge.net/p/scintilla/bugs/2460/ Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx Modified: scintilla/gtk/PlatGTK.cxx 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1346,7 +1346,13 @@ void Window::SetCursor(Cursor curs) { gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_HAND2); break; case Cursor::reverseArrow: +#ifdef G_OS_WIN32 + // GDK_RIGHT_PTR is scaled incorrectly under Windows with HiDPI screens (GTK 3.24); + // GDK_HAND2 is mapped to a native Windows cursor by GTK + gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_HAND2); +#else gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_RIGHT_PTR); +#endif break; default: gdkCurs = gdk_cursor_new_for_display(pdisplay, GDK_LEFT_PTR); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2025