Revision: 2668
http://geany.svn.sourceforge.net/geany/?rev=2668&view=rev
Author: ntrel
Date: 2008-06-09 08:03:53 -0700 (Mon, 09 Jun 2008)
Log Message:
-----------
Fix variable names sometimes having leading junk characters.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tagmanager/python.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-08 20:09:00 UTC (rev 2667)
+++ trunk/ChangeLog 2008-06-09 15:03:53 UTC (rev 2668)
@@ -1,9 +1,15 @@
+2008-06-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * tagmanager/python.c:
+ Fix variable names sometimes having leading junk characters.
+
+
2008-06-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
- * THANKS, src/about.c: Added Anna Talianova to list of contributers for
- Czech translation.
-
+ * THANKS, src/about.c: Added Anna Talianova to list of contributers for
+ Czech translation.
+
2008-06-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* doc/geany.html, doc/geany.html, src/encodings.c:
Modified: trunk/tagmanager/python.c
===================================================================
--- trunk/tagmanager/python.c 2008-06-08 20:09:00 UTC (rev 2667)
+++ trunk/tagmanager/python.c 2008-06-09 15:03:53 UTC (rev 2668)
@@ -571,6 +571,7 @@
goto skipvar;
/* the line is valid, parse the variable name */
++start;
+ vStringClear (name);
while (isIdentifierCharacter ((int) *start))
{
vStringPut (name, (int) *start);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2663
http://geany.svn.sourceforge.net/geany/?rev=2663&view=rev
Author: eht16
Date: 2008-06-08 07:49:22 -0700 (Sun, 08 Jun 2008)
Log Message:
-----------
Reshow a previously shown calltip if an auto completion list was cancelled.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/editor.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-08 14:38:01 UTC (rev 2662)
+++ trunk/ChangeLog 2008-06-08 14:49:22 UTC (rev 2663)
@@ -19,6 +19,12 @@
Don't make checks for header files and functions mandatory.
Update some method names to latest API changes in Waf.
Various other small fixes.
+ * scintilla/include/Scintilla.h, scintilla/include/Scintilla.iface,
+ scintilla/ScintillaBase.cxx:
+ Backport AutoCCancelled event implementation from Scintilla CVS.
+ * src/editor.c:
+ Reshow a previously shown calltip if an auto completion list was
+ cancelled.
2008-06-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-06-08 14:38:01 UTC (rev 2662)
+++ trunk/src/editor.c 2008-06-08 14:49:22 UTC (rev 2663)
@@ -61,7 +61,9 @@
gboolean set;
gchar *last_word;
guint tag_index;
-} calltip = {NULL, FALSE, NULL, 0};
+ gint pos;
+ ScintillaObject *sci;
+} calltip = {NULL, FALSE, NULL, 0, 0, NULL};
static gchar indent[100];
@@ -286,6 +288,8 @@
}
g_free(calltip.text);
calltip.text = NULL;
+ calltip.pos = 0;
+ calltip.sci = NULL;
calltip.set = FALSE;
break;
}
@@ -418,6 +422,31 @@
}
+static gboolean reshow_calltip(gpointer data)
+{
+ SCNotification *nt = data;
+
+ g_return_val_if_fail(calltip.sci != NULL, FALSE);
+
+ SSM(calltip.sci, SCI_CALLTIPCANCEL, 0, 0);
+ /* we use the position where the calltip was previously started as SCI_GETCURRENTPOS
+ * may be completely wrong in case the user cancelled the auto completion with the mouse */
+ SSM(calltip.sci, SCI_CALLTIPSHOW, calltip.pos, (sptr_t) calltip.text);
+
+ /* now autocompletion has been cancelled by SCI_CALLTIPSHOW, so do it manually */
+ if (nt->nmhdr.code == SCN_AUTOCSELECTION)
+ {
+ gint pos = SSM(calltip.sci, SCI_GETCURRENTPOS, 0, 0);
+ sci_set_selection_start(calltip.sci, nt->lParam);
+ sci_set_selection_end(calltip.sci, pos);
+ sci_replace_sel(calltip.sci, ""); /* clear root of word */
+ SSM(calltip.sci, SCI_INSERTTEXT, nt->lParam, (sptr_t) nt->text);
+ sci_goto_pos(calltip.sci, nt->lParam + strlen(nt->text), FALSE);
+ }
+ return FALSE;
+}
+
+
/* callback func called by all editors when a signal arises */
void on_editor_notification(GtkWidget *editor, gint scn, gpointer lscn, gpointer user_data)
{
@@ -491,19 +520,17 @@
}
break;
}
+ case SCN_AUTOCCANCELLED:
case SCN_AUTOCSELECTION:
{
- /* now that autocomplete is finishing, reshow calltips if they were showing */
+ /* now that autocomplete is finishing or was cancelled, reshow calltips
+ * if they were showing */
if (calltip.set)
{
- gint pos = sci_get_current_position(sci);
- SSM(sci, SCI_CALLTIPSHOW, pos, (sptr_t) calltip.text);
- /* now autocompletion has been cancelled, so do it manually */
- sci_set_selection_start(sci, nt->lParam);
- sci_set_selection_end(sci, pos);
- sci_replace_sel(sci, ""); /* clear root of word */
- SSM(sci, SCI_INSERTTEXT, nt->lParam, (sptr_t) nt->text);
- sci_goto_pos(sci, nt->lParam + strlen(nt->text), FALSE);
+ /* delay the reshow of the calltip window to make sure it is actually displayed,
+ * without it might be not visible on SCN_AUTOCCANCEL */
+ /* TODO g_idle_add() seems to be not enough, only with a timeout it works stable */
+ g_timeout_add(50, reshow_calltip, nt);
}
break;
}
@@ -1081,6 +1108,8 @@
{
g_free(calltip.text); /* free the old calltip */
calltip.text = str;
+ calltip.pos = orig_pos;
+ calltip.sci = sci;
calltip.set = TRUE;
utils_wrap_string(calltip.text, -1);
SSM(sci, SCI_CALLTIPSHOW, orig_pos, (sptr_t) calltip.text);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2661
http://geany.svn.sourceforge.net/geany/?rev=2661&view=rev
Author: eht16
Date: 2008-06-08 07:19:49 -0700 (Sun, 08 Jun 2008)
Log Message:
-----------
Update Waf to its latest SVN version.
Don't update po files on normal build, add target --update-po for this task.
Fix wrong handling of CCFlags and CXXFlags which caused the build to hang if CFLAGS were not already set.
Don't make checks for header files and functions mandatory.
Update some method names to latest API changes in Waf.
Various other small fixes.
Modified Paths:
--------------
trunk/ChangeLog
trunk/waf
trunk/wscript
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-06-08 14:04:01 UTC (rev 2660)
+++ trunk/ChangeLog 2008-06-08 14:19:49 UTC (rev 2661)
@@ -9,6 +9,16 @@
Use Python from CTags SVN.
Adapt variable parsing code from the old parser code.
Fix three bugs (see CTags bugs #1988026, 1988027 and 1988130).
+ * waf:
+ Update Waf to its latest SVN version.
+ * wscript:
+ Don't update po files on normal build, add target --update-po for
+ this task.
+ Fix wrong handling of CCFlags and CXXFlags which caused the build
+ to hang if CFLAGS were not already set.
+ Don't make checks for header files and functions mandatory.
+ Update some method names to latest API changes in Waf.
+ Various other small fixes.
2008-06-07 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/waf
===================================================================
--- trunk/waf 2008-06-08 14:04:01 UTC (rev 2660)
+++ trunk/waf 2008-06-08 14:19:49 UTC (rev 2661)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python
# encoding: utf-8
# Thomas Nagy, 2005-2008
@@ -38,7 +38,7 @@
except:pass
VERSION="1.4.2"
-REVISION="fd1f2e9d93f8e1634be8fb448b10b939"
+REVISION="0edf0b55479df1fe516b41b2d7255b2e"
INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local'
cwd = os.getcwd()
join = os.path.join
@@ -141,5 +141,5 @@
Scripting.prepare()
#==>
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.