SF.net SVN: geany: [461] trunk

[ntrel at users.sourceforge.net]

Revision: 461
Author:   ntrel
Date:     2006-06-18 13:21:19 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=461&view=rev

Log Message:
-----------
Use correct current_word buffer for popup menu item keybindings; also use GEANY_MAX_WORD_LENGTH

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/callbacks.h
    trunk/src/geany.h
    trunk/src/keybindings.c
    trunk/src/sci_cb.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-18 17:14:32 UTC (rev 460)
+++ trunk/ChangeLog	2006-06-18 20:21:19 UTC (rev 461)
@@ -16,6 +16,9 @@
    In prefs use 'Recent files' instead of 'MRU'.
    Correct indentation spelling.
  * src/keybindings.c: Show shortcut keys for Undo/Redo and popup items.
+ * src/keybindings.c, src/geany.h, src/callbacks.c, src/sci_cb.c,
+   src/callbacks.h: Use correct current_word buffer for popup menu item
+                    keybindings; also use GEANY_MAX_WORD_LENGTH.
 
 
 2006-06-17  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2006-06-18 17:14:32 UTC (rev 460)
+++ trunk/src/callbacks.c	2006-06-18 20:21:19 UTC (rev 461)
@@ -63,7 +63,7 @@
 
 
 // represents the word under the mouse pointer when right button(no. 3) is pressed
-static gchar current_word[128];
+gchar current_word[GEANY_MAX_WORD_LENGTH];
 
 // represents the state while closing all tabs(used to prevent notebook switch page signals)
 static gboolean closing_all = FALSE;

Modified: trunk/src/callbacks.h
===================================================================
--- trunk/src/callbacks.h	2006-06-18 17:14:32 UTC (rev 460)
+++ trunk/src/callbacks.h	2006-06-18 20:21:19 UTC (rev 461)
@@ -21,6 +21,8 @@
  */
 
 
+extern gchar current_word[]; //needed for popup menu keybindings access
+
 void
 signal_cb							   (gint sig);
 

Modified: trunk/src/geany.h
===================================================================
--- trunk/src/geany.h	2006-06-18 17:14:32 UTC (rev 460)
+++ trunk/src/geany.h	2006-06-18 20:21:19 UTC (rev 461)
@@ -66,6 +66,7 @@
 #define GEANY_MAX_TAGS_COUNT			1000
 #define GEANY_CHECK_FILE_DELAY			30
 #define GEANY_WORDCHARS					"_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+#define GEANY_MAX_WORD_LENGTH			192
 #define GEANY_MAX_AUTOCOMPLETE_WORDS	30
 #define GEANY_STRING_UNTITLED			_("untitled")
 #define GEANY_MSGWIN_HEIGHT				208

Modified: trunk/src/keybindings.c
===================================================================
--- trunk/src/keybindings.c	2006-06-18 17:14:32 UTC (rev 460)
+++ trunk/src/keybindings.c	2006-06-18 20:21:19 UTC (rev 461)
@@ -545,14 +545,13 @@
 {
 	gint idx = document_get_cur_idx();
 	gint pos;
-	gchar current_word[128];
 
 	if (idx == -1 || ! doc_list[idx].is_valid) return;
 	
 	pos = sci_get_current_position(doc_list[idx].sci);
 
 	utils_find_current_word(doc_list[idx].sci, pos,
-		current_word, sizeof current_word);
+		current_word, GEANY_MAX_WORD_LENGTH);
 
 	if (*current_word == 0)
 		utils_beep();

Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c	2006-06-18 17:14:32 UTC (rev 460)
+++ trunk/src/sci_cb.c	2006-06-18 20:21:19 UTC (rev 461)
@@ -364,7 +364,7 @@
 {
 	gint lexer = SSM(sci, SCI_GETLEXER, 0, 0);
 	gint style;
-	gchar word[128];
+	gchar word[GEANY_MAX_WORD_LENGTH];
 	const GPtrArray *tags;
 
 	word[0] = '\0';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.