Revision: 1846
http://geany.svn.sourceforge.net/geany/?rev=1846&view=rev
Author: ntrel
Date: 2007-08-31 05:01:22 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Undo last commit, because it makes selecting text with the mouse
include all trailing lines with no wordchars on them.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.common
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/highlighting.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-31 11:42:58 UTC (rev 1845)
+++ trunk/ChangeLog 2007-08-31 12:01:22 UTC (rev 1846)
@@ -3,6 +3,9 @@
* src/highlighting.c, doc/geany.txt, doc/geany.html,
data/filetypes.common:
Include \n\r newline chars in Scintilla whitespace chars.
+ * data/filetypes.common:
+ Undo last commit, because it makes selecting text with the mouse
+ include all trailing lines with no wordchars on them.
2007-08-30 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/data/filetypes.common
===================================================================
--- trunk/data/filetypes.common 2007-08-31 11:42:58 UTC (rev 1845)
+++ trunk/data/filetypes.common 2007-08-31 12:01:22 UTC (rev 1846)
@@ -52,4 +52,4 @@
[settings]
# which characters should be skipped when moving (or included when deleting) to word boundaries
# should always include space and tab (\s\t)
-whitespace_chars=\s\t\n\r!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~
+whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2007-08-31 11:42:58 UTC (rev 1845)
+++ trunk/doc/geany.html 2007-08-31 12:01:22 UTC (rev 1846)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="2007-08-30" />
+<meta name="date" content="2007-08-29" />
<style type="text/css">
/*
@@ -133,7 +133,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2007-08-30</td></tr>
+<td>2007-08-29</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.12</td></tr>
</tbody>
@@ -2077,7 +2077,7 @@
when moving, selecting and deleting across word boundaries
(see <a class="reference" href="#scintilla-keyboard-commands">Scintilla keyboard commands</a>).</p>
<p>This should include space (\s) and tab (\t).</p>
-<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">whitespace_chars=\s\t\n\r!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~</span></tt></p>
+<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~</span></tt></p>
</dd>
</dl>
</div>
@@ -2962,7 +2962,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2007-08-31 11:35 UTC.
+Generated on: 2007-08-30 10:25 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2007-08-31 11:42:58 UTC (rev 1845)
+++ trunk/doc/geany.txt 2007-08-31 12:01:22 UTC (rev 1846)
@@ -1928,7 +1928,7 @@
This should include space (\\s) and tab (\\t).
- *Example:* ``whitespace_chars=\s\t\n\r!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~``
+ *Example:* ``whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~``
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2007-08-31 11:42:58 UTC (rev 1845)
+++ trunk/src/highlighting.c 2007-08-31 12:01:22 UTC (rev 1846)
@@ -37,7 +37,7 @@
/* Whitespace has to be set after setting wordchars. */
-#define GEANY_WHITESPACE_CHARS " \t\n\r" "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~"
+#define GEANY_WHITESPACE_CHARS " \t" "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~"
static gchar *whitespace_chars;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1844
http://geany.svn.sourceforge.net/geany/?rev=1844&view=rev
Author: ntrel
Date: 2007-08-30 08:11:33 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Prevent calltip after typing '(' when in a comment or string.
Allow forced autocompletion in a comment or string.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/editor.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-30 14:24:26 UTC (rev 1843)
+++ trunk/ChangeLog 2007-08-30 15:11:33 UTC (rev 1844)
@@ -13,6 +13,9 @@
Only focus the current document after switching pages if the open
files treeview currently has focus (otherwise focus commands can be
overridden, e.g. when pressing F4 during opening several files).
+ * src/editor.c:
+ Prevent calltip after typing '(' when in a comment or string.
+ Allow forced autocompletion in a comment or string.
2007-08-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2007-08-30 14:24:26 UTC (rev 1843)
+++ trunk/src/editor.c 2007-08-30 15:11:33 UTC (rev 1844)
@@ -863,7 +863,7 @@
if (pos == -1) return FALSE;
}
- style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
+ style = SSM(sci, SCI_GETSTYLEAT, pos - 1, 0); // the style 1 before the brace (which may be highlighted)
if (is_comment(lexer, style))
return FALSE;
@@ -975,7 +975,7 @@
style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
// don't autocomplete in comments and strings
- if (is_comment(lexer, style))
+ if (!force && is_comment(lexer, style))
return FALSE;
linebuf = sci_get_line(sci, line);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1843
http://geany.svn.sourceforge.net/geany/?rev=1843&view=rev
Author: ntrel
Date: 2007-08-30 07:24:26 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Only focus the current document after switching pages if the open
files treeview currently has focus (otherwise focus commands can be
overridden, e.g. when pressing F4 during opening several files).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/treeviews.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-30 14:07:49 UTC (rev 1842)
+++ trunk/ChangeLog 2007-08-30 14:24:26 UTC (rev 1843)
@@ -9,6 +9,10 @@
Rename non-menu keybinding titles, e.g. Tags menu -> Tags commands.
* src/keybindings.c:
Fix Ctrl-Shift bindings not working when caps lock is on.
+ * src/treeviews.c:
+ Only focus the current document after switching pages if the open
+ files treeview currently has focus (otherwise focus commands can be
+ overridden, e.g. when pressing F4 during opening several files).
2007-08-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c 2007-08-30 14:07:49 UTC (rev 1842)
+++ trunk/src/treeviews.c 2007-08-30 14:24:26 UTC (rev 1843)
@@ -469,9 +469,11 @@
// idx might not be valid e.g. if user closed a tab whilst Geany is opening files
if (DOC_IDX_VALID(idx))
{
- GtkWidget *widget = GTK_WIDGET(doc_list[idx].sci);
+ GtkWidget *focusw = gtk_window_get_focus(GTK_WINDOW(app->window));
+ GtkWidget *sci = GTK_WIDGET(doc_list[idx].sci);
- gtk_widget_grab_focus(widget);
+ if (focusw == tv.tree_openfiles)
+ gtk_widget_grab_focus(sci);
}
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 1842
http://geany.svn.sourceforge.net/geany/?rev=1842&view=rev
Author: ntrel
Date: 2007-08-30 07:07:49 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Fix Ctrl-Shift bindings not working when caps lock is on.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/keybindings.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-08-30 10:33:09 UTC (rev 1841)
+++ trunk/ChangeLog 2007-08-30 14:07:49 UTC (rev 1842)
@@ -7,6 +7,8 @@
geany.conf in 'Hidden preferences' appendix.
* src/keybindings.c:
Rename non-menu keybinding titles, e.g. Tags menu -> Tags commands.
+ * src/keybindings.c:
+ Fix Ctrl-Shift bindings not working when caps lock is on.
2007-08-29 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c 2007-08-30 10:33:09 UTC (rev 1841)
+++ trunk/src/keybindings.c 2007-08-30 14:07:49 UTC (rev 1842)
@@ -643,12 +643,16 @@
/* central keypress event handler, almost all keypress events go to this function */
gboolean keybindings_got_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
{
- guint i, k;
+ guint i, keyval = event->keyval;
- if (event->keyval == 0)
+ if (keyval == 0)
return FALSE;
- // ignore caps-lock
+ // hack to get around that CTRL+Shift+r results in GDK_R not GDK_r
+ if (event->state & GDK_SHIFT_MASK || event->state & GDK_LOCK_MASK)
+ if (keyval >= GDK_A && keyval <= GDK_Z)
+ keyval += GDK_a - GDK_A;
+ // now ignore caps-lock
if (event->state & GDK_LOCK_MASK)
event->state -= GDK_LOCK_MASK;
// ignore numlock key, not necessary but nice
@@ -663,18 +667,8 @@
for (i = 0; i < GEANY_MAX_KEYS; i++)
{
- // ugly hack to get around that CTRL+Shift+r results in 'R' not 'r'
- k = keys[i]->key;
- if (event->state & GDK_SHIFT_MASK)
+ if (keyval == keys[i]->key && event->state == keys[i]->mods)
{
- // skip entries which don't include SHIFT
- if (! (keys[i]->mods & GDK_SHIFT_MASK)) continue;
- // raise the keyval
- if (keys[i]->key >= GDK_a && keys[i]->key <= GDK_z) k = keys[i]->key - 32;
- }
-
- if (event->keyval == k && event->state == keys[i]->mods)
- {
if (keys[i]->cb_func == NULL)
return FALSE; // ignore the keybinding
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.