SF.net SVN: geany: [476] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Sat Jun 24 18:44:07 UTC 2006
Revision: 476
Author: eht16
Date: 2006-06-24 11:43:56 -0700 (Sat, 24 Jun 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=476&view=rev
Log Message:
-----------
Removed URL highlighting code(useless feature, never was enabled).
Set policy settings for the scolledwindow.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/highlighting.c
trunk/src/sci_cb.c
trunk/src/treeviews.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-06-24 14:42:56 UTC (rev 475)
+++ trunk/ChangeLog 2006-06-24 18:43:56 UTC (rev 476)
@@ -10,7 +10,13 @@
tagmanager/tm_tag.c, tagmanager/tm_project, tagmanager/parsers.h,
tagmanager/tm_file_entry.c, tagmanager/entry.c, src/highlighting.c,
data/latex.tags, data/php.tags, Makefile.am:
- Added global auto completion tags for PHP and LaTeX.
+ Added global auto completion tags for PHP and LaTeX.
+ * src/keybindings.c, src/callbacks.c, src/sci_cb.c, src/main.c,
+ src/geany.h, src/dialogs.c:
+ Added some sanity checks to prevent crashes.
+ * src/sci_cb.c, src/highlighting.c:
+ Removed URL highlighting code(useless feature, never was enabled).
+ * src/treeviews.c: Set policy settings for the scolledwindow.
2006-06-23 Nick Treleaven <nick.treleaven at btinternet.com>
Modified: trunk/src/highlighting.c
===================================================================
--- trunk/src/highlighting.c 2006-06-24 14:42:56 UTC (rev 475)
+++ trunk/src/highlighting.c 2006-06-24 18:43:56 UTC (rev 476)
@@ -801,9 +801,6 @@
SSM (sci, SCI_SETPROPERTY, (sptr_t) "phpscript.mode", (sptr_t) "1");
SSM (sci, SCI_SETLEXER, SCLEX_HTML, 0);
- // DWELL notification for URL highlighting
- //SSM(sci, SCI_SETMOUSEDWELLTIME, 500, 0);
-
// use the same colouring for HTML; XML and so on
styleset_markup(sci);
Modified: trunk/src/sci_cb.c
===================================================================
--- trunk/src/sci_cb.c 2006-06-24 14:42:56 UTC (rev 475)
+++ trunk/src/sci_cb.c 2006-06-24 18:43:56 UTC (rev 476)
@@ -31,7 +31,6 @@
#include "sciwrappers.h"
#include "utils.h"
-static gint link_start, link_end, style;
static gchar indent[100];
@@ -212,19 +211,6 @@
}
break;
}
- case SCN_DWELLSTART:
- {
- //sci_cb_handle_uri(sci, nt->position);
- break;
- }
- case SCN_DWELLEND:
- {
-/* gint end_of_styling = SSM(sci, SCI_GETENDSTYLED, 0, 0);
- SSM(sci, SCI_STARTSTYLING, link_start, 31);
- SSM(sci, SCI_SETSTYLING, (link_end - link_start) + 1, style);
- SSM(sci, SCI_STARTSTYLING, end_of_styling, 31);
-*/ break;
- }
/* case SCN_STYLENEEDED:
{
geany_debug("style");
@@ -363,12 +349,17 @@
gboolean sci_cb_show_calltip(ScintillaObject *sci, gint pos)
{
- gint lexer = SSM(sci, SCI_GETLEXER, 0, 0);
+ gint lexer;
gint style;
gchar word[GEANY_MAX_WORD_LENGTH];
- gint idx = document_find_by_sci(sci);
+ gint idx;
const GPtrArray *tags;
+ if (sci == NULL) return FALSE;
+
+ lexer = SSM(sci, SCI_GETLEXER, 0, 0);
+ idx = document_find_by_sci(sci);
+
word[0] = '\0';
if (pos == -1)
{ // position of '(' is unknown, so go backwards to find it
@@ -409,6 +400,16 @@
gchar *root;
const GPtrArray *tags;
+ if (sci == NULL) return FALSE;
+
+ line = sci_get_line_from_position(sci, pos);
+ line_start = sci_get_position_from_line(sci, line);
+ line_len = sci_get_line_length(sci, line);
+ line_pos = pos - line_start - 1;
+ current = pos - line_start;
+ startword = current, lexer = SSM(sci, SCI_GETLEXER, 0, 0);
+ style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
+
//if (lexer != SCLEX_CPP && lexer != SCLEX_HTML && lexer != SCLEX_PASCAL) return FALSE;
if (lexer == SCLEX_HTML && style == SCE_H_DEFAULT) return FALSE;
if (lexer == SCLEX_CPP && (style == SCE_C_COMMENT ||
@@ -669,9 +670,14 @@
{
guint j, i;
const GPtrArray *tags;
- GPtrArray *ftags = g_ptr_array_sized_new(50);
- GString *words = g_string_sized_new(200);
+ GPtrArray *ftags;
+ GString *words;
+ if (sci == NULL) return;
+
+ ftags = g_ptr_array_sized_new(50);
+ words = g_string_sized_new(200);
+
for (j = 0; j < app->tm_workspace->work_objects->len; j++)
{
tags = tm_tags_extract(TM_WORK_OBJECT(app->tm_workspace->work_objects->pdata[j])->tags_array,
@@ -795,94 +801,6 @@
}
-/**
- * This routine will find an uri like http://www.example.com or file:///tmp/test.c
- * @parm pos The position where to start looking for an URI
- * @return the position where the URI starts, or -1 if no URI was found
- */
-gint sci_cb_handle_uri(ScintillaObject *sci, gint pos)
-{
- gint lexer = SSM(sci, SCI_GETLEXER, 0, 0);
- gint min, sel_start, sel_end, end_of_text, end_of_styling;
- gint line = sci_get_line_from_position(sci, pos);
- gint line_start = sci_get_position_from_line(sci, line);
- gint line_end = line_start + sci_get_line_length(sci, line) - 1;
- gchar sel[300], *begin, *cur, *uri;
-
- // This may make sense only in certain languages
- if ((lexer != SCLEX_HTML && lexer != SCLEX_XML))
- return -1;
-
- if (pos < 0) return -1;
-
- if (SSM(sci, SCI_GETSTYLEAT, pos, 0) == SCE_H_VALUE || SSM(sci, SCI_GETSTYLEAT, pos, 0) == SCE_H_CDATA)
- return -1;
-
- // Grab some characters around pos
- min = pos - 149;
- if (min < 0) min = 0;
- end_of_text = pos + 149;
- if (end_of_text > sci_get_length(sci)) end_of_text = sci_get_length(sci);
-
- sci_get_text_range(sci, min, end_of_text, sel);
- sel[sizeof(sel) - 1] = '\0';
-
- begin = &sel[0];
- cur = &sel[149];
-
- sel_start = pos;
- while (cur > begin)
- {
- if (*cur == '>') break;
- else if (*cur == ' ') break;
- else if (*cur == '"') break;
- else if (*cur == '=') break;
- --cur;
- --sel_start;
- }
- // stay in the current line
- if (sel_start < line_start) sel_start = line_start - 1;
- sel_end = sel_start++;
-
- cur++;
- while(cur > begin)
- {
- if (*cur == '\0') break;
- else if (*cur == ' ') break;
- else if (*cur == '"') break;
- else if (*cur == '<') break;
- else if (*cur == '>') break;
- sel_end++;
- cur++;
- }
- // stay in the current line
- if (sel_end > line_end) sel_end = line_end - 1;
-
- // check wether uri contains ://, otherwise give up
- uri = g_malloc0(sel_end - sel_start + 1);
- sci_get_text_range(sci, sel_start, sel_end, uri);
- if (strstr(uri, "://") == NULL)
- {
- g_free(uri);
- return -1;
- }
- g_free(uri);
-
- end_of_styling = SSM(sci, SCI_GETENDSTYLED, 0, 0);
- SSM(sci, SCI_STARTSTYLING, sel_start, 31);
- SSM(sci, SCI_SETSTYLING, (sel_end - sel_start) + 1, SCE_H_QUESTION);
- SSM(sci, SCI_STARTSTYLING, end_of_styling, 31);
-
- link_start = sel_start;
- link_end = sel_end + 1;
- style = SSM(sci, SCI_GETSTYLEAT, pos, 0);
-
- //geany_debug("pos: %d start: %d end: %d length: %d", pos, sel_start, sel_end, sel_end - sel_start);
-
- return -1;
-}
-
-
void sci_cb_do_comment(gint idx)
{
gint first_line;
@@ -890,8 +808,12 @@
gint x, i, line_start, line_len;
gchar sel[64], *co, *cc;
gboolean break_loop = FALSE;
- filetype *ft = doc_list[idx].file_type;
+ filetype *ft;
+ if (idx == -1 || ! doc_list[idx].is_valid) return;
+
+ ft = doc_list[idx].file_type;
+
first_line = sci_get_line_from_position(doc_list[idx].sci,
sci_get_selection_start(doc_list[idx].sci));
// Find the last line with chars selected (not EOL char)
Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c 2006-06-24 14:42:56 UTC (rev 475)
+++ trunk/src/treeviews.c 2006-06-24 18:43:56 UTC (rev 476)
@@ -176,6 +176,12 @@
tv.store_openfiles = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
gtk_tree_view_set_model(GTK_TREE_VIEW(tv.tree_openfiles), GTK_TREE_MODEL(tv.store_openfiles));
+ // set policy settings for the scolledwindow around the treeview again, because glade
+ // doesn't keep the settings
+ gtk_scrolled_window_set_policy(
+ GTK_SCROLLED_WINDOW(lookup_widget(app->window, "scrolledwindow7")),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Open files"), renderer, "text", 0, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tv.tree_openfiles), column);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list