Commits August 2014

commits@lists.geany.org

1 participants
94 discussions

[geany/geany] 3ff01a: JavaScript: recognize assignation to a parenthesized expression
by Colomban Wendling 03 Aug '14

03 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Aug 2014 17:07:59 UTC Commit: 3ff01aeeb30462fe8b9c82740cae4a2e419c9587 https://github.com/geany/geany/commit/3ff01aeeb30462fe8b9c82740cae4a2e419c9… Log Message: ----------- JavaScript: recognize assignation to a parenthesized expression Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/bug2777310.js tests/ctags/bug2777310.js.tags Modified: tagmanager/ctags/js.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1433,6 +1433,8 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) /* * Handle nameless functions * this.method_name = () {} + * Also assignments starting with parentheses + * var foo = (1 + 2) * 3; */ skipArgumentList(token); @@ -1446,6 +1448,8 @@ static boolean parseStatement (tokenInfo *const token, boolean is_inside_class) } else if (isType (token, TOKEN_CLOSE_CURLY)) is_terminated = FALSE; + else if (token->nestLevel == 0 && is_global) + makeJsTag (name, JSTAG_VARIABLE); } else if (isType (token, TOKEN_OPEN_CURLY)) { Modified: tests/ctags/bug2777310.js 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,6 @@ var x = 1; var z = {}; var y = []; +var a = (42 + 1) * 2; +var b = 2 * (42 + 1); Modified: tests/ctags/bug2777310.js.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,6 @@ # format=tagmanager +a�16384�0 +b�16384�0 x�16384�0 y�16384�0 z�16384�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b596aa: JavaScript: don't choke when returning object literals
by Colomban Wendling 03 Aug '14

03 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Aug 2014 14:57:26 UTC Commit: b596aa14e82967d02d711c48cd62e631c29bea65 https://github.com/geany/geany/commit/b596aa14e82967d02d711c48cd62e631c29be… Log Message: ----------- JavaScript: don't choke when returning object literals Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/complex-return.js tests/ctags/complex-return.js.tags Modified: tagmanager/ctags/js.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1663,6 +1663,10 @@ static boolean parseLine (tokenInfo *const token, boolean is_inside_class) case KEYWORD_switch: parseSwitch (token); break; + case KEYWORD_return: + findCmdTerm (token); + is_terminated = isType (token, TOKEN_SEMICOLON); + break; default: is_terminated = parseStatement (token, is_inside_class); break; Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,7 @@ test_sources = \ char-selector.f90 \ classes.php \ common.f \ + complex-return.js \ continuation.f90 \ countall.sql \ cpp_destructor.cpp \ Modified: tests/ctags/complex-return.js 61 lines changed, 61 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,61 @@ + +function func1() { + return { a: 1, b:2 }; +} + +function func2() { + return 42; +} + +var class1 = function() { + this.method1 = function() { + return 42; + }; + this.method2 = function() { + return { a:1, b:2 }; + }; + this.method3 = function() { + return [1, 2, 3]; + }; + this.method4 = function() { + return "hello"; + }; +}; + +var class2 = function() { + this.c2m1 = function() { + c2m3(function() { + return { 'test': {} }; + }); + }; + this.c2m2 = function(f) { + return { 'ret': f() }; + }; + this.c2m3 = function(f) { + return f(); + }; +}; + +var class3 = function() { + this.c3m1 = function() { + return function(n) { + if (n == 42) { + return 0; + } else { + return (n + 1) % 42; + } + }; + }; + this.c3m2 = function() { + return 0; + }; +} + +var class4 = function() { + this.method1 = function() { + return [{a:1, b:2}, {a:3, b:4}, {a:5, b:6}]; + }; + this.method2 = function() { + return 0; + }; +}; Modified: tests/ctags/complex-return.js.tags 18 lines changed, 18 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,18 @@ +# format=tagmanager +c2m1�128�class2�0 +c2m2�128�class2�0 +c2m3�128�class2�0 +c3m1�128�class3�0 +c3m2�128�class3�0 +class1�1�0 +class2�1�0 +class3�1�0 +class4�1�0 +func1�16�0 +func2�16�0 +method1�128�class1�0 +method1�128�class4�0 +method2�128�class1�0 +method2�128�class4�0 +method3�128�class1�0 +method4�128�class1�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bc9b2f: JavaScript: don't choke on array lists
by Colomban Wendling 03 Aug '14

03 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 03 Aug 2014 14:52:11 UTC Commit: bc9b2fa4445b6b870f2be942aa27d49994985ae9 https://github.com/geany/geany/commit/bc9b2fa4445b6b870f2be942aa27d49994985… Log Message: ----------- JavaScript: don't choke on array lists Modified Paths: -------------- tagmanager/ctags/js.c tests/ctags/Makefile.am tests/ctags/arraylist.js tests/ctags/arraylist.js.tags Modified: tagmanager/ctags/js.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -660,6 +660,10 @@ static void findCmdTerm (tokenInfo *const token) { skipArgumentList(token); } + else if ( isType (token, TOKEN_OPEN_SQUARE) ) + { + skipArrayList(token); + } else { readToken (token); Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -14,6 +14,7 @@ test_sources = \ 68hc11.asm \ angle_bracket.cpp \ anonymous_functions.php \ + arraylist.js \ array_ref_and_out.cs \ array_spec.f90 \ array-spec.f90 \ Modified: tests/ctags/arraylist.js 20 lines changed, 20 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,20 @@ + +var a = []; +var b = [1, 2, 3]; +var c = [ + { a: "hello", b: 42 }, + { a: "hi", b: 41 } +]; + +var class = function() { + this.test1 = { + foo: [ 1, 2, 3], + bar: [ 4, 5, 9] + }; + // FIXME: no tag is generated for test2 + this.test2 = [ + { a: {}, b: {} }, + { a: {}, b: {} } + ]; + this.test3 = function() {} +} Modified: tests/ctags/arraylist.js.tags 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +# format=tagmanager +a�16384�0 +b�16384�0 +bar�64�class.test1�0 +c�16384�0 +class�1�0 +foo�64�class.test1�0 +test1�1�class�0 +test3�128�class�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3c2d93: Refactor win32 native dialog-mainloop update code
by Matthew Brush 03 Aug '14

03 Aug '14

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sun, 03 Aug 2014 11:23:19 UTC Commit: 3c2d93eca42d550fe416a9200e6a67a82bcd7afe https://github.com/geany/geany/commit/3c2d93eca42d550fe416a9200e6a67a82bcd7… Log Message: ----------- Refactor win32 native dialog-mainloop update code Just cleaning up last commit. Modified Paths: -------------- src/win32.c Modified: src/win32.c 74 lines changed, 40 insertions(+), 34 deletions(-) =================================================================== @@ -83,68 +83,74 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error); +/* The timer handle used to refresh windows below modal native dialogs. If + * ever more than one dialog can be shown at a time, this needs to be changed + * to be for specific dialogs. */ static UINT_PTR dialog_timer = 0; +G_INLINE_FUNC void win32_dialog_reset_timer(HWND hwnd) +{ + if (G_UNLIKELY(dialog_timer != 0)) + { + KillTimer(hwnd, dialog_timer); + dialog_timer = 0; + } +} + + VOID CALLBACK win32_dialog_update_main_window(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { gint i; + + /* Pump the main window loop a bit, but not enough to lock-up. + * The typical `while(gtk_events_pending()) gtk_main_iteration();` + * loop causes the entire operating system to lock-up. */ for (i = 0; i < 4 && gtk_events_pending(); i++) gtk_main_iteration(); - dialog_timer = 0; -} - -VOID CALLBACK win32_dialog_timer_expired(HWND hwnd, UINT msg, UINT_PTR idEvent, DWORD dwTime) -{ - while (gtk_events_pending()) - gtk_main_iteration(); + /* Cancel any pending timers since we just did an update */ + win32_dialog_reset_timer(hwnd); } -/* This function is called for OPENFILENAME lpfnHook function and it establishes - * a timer that is reset each time which will update the main window loop eventually */ -UINT_PTR CALLBACK win32_dialog_explorer_hook_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +G_INLINE_FUNC UINT_PTR win32_dialog_queue_main_window_redraw(HWND dlg, UINT msg, + WPARAM wParam, LPARAM lParam, gboolean postpone) { switch (msg) { + /* Messages that likely mean the window below a dialog needs to be re-drawn. */ case WM_WINDOWPOSCHANGED: case WM_MOVE: case WM_SIZE: case WM_THEMECHANGED: - { - if (dialog_timer != 0) - KillTimer(dlg, dialog_timer); - dialog_timer = SetTimer(dlg, 0, 33 /* around 30fps */, win32_dialog_update_main_window); - } + if (postpone) + { + win32_dialog_reset_timer(dlg); + dialog_timer = SetTimer(dlg, 0, 33 /* around 30fps */, win32_dialog_update_main_window); + } + else + win32_dialog_update_main_window(dlg, msg, wParam, lParam); + break; } return 0; /* always let the default proc handle it */ } +/* This function is called for OPENFILENAME lpfnHook function and it establishes + * a timer that is reset each time which will update the main window loop eventually. */ +UINT_PTR CALLBACK win32_dialog_explorer_hook_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return win32_dialog_queue_main_window_redraw(dlg, msg, wParam, lParam, TRUE); +} + + /* This function is called for old-school win32 dialogs that accept a proper - * lpfnHook function for all messages. It doesn't use a timer but instead checks - * GTK+ events pending and clamps to some arbitrary limit to prevent freeze-ups. */ + * lpfnHook function for all messages, it doesn't use a timer. */ UINT_PTR CALLBACK win32_dialog_hook_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) { - switch (msg) - { - case WM_WINDOWPOSCHANGED: - case WM_MOVE: - case WM_SIZE: - case WM_THEMECHANGED: - { - /* Pump the main window loop a bit, but not enough to lock-up. - * The typical `while(gtk_events_pending()) gtk_main_iteration();` - * loop causes the entire operating system to lock-up. */ - guint i; - for (i = 0; i < 4 && gtk_events_pending(); i++) - gtk_main_iteration(); - break; - } - } - return 0; /* always let the default proc handle it */ + return win32_dialog_queue_main_window_redraw(dlg, msg, wParam, lParam, FALSE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] eb267d: For native win32 dialogs, pump main window loop a bit
by Matthew Brush 03 Aug '14

03 Aug '14

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Sun, 03 Aug 2014 03:29:02 UTC Commit: eb267d30cbe1fe603d315d7f165bdff7ed574b2c https://github.com/geany/geany/commit/eb267d30cbe1fe603d315d7f165bdff7ed574… Log Message: ----------- For native win32 dialogs, pump main window loop a bit Mostly gets rid of re-drawing issues, however is not great. Modified Paths: -------------- src/win32.c Modified: src/win32.c 87 lines changed, 80 insertions(+), 7 deletions(-) =================================================================== @@ -83,6 +83,71 @@ static gboolean CreateChildProcess(geany_win32_spawn *gw_spawn, TCHAR *szCmdline static VOID ReadFromPipe(HANDLE hRead, HANDLE hWrite, HANDLE hFile, GError **error); +static UINT_PTR dialog_timer = 0; + + +VOID CALLBACK +win32_dialog_update_main_window(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + gint i; + for (i = 0; i < 4 && gtk_events_pending(); i++) + gtk_main_iteration(); + dialog_timer = 0; +} + + +VOID CALLBACK win32_dialog_timer_expired(HWND hwnd, UINT msg, UINT_PTR idEvent, DWORD dwTime) +{ + while (gtk_events_pending()) + gtk_main_iteration(); +} + + +/* This function is called for OPENFILENAME lpfnHook function and it establishes + * a timer that is reset each time which will update the main window loop eventually */ +UINT_PTR CALLBACK win32_dialog_explorer_hook_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_WINDOWPOSCHANGED: + case WM_MOVE: + case WM_SIZE: + case WM_THEMECHANGED: + { + if (dialog_timer != 0) + KillTimer(dlg, dialog_timer); + dialog_timer = SetTimer(dlg, 0, 33 /* around 30fps */, win32_dialog_update_main_window); + } + } + return 0; /* always let the default proc handle it */ +} + + +/* This function is called for old-school win32 dialogs that accept a proper + * lpfnHook function for all messages. It doesn't use a timer but instead checks + * GTK+ events pending and clamps to some arbitrary limit to prevent freeze-ups. */ +UINT_PTR CALLBACK win32_dialog_hook_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_WINDOWPOSCHANGED: + case WM_MOVE: + case WM_SIZE: + case WM_THEMECHANGED: + { + /* Pump the main window loop a bit, but not enough to lock-up. + * The typical `while(gtk_events_pending()) gtk_main_iteration();` + * loop causes the entire operating system to lock-up. */ + guint i; + for (i = 0; i < 4 && gtk_events_pending(); i++) + gtk_main_iteration(); + break; + } + } + return 0; /* always let the default proc handle it */ +} + + static wchar_t *get_file_filters(void) { gchar *string; @@ -206,6 +271,7 @@ static wchar_t *get_dir_for_path(const gchar *utf8_filename) * folder when the dialog is initialised. Yeah, I like Windows. */ INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData) { + win32_dialog_hook_proc(hwnd, uMsg, lp, pData); switch (uMsg) { case BFFM_INITIALIZED: @@ -309,7 +375,8 @@ gchar *win32_show_project_open_dialog(GtkWidget *parent, const gchar *title, of.lpstrFileTitle = NULL; of.lpstrTitle = w_title; of.lpstrDefExt = L""; - of.Flags = OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_HIDEREADONLY; + of.Flags = OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_ENABLEHOOK; + of.lpfnHook = win32_dialog_explorer_hook_proc; if (! allow_new_file) of.Flags |= OFN_FILEMUSTEXIST; @@ -371,7 +438,8 @@ gboolean win32_show_document_open_dialog(GtkWindow *parent, const gchar *title, of.lpstrFileTitle = NULL; of.lpstrTitle = w_title; of.lpstrDefExt = L""; - of.Flags = OFN_ALLOWMULTISELECT | OFN_FILEMUSTEXIST | OFN_EXPLORER; + of.Flags = OFN_ALLOWMULTISELECT | OFN_FILEMUSTEXIST | OFN_EXPLORER | OFN_ENABLEHOOK; + of.lpfnHook = win32_dialog_explorer_hook_proc; retval = GetOpenFileNameW(&of); @@ -464,7 +532,8 @@ gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, of.lpstrFileTitle = NULL; of.lpstrTitle = w_title; of.lpstrDefExt = L""; - of.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER; + of.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER | OFN_ENABLEHOOK; + of.lpfnHook = win32_dialog_explorer_hook_proc; retval = GetSaveFileNameW(&of); if (! retval) @@ -516,7 +585,8 @@ gchar *win32_show_file_dialog(GtkWindow *parent, const gchar *title, const gchar of.lpstrFileTitle = NULL; of.lpstrTitle = w_title; of.lpstrDefExt = L""; - of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER; + of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER | OFN_ENABLEHOOK; + of.lpfnHook = win32_dialog_explorer_hook_proc; retval = GetOpenFileNameW(&of); if (! retval) @@ -551,7 +621,8 @@ void win32_show_font_dialog(void) cf.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window)); cf.lpLogFont = &lf; /* support CF_APPLY? */ - cf.Flags = CF_NOSCRIPTSEL | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS; + cf.Flags = CF_NOSCRIPTSEL | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS | CF_ENABLEHOOK; + cf.lpfnHook = win32_dialog_hook_proc; retval = ChooseFont(&cf); @@ -578,7 +649,8 @@ void win32_show_color_dialog(const gchar *colour) 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_to_bgr(colour) : 0; - cc.Flags = CC_FULLOPEN | CC_RGBINIT; + cc.Flags = CC_FULLOPEN | CC_RGBINIT | CC_ENABLEHOOK; + cc.lpfnHook = win32_dialog_hook_proc; if (ChooseColor(&cc)) { @@ -636,7 +708,8 @@ void win32_show_pref_file_dialog(GtkEntry *item) of.lpstrInitialDir = NULL; of.lpstrTitle = NULL; of.lpstrDefExt = L"exe"; - of.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_EXPLORER; + of.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_EXPLORER | OFN_ENABLEHOOK; + of.lpfnHook = win32_dialog_explorer_hook_proc; retval = GetOpenFileNameW(&of); if (!retval) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fc0e8f: Merge pull request #311 from philippwiesemann/fix-typo-doc
by Dominic Hopf 02 Aug '14

02 Aug '14

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Sat, 02 Aug 2014 21:02:21 UTC Commit: fc0e8fa56644230aeb4b7cdfde4271280565ce76 https://github.com/geany/geany/commit/fc0e8fa56644230aeb4b7cdfde4271280565c… Log Message: ----------- Merge pull request #311 from philippwiesemann/fix-typo-doc Fix typo in documentation Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -5139,7 +5139,7 @@ After you are happy with your changes, create a patch e.g. by using:: or even better, by creating a Git-formatted patch which will keep authoring and description data, by first committing your changes (doing so in a fresh -new branch is recommended for `matser` not to diverge from upstream) and then +new branch is recommended for `master` not to diverge from upstream) and then using git format-patch:: % git checkout -b my-documentation-changes # create a fresh branch -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c47c84: Fix typo in documentation
by Philipp Wiesemann 02 Aug '14

02 Aug '14

Branch: refs/heads/master Author: Philipp Wiesemann <philipp.wiesemann(a)arcor.de> Committer: Philipp Wiesemann <philipp.wiesemann(a)arcor.de> Date: Sat, 02 Aug 2014 20:03:34 UTC Commit: c47c84820e6f48be9eb70261d4d790229b1b3294 https://github.com/geany/geany/commit/c47c84820e6f48be9eb70261d4d790229b1b3… Log Message: ----------- Fix typo in documentation Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -5139,7 +5139,7 @@ After you are happy with your changes, create a patch e.g. by using:: or even better, by creating a Git-formatted patch which will keep authoring and description data, by first committing your changes (doing so in a fresh -new branch is recommended for `matser` not to diverge from upstream) and then +new branch is recommended for `master` not to diverge from upstream) and then using git format-patch:: % git checkout -b my-documentation-changes # create a fresh branch -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d4acd1: *View->Change Font* should respect native dialog setting (Windows, #1059)
by Nick Treleaven 02 Aug '14

02 Aug '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 02 Aug 2014 14:29:08 UTC Commit: d4acd1e061211cb5c113b50dbe9786d62e67786e https://github.com/geany/geany/commit/d4acd1e061211cb5c113b50dbe9786d62e677… Log Message: ----------- *View->Change Font* should respect native dialog setting (Windows, #1059) Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 11 lines changed, 6 insertions(+), 5 deletions(-) =================================================================== @@ -814,7 +814,6 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc) } -#ifndef G_OS_WIN32 /* Use GtkFontChooserDialog on GTK3.2 for consistency, and because * GtkFontSelectionDialog is somewhat broken on 3.4 */ #if GTK_CHECK_VERSION(3, 2, 0) @@ -854,15 +853,18 @@ on_font_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) if (close) gtk_widget_hide(ui_widgets.open_fontsel); } -#endif /* This shows the font selection dialog to choose a font. */ void dialogs_show_open_font(void) { #ifdef G_OS_WIN32 - win32_show_font_dialog(); -#else + if (interface_prefs.use_native_windows_dialogs) + { + win32_show_font_dialog(); + return; + } +#endif if (ui_widgets.open_fontsel == NULL) { @@ -896,7 +898,6 @@ void dialogs_show_open_font(void) GTK_FONT_SELECTION_DIALOG(ui_widgets.open_fontsel), interface_prefs.editor_font); /* We make sure the dialog is visible. */ gtk_window_present(GTK_WINDOW(ui_widgets.open_fontsel)); -#endif } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f1ce9a: TM: don't needlessly duplicate array when searching for current tag
by Colomban Wendling 01 Aug '14

01 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 00:10:07 UTC Commit: f1ce9afadd743dee5a6184b12eb5125305570d4d https://github.com/geany/geany/commit/f1ce9afadd743dee5a6184b12eb5125305570… Log Message: ----------- TM: don't needlessly duplicate array when searching for current tag Modified Paths: -------------- tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_workspace.c 12 lines changed, 5 insertions(+), 7 deletions(-) =================================================================== @@ -745,25 +745,23 @@ tm_workspace_find_scoped (const char *name, const char *scope, gint type, const TMTag * tm_get_current_tag (GPtrArray * file_tags, const gulong line, const guint tag_types) { - GPtrArray *const local = tm_tags_extract (file_tags, tag_types); TMTag *matching_tag = NULL; - if (local && local->len) + if (file_tags && file_tags->len) { guint i; gulong matching_line = 0; - for (i = 0; (i < local->len); ++i) + for (i = 0; (i < file_tags->len); ++i) { - TMTag *tag = TM_TAG (local->pdata[i]); - if (tag->atts.entry.line <= line && tag->atts.entry.line > matching_line) + TMTag *tag = TM_TAG (file_tags->pdata[i]); + if (tag && tag->type & tag_types && + tag->atts.entry.line <= line && tag->atts.entry.line > matching_line) { matching_tag = tag; matching_line = tag->atts.entry.line; } } } - if (local) - g_ptr_array_free (local, TRUE); return matching_tag; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c078a1: TM: simplify match test for current tag
by Colomban Wendling 01 Aug '14

01 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 19 Feb 2014 00:05:37 UTC Commit: c078a13019dc7a0a2789bf672feceaa9cb91f1c3 https://github.com/geany/geany/commit/c078a13019dc7a0a2789bf672feceaa9cb91f… Log Message: ----------- TM: simplify match test for current tag Modified Paths: -------------- tagmanager/src/tm_workspace.c Modified: tagmanager/src/tm_workspace.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -751,13 +751,11 @@ tm_get_current_tag (GPtrArray * file_tags, const gulong line, const guint tag_ty { guint i; gulong matching_line = 0; - glong delta; for (i = 0; (i < local->len); ++i) { TMTag *tag = TM_TAG (local->pdata[i]); - delta = line - tag->atts.entry.line; - if (delta >= 0 && (gulong)delta < line - matching_line) + if (tag->atts.entry.line <= line && tag->atts.entry.line > matching_line) { matching_tag = tag; matching_line = tag->atts.entry.line; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2014