8489 Commits

Author SHA1 Message Date
Colomban Wendling
d7750a4479 Fix canceling keybinding overriding by discarding the dialog
Properly handle discarding the dialog asking whether to override a
keybinding as canceling it rather than as allowing multiple identical
keybindings.

In the way, simplify and fix dialogs_show_prompt() not to perform odd
and useless response mapping that effectively go round back, and that
don't handle what the comment above it suggests.  Simply document it
can return GTK_RESPONSE_DELETE_EVENT and handle it in the caller side,
as it's a possibly valuable information.  Only one current caller is
affected, and it doesn't change anything as it doesn't change behavior
but only documents it.

Closes #714.
2016-05-17 02:45:03 +02:00
Colomban Wendling
9681888806 Merge pull request #1014 from b4n/streamline-builtin-tags
Streamline builtin tags
2016-05-15 15:58:05 +02:00
elextr
b81f41ce32 Merge pull request #1024 from Yanpas/java-review
Reviewed java keywords
2016-05-14 19:36:24 +10:00
Colomban Wendling
cb8151b29b GTK: Avoid possible IdleWork() calls on destructed objects
The idle callback removal clause in the ScintillaGTK destructor got
broken in the last Scintilla update [1], leading to the callback not
being removed thus possibly running after the instance destruction.
Indeed, gdk_threads_add_idle() wraps g_idle_add() with a custom user
data, thus making the g_source_remove_by_user_data() call in the
destructor incorrect, as we give it our own user data, not GDK's
wrapper one.

Fix the callback removal not to use user data matching to avoid this.

Closes #1033.

[1] 4e5c321dda/

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1827/
X-Scintilla-Commit-ID: d889200cd9de032e278745f48b9c3108ccfa5984
2016-05-12 15:02:15 +02:00
elextr
8ca8b26051 Merge pull request #1029 from AleXoundOS/AleXoundOS-patch-2
Fix Haskell single line comments by adding space
2016-05-12 17:54:30 +10:00
Alexander
6b608974c0 Fix Haskell single line comments by adding space
Haskell single line comments consist of at least two dashes "--",
not followed by special symbol.
So in practice everywhere in code you will see a space following "--".
Reference: Haskell 2010 Language Report -> Chapter 2 -> Lexical Structure
2016-05-06 02:15:51 +04:00
Yan Pashkovsky
175d987305 Reviewed java 2016-05-04 16:21:13 +03:00
Colomban Wendling
a291a4239a Merge branch 'gtk-3-20-fixes' 2016-05-03 00:32:51 +02:00
Colomban Wendling
f948916ad0 Don't get properties of a non-current style state to please GTK 3.20
GTK 3.20 doesn't like getting a style property for a non-current state,
unless the call is wrapped in a save()/restore() pair.

So, fix the code to either use the current state or temporarily save
the context.

gb.c now uses different states, but it shouldn't really matter given
how they are used, and even gives a native behavior when the window
loses focus, as it now properly reacts to BACKDROP state.
2016-05-03 00:31:38 +02:00
Colomban Wendling
75063e9159 Merge branch 'scintilla/gtk-3-20' into gtk-3-20-fixes 2016-05-02 15:26:39 +02:00
Colomban Wendling
c4f56bfcd6 Fix some custom CSS selectors to work on GTK 3.20 2016-05-02 15:26:29 +02:00
Colomban Wendling
5851f5616e Merge branch 'gtk-version-specific-css' into gtk-3-20-fixes
Merges pull request #994.
2016-05-02 15:25:47 +02:00
Neil Hodgson
bf3140004d Do not call deprecated functions on newer GTK+.
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 5e4f2e6c167ee30e2c2bfadd1b1579c3d8716c60
2016-05-02 15:19:26 +02:00
Neil Hodgson
0a0c9bb7ce Move function braces for consistency.
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: cdded8beb41e4a494e68b76a6bafeeae14b0d103
2016-05-02 15:19:26 +02:00
Colomban Wendling
ba58a391c7 GTK: Get border for the exact current style's state on GTK 3
GTK 3.20 doesn't seem to like it so much when looking up details of a
non-exact current style context state, so use the current one.

This is GTK being really picky as in this case we are just missing the
`DIR_LTR` flag, which we definitely don't care about, but let's make it
happy.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 9fc624da4a3d935633c45fb56d0e9a77ef9b5af1
2016-05-02 15:19:26 +02:00
Colomban Wendling
abf0365e43 GTK: Fix auto-completion popup sizing code for GTK 3.20
GTK 3.20's GtkScrolledWinodw doesn't like having a too small allocation
and spews scary assertion failures.  Fix that by requesting the real
size we'd like instead of hard-coding 1 as small-enough value in our
overriding height requisition method.

The actual value doesn't really matter so long as it's small enough
anyway, as we resize the popup to fit later on.

Note: this moves the actual implementation of ListBoxX::GetRowHeight()
to the new convenience function treeViewGetRowHeight(), with no changes
in implementation.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 5a0afdd87d56d837dd8068e234aed8e2b6bdbe93
2016-05-02 15:19:26 +02:00
Colomban Wendling
2723727ecd GTK: Plug a memory leak
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 4f96ed32ebb94809ca419c0f77d37de41984cf76
2016-05-02 15:19:26 +02:00
Colomban Wendling
ead0e9ee5f GTK: Fix fetching the frame border width on GTK 3.20
GTK 3.20 introduced a sub-node named "border" to the frame, requiring
to lookup the border on that sub-node rather than on the frame itself.

Unfortunately supporting this requires to be built against GTK 3.20, as
it requires API this version introduced.  This means that a build
against an older version won't be able to get the popup sizing right if
running on 3.20.  To mitigate this, add reasonable fallback defaults
when running 3.20 but built on an earlier version, to try and avoid

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 83d56b1fc63a206e4c1b776f5991b3b17ccb3473
2px-scrolling on GTK 3.20's default theme.
2016-05-02 15:19:26 +02:00
Colomban Wendling
28a99f8188 GTK: Properly ask wText what size it wants to please GTK 3.20
It's not really of any use as we do know any size would do as wText is
ours anyway, but GTK 3.20 doesn't like allocating without querying the
preferred size beforehand, so do it.

As wText has a size_request() of 100x100, this might change how we
allocate in case we used to underallocate it, but AFAIK we don't, and
it is the real minimum size expected.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: d06e3db3e26842cd136328df17eb6f864b3adc02
2016-05-02 15:19:26 +02:00
Colomban Wendling
915e8b781c GTK: Fix popup font on GTK >= 3.20
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: a28863773874af35d3cc8912ae3c028fb0462ea9
2016-05-02 15:19:26 +02:00
Colomban Wendling
62be0b9b96 Fix our tab close buttons appearance on GTK 3.20 2016-05-02 15:07:50 +02:00
Colomban Wendling
05870d9ebc Merge pull request #973 from techee/osx_keybindings
osx: force resync menus when changing keybindings
2016-04-30 00:22:58 +02:00
Yan Pashkovsky
a5a47da9f2 classbuilder: Use .hpp instead of .h for C++ header file extension
.hpp is a C++-specific extension avoiding any confusion, and better
supported as C++ out of the box by Geany.

Closes #999.
2016-04-30 00:06:51 +02:00
Colomban Wendling
854a5d5af8 Don't special-case tags files distributed with Geany
Load those tags files just as any user tags files, removing
unnecessary code redundancy.
2016-04-29 01:39:11 +02:00
Colomban Wendling
6b262bb4ec Make html_entities.tags a real tags file
This removes a fair amount of specific code that is just as well
handled by the generic symbols completion code.
2016-04-29 01:35:21 +02:00
Colomban Wendling
1403d352b2 Update Scintilla to version 3.6.5 2016-04-29 01:12:20 +02:00
Quentin Glidic
4374769b7c ui-utils: Fix ui_path_box_new with GTK+ >= 3.20
They introduced[1] a GtkBox between the GtkEntry and the GtkComboBox to
add some magic in the layout computation.

[1] <https://git.gnome.org/browse/gtk+/commit/?id=222c43fc60362eeb97ce2d5e3a5583a69a2e30ef>

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
2016-04-17 11:57:38 +02:00
Quentin Glidic
1f392b75bf ui-utils: Load per-version GTK+ CSS file
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
2016-04-14 13:17:12 +02:00
elextr
f74fdd8d1c Merge pull request #991 from philippwiesemann/fix-plugin-doc-typos
Fix typos in plugin documentation
2016-04-11 09:21:17 +10:00
Philipp Wiesemann
ad81720d98 Fix typos in plugin documentation 2016-04-10 21:05:50 +02:00
Frank Lanitz
3967ce582f Update of Greek translation 2016-03-26 09:38:13 +01:00
Jiří Techet
1c83b18e22 osx: force resync menus when changing keybindings
Normally menu items are updated only when adding or removing
them on osx. They are however not redrawn when just changing
keybindings so the old keybinding is displayed after the change.

Force the menu update to show the updated keybindings.
2016-03-23 20:45:47 +01:00
Enrico Tröger
d75873f9bc Windows installer: fix broken installation tags files 2016-03-22 08:44:11 +01:00
Enrico Tröger
bd8caf2a85 GTK bundle creation: don't delete necessary GLib schema files
The files in share/glib-2.0/schemas are necessary for GTK3,
so don't delete them but everything else on the same directory level.
2016-03-21 23:16:12 +01:00
Enrico Tröger
e1a9929e9c Windows installer: install data files into new locations
This adapts the paths in the installer for the tags and filedefs files
as changed in #485.
Also simply include everything in share/ when including a GTK3
runtime environment instead of a fixed list of subdirectories,
share/glib-2.0 doesn't exist anymore when using MSYS2 packages.
2016-03-21 23:01:05 +01:00
Colomban Wendling
801698dded Merge pull request #965 from kugel-/gi-fix-structs
gtkdoc: fix gtkdoc header script for structs with inline types
2016-03-19 23:35:16 +01:00
Colomban Wendling
83c2a0de69 Merge branch 'ruby/uctags-update'
Update Ruby parser from Universal-CTags.

Closes #587.
2016-03-19 23:22:38 +01:00
Colomban Wendling
9febf02261 Merge pull request #485 from techee/ft_menu
Move filetypes.* and *.tags to separate directories
2016-03-19 23:15:37 +01:00
Matthew Brush
813f756c84 Add /doc/Doxyfile-gi.stamp generated file to .gitignore 2016-03-14 14:26:45 -07:00
Masatake YAMATO
e46093d1fc Ruby: delete rspec related kinds
Close universal-ctags/ctags#453.

(This is about a bug spotted in universal-ctags/ctags#453 by @mislav and
 in universal-ctags/ctags#11 by @NewAlexandria.)

Kinds C and d are for Rspec.

Parts of code related to above kinds assume a ruby string
comes after Rspec keywords (describe or context).

This is a wrong assumption. A class name can be used there.

It is nice if ctags can handle these rspec code well, but we
don't have enough resource to make it now.

So in this commit I delete rspec related code temporary. I
just reserve a kind letter 'd' for rspec for the future. 'C'
is completely deleted because (1) describe and context have
the same meaning in rspec, and (2) we would like to assign
'C' for Ruby constant as ripper-tags does.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
2016-03-14 19:49:47 +01:00
Colomban Wendling
885b994ec2 ruby: License under GPLv2+ as per Universal CTags
See https://github.com/universal-ctags/ctags/pull/578
2016-03-14 19:40:50 +01:00
Colomban Wendling
ab6a012119 ruby: Unify identifier character classification 2016-03-14 19:27:22 +01:00
Colomban Wendling
116c749cd9 ruby: Report singleton type inside anonymous classes at a class level
New test case contributed by @masatake in universal-ctags/ctags#456.

Closes universal-ctags/ctags#455 and universal-ctags/ctags#456.
2016-03-14 19:27:22 +01:00
Colomban Wendling
7d116cb482 ruby: Report proper scope type 2016-03-14 19:27:22 +01:00
Colomban Wendling
9e97746751 ruby: Use nestlevel instead of string lists
This will simplify some upcoming fixes.
2016-03-14 19:27:22 +01:00
Colomban Wendling
17606d8af7 ruby: Fix scope after anonymous classes 2016-03-14 19:27:22 +01:00
Colomban Wendling
1ed29f1d7b ruby: Fix parsing qualified identifiers
The implementation is a bit hacky, but avoids the need for complex
logic to pop several scopes at once.

Closes universal-ctags/ctags#452.
2016-03-14 19:27:22 +01:00
Colomban Wendling
eaf6c82af8 ruby: Fix keyword matching
After an identifier there can be anything but an identifier character.
2016-03-14 19:27:22 +01:00
Colomban Wendling
e003da2bea ruby: Properly skip documentation contents 2016-03-14 19:27:22 +01:00
Masatake YAMATO
e9e9b9988d ruby: handle singleton method including ?!= in its name(sf.bug:364)
This patch is intended a bug reported as sf.bug:364.
https://sourceforge.net/p/ctags/bugs/364/

Writing a test case is helped by Dmitry Gutov.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
2016-03-14 19:27:22 +01:00