Commits November 2008

commits@lists.geany.org

4 participants
134 discussions

SF.net SVN: geany:[3188] trunk/tagmanager/include/tm_source_file.h
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3188 http://geany.svn.sourceforge.net/geany/?rev=3188&view=rev Author: eht16 Date: 2008-11-07 14:38:38 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Oops, forgot to commit. Modified Paths: -------------- trunk/tagmanager/include/tm_source_file.h Modified: trunk/tagmanager/include/tm_source_file.h =================================================================== --- trunk/tagmanager/include/tm_source_file.h 2008-11-07 14:38:13 UTC (rev 3187) +++ trunk/tagmanager/include/tm_source_file.h 2008-11-07 14:38:38 UTC (rev 3188) @@ -78,6 +78,26 @@ gboolean tm_source_file_update(TMWorkObject *source_file, gboolean force , gboolean recurse, gboolean update_parent); +/*! Updates the source file by reparsing the text-buffer passed as parameter. + Ctags will use a parsing based on buffer instead of on files. + You should call this function when you don't want a previous saving of the file + you're editing. It's useful for a "real-time" updating of the tags. + The tags array and the tags themselves are destroyed and re-created, hence any + other tag arrays pointing to these tags should be rebuilt as well. All sorting + information is also lost. The language parameter is automatically set the first + time the file is parsed. + \param source_file The source file to update with a buffer. + \param text_buf A text buffer. The user should take care of allocate and free it after + the use here. + \param buf_size The size of text_buf. + \param update_parent If set to TRUE, sends an update signal to parent if required. You should + always set this to TRUE if you are calling this function directly. + \return TRUE if the file was parsed, FALSE otherwise. + \sa tm_work_object_update(), tm_project_update(), tm_workspace_update() +*/ +gboolean tm_source_file_buffer_update(TMWorkObject *source_file, guchar* text_buf, + gint buf_size, gboolean update_parent); + /* Parses the source file and regenarates the tags. \param source_file The source file to parse \return TRUE on success, FALSE on failure @@ -85,6 +105,15 @@ */ gboolean tm_source_file_parse(TMSourceFile *source_file); +/* Parses the text-buffer and regenarates the tags. + \param source_file The source file to parse + \param text_buf The text buffer to parse + \param buf_size The size of text_buf. + \return TRUE on success, FALSE on failure + \sa tm_source_file_update() +*/ +gboolean tm_source_file_buffer_parse(TMSourceFile *source_file, guchar* text_buf, gint buf_size); + /* This function is registered into the ctags parser when a file is parsed for the first time. The function is then called by the ctags parser each time This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3187] trunk/src/dialogs.c
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3187 http://geany.svn.sourceforge.net/geany/?rev=3187&view=rev Author: eht16 Date: 2008-11-07 14:38:13 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Allow showing remote locations in the file open dialog with GTK >= 2.14 since it works with Gvfs/FUSE mounts, too. Modified Paths: -------------- trunk/src/dialogs.c Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-11-07 14:37:57 UTC (rev 3186) +++ trunk/src/dialogs.c 2008-11-07 14:38:13 UTC (rev 3187) @@ -196,6 +196,9 @@ gtk_window_set_type_hint(GTK_WINDOW(ui_widgets.open_filesel), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_transient_for(GTK_WINDOW(ui_widgets.open_filesel), GTK_WINDOW(main_widgets.window)); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(ui_widgets.open_filesel), TRUE); +#if GTK_CHECK_VERSION(2, 14, 0) + gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(ui_widgets.open_filesel), FALSE); +#endif /* add checkboxes and filename entry */ gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(ui_widgets.open_filesel), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3186] trunk/src/utils.c
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3186 http://geany.svn.sourceforge.net/geany/?rev=3186&view=rev Author: eht16 Date: 2008-11-07 14:37:57 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Formatting. Modified Paths: -------------- trunk/src/utils.c Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-11-07 14:37:42 UTC (rev 3185) +++ trunk/src/utils.c 2008-11-07 14:37:57 UTC (rev 3186) @@ -313,7 +313,7 @@ } -gdouble utils_scale_round (gdouble val, gdouble factor) +gdouble utils_scale_round(gdouble val, gdouble factor) { /*val = floor(val * factor + 0.5);*/ val = floor(val); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3185] trunk/src/prefs.c
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3185 http://geany.svn.sourceforge.net/geany/?rev=3185&view=rev Author: eht16 Date: 2008-11-07 14:37:42 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Plug a little memory leak. Modified Paths: -------------- trunk/src/prefs.c Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-11-07 14:37:17 UTC (rev 3184) +++ trunk/src/prefs.c 2008-11-07 14:37:42 UTC (rev 3185) @@ -1177,7 +1177,7 @@ case 1: { gtk_color_button_get_color(widget, &color); - editor_prefs.long_line_color = utils_get_hex_from_color(&color); + setptr(editor_prefs.long_line_color, utils_get_hex_from_color(&color)); break; } #ifdef HAVE_VTE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3184] trunk
by eht16＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3184 http://geany.svn.sourceforge.net/geany/?rev=3184&view=rev Author: eht16 Date: 2008-11-07 14:37:17 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Add support for updating tags from a memory buffer (code merged from Anjuta). This still doesn't work and is currently disabled. It would only work for a few filetypes like C, Fortran and JavaScript. The current implementation is still buggy, e.g. function signature parsing is broken. Modified Paths: -------------- trunk/src/document.c trunk/tagmanager/c.c trunk/tagmanager/entry.c trunk/tagmanager/entry.h trunk/tagmanager/fortran.c trunk/tagmanager/get.c trunk/tagmanager/get.h trunk/tagmanager/include/tm_project.h trunk/tagmanager/js.c trunk/tagmanager/read.c trunk/tagmanager/read.h trunk/tagmanager/sql.c trunk/tagmanager/tm_source_file.c trunk/tagmanager/tm_tag.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/src/document.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -99,6 +99,7 @@ static void document_undo_clear(GeanyDocument *doc); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); +static gboolean update_tags_from_buffer(GeanyDocument *doc); /* ignore the case of filenames and paths under WIN32, causes errors if not */ @@ -975,6 +976,25 @@ } +#if 0 +static gboolean auto_update_tag_list(gpointer data) +{ + GeanyDocument *doc = data; + + if (! doc || ! doc->is_valid || doc->tm_file == NULL) + return FALSE; + + if (gtk_window_get_focus(GTK_WINDOW(main_widgets.window)) != GTK_WIDGET(doc->editor->sci)) + return TRUE; + + if (update_tags_from_buffer(doc)) + treeviews_update_tag_list(doc, TRUE); + + return TRUE; +} +#endif + + /* To open a new file, set doc to NULL; filename should be locale encoded. * To reload a file, set the doc for the document to be reloaded; filename should be NULL. * pos is the cursor position, which can be overridden by --line and --column. @@ -990,10 +1010,6 @@ GeanyFiletype *use_ft; FileData filedata; - /*struct timeval tv, tv1;*/ - /*struct timezone tz;*/ - /*gettimeofday(&tv, &tz);*/ - if (reload) { utf8_filename = g_strdup(doc->file_name); @@ -1123,9 +1139,11 @@ g_free(utf8_filename); g_free(locale_filename); - /*gettimeofday(&tv1, &tz);*/ - /*geany_debug("%s: %d", filename, (gint)(tv1.tv_usec - tv.tv_usec)); */ + /* TODO This could be used to automatically update the symbol list, + * based on a configurable interval */ + /*g_timeout_add(10000, auto_update_tag_list, doc);*/ + return doc; } @@ -1532,10 +1550,10 @@ document_set_filetype(doc, doc->file_type); tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); - { - gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); - gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); - } + + gtk_label_set_text(GTK_LABEL(doc->priv->tab_label), base_name); + gtk_label_set_text(GTK_LABEL(doc->priv->tabmenu_label), base_name); + msgwin_status_add(_("File %s saved."), doc->file_name); ui_update_statusbar(doc, -1); g_free(base_name); @@ -1972,6 +1990,26 @@ } +static gboolean update_tags_from_buffer(GeanyDocument *doc) +{ + gboolean result; +#if 1 + /* old code */ + result = tm_source_file_update(doc->tm_file, TRUE, FALSE, TRUE); +#else + gsize len = sci_get_length(doc->editor->sci) + 1; + gchar *text = g_malloc(len); + + /* we copy the whole text into memory instead using a direct char pointer from + * Scintilla because tm_source_file_buffer_update() does modify the string slightly */ + sci_get_text(doc->editor->sci, len, text); + result = tm_source_file_buffer_update(doc->tm_file, (guchar*) text, len, TRUE); + g_free(text); +#endif + return result; +} + + void document_update_tag_list(GeanyDocument *doc, gboolean update) { /* We must call treeviews_update_tag_list() before returning, @@ -2006,14 +2044,14 @@ else { if (update) - tm_source_file_update(doc->tm_file, TRUE, FALSE, TRUE); + update_tags_from_buffer(doc); success = TRUE; } } } else { - success = tm_source_file_update(doc->tm_file, TRUE, FALSE, TRUE); + success = update_tags_from_buffer(doc); if (! success) geany_debug("tag list updating failed"); } Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/c.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -169,6 +169,7 @@ vString* name; /* the name of the token */ unsigned long lineNumber; /* line number of tag */ fpos_t filePosition; /* file position of line containing name */ + int bufferPosition; /* buffer position of line containing name */ } tokenInfo; typedef enum eImplementation { @@ -506,7 +507,10 @@ token->type = TOKEN_NONE; token->keyword = KEYWORD_NONE; token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); vStringClear (token->name); } @@ -1057,8 +1061,16 @@ tag->extensionFields.access = accessField (st); } if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) && - ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) { - tag->extensionFields.arglist = getArglistFromPos(tag->filePosition, tag->name); + ((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type))) + { + if (useFile()) { + tag->extensionFields.arglist = getArglistFromFilePos( + tag->filePosition, tag->name); + } + else { + tag->extensionFields.arglist = getArglistFromBufferPos( + tag->bufferPosition, tag->name); + } } break; } @@ -1233,8 +1245,11 @@ initTagEntry (&e, vStringValue (token->name)); e.lineNumber = token->lineNumber; - e.filePosition = token->filePosition; - e.isFileScope = isFileScope; + if (useFile()) + e.filePosition = token->filePosition; + else + e.bufferPosition = token->bufferPosition; + e.isFileScope = isFileScope; e.kindName = tagName (type); e.kind = tagLetter (type); e.type = type; @@ -1688,7 +1703,10 @@ { dest->type = src->type; dest->keyword = src->keyword; - dest->filePosition = src->filePosition; + if (useFile()) + dest->filePosition = src->filePosition; + else + dest->bufferPosition = src->bufferPosition; dest->lineNumber = src->lineNumber; vStringCopy (dest->name, src->name); } @@ -2199,7 +2217,14 @@ --depth; } if (st->argEndPosition == 0) - st->argEndPosition = ftell(File.fp); + { + if (useFile()) + st->argEndPosition = ftell(File.fp); + else + /* FIXME File.fpBufferPosition is wrong here, this breaks function signatures and + * so Geany's calltips */ + st->argEndPosition = File.fpBufferPosition; + } if (! info->isNameCandidate) initToken (token); Modified: trunk/tagmanager/entry.c =================================================================== --- trunk/tagmanager/entry.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/entry.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -403,6 +403,7 @@ e->lineNumber = getSourceLineNumber (); e->language = getSourceLanguageName (); e->filePosition = getInputFilePosition (); + e->bufferPosition = getInputBufferPosition (); e->sourceFileName = getSourceFileTagPath (); e->name = name; } Modified: trunk/tagmanager/entry.h =================================================================== --- trunk/tagmanager/entry.h 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/entry.h 2008-11-07 14:37:17 UTC (rev 3184) @@ -56,6 +56,7 @@ boolean lineNumberEntry;/* pattern or line number entry */ unsigned long lineNumber; /* line number of tag */ fpos_t filePosition; /* file position of line containing tag */ + int bufferPosition; /* buffer position of line containing tag */ const char* language; /* language of source file */ boolean isFileScope; /* is tag visibile only within source file? */ boolean isFileEntry; /* is this just an entry for a file name? */ Modified: trunk/tagmanager/fortran.c =================================================================== --- trunk/tagmanager/fortran.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/fortran.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -155,6 +155,7 @@ vString* string; unsigned long lineNumber; fpos_t filePosition; + int bufferPosition; /* buffer position of line containing name */ } tokenInfo; /* @@ -350,7 +351,10 @@ e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN); e.lineNumber = token->lineNumber; - e.filePosition = token->filePosition; + if (useFile()) + e.filePosition = token->filePosition; + else + e.bufferPosition = token->bufferPosition; e.isFileScope = isFileScope (token->tag); e.kindName = FortranKinds [token->tag].name; e.kind = FortranKinds [token->tag].letter; @@ -390,7 +394,10 @@ token.tag = TAG_LABEL; token.string = label; token.lineNumber = getSourceLineNumber (); - token.filePosition = getInputFilePosition (); + if (useFile()) + token.filePosition = getInputFilePosition (); + else + token.bufferPosition = getInputBufferPosition (); makeFortranTag (&token, TAG_LABEL); } @@ -728,7 +735,10 @@ token->tag = TAG_UNDEFINED; token->string = vStringNew (); token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); return token; } @@ -797,7 +807,10 @@ getNextChar: token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); c = getChar (); Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/get.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -313,8 +313,16 @@ e.kindName = "macro"; e.kind = 'd'; if (parameterized) - e.extensionFields.arglist = getArglistFromPos(getInputFilePosition() - , e.name); + { + if (useFile()) { + e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition() + , e.name); + } + else { + e.extensionFields.arglist = getArglistFromBufferPos(getInputBufferPosition() + , e.name); + } + } makeTagEntry (&e); if (parameterized) free((char *) e.extensionFields.arglist); @@ -676,16 +684,52 @@ return c; } -extern char *getArglistFromPos(fpos_t startPosition, const char *tokenName) +extern char *getArglistFromBufferPos(int startPosition, const char *tokenName) { + int bufferOriginalPosition; + char *result = NULL; + char *arglist = NULL; + long pos1, pos2; + + /* FIXME startPosition as well as getBufPos() are mostly wrong here */ + pos2 = getBufPos(); + + if (!useFile()) { + bufferOriginalPosition = getBufPos (); + setBufPos(startPosition); + pos1 = File.fpBufferPosition; + } + else + return NULL; + + if (pos2 > pos1) + { + result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); + if (result != NULL) + { + memcpy(result, &File.fpBuffer[getBufPos()], pos2 - pos1 + 1); + result[pos2-pos1+1] = '\0'; + arglist = getArglistFromStr(result, tokenName); + free(result); + } + } + setBufPos (bufferOriginalPosition); + return arglist; +} + +extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName) +{ fpos_t originalPosition; char *result = NULL; char *arglist = NULL; - long pos1, pos2 = ftell(File.fp); + long pos1, pos2; + pos2 = ftell(File.fp); + fgetpos(File.fp, &originalPosition); fsetpos(File.fp, &startPosition); pos1 = ftell(File.fp); + if (pos2 > pos1) { result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); Modified: trunk/tagmanager/get.h =================================================================== --- trunk/tagmanager/get.h 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/get.h 2008-11-07 14:37:17 UTC (rev 3184) @@ -44,7 +44,8 @@ extern void cppUngetc (const int c); extern int cppGetc (void); extern int skipOverCComment (void); -extern char *getArglistFromPos(fpos_t startPosition, const char *tokenName); +extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName); +extern char *getArglistFromBufferPos(int startPosition, const char *tokenName); extern char *getArglistFromStr(char *buf, const char *name); #endif /* _GET_H */ Modified: trunk/tagmanager/include/tm_project.h =================================================================== --- trunk/tagmanager/include/tm_project.h 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/include/tm_project.h 2008-11-07 14:37:17 UTC (rev 3184) @@ -13,6 +13,7 @@ #include <glib.h> #include "tm_work_object.h" + /*! \file The TMProject structure and associated functions can be used to group together related source files in a "project". The update, open and save functions take @@ -142,6 +143,13 @@ */ gboolean tm_project_remove_object(TMProject *project, TMWorkObject *w); +/*! Removes only the project-tags associated with the object. Then resort the project's tags. + \param project The project from which the file's tags are to be removed. + \param w The member work object (source file) to remove the tags. + \return TRUE on success, FALSE on failure +*/ +gboolean tm_project_remove_tags_from_list(TMProject *project, TMWorkObject *w); + /*! Updates the project database and all the source files contained in the project. All sorting and deduping is lost and should be redone. \param work_object The project to update. Modified: trunk/tagmanager/js.c =================================================================== --- trunk/tagmanager/js.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/js.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -110,6 +110,7 @@ fpos_t filePosition; int nestLevel; boolean ignoreTag; + int bufferPosition; /* buffer position of line containing name */ } tokenInfo; /* @@ -197,7 +198,10 @@ token->nestLevel = 0; token->ignoreTag = FALSE; token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); return token; } @@ -353,8 +357,11 @@ { c = fileGetc (); token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); - } + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); + } while (c == '\t' || c == ' ' || c == '\n'); switch (c) @@ -377,7 +384,10 @@ token->type = TOKEN_STRING; parseString (token->string, c); token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); break; case '\\': @@ -386,7 +396,10 @@ fileUngetc (c); token->type = TOKEN_CHARACTER; token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); break; case '/': @@ -429,7 +442,10 @@ { parseIdentifier (token->string, c); token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); token->keyword = analyzeToken (token->string); if (isKeyword (token, KEYWORD_NONE)) token->type = TOKEN_IDENTIFIER; @@ -444,7 +460,10 @@ { dest->nestLevel = src->nestLevel; dest->lineNumber = src->lineNumber; - dest->filePosition = src->filePosition; + if (useFile()) + dest->filePosition = src->filePosition; + else + dest->bufferPosition = src->bufferPosition; dest->type = src->type; dest->keyword = src->keyword; vStringCopy(dest->string, src->string); Modified: trunk/tagmanager/read.c =================================================================== --- trunk/tagmanager/read.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/read.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -29,7 +29,12 @@ */ inputFile File; /* globally read through macros */ static fpos_t StartOfLine; /* holds deferred position of start of line */ +static int bufferStartOfLine; /* the same as StartOfLine but for buffer */ + +static int readNextChar (void); +static int pushBackChar (int c); + /* * FUNCTION DEFINITIONS */ @@ -115,7 +120,7 @@ { int c; do - c = getc (File.fp); + c = readNextChar (); while (c == ' ' || c == '\t'); return c; } @@ -127,9 +132,9 @@ while (c != EOF && isdigit (c)) { lNum = (lNum * 10) + (c - '0'); - c = getc (File.fp); + c = readNextChar (); } - ungetc (c, File.fp); + pushBackChar (c); if (c != ' ' && c != '\t') lNum = 0; @@ -152,17 +157,17 @@ if (c == '"') { - c = getc (File.fp); /* skip double-quote */ + c = readNextChar (); /* skip double-quote */ quoteDelimited = TRUE; } while (c != EOF && c != '\n' && (quoteDelimited ? (c != '"') : (c != ' ' && c != '\t'))) { vStringPut (fileName, c); - c = getc (File.fp); + c = readNextChar (); } if (c == '\n') - ungetc (c, File.fp); + pushBackChar (c); vStringPut (fileName, '\0'); return fileName; @@ -176,13 +181,13 @@ if (isdigit (c)) { - ungetc (c, File.fp); + pushBackChar (c); result = TRUE; } - else if (c == 'l' && getc (File.fp) == 'i' && - getc (File.fp) == 'n' && getc (File.fp) == 'e') + else if (c == 'l' && readNextChar () == 'i' && + readNextChar () == 'n' && readNextChar () == 'e') { - c = getc (File.fp); + c = readNextChar (); if (c == ' ' || c == '\t') { DebugStatement ( lineStr = "line"; ) @@ -283,6 +288,60 @@ return opened; } +/* The user should take care of allocate and free the buffer param. + * This func is NOT THREAD SAFE. + * The user should not tamper with the buffer while this func is executing. + */ +extern boolean bufferOpen (unsigned char *buffer, int buffer_size, + const char *const fileName, const langType language ) +{ + boolean opened = FALSE; + + /* Check whether a file of a buffer were already open, then close them. + */ + if (File.fp != NULL) { + fclose (File.fp); /* close any open source file */ + File.fp = NULL; + } + + if (File.fpBuffer != NULL) { + error(PERROR, "An unallocated buffer was found. Please check you called \ + correctly bufferClose ()\n"); + File.fpBuffer = NULL; + } + + /* check if we got a good buffer */ + if (buffer == NULL || buffer_size == 0) { + opened = FALSE; + return opened; + } + + opened = TRUE; + + File.fpBuffer = buffer; + setInputFileName (fileName); + bufferStartOfLine = 0; + File.fpBufferPosition = 0; + File.fpBufferSize = buffer_size; + File.currentLine = NULL; + File.language = language; + File.lineNumber = 0L; + File.eof = FALSE; + File.newLine = TRUE; + + if (File.line != NULL) + vStringClear (File.line); + + setSourceFileParameters (vStringNewInit (fileName), language); + File.source.lineNumber = 0L; + + verbose ("OPENING %s as %s language %sfile\n", fileName, + getLanguageName (language), + File.source.isHeader ? "include " : ""); + + return opened; +} + extern void fileClose (void) { if (File.fp != NULL) @@ -299,6 +358,14 @@ } } +/* user should take care of freeing the buffer */ +extern void bufferClose (void) +{ + if (File.fpBuffer != NULL) { + File.fpBuffer = NULL; + } +} + extern boolean fileEOF (void) { return File.eof; @@ -323,7 +390,7 @@ { int c; readnext: - c = getc (File.fp); + c = readNextChar (); /* If previous character was a newline, then we're starting a line. */ @@ -336,8 +403,13 @@ goto readnext; else { - fsetpos (File.fp, &StartOfLine); - c = getc (File.fp); + /* FIXME: find out a better way to do this check */ + if (File.fp != NULL) + fsetpos (File.fp, &StartOfLine); + else + File.fpBufferPosition = bufferStartOfLine; + + c = readNextChar (); } } } @@ -346,8 +418,10 @@ File.eof = TRUE; else if (c == NEWLINE) { - File.newLine = TRUE; - fgetpos (File.fp, &StartOfLine); + if (File.fp != NULL) /* we have a file */ + fgetpos (File.fp, &StartOfLine); + else /* it's a buffer */ + bufferStartOfLine = File.fpBufferPosition; } else if (c == CRETURN) { @@ -355,14 +429,17 @@ * used forms if line breaks: LF (UNIX), CR (MacIntosh), and * CR-LF (MS-DOS) are converted into a generic newline. */ - const int next = getc (File.fp); /* is CR followed by LF? */ + const int next = readNextChar (); /* is CR followed by LF? */ if (next != NEWLINE) - ungetc (next, File.fp); + pushBackChar (next); c = NEWLINE; /* convert CR into newline */ File.newLine = TRUE; - fgetpos (File.fp, &StartOfLine); + if (File.fp != NULL) + fgetpos (File.fp, &StartOfLine); + else + bufferStartOfLine = File.fpBufferPosition; } DebugStatement ( debugPutc (DEBUG_RAW, c); ) return c; @@ -457,8 +534,67 @@ return result; } +/* Read a character choosing automatically between file or buffer, depending + * on which mode we are. + */ +static int readNextChar(void) +{ + if (File.fp != NULL) { + return getc(File.fp); + } + else { + int c; + if (File.fpBufferPosition >= File.fpBufferSize) + return EOF; + + c = File.fpBuffer[File.fpBufferPosition]; + File.fpBufferPosition++; + + return c; + } +} + +/* Replaces ungetc() for file. In case of buffer we'll perform the same action: + * fpBufferPosition-- and write of the param char into the buf. + */ +static int pushBackChar (int c) +{ + if (File.fp != NULL) { + return ungetc (c, File.fp); + } + else { + File.fpBufferPosition--; + if (File.fpBufferPosition < 0) + return EOF; + File.fpBuffer[File.fpBufferPosition] = c; + return File.fpBuffer[File.fpBufferPosition]; + } +} + + +/* replacement for fsetpos, applied to a buffer */ +extern void setBufPos (int new_position) +{ + File.fpBufferPosition = new_position; +} + +/* replacement for fgetpos, applied to a buffer */ +extern int getBufPos (void) +{ + return File.fpBufferPosition; +} + +extern boolean useFile (void) +{ + if (File.fp != NULL) + return TRUE; + else + return FALSE; +} + /* * Source file line reading with automatic buffer sizing + * Does not perform file/buffer checks. Only file is supported. */ extern char *readLine (vString *const vLine, FILE *const fp) { Modified: trunk/tagmanager/read.h =================================================================== --- trunk/tagmanager/read.h 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/read.h 2008-11-07 14:37:17 UTC (rev 3184) @@ -33,6 +33,7 @@ #define getInputLineNumber() File.lineNumber #define getInputFileName() vStringValue (File.source.name) #define getInputFilePosition() File.filePosition +#define getInputBufferPosition() File.fpBufferPosition #define getSourceFileName() vStringValue (File.source.name) #define getSourceFileTagPath() File.source.tagPath #define getSourceLanguage() File.source.language @@ -73,6 +74,10 @@ vString *line; /* last line read from file */ const unsigned char* currentLine; /* current line being worked on */ FILE *fp; /* stream used for reading the file */ + unsigned char* fpBuffer; /* buffer which contains the text to be parsed. + This is optional to the use of a file-descriptor */ + int fpBufferSize; /* size of the fpBuffer */ + int fpBufferPosition; /* pointer to the current position in buffer */ unsigned long lineNumber; /* line number in the input file */ fpos_t filePosition; /* file position of current line */ int ungetch; /* a single character that was ungotten */ @@ -116,6 +121,13 @@ extern char *readLine (vString *const vLine, FILE *const fp); extern char *readSourceLine (vString *const vLine, fpos_t location, long *const pSeekValue); +extern boolean bufferOpen (unsigned char *buffer, int buffer_size, + const char *const fileName, const langType language ); +extern void bufferClose (void); +extern void setBufPos (int new_position); +extern int getBufPos (); +extern boolean useFile (); + #endif /* _READ_H */ /* vi:set tabstop=8 shiftwidth=4: */ Modified: trunk/tagmanager/sql.c =================================================================== --- trunk/tagmanager/sql.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/sql.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -138,6 +138,7 @@ vString * scope; unsigned long lineNumber; fpos_t filePosition; + int bufferPosition; /* buffer position of line containing name */ } tokenInfo; /* @@ -274,30 +275,30 @@ { if ( isType(token, TOKEN_IDENTIFIER) || isType(token, TOKEN_STRING) ) { - printf( "\n%s: token string t:%s s:%s l:%lu p:%ld\n" + printf( "\n%s: token string t:%s s:%s l:%lu p:%d\n" , location , vStringValue(token->string) , vStringValue(token->scope) , token->lineNumber - , token->filePosition + , token->bufferPosition ); } else { - printf( "\n%s: token t:%d s:%s l:%lu p:%lu\n" + printf( "\n%s: token t:%d s:%s l:%lu p:%d\n" , location , token->type , vStringValue(token->scope) , token->lineNumber - , token->filePosition + , token->bufferPosition ); } } else { - printf( "\n%s: keyword:%s k:%d s:%s l:%lu p:%ld\n" + printf( "\n%s: keyword:%s k:%d s:%s l:%lu p:%d\n" , location , vStringValue(token->string) , token->keyword , vStringValue(token->scope) , token->lineNumber - , token->filePosition + , token->bufferPosition ); } #endif @@ -391,7 +392,10 @@ initTagEntry (&e, name); e.lineNumber = token->lineNumber; - e.filePosition = token->filePosition; + if (useFile()) + e.filePosition = token->filePosition; + else + e.bufferPosition = token->bufferPosition; e.kindName = SqlKinds [kind].name; e.kind = SqlKinds [kind].letter; @@ -491,7 +495,10 @@ token->type = TOKEN_STRING; parseString (token->string, c); token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); break; case '-': @@ -557,7 +564,10 @@ { parseIdentifier (token->string, c); token->lineNumber = getSourceLineNumber (); - token->filePosition = getInputFilePosition (); + if (useFile()) + token->filePosition = getInputFilePosition (); + else + token->bufferPosition = getInputBufferPosition (); token->keyword = analyzeToken (token->string); if (isKeyword (token, KEYWORD_rem)) { Modified: trunk/tagmanager/tm_source_file.c =================================================================== --- trunk/tagmanager/tm_source_file.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/tm_source_file.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -29,6 +29,7 @@ #include "tm_source_file.h" #include "tm_tag.h" + guint source_file_class_id = 0; static TMSourceFile *current_source_file = NULL; @@ -154,6 +155,76 @@ return status; } +gboolean tm_source_file_buffer_parse(TMSourceFile *source_file, guchar* text_buf, gint buf_size) +{ + const char *file_name; + gboolean status = TRUE; + + if ((NULL == source_file) || (NULL == source_file->work_object.file_name)) + { + g_warning("Attempt to parse NULL file"); + return FALSE; + } + + if ((NULL == text_buf) || (0 == buf_size)) + { + g_warning("Attempt to parse a NULL text buffer"); + } + + file_name = source_file->work_object.file_name; + if (NULL == LanguageTable) + { + initializeParsing(); + installLanguageMapDefaults(); + if (NULL == TagEntryFunction) + TagEntryFunction = tm_source_file_tags; + } + current_source_file = source_file; + if (LANG_AUTO == source_file->lang) + source_file->lang = getFileLanguage (file_name); + if (source_file->lang == LANG_IGNORE) + { +#ifdef TM_DEBUG + g_warning("ignoring %s (unknown language)\n", file_name); +#endif + } + else if (! LanguageTable [source_file->lang]->enabled) + { +#ifdef TM_DEBUG + g_warning("ignoring %s (language disabled)\n", file_name); +#endif + } + else + { + int passCount = 0; + while ((TRUE == status) && (passCount < 3)) + { + if (source_file->work_object.tags_array) + tm_tags_array_free(source_file->work_object.tags_array, FALSE); + if (bufferOpen (text_buf, buf_size, file_name, source_file->lang)) + { + if (LanguageTable [source_file->lang]->parser != NULL) + { + LanguageTable [source_file->lang]->parser (); + bufferClose (); + break; + } + else if (LanguageTable [source_file->lang]->parser2 != NULL) + status = LanguageTable [source_file->lang]->parser2 (passCount); + bufferClose (); + } + else + { + g_warning("Unable to open %s", file_name); + return FALSE; + } + ++ passCount; + } + return TRUE; + } + return status; +} + int tm_source_file_tags(const tagEntryInfo *tag) { if (NULL == current_source_file) @@ -179,10 +250,42 @@ } return TRUE; } - else + else { +#ifdef TM_DEBUG + g_message ("no parsing of %s has been done", source_file->file_name); +#endif return FALSE; + } } + +gboolean tm_source_file_buffer_update(TMWorkObject *source_file, guchar* text_buf, + gint buf_size, gboolean update_parent) +{ +#ifdef TM_DEBUG + g_message("Buffer updating based on source file %s", source_file->file_name); +#endif + + tm_source_file_buffer_parse (TM_SOURCE_FILE(source_file), text_buf, buf_size); + tm_tags_sort(source_file->tags_array, NULL, FALSE); + source_file->analyze_time = time(NULL); + if ((source_file->parent) && update_parent) + { +#ifdef TM_DEBUG + g_message("Updating parent [project] from buffer.."); +#endif + tm_work_object_update(source_file->parent, TRUE, FALSE, TRUE); + } +#ifdef TM_DEBUG + else + g_message("Skipping parent update because parent is %s and update_parent is %s" + , source_file->parent?"NOT NULL":"NULL", update_parent?"TRUE":"FALSE"); + +#endif + return TRUE; +} + + gboolean tm_source_file_write(TMWorkObject *source_file, FILE *fp, guint attrs) { TMTag *tag; Modified: trunk/tagmanager/tm_tag.c =================================================================== --- trunk/tagmanager/tm_tag.c 2008-11-07 05:20:43 UTC (rev 3183) +++ trunk/tagmanager/tm_tag.c 2008-11-07 14:37:17 UTC (rev 3184) @@ -631,7 +631,7 @@ s_partial = partial; result = (TMTag **) bsearch(&tag, sorted_tags_array->pdata, sorted_tags_array->len , sizeof(gpointer), tm_tag_compare); - /* there can be matches on both sides of result */ + /* There can be matches on both sides of result */ if (result) { TMTag **last = (TMTag **) &sorted_tags_array->pdata[sorted_tags_array->len - 1]; @@ -640,7 +640,7 @@ /* First look for any matches after result */ adv = result; adv++; - for (; *adv && adv <= last; ++ adv) + for (; adv <= last && *adv; ++ adv) { if (0 != tm_tag_compare(&tag, adv)) break; @@ -654,7 +654,7 @@ ++tagMatches; } *tagCount=tagMatches; - ++ result; /* correct address for the last successful match */ + ++ result; /* Correct address for the last successful match */ } s_partial = FALSE; return (TMTag **) result; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3183] branches/build-system/src/build.c
by elextr＠users.sourceforge.net 07 Nov '08

07 Nov '08

Revision: 3183 http://geany.svn.sourceforge.net/geany/?rev=3183&view=rev Author: elextr Date: 2008-11-07 05:20:43 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Check the new format Modified Paths: -------------- branches/build-system/src/build.c Modified: branches/build-system/src/build.c =================================================================== --- branches/build-system/src/build.c 2008-11-06 17:26:29 UTC (rev 3182) +++ branches/build-system/src/build.c 2008-11-07 05:20:43 UTC (rev 3183) @@ -83,15 +83,15 @@ }; static BuildMenuItems default_menu_items = - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; static BuildMenuItems latex_menu_items = - {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; static struct { - GtkWidget *run_button; - GtkWidget *compile_button; + GtkWidget *run_button; + GtkWidget *compile_button; } widgets; @@ -150,17 +150,17 @@ static GPid build_view_tex_file(GeanyDocument *doc, gint mode) { - gchar **argv, **term_argv; - gchar *executable = NULL; - gchar *view_file = NULL; - gchar *locale_filename = NULL; - gchar *cmd_string = NULL; - gchar *locale_cmd_string = NULL; - gchar *locale_term_cmd; - gchar *script_name; - gchar *working_dir; - gint term_argv_len, i; - GError *error = NULL; + gchar **argv, **term_argv; + gchar *executable = NULL; + gchar *view_file = NULL; + gchar *locale_filename = NULL; + gchar *cmd_string = NULL; + gchar *locale_cmd_string = NULL; + gchar *locale_term_cmd; + gchar *script_name; + gchar *working_dir; + gint term_argv_len, i; + GError *error = NULL; struct stat st; if (doc == NULL || doc->file_name == NULL) @@ -185,8 +185,8 @@ /* replace %f and %e in the run_cmd string */ cmd_string = g_strdup((mode == LATEX_CMD_VIEW_DVI) ? - g_strdup(doc->file_type->programs->run_cmd) : - g_strdup(doc->file_type->programs->run_cmd2)); + g_strdup(doc->file_type->programs->run_cmd) : + g_strdup(doc->file_type->programs->run_cmd2)); cmd_string = utils_str_replace(cmd_string, "%f", view_file); cmd_string = utils_str_replace(cmd_string, "%e", executable); @@ -210,11 +210,12 @@ if (term_argv[0] == NULL) { ui_set_statusbar(TRUE, - _("Could not find terminal \"%s\" " - "(check path for Terminal tool setting in Preferences)"), tool_prefs.term_cmd); + _("Could not find terminal \"%s\" " + "(check path for Terminal tool setting in Preferences)"), + tool_prefs.term_cmd); utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, NULL); + locale_term_cmd, NULL); g_strfreev(term_argv); return (GPid) 1; } @@ -226,9 +227,9 @@ if (! build_create_shellscript(script_name, locale_cmd_string, TRUE)) { ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), - executable); + executable); utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, working_dir, NULL); + locale_term_cmd, working_dir, NULL); g_strfreev(term_argv); return (GPid) 1; } @@ -240,17 +241,17 @@ argv[i] = g_strdup(term_argv[i]); } #ifdef G_OS_WIN32 - /* command line arguments only for cmd.exe */ - if (strstr(argv[0], "cmd.exe") != NULL) - { - argv[term_argv_len ] = g_strdup("/Q /C"); - argv[term_argv_len + 1] = script_name; - } - else - { - argv[term_argv_len ] = script_name; - argv[term_argv_len + 1] = NULL; - } + /* command line arguments only for cmd.exe */ + if (strstr(argv[0], "cmd.exe") != NULL) + { + argv[term_argv_len ] = g_strdup("/Q /C"); + argv[term_argv_len + 1] = script_name; + } + else + { + argv[term_argv_len ] = script_name; + argv[term_argv_len + 1] = NULL; + } #else argv[term_argv_len ] = g_strdup("-e"); argv[term_argv_len + 1] = script_name; @@ -265,7 +266,7 @@ ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, NULL); + locale_term_cmd, NULL); g_strfreev(argv); g_strfreev(term_argv); g_error_free(error); @@ -281,7 +282,7 @@ } utils_free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, - locale_term_cmd, NULL); + locale_term_cmd, NULL); g_strfreev(argv); g_strfreev(term_argv); @@ -310,52 +311,54 @@ return object_file; } + + #endif static GPid build_make_file(GeanyDocument *doc, gint build_opts) { GString *cmdstr; - gchar *dir = NULL; - gchar *part1=NULL; - gchar *part2=NULL; - GPid pid; + gchar *dir = NULL; + gchar *part1=NULL; + gchar *part2=NULL; + GPid pid; if (doc == NULL || doc->file_name == NULL) return (GPid) 1; - part1 = tool_prefs.make_cmd; + part1 = tool_prefs.make_cmd; if (build_opts == GBO_MAKE_OBJECT) { build_info.type = build_opts; - if( app->project!=NULL && app->project->build_3_cmd != NULL ) - part1 = app->project->build_3_cmd; - else part2 = "\"%e.o\""; + if (app->project!=NULL && app->project->build_3_cmd != NULL) + part1 = app->project->build_3_cmd; + else part2 = "\"%e.o\""; } else if (build_opts == GBO_MAKE_CUSTOM && build_info.custom_target) { build_info.type = GBO_MAKE_CUSTOM; - if( app->project != NULL && app->project->build_2_cmd != NULL ) - part1 = app->project->build_2_cmd; - else part2 = build_info.custom_target; + if (app->project != NULL && app->project->build_2_cmd != NULL) + part1 = app->project->build_2_cmd; + else part2 = build_info.custom_target; dir = project_get_make_dir(); } - else /* GBO_MAKE_ALL */ + else /* GBO_MAKE_ALL */ { build_info.type = GBO_MAKE_ALL; - if( app->project != NULL && app->project->build_1_cmd != NULL ) - part1 = app->project->build_1_cmd; - else part2 = "all"; + if (app->project != NULL && app->project->build_1_cmd != NULL) + part1 = app->project->build_1_cmd; + else part2 = "all"; dir = project_get_make_dir(); } cmdstr = g_string_new(part1); - if( part2!=NULL ) + if (part2!=NULL) { - g_string_append_c(cmdstr, ' '); - g_string_append( cmdstr, part2 ); - } + g_string_append_c(cmdstr, ' '); + g_string_append(cmdstr, part2); + } pid = build_spawn_cmd(doc, cmdstr->str, dir); /* if dir is NULL, idx filename is used */ g_free(dir); @@ -419,7 +422,7 @@ static gchar *quote_executable(const gchar *cmd) { gchar **fields; - gchar *result; + gchar *result; if (! NZV(cmd)) return NULL; @@ -433,6 +436,8 @@ g_strfreev(fields); return result; } + + #endif @@ -440,17 +445,17 @@ * idx document directory */ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *dir) { - GError *error = NULL; - gchar **argv; - gchar *working_dir; - gchar *utf8_working_dir; - gchar *cmd_string; - gchar *utf8_cmd_string; - gchar *locale_filename; - gchar *executable; - gchar *tmp; - gint stdout_fd; - gint stderr_fd; + GError *error = NULL; + gchar **argv; + gchar *working_dir; + gchar *utf8_working_dir; + gchar *cmd_string; + gchar *utf8_cmd_string; + gchar *locale_filename; + gchar *executable; + gchar *tmp; + gint stdout_fd; + gint stderr_fd; g_return_val_if_fail(doc != NULL, (GPid) 1); clear_errors(doc); @@ -487,12 +492,13 @@ utf8_cmd_string = utils_get_utf8_from_locale(cmd_string); utf8_working_dir = (dir != NULL) ? g_strdup(dir) : - g_path_get_dirname(doc->file_name); + g_path_get_dirname(doc->file_name); working_dir = utils_get_locale_from_utf8(utf8_working_dir); gtk_list_store_clear(msgwindow.store_compiler); gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); - msgwin_compiler_add_fmt(COLOR_BLUE, _("%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); + msgwin_compiler_add_fmt(COLOR_BLUE, _( + "%s (in directory: %s)"), utf8_cmd_string, utf8_working_dir); g_free(utf8_working_dir); g_free(utf8_cmd_string); @@ -501,8 +507,10 @@ build_info.dir = g_strdup(working_dir); build_info.file_type_id = FILETYPE_ID(doc->file_type); - if (! g_spawn_async_with_pipes(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(build_info.pid), NULL, &stdout_fd, &stderr_fd, &error)) + if (! g_spawn_async_with_pipes(working_dir, argv, NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, &(build_info.pid), NULL, &stdout_fd, + &stderr_fd, &error)) { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); ui_set_statusbar(TRUE, _("Process failed (%s)"), error->message); @@ -522,9 +530,9 @@ /* use GIOChannels to monitor stdout and stderr */ utils_set_up_io_channel(stdout_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, - TRUE, build_iofunc, GINT_TO_POINTER(0)); + TRUE, build_iofunc, GINT_TO_POINTER(0)); utils_set_up_io_channel(stderr_fd, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, - TRUE, build_iofunc, GINT_TO_POINTER(1)); + TRUE, build_iofunc, GINT_TO_POINTER(1)); g_strfreev(argv); g_free(working_dir); @@ -538,9 +546,9 @@ * Returns the name part of the filename, without extension. * Returns NULL if executable file doesn't exist. */ static gchar *get_build_executable(const gchar *locale_filename, gboolean check_exists, - filetype_id ft_id) + filetype_id ft_id) { - gchar *long_executable = NULL; + gchar *long_executable = NULL; struct stat st; long_executable = utils_remove_ext_from_filename(locale_filename); @@ -584,7 +592,7 @@ gchar *utf8_check_executable = utils_get_utf8_from_locale(check_executable); ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (make sure it is already built)"), - utf8_check_executable); + utf8_check_executable); g_free(utf8_check_executable); g_free(check_executable); return NULL; @@ -603,17 +611,17 @@ * when vc->skip_run_script is set, otherwise it will be set to NULL */ static gchar *prepare_run_script(GeanyDocument *doc, gchar **vte_cmd_nonscript) { - gchar *locale_filename = NULL; - gboolean have_project; - GeanyProject *project = app->project; + gchar *locale_filename = NULL; + gboolean have_project; + GeanyProject *project = app->project; GeanyFiletype *ft = doc->file_type; - gboolean check_exists; - gchar *cmd = NULL; - gchar *executable = NULL; - gchar *working_dir = NULL; - gboolean autoclose = FALSE; - gboolean result = FALSE; - gchar *tmp; + gboolean check_exists; + gchar *cmd = NULL; + gchar *executable = NULL; + gchar *working_dir = NULL; + gboolean autoclose = FALSE; + gboolean result = FALSE; + gchar *tmp; if (vte_cmd_nonscript != NULL) *vte_cmd_nonscript = NULL; @@ -622,8 +630,8 @@ have_project = (project != NULL && NZV(project->run_cmd)); cmd = (have_project) ? - project->run_cmd : - ft->programs->run_cmd; + project->run_cmd : + ft->programs->run_cmd; /* only check for existing executable, if executable is required by %e */ check_exists = (strstr(cmd, "%e") != NULL); @@ -651,7 +659,8 @@ { gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir); - ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), utf8_working_dir); + ui_set_statusbar(TRUE, _("Failed to change the working directory to \"%s\""), + utf8_working_dir); utils_free_pointers(utf8_working_dir, working_dir, executable, locale_filename, NULL); return NULL; } @@ -689,7 +698,7 @@ gchar *utf8_cmd = utils_get_utf8_from_locale(cmd); ui_set_statusbar(TRUE, _("Failed to execute \"%s\" (start-script could not be created)"), - utf8_cmd); + utf8_cmd); g_free(utf8_cmd); } @@ -705,9 +714,9 @@ static GPid build_run_cmd(GeanyDocument *doc) { - gchar *working_dir; - gchar *vte_cmd_nonscript = NULL; - GError *error = NULL; + gchar *working_dir; + gchar *vte_cmd_nonscript = NULL; + GError *error = NULL; if (doc == NULL || doc->file_name == NULL) return (GPid) 0; @@ -722,7 +731,7 @@ if (vte_info.load_vte && vc != NULL && vc->run_in_vte) { GeanyProject *project = app->project; - gchar *vte_cmd; + gchar *vte_cmd; if (vc->skip_run_script) { @@ -744,7 +753,8 @@ } if (! vte_send_cmd(vte_cmd)) ui_set_statusbar(FALSE, - _("Could not execute the file in the VTE because it probably contains a command.")); + _("Could not execute the file in the VTE " + "because it probably contains a command.")); /* show the VTE */ gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_VTE); @@ -758,10 +768,10 @@ else #endif { - gchar *locale_term_cmd = NULL; - gchar **term_argv = NULL; - guint term_argv_len, i; - gchar **argv = NULL; + gchar *locale_term_cmd = NULL; + gchar **term_argv = NULL; + guint term_argv_len, i; + gchar **argv = NULL; /* get the terminal path */ locale_term_cmd = utils_get_locale_from_utf8(tool_prefs.term_cmd); @@ -780,8 +790,9 @@ if (term_argv[0] == NULL) { ui_set_statusbar(TRUE, - _("Could not find terminal \"%s\" " - "(check path for Terminal tool setting in Preferences)"), tool_prefs.term_cmd); + _("Could not find terminal \"%s\" " + "(check path for Terminal tool setting in Preferences)"), + tool_prefs.term_cmd); run_info.pid = (GPid) 1; goto free_strings; } @@ -846,7 +857,7 @@ while (g_io_channel_read_line(ioc, &msg, NULL, NULL, NULL) && msg) { /*if (s != G_IO_STATUS_NORMAL && s != G_IO_STATUS_EOF) break;*/ - gint color; + gint color; gchar *tmp; color = (GPOINTER_TO_INT(data)) ? COLOR_DARK_RED : COLOR_BLACK; @@ -860,17 +871,17 @@ if (editor_prefs.use_indicators) { gchar *filename; - gint line; + gint line; msgwin_parse_compiler_error_line(msg, current_dir_entered, - &filename, &line); + &filename, &line); if (line != -1 && filename != NULL) { GeanyDocument *doc = document_find_by_filename(filename); if (doc) editor_set_indicator_on_line(doc->editor, line - 1); - color = COLOR_RED; /* error message parsed on the line */ + color = COLOR_RED; /* error message parsed on the line */ } g_free(filename); } @@ -897,7 +908,7 @@ if ((pos = strstr(string, "Entering directory")) != NULL) { - gsize len; + gsize len; gchar *input; /* get the start of the path */ @@ -911,7 +922,7 @@ /* kill the ' at the end of the path */ len = strlen(input); input[len - 1] = '\0'; - input = g_realloc(input, len); /* shorten by 1 */ + input = g_realloc(input, len); /* shorten by 1 */ *prefix = input; return TRUE; @@ -945,7 +956,7 @@ msgwin_compiler_add(COLOR_BLUE, msg); if (! ui_prefs.msgwindow_visible || gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)) != MSG_COMPILER) - ui_set_statusbar(FALSE, "%s", msg); + ui_set_statusbar(FALSE, "%s", msg); } } @@ -966,7 +977,8 @@ failure = TRUE; } else - { /* any other failure occured */ + { + /* any other failure occured */ failure = TRUE; } show_build_result_message(failure); @@ -997,7 +1009,7 @@ * fname is the full file name (including path) for the script to create */ static gboolean build_create_shellscript(const gchar *fname, const gchar *cmd, gboolean autoclose) { - FILE *fp; + FILE *fp; gchar *str; fp = g_fopen(fname, "w"); @@ -1006,9 +1018,10 @@ str = g_strdup_printf("%s\n\n%s\ndel %s\n", cmd, (autoclose) ? "" : "pause", fname); #else str = g_strdup_printf( - "#!/bin/sh\n\n%s\n\necho \"\n\n------------------\n(program exited with code: $?)\" \ - \n\n%s\nrm $0\n", cmd, (autoclose) ? "" : - "\necho \"Press return to continue\"\n#to be more compatible with shells like dash\ndummy_var=\"\"\nread dummy_var"); + "#!/bin/sh\n\n%s\n\necho \"\n\n------------------\n(program exited " + "with code: $?)\"\n\n%s\nrm $0\n", cmd, (autoclose) ? "" : + "\necho \"Press return to continue\"\n#to be more compatible with " + "shells like dash\ndummy_var=\"\"\nread dummy_var"); #endif fputs(str, fp); @@ -1024,26 +1037,26 @@ * Perhaps the separate Tex menu could be merged with the default build menu? * Then this could be done with Glade and set the accels in keybindings.c. */ static void add_menu_accel(GeanyKeyGroup *group, guint kb_id, - GtkAccelGroup *accel_group, GtkWidget *menuitem) + GtkAccelGroup *accel_group, GtkWidget *menuitem) { GeanyKeyBinding *kb = &group->keys[kb_id]; if (kb->key != 0) gtk_widget_add_accelerator(menuitem, "activate", accel_group, - kb->key, kb->mods, GTK_ACCEL_VISIBLE); + kb->key, kb->mods, GTK_ACCEL_VISIBLE); } -#define GEANY_ADD_WIDGET_ACCEL(kb_id, menuitem) \ +#define GEANY_ADD_WIDGET_ACCEL(kb_id, menuitem) \ add_menu_accel(group, kb_id, accel_group, menuitem) static void create_build_menu_gen(BuildMenuItems *menu_items) { - GtkWidget *menu, *item = NULL, *image, *separator; - GeanyProject *proj; - gchar *tiptext; + GtkWidget *menu, *item = NULL, *image, *separator; + GeanyProject *proj; + gchar *tiptext; GtkAccelGroup *accel_group = gtk_accel_group_new(); - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_BUILD); menu = gtk_menu_new(); @@ -1065,7 +1078,7 @@ gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, - _("Builds the current file (generate an executable file)"), NULL); + _("Builds the current file (generate an executable file)"), NULL); GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); g_signal_connect(item, "activate", G_CALLBACK(on_build_build_activate), NULL); menu_items->item_link = item; @@ -1076,60 +1089,60 @@ /* build the code with make all or prefs or project command*/ proj = app->project; - if( proj!=NULL && proj->build_1_label!=NULL ) + if (proj!=NULL && proj->build_1_label!=NULL) { - item = gtk_image_menu_item_new_with_mnemonic( proj->build_1_label ); - tiptext = NULL; /* user label so no tip needed */ - }/* else if prefs */ + item = gtk_image_menu_item_new_with_mnemonic(proj->build_1_label); + tiptext = NULL; /* user label so no tip needed */ + } /* else if prefs */ else { - item = gtk_image_menu_item_new_with_mnemonic(_("_Make All")); - tiptext = _("Builds the current file with the make tool and the default target"); - } + item = gtk_image_menu_item_new_with_mnemonic(_("_Make All")); + tiptext = _("Builds the current file with the make tool and the default target"); + } gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - if( tiptext != NULL )gtk_tooltips_set_tip(tooltips, item, tiptext, NULL); + if (tiptext != NULL) gtk_tooltips_set_tip(tooltips, item, tiptext, NULL); GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_ALL)); + GINT_TO_POINTER(GBO_MAKE_ALL)); menu_items->item_make_all = item; /* build the code with make custom */ - if( proj!=NULL && proj->build_2_label!=NULL ) + if (proj!=NULL && proj->build_2_label!=NULL) { - item = gtk_image_menu_item_new_with_mnemonic( proj->build_2_label ); - tiptext = _("Dialog contents appended to this command"); - }/* else if prefs */ + item = gtk_image_menu_item_new_with_mnemonic(proj->build_2_label); + tiptext = _("Dialog contents appended to this command"); + } /* else if prefs */ else { - item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); - tiptext = _("Builds the current file with the make tool and the specified target"); - } + item = gtk_image_menu_item_new_with_mnemonic(_("Make Custom _Target")); + tiptext = _("Builds the current file with the make tool and the specified target"); + } gtk_widget_show(item); GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOWNTARGET, item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, tiptext, NULL); g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_CUSTOM)); + GINT_TO_POINTER(GBO_MAKE_CUSTOM)); menu_items->item_make_custom = item; /* build the code with make object */ - if( proj!=NULL && proj->build_2_label!=NULL ) + if (proj!=NULL && proj->build_2_label!=NULL) { - item = gtk_image_menu_item_new_with_mnemonic( proj->build_2_label ); - tiptext = NULL; - }/* else if prefs */ + item = gtk_image_menu_item_new_with_mnemonic(proj->build_2_label); + tiptext = NULL; + } /* else if prefs */ else { - item = gtk_image_menu_item_new_with_mnemonic(_("Make _Object")); - tiptext = _("Compiles the current file using the make tool"); - } + item = gtk_image_menu_item_new_with_mnemonic(_("Make _Object")); + tiptext = _("Compiles the current file using the make tool"); + } gtk_widget_show(item); GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKEOBJECT, item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, tiptext, NULL); g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_OBJECT)); + GINT_TO_POINTER(GBO_MAKE_OBJECT)); menu_items->item_make_object = item; item = gtk_separator_menu_item_new(); @@ -1175,31 +1188,32 @@ GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, - _("Sets the includes and library paths for the compiler and " - "the program arguments for execution"), NULL); + _("Sets the includes and library paths for the compiler and " + "the program arguments for execution"), NULL); image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect(item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); menu_items->item_set_args = item; - if( menu_items->menu ) g_object_unref( (gpointer)menu_items->menu ); /* free it */ + if (menu_items->menu) g_object_unref( (gpointer)menu_items->menu); /* free it */ menu_items->menu = menu; - g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */ + g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */ } + /* externally callable build default menu for when projects change menu */ void build_default_menu() { - create_build_menu_gen( &default_menu_items ); + create_build_menu_gen(&default_menu_items); }; static void create_build_menu_tex(BuildMenuItems *menu_items) { - GtkWidget *menu, *item, *image, *separator; + GtkWidget *menu, *item, *image, *separator; GtkAccelGroup *accel_group = gtk_accel_group_new(); - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); GeanyKeyGroup *group = g_ptr_array_index(keybinding_groups, GEANY_KEY_GROUP_BUILD); menu = gtk_menu_new(); @@ -1214,7 +1228,7 @@ gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect(item, "activate", - G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_DVI)); + G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_DVI)); menu_items->item_compile = item; /* PDF */ @@ -1227,7 +1241,7 @@ gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect(item, "activate", - G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_PDF)); + G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_PDF)); menu_items->item_link = item; item = gtk_separator_menu_item_new(); @@ -1242,7 +1256,7 @@ "make tool and the default target"), NULL); GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_ALL)); + GINT_TO_POINTER(GBO_MAKE_ALL)); menu_items->item_make_all = item; /* build the code with make custom */ @@ -1253,7 +1267,7 @@ gtk_tooltips_set_tip(tooltips, item, _("Builds the current file with the " "make tool and the specified target"), NULL); g_signal_connect(item, "activate", G_CALLBACK(on_build_make_activate), - GINT_TO_POINTER(GBO_MAKE_CUSTOM)); + GINT_TO_POINTER(GBO_MAKE_CUSTOM)); menu_items->item_make_custom = item; item = gtk_separator_menu_item_new(); @@ -1290,7 +1304,7 @@ gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect(item, "activate", - G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_DVI)); + G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_DVI)); menu_items->item_exec = item; /* PDF view */ @@ -1303,7 +1317,7 @@ gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect(item, "activate", - G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_PDF)); + G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_PDF)); menu_items->item_exec2 = item; /* separator */ @@ -1318,36 +1332,36 @@ GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); gtk_container_add(GTK_CONTAINER(menu), item); gtk_tooltips_set_tip(tooltips, item, - _("Sets the program paths and arguments"), NULL); + _("Sets the program paths and arguments"), NULL); image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect(item, "activate", - G_CALLBACK(on_build_arguments_activate), filetypes[GEANY_FILETYPES_LATEX]); + G_CALLBACK(on_build_arguments_activate), filetypes[GEANY_FILETYPES_LATEX]); menu_items->item_set_args = item; gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group); menu_items->menu = menu; - g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */ + g_object_ref((gpointer)menu_items->menu); /* to hold it after removing */ } static void on_includes_arguments_tex_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data) + gint response, + gpointer user_data) { GeanyFiletype *ft = user_data; g_return_if_fail(ft != NULL); if (response == GTK_RESPONSE_ACCEPT) { - const gchar *newstr; + const gchar *newstr; struct build_programs *programs = ft->programs; newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry1"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry1"))); if (! utils_str_equal(newstr, programs->compiler)) { if (programs->compiler) g_free(programs->compiler); @@ -1355,7 +1369,7 @@ programs->modified = TRUE; } newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry2"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry2"))); if (! utils_str_equal(newstr, programs->linker)) { if (programs->linker) g_free(programs->linker); @@ -1363,7 +1377,7 @@ programs->modified = TRUE; } newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry3"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry3"))); if (! utils_str_equal(newstr, programs->run_cmd)) { if (programs->run_cmd) g_free(programs->run_cmd); @@ -1371,7 +1385,7 @@ programs->modified = TRUE; } newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry4"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "tex_entry4"))); if (! utils_str_equal(newstr, programs->run_cmd2)) { if (programs->run_cmd2) g_free(programs->run_cmd2); @@ -1384,9 +1398,9 @@ static void show_includes_arguments_tex(void) { - GtkWidget *dialog, *label, *entries[4], *vbox, *table; + GtkWidget *dialog, *label, *entries[4], *vbox, *table; GeanyDocument *doc = document_get_current(); - gint response; + gint response; GeanyFiletype *ft = NULL; if (doc != NULL) @@ -1394,9 +1408,9 @@ g_return_if_fail(ft != NULL); dialog = gtk_dialog_new_with_buttons(_("Set Arguments"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_widget_set_name(dialog, "GeanyDialog"); @@ -1414,7 +1428,7 @@ label = gtk_label_new(_("DVI creation:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[0] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[0]), 30); @@ -1424,7 +1438,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[0], 1, 2, 0, 1); g_object_set_data_full(G_OBJECT(dialog), "tex_entry1", - gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref); } /* LaTeX -> PDF args */ @@ -1433,7 +1447,7 @@ label = gtk_label_new(_("PDF creation:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[1] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[1]), 30); @@ -1443,7 +1457,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[1], 1, 2, 1, 2); g_object_set_data_full(G_OBJECT(dialog), "tex_entry2", - gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref); } /* View LaTeX -> DVI args */ @@ -1452,7 +1466,7 @@ label = gtk_label_new(_("DVI preview:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[2] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[2]), 30); @@ -1462,7 +1476,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[2], 1, 2, 2, 3); g_object_set_data_full(G_OBJECT(dialog), "tex_entry3", - gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref); } /* View LaTeX -> PDF args */ @@ -1471,7 +1485,7 @@ label = gtk_label_new(_("PDF preview:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[3] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[3]), 30); @@ -1481,7 +1495,7 @@ } gtk_table_attach_defaults(GTK_TABLE(table), entries[3], 1, 2, 3, 4); g_object_set_data_full(G_OBJECT(dialog), "tex_entry4", - gtk_widget_ref(entries[3]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[3]), (GDestroyNotify)gtk_widget_unref); } label = gtk_label_new(_("%f will be replaced by the current filename, e.g. test_file.c\n" @@ -1501,8 +1515,8 @@ static void on_includes_arguments_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data) + gint response, + gpointer user_data) { GeanyFiletype *ft = user_data; @@ -1510,13 +1524,13 @@ if (response == GTK_RESPONSE_ACCEPT) { - const gchar *newstr; + const gchar *newstr; struct build_programs *programs = ft->programs; if (ft->actions->can_compile) { newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry1"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry1"))); if (! utils_str_equal(newstr, programs->compiler)) { if (programs->compiler) g_free(programs->compiler); @@ -1527,7 +1541,7 @@ if (ft->actions->can_link) { newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry2"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry2"))); if (! utils_str_equal(newstr, programs->linker)) { if (programs->linker) g_free(programs->linker); @@ -1538,7 +1552,7 @@ if (ft->actions->can_exec) { newstr = gtk_entry_get_text( - GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry3"))); + GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry3"))); if (! utils_str_equal(newstr, programs->run_cmd)) { if (programs->run_cmd) g_free(programs->run_cmd); @@ -1546,47 +1560,47 @@ programs->modified = TRUE; } } - if( app->project!=NULL ) + if (app->project!=NULL) { - GeanyProject *proj = app->project; + GeanyProject *proj = app->project; - newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_1_label" ) ) ); - if( !utils_str_equal( newstr, proj->build_1_label ) ) - { - if( proj->build_1_label ) g_free( proj->build_1_label ); - proj->build_1_label = g_strdup(newstr); - } - newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_1_cmd" ) ) ); - if( !utils_str_equal( newstr, proj->build_1_cmd ) ) - { - if( proj->build_1_cmd ) g_free( proj->build_1_cmd ); - proj->build_1_cmd = g_strdup(newstr); - } - newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_2_label" ) ) ); - if( !utils_str_equal( newstr, proj->build_2_label ) ) - { - if( proj->build_2_label ) g_free( proj->build_2_label ); - proj->build_2_label = g_strdup(newstr); - } - newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_2_cmd" ) ) ); - if( !utils_str_equal( newstr, proj->build_2_cmd ) ) - { - if( proj->build_2_cmd ) g_free( proj->build_2_cmd ); - proj->build_2_cmd = g_strdup(newstr); - } - newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_3_label" ) ) ); - if( !utils_str_equal( newstr, proj->build_3_label ) ) - { - if( proj->build_3_label ) g_free( proj->build_3_label ); - proj->build_3_label = g_strdup(newstr); - } - newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_3_cmd" ) ) ); - if( !utils_str_equal( newstr, proj->build_3_cmd ) ) - { - if( proj->build_3_cmd ) g_free( proj->build_3_cmd ); - proj->build_3_cmd = g_strdup(newstr); - } - } + newstr = gtk_entry_get_text(GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "build_1_label") ) ); + if (!utils_str_equal(newstr, proj->build_1_label) ) + { + if (proj->build_1_label) g_free(proj->build_1_label); + proj->build_1_label = g_strdup(newstr); + } + newstr = gtk_entry_get_text(GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "build_1_cmd") ) ); + if (!utils_str_equal(newstr, proj->build_1_cmd) ) + { + if (proj->build_1_cmd) g_free(proj->build_1_cmd); + proj->build_1_cmd = g_strdup(newstr); + } + newstr = gtk_entry_get_text(GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "build_2_label") ) ); + if (!utils_str_equal(newstr, proj->build_2_label) ) + { + if (proj->build_2_label) g_free(proj->build_2_label); + proj->build_2_label = g_strdup(newstr); + } + newstr = gtk_entry_get_text(GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "build_2_cmd") ) ); + if (!utils_str_equal(newstr, proj->build_2_cmd) ) + { + if (proj->build_2_cmd) g_free(proj->build_2_cmd); + proj->build_2_cmd = g_strdup(newstr); + } + newstr = gtk_entry_get_text(GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "build_3_label") ) ); + if (!utils_str_equal(newstr, proj->build_3_label) ) + { + if (proj->build_3_label) g_free(proj->build_3_label); + proj->build_3_label = g_strdup(newstr); + } + newstr = gtk_entry_get_text(GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "build_3_cmd") ) ); + if (!utils_str_equal(newstr, proj->build_3_cmd) ) + { + if (proj->build_3_cmd) g_free(proj->build_3_cmd); + proj->build_3_cmd = g_strdup(newstr); + } + } } } @@ -1596,7 +1610,7 @@ GtkWidget *label, *entries[3], *build_entry; GtkWidget *ft_table = NULL; GtkWidget *pr_table = NULL; - gint row = 0; + gint row = 0; if (ft->actions->can_compile || ft->actions->can_link || ft->actions->can_exec) { @@ -1620,7 +1634,7 @@ label = gtk_label_new(_("Compile:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(ft_table), label, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[0] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[0]), 30); @@ -1632,7 +1646,7 @@ row++; g_object_set_data_full(G_OBJECT(dialog), "includes_entry1", - gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[0]), (GDestroyNotify)gtk_widget_unref); } /* lib-args */ @@ -1641,7 +1655,7 @@ label = gtk_label_new(_("Build:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(ft_table), label, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[1] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[1]), 30); @@ -1653,7 +1667,7 @@ row++; g_object_set_data_full(G_OBJECT(dialog), "includes_entry2", - gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[1]), (GDestroyNotify)gtk_widget_unref); } /* program-args */ @@ -1662,7 +1676,7 @@ label = gtk_label_new(_("Execute:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(ft_table), label, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); + GTK_FILL, GTK_FILL | GTK_EXPAND, 6, 0); entries[2] = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(entries[2]), 30); @@ -1674,20 +1688,20 @@ row++; g_object_set_data_full(G_OBJECT(dialog), "includes_entry3", - gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(entries[2]), (GDestroyNotify)gtk_widget_unref); /* disable the run command if there is a valid project run command set */ if (app->project && NZV(app->project->run_cmd)) gtk_widget_set_sensitive(entries[2], FALSE); } - /* see if need project based command fields */ + /* see if need project based command fields */ - if( app->project!=NULL ) - { - GtkWidget *align, *frame; + if (app->project!=NULL) + { + GtkWidget *align, *frame; /* in-dialog heading for the project part of the build commands dialog */ - GeanyProject *proj = app->project; + GeanyProject *proj = app->project; frame = ui_frame_new_with_alignment(_("Project build menu commands"), &align); gtk_container_add(GTK_CONTAINER(vbox), frame); @@ -1699,72 +1713,72 @@ /* label and cmd 1 */ build_entry = gtk_entry_new(); - gtk_entry_set_width_chars( GTK_ENTRY(build_entry), 10 ); - if( proj->build_1_label!=NULL ) + gtk_entry_set_width_chars(GTK_ENTRY(build_entry), 10); + if (proj->build_1_label!=NULL) { - gtk_entry_set_text( GTK_ENTRY(build_entry), proj->build_1_label ); - } - gtk_table_attach_defaults( GTK_TABLE(pr_table), build_entry, 0, 1, 0, 1 ); - g_object_set_data_full( G_OBJECT(dialog), "build_1_label", - gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref ); + gtk_entry_set_text(GTK_ENTRY(build_entry), proj->build_1_label); + } + gtk_table_attach_defaults(GTK_TABLE(pr_table), build_entry, 0, 1, 0, 1); + g_object_set_data_full(G_OBJECT(dialog), "build_1_label", + gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); build_entry = gtk_entry_new(); - gtk_entry_set_width_chars( GTK_ENTRY(build_entry), 30 ); - if( proj->build_1_cmd!=NULL ) + gtk_entry_set_width_chars(GTK_ENTRY(build_entry), 30); + if (proj->build_1_cmd!=NULL) { - gtk_entry_set_text( GTK_ENTRY(build_entry), proj->build_1_cmd ); - } - gtk_table_attach_defaults( GTK_TABLE(pr_table), build_entry, 1, 3, 0, 1 ); + gtk_entry_set_text(GTK_ENTRY(build_entry), proj->build_1_cmd); + } + gtk_table_attach_defaults(GTK_TABLE(pr_table), build_entry, 1, 3, 0, 1); g_object_set_data_full(G_OBJECT(dialog), "build_1_cmd", - gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); /* label and cmd 2 */ build_entry = gtk_entry_new(); - gtk_entry_set_width_chars( GTK_ENTRY(build_entry), 10 ); - if( proj->build_2_label!=NULL ) + gtk_entry_set_width_chars(GTK_ENTRY(build_entry), 10); + if (proj->build_2_label!=NULL) { - gtk_entry_set_text( GTK_ENTRY(build_entry), proj->build_2_label ); - } - gtk_table_attach_defaults( GTK_TABLE(pr_table), build_entry, 0, 1, 1, 2 ); - g_object_set_data_full( G_OBJECT(dialog), "build_2_label", - gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref ); + gtk_entry_set_text(GTK_ENTRY(build_entry), proj->build_2_label); + } + gtk_table_attach_defaults(GTK_TABLE(pr_table), build_entry, 0, 1, 1, 2); + g_object_set_data_full(G_OBJECT(dialog), "build_2_label", + gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); build_entry = gtk_entry_new(); - gtk_entry_set_width_chars( GTK_ENTRY(build_entry), 30 ); - if( proj->build_2_cmd!=NULL ) + gtk_entry_set_width_chars(GTK_ENTRY(build_entry), 30); + if (proj->build_2_cmd!=NULL) { - gtk_entry_set_text( GTK_ENTRY(build_entry), proj->build_2_cmd ); - } - gtk_table_attach_defaults( GTK_TABLE(pr_table), build_entry, 1, 3, 1, 2 ); + gtk_entry_set_text(GTK_ENTRY(build_entry), proj->build_2_cmd); + } + gtk_table_attach_defaults(GTK_TABLE(pr_table), build_entry, 1, 3, 1, 2); g_object_set_data_full(G_OBJECT(dialog), "build_2_cmd", - gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); /* label and cmd 3 */ build_entry = gtk_entry_new(); - gtk_entry_set_width_chars( GTK_ENTRY(build_entry), 10 ); - if( proj->build_3_label!=NULL ) + gtk_entry_set_width_chars(GTK_ENTRY(build_entry), 10); + if (proj->build_3_label!=NULL) { - gtk_entry_set_text( GTK_ENTRY(build_entry), proj->build_3_label ); - } - gtk_table_attach_defaults( GTK_TABLE(pr_table), build_entry, 0, 1, 2, 3 ); - g_object_set_data_full( G_OBJECT(dialog), "build_3_label", - gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref ); + gtk_entry_set_text(GTK_ENTRY(build_entry), proj->build_3_label); + } + gtk_table_attach_defaults(GTK_TABLE(pr_table), build_entry, 0, 1, 2, 3); + g_object_set_data_full(G_OBJECT(dialog), "build_3_label", + gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); build_entry = gtk_entry_new(); - gtk_entry_set_width_chars( GTK_ENTRY(build_entry), 30 ); - if( proj->build_3_cmd!=NULL ) + gtk_entry_set_width_chars(GTK_ENTRY(build_entry), 30); + if (proj->build_3_cmd!=NULL) { - gtk_entry_set_text( GTK_ENTRY(build_entry), proj->build_3_cmd ); - } - gtk_table_attach_defaults( GTK_TABLE(pr_table), build_entry, 1, 3, 2, 3 ); + gtk_entry_set_text(GTK_ENTRY(build_entry), proj->build_3_cmd); + } + gtk_table_attach_defaults(GTK_TABLE(pr_table), build_entry, 1, 3, 2, 3); g_object_set_data_full(G_OBJECT(dialog), "build_3_cmd", - gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); + gtk_widget_ref(build_entry), (GDestroyNotify)gtk_widget_unref); - } + } } static void show_includes_arguments_gen(void) { - GtkWidget *dialog, *label, *vbox; - gint response; + GtkWidget *dialog, *label, *vbox; + gint response; GeanyDocument *doc = document_get_current(); GeanyFiletype *ft = NULL; @@ -1773,9 +1787,9 @@ g_return_if_fail(ft != NULL); dialog = gtk_dialog_new_with_buttons(_("Build Menu Commands"), GTK_WINDOW(main_widgets.window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_widget_set_name(dialog, "GeanyDialog"); @@ -1801,8 +1815,8 @@ static void -on_build_arguments_activate (GtkMenuItem *menuitem, - gpointer user_data) +on_build_arguments_activate (GtkMenuItem *menuitem, + gpointer user_data) { if (user_data && FILETYPE_ID((GeanyFiletype*) user_data) == GEANY_FILETYPES_LATEX) show_includes_arguments_tex(); @@ -1819,7 +1833,7 @@ { ext = strrchr(fname, '.'); } - return (ext == NULL) ? FALSE : (*(ext + 1) == 'h'); /* match *.h* */ + return (ext == NULL) ? FALSE : (*(ext + 1) == 'h'); /* match *.h* */ } @@ -1827,14 +1841,14 @@ * Uses current document (if there is one) when idx == -1 */ void build_menu_update(GeanyDocument *doc) { - GeanyFiletype *ft; - gboolean have_path, can_build, can_make, can_run, can_stop, can_set_args, have_errors; + GeanyFiletype *ft; + gboolean have_path, can_build, can_make, can_run, can_stop, can_set_args, have_errors; BuildMenuItems *menu_items; if (doc == NULL) doc = document_get_current(); if (doc == NULL || - (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_NONE && doc->file_name == NULL)) + (FILETYPE_ID(doc->file_type) == GEANY_FILETYPES_NONE && doc->file_name == NULL)) { gtk_widget_set_sensitive(lookup_widget(main_widgets.window, "menu_build1"), FALSE); gtk_menu_item_remove_submenu(GTK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_build1"))); @@ -1852,7 +1866,7 @@ /* Note: don't remove the submenu first because it can now cause an X hang if * the menu is already open when called from build_exit_cb(). */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(lookup_widget(main_widgets.window, "menu_build1")), - menu_items->menu); + menu_items->menu); have_path = (doc->file_name != NULL); @@ -1876,7 +1890,7 @@ gtk_widget_set_sensitive(menu_items->item_make_object, can_make); if (app->project && NZV(app->project->run_cmd)) - can_run = have_path; /* for now run is disabled for all untitled files */ + can_run = have_path; /* for now run is disabled for all untitled files */ else can_run = have_path && ft->actions->can_exec; @@ -1892,9 +1906,9 @@ can_set_args = ((ft->actions->can_compile || - ft->actions->can_link || - ft->actions->can_exec) && - FILETYPE_ID(ft) != GEANY_FILETYPES_NONE); + ft->actions->can_link || + ft->actions->can_exec) && + FILETYPE_ID(ft) != GEANY_FILETYPES_NONE); if (menu_items->item_set_args) gtk_widget_set_sensitive(menu_items->item_set_args, can_set_args); @@ -1906,7 +1920,7 @@ /* simply enable next error command if the compiler window has any items */ have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler), - NULL) > 0; + NULL) > 0; if (menu_items->item_next_error) gtk_widget_set_sensitive(menu_items->item_next_error, have_errors); if (menu_items->item_previous_error) @@ -1918,13 +1932,14 @@ static void set_stop_button(gboolean stop) { GtkStockItem sitem; - GtkWidget *menuitem = + GtkWidget *menuitem = build_get_menu_items(run_info.file_type_id)->item_exec; if (stop && utils_str_equal( - gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(widgets.run_button)), "gtk-stop")) return; + gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(widgets.run_button)), "gtk-stop")) return; if (! stop && utils_str_equal( - gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(widgets.run_button)), "gtk-execute")) return; + gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(widgets.run_button)), + "gtk-execute")) return; /* use the run button also as stop button */ if (stop) @@ -1934,10 +1949,10 @@ if (menuitem != NULL) { gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-stop", GTK_ICON_SIZE_MENU)); + gtk_image_new_from_stock("gtk-stop", GTK_ICON_SIZE_MENU)); gtk_stock_lookup("gtk-stop", &sitem); gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - sitem.label); + sitem.label); } } else @@ -1950,18 +1965,20 @@ if (run_info.file_type_id == GEANY_FILETYPES_LATEX) { gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU)); + gtk_image_new_from_stock("gtk-find", + GTK_ICON_SIZE_MENU)); gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - LATEX_VIEW_DVI_LABEL); + LATEX_VIEW_DVI_LABEL); } else { gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_MENU)); + gtk_image_new_from_stock("gtk-execute", + GTK_ICON_SIZE_MENU)); gtk_stock_lookup("gtk-execute", &sitem); gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - sitem.label); + sitem.label); } } } @@ -2001,8 +2018,8 @@ static void -on_build_compile_activate (GtkMenuItem *menuitem, - gpointer user_data) +on_build_compile_activate (GtkMenuItem *menuitem, + gpointer user_data) { GeanyDocument *doc = document_get_current(); @@ -2020,8 +2037,8 @@ static void -on_build_tex_activate (GtkMenuItem *menuitem, - gpointer user_data) +on_build_tex_activate (GtkMenuItem *menuitem, + gpointer user_data) { GeanyDocument *doc = document_get_current(); @@ -2044,8 +2061,8 @@ static void -on_build_build_activate (GtkMenuItem *menuitem, - gpointer user_data) +on_build_build_activate (GtkMenuItem *menuitem, + gpointer user_data) { GeanyDocument *doc = document_get_current(); @@ -2079,12 +2096,13 @@ static void show_make_custom(void) { - static GtkWidget *dialog = NULL; /* keep dialog for combo history */ + static GtkWidget *dialog = NULL; /* keep dialog for combo history */ if (! dialog) dialog = dialogs_show_input(_("Make Custom Target"), - _("Enter custom options here, all entered text is passed to the make command."), - build_info.custom_target, TRUE, &on_make_custom_input_response); + _("Enter custom options here, all entered text" + " is passed to the make command."), + build_info.custom_target, TRUE, &on_make_custom_input_response); else { gtk_widget_show(dialog); @@ -2093,11 +2111,11 @@ static void -on_build_make_activate (GtkMenuItem *menuitem, - gpointer user_data) +on_build_make_activate (GtkMenuItem *menuitem, + gpointer user_data) { GeanyDocument *doc = document_get_current(); - gint build_opts = GPOINTER_TO_INT(user_data); + gint build_opts = GPOINTER_TO_INT(user_data); g_return_if_fail(doc != NULL && doc->file_name != NULL); @@ -2151,11 +2169,11 @@ static void -on_build_execute_activate (GtkMenuItem *menuitem, - gpointer user_data) +on_build_execute_activate (GtkMenuItem *menuitem, + gpointer user_data) { GeanyDocument *doc = document_get_current(); - filetype_id ft_id; + filetype_id ft_id; GeanyFiletype *ft; if (doc == NULL) @@ -2171,7 +2189,7 @@ ft_id = FILETYPE_ID(doc->file_type); ft = filetypes[ft_id]; if (ft_id == GEANY_FILETYPES_LATEX) - { /* run LaTeX file */ + { /* run LaTeX file */ if (build_view_tex_file(doc, GPOINTER_TO_INT(user_data)) == (GPid) 0) { ui_set_statusbar(TRUE, _("Failed to execute the view program")); @@ -2179,13 +2197,13 @@ } /* use_html_builtin() checks for HTML builtin request and returns FALSE if not */ else if (! use_html_builtin(doc, ft)) - { /* run everything else */ + { /* run everything else */ /* save the file only if the run command uses it */ if (doc->changed && - NZV(ft->programs->run_cmd) && /* can happen when project is open */ + NZV(ft->programs->run_cmd) && /* can happen when project is open */ strstr(ft->programs->run_cmd, "%f") != NULL) - document_save_file(doc, FALSE); + document_save_file(doc, FALSE); build_run_cmd(doc); } @@ -2222,11 +2240,11 @@ static void -on_build_next_error (GtkMenuItem *menuitem, - gpointer user_data) +on_build_next_error (GtkMenuItem *menuitem, + gpointer user_data) { if (ui_tree_view_find_next(GTK_TREE_VIEW(msgwindow.tree_compiler), - msgwin_goto_compiler_file_line)) + msgwin_goto_compiler_file_line)) { gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); } @@ -2236,11 +2254,11 @@ static void -on_build_previous_error (GtkMenuItem *menuitem, - gpointer user_data) +on_build_previous_error (GtkMenuItem *menuitem, + gpointer user_data) { if (ui_tree_view_find_previous(GTK_TREE_VIEW(msgwindow.tree_compiler), - msgwin_goto_compiler_file_line)) + msgwin_goto_compiler_file_line)) { gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); } @@ -2254,3 +2272,5 @@ widgets.compile_button = lookup_widget(main_widgets.window, "toolbutton_compile"); widgets.run_button = lookup_widget(main_widgets.window, "toolbutton_run"); } + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3182] trunk
by ntrel＠users.sourceforge.net 06 Nov '08

06 Nov '08

Revision: 3182 http://geany.svn.sourceforge.net/geany/?rev=3182&view=rev Author: ntrel Date: 2008-11-06 17:26:29 +0000 (Thu, 06 Nov 2008) Log Message: ----------- Fix segfault when showing Find in Files dialog when no documents are open (r2998, #2228544). Fix segfault for FIF from last commit (oops). Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-06 17:13:18 UTC (rev 3181) +++ trunk/ChangeLog 2008-11-06 17:26:29 UTC (rev 3182) @@ -2,6 +2,10 @@ * src/search.c: Refactor search_show_find_in_files_dialog(). + * src/search.c: + Fix segfault when showing Find in Files dialog when no documents are + open (r2998, #2228544). + Fix segfault for FIF from last commit (oops). 2008-11-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-06 17:13:18 UTC (rev 3181) +++ trunk/src/search.c 2008-11-06 17:26:29 UTC (rev 3182) @@ -716,18 +716,20 @@ { GtkWidget *entry; /* for child GtkEntry of a GtkComboBoxEntry */ GeanyDocument *doc = document_get_current(); + GeanyEditor *editor = doc ? doc->editor : NULL; gchar *sel = NULL; gchar *cur_dir = NULL; if (widgets.find_in_files_dialog == NULL) { create_fif_dialog(); - sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); + sel = editor_get_default_selection(editor, search_prefs.use_current_word, NULL); } - entry = GTK_BIN(find_in_files.search_combo)->child; /* only set selection if the dialog is not already visible, or has just been created */ if (! sel && ! GTK_WIDGET_VISIBLE(widgets.find_in_files_dialog)) - sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); + sel = editor_get_default_selection(editor, search_prefs.use_current_word, NULL); + + entry = GTK_BIN(find_in_files.search_combo)->child; if (sel) gtk_entry_set_text(GTK_ENTRY(entry), sel); g_free(sel); @@ -1131,9 +1133,9 @@ { if (response == GTK_RESPONSE_ACCEPT) { + GtkWidget *search_combo = find_in_files.search_combo; const gchar *search_text = - gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child( - GTK_BIN(find_in_files.search_combo)))); + gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(search_combo)))); GtkWidget *dir_combo = find_in_files.dir_combo; const gchar *utf8_dir = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo)))); @@ -1154,7 +1156,7 @@ if (search_find_in_files(search_text, locale_dir, opts->str)) { - ui_combo_box_add_to_history(GTK_COMBO_BOX(user_data), search_text); + ui_combo_box_add_to_history(GTK_COMBO_BOX(search_combo), search_text); ui_combo_box_add_to_history(GTK_COMBO_BOX(dir_combo), utf8_dir); gtk_widget_hide(widgets.find_in_files_dialog); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3181] trunk
by ntrel＠users.sourceforge.net 06 Nov '08

06 Nov '08

Revision: 3181 http://geany.svn.sourceforge.net/geany/?rev=3181&view=rev Author: ntrel Date: 2008-11-06 17:13:18 +0000 (Thu, 06 Nov 2008) Log Message: ----------- Refactor search_show_find_in_files_dialog(). Modified Paths: -------------- trunk/ChangeLog trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-05 23:08:24 UTC (rev 3180) +++ trunk/ChangeLog 2008-11-06 17:13:18 UTC (rev 3181) @@ -1,3 +1,9 @@ +2008-11-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/search.c: + Refactor search_show_find_in_files_dialog(). + + 2008-11-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c: Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-11-05 23:08:24 UTC (rev 3180) +++ trunk/src/search.c 2008-11-06 17:13:18 UTC (rev 3181) @@ -72,9 +72,18 @@ GtkWidget *find_dialog; GtkWidget *replace_dialog; GtkWidget *find_in_files_dialog; -} widgets; +} +widgets = {NULL, NULL, NULL}; +struct +{ + GtkWidget *dir_combo; + GtkWidget *search_combo; + GtkWidget *extra_entry; +} +find_in_files = {NULL, NULL, NULL}; + static gboolean search_read_io (GIOChannel *source, GIOCondition condition, gpointer data); @@ -111,10 +120,7 @@ void search_init(void) { - widgets.find_dialog = NULL; - widgets.replace_dialog = NULL; - widgets.find_in_files_dialog = NULL; - search_data.text = NULL; + search_data.text = NULL; } @@ -553,169 +559,172 @@ } -/* dir is the directory to search in (UTF-8 encoding), maybe NULL to determine it the usual way - * by using the current file's path */ -void search_show_find_in_files_dialog(const gchar *dir) +static void create_fif_dialog() { - static GtkWidget *combo = NULL; - static GtkWidget *dir_combo; - GtkWidget *entry; /* the child GtkEntry of combo (or dir_combo) */ - GeanyDocument *doc = document_get_current(); - gchar *sel = NULL; - gchar *cur_dir = NULL; + GtkWidget *dir_combo, *combo, *entry; + GtkWidget *label, *label1, *checkbox1, *checkbox2, *check_wholeword, + *check_recursive, *check_extra, *entry_extra; + GtkWidget *dbox, *sbox, *cbox, *rbox, *rbtn, *hbox, *vbox; + GtkSizeGroup *size_group; + GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); - if (widgets.find_in_files_dialog == NULL) - { - GtkWidget *label, *label1, *checkbox1, *checkbox2, *check_wholeword, - *check_recursive, *check_extra, *entry_extra; - GtkWidget *dbox, *sbox, *cbox, *rbox, *rbtn, *hbox, *vbox; - GtkSizeGroup *size_group; - GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); + load_monospace_style(); - load_monospace_style(); + widgets.find_in_files_dialog = gtk_dialog_new_with_buttons( + _("Find in Files"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + vbox = ui_dialog_vbox_new(GTK_DIALOG(widgets.find_in_files_dialog)); + gtk_box_set_spacing(GTK_BOX(vbox), 9); + gtk_widget_set_name(widgets.find_in_files_dialog, "GeanyDialogSearch"); - widgets.find_in_files_dialog = gtk_dialog_new_with_buttons( - _("Find in Files"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); - vbox = ui_dialog_vbox_new(GTK_DIALOG(widgets.find_in_files_dialog)); - gtk_box_set_spacing(GTK_BOX(vbox), 9); - gtk_widget_set_name(widgets.find_in_files_dialog, "GeanyDialogSearch"); + gtk_dialog_add_button(GTK_DIALOG(widgets.find_in_files_dialog), "gtk-find", GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response(GTK_DIALOG(widgets.find_in_files_dialog), + GTK_RESPONSE_ACCEPT); - gtk_dialog_add_button(GTK_DIALOG(widgets.find_in_files_dialog), "gtk-find", GTK_RESPONSE_ACCEPT); - gtk_dialog_set_default_response(GTK_DIALOG(widgets.find_in_files_dialog), - GTK_RESPONSE_ACCEPT); + label1 = gtk_label_new_with_mnemonic(_("_Directory:")); + gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); - label1 = gtk_label_new_with_mnemonic(_("_Directory:")); - gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); + dir_combo = gtk_combo_box_entry_new_text(); + entry = gtk_bin_get_child(GTK_BIN(dir_combo)); + gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry); + gtk_entry_set_max_length(GTK_ENTRY(entry), 248); + gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); + find_in_files.dir_combo = dir_combo; - dir_combo = gtk_combo_box_entry_new_text(); - entry = gtk_bin_get_child(GTK_BIN(dir_combo)); - gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry); - gtk_entry_set_max_length(GTK_ENTRY(entry), 248); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "dir_combo", - g_object_ref(dir_combo), (GDestroyNotify)g_object_unref); + dbox = ui_path_box_new(NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_ENTRY(entry)); + gtk_box_pack_start(GTK_BOX(dbox), label1, FALSE, FALSE, 0); - dbox = ui_path_box_new(NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_ENTRY(entry)); - gtk_box_pack_start(GTK_BOX(dbox), label1, FALSE, FALSE, 0); + label = gtk_label_new_with_mnemonic(_("_Search for:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - label = gtk_label_new_with_mnemonic(_("_Search for:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + combo = gtk_combo_box_entry_new_text(); + entry = gtk_bin_get_child(GTK_BIN(combo)); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); + gtk_entry_set_max_length(GTK_ENTRY(entry), 248); + gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); + gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + find_in_files.search_combo = combo; - combo = gtk_combo_box_entry_new_text(); - entry = gtk_bin_get_child(GTK_BIN(combo)); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry); - gtk_entry_set_max_length(GTK_ENTRY(entry), 248); - gtk_entry_set_width_chars(GTK_ENTRY(entry), 50); - gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + sbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(sbox), label, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(sbox), combo, TRUE, TRUE, 0); - sbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(sbox), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(sbox), combo, TRUE, TRUE, 0); + size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(size_group, label1); + gtk_size_group_add_widget(size_group, label); + g_object_unref(G_OBJECT(size_group)); /* auto destroy the size group */ - size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - gtk_size_group_add_widget(size_group, label1); - gtk_size_group_add_widget(size_group, label); - g_object_unref(G_OBJECT(size_group)); /* auto destroy the size group */ + rbox = gtk_vbox_new(FALSE, 0); + rbtn = gtk_radio_button_new_with_mnemonic(NULL, _("Fixed s_trings")); + /* Make fixed strings the default to speed up searching all files in directory. */ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rbtn), TRUE); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_fgrep", + g_object_ref(rbtn), (GDestroyNotify)g_object_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); + gtk_container_add(GTK_CONTAINER(rbox), rbtn); - rbox = gtk_vbox_new(FALSE, 0); - rbtn = gtk_radio_button_new_with_mnemonic(NULL, _("Fixed s_trings")); - /* Make fixed strings the default to speed up searching all files in directory. */ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(rbtn), TRUE); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_fgrep", - g_object_ref(rbtn), (GDestroyNotify)g_object_unref); - gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); - gtk_container_add(GTK_CONTAINER(rbox), rbtn); + rbtn = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(rbtn), + _("_Grep regular expressions")); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_grep", + g_object_ref(rbtn), (GDestroyNotify)g_object_unref); + gtk_tooltips_set_tip(tooltips, rbtn, + _("See grep's manual page for more information."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); + gtk_container_add(GTK_CONTAINER(rbox), rbtn); - rbtn = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(rbtn), - _("_Grep regular expressions")); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "radio_grep", - g_object_ref(rbtn), (GDestroyNotify)g_object_unref); - gtk_tooltips_set_tip(tooltips, rbtn, - _("See grep's manual page for more information."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); - gtk_container_add(GTK_CONTAINER(rbox), rbtn); + rbtn = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(rbtn), + _("_Extended regular expressions")); + gtk_tooltips_set_tip(tooltips, rbtn, + _("See grep's manual page for more information."), NULL); + gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); + gtk_container_add(GTK_CONTAINER(rbox), rbtn); - rbtn = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(rbtn), - _("_Extended regular expressions")); - gtk_tooltips_set_tip(tooltips, rbtn, - _("See grep's manual page for more information."), NULL); - gtk_button_set_focus_on_click(GTK_BUTTON(rbtn), FALSE); - gtk_container_add(GTK_CONTAINER(rbox), rbtn); + check_recursive = gtk_check_button_new_with_mnemonic(_("_Recurse in subfolders")); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_recursive", + g_object_ref(check_recursive), (GDestroyNotify)g_object_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(check_recursive), FALSE); - check_recursive = gtk_check_button_new_with_mnemonic(_("_Recurse in subfolders")); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_recursive", - g_object_ref(check_recursive), (GDestroyNotify)g_object_unref); - gtk_button_set_focus_on_click(GTK_BUTTON(check_recursive), FALSE); + checkbox1 = gtk_check_button_new_with_mnemonic(_("C_ase sensitive")); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_case", + g_object_ref(checkbox1), (GDestroyNotify)g_object_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox1), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox1), TRUE); - checkbox1 = gtk_check_button_new_with_mnemonic(_("C_ase sensitive")); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_case", - g_object_ref(checkbox1), (GDestroyNotify)g_object_unref); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox1), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox1), TRUE); + check_wholeword = gtk_check_button_new_with_mnemonic(_("Match only a _whole word")); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_wholeword", + g_object_ref(check_wholeword), (GDestroyNotify)g_object_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(check_wholeword), FALSE); - check_wholeword = gtk_check_button_new_with_mnemonic(_("Match only a _whole word")); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_wholeword", - g_object_ref(check_wholeword), (GDestroyNotify)g_object_unref); - gtk_button_set_focus_on_click(GTK_BUTTON(check_wholeword), FALSE); + checkbox2 = gtk_check_button_new_with_mnemonic(_("_Invert search results")); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_invert", + g_object_ref(checkbox2), (GDestroyNotify)g_object_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(checkbox2), FALSE); + gtk_tooltips_set_tip(tooltips, checkbox2, + _("Invert the sense of matching, to select non-matching lines."), NULL); - checkbox2 = gtk_check_button_new_with_mnemonic(_("_Invert search results")); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_invert", - g_object_ref(checkbox2), (GDestroyNotify)g_object_unref); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox2), FALSE); - gtk_tooltips_set_tip(tooltips, checkbox2, - _("Invert the sense of matching, to select non-matching lines."), NULL); + cbox = gtk_vbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER(cbox), checkbox1); + gtk_container_add(GTK_CONTAINER(cbox), check_wholeword); + gtk_container_add(GTK_CONTAINER(cbox), checkbox2); + gtk_container_add(GTK_CONTAINER(cbox), check_recursive); - cbox = gtk_vbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(cbox), checkbox1); - gtk_container_add(GTK_CONTAINER(cbox), check_wholeword); - gtk_container_add(GTK_CONTAINER(cbox), checkbox2); - gtk_container_add(GTK_CONTAINER(cbox), check_recursive); + hbox = gtk_hbox_new(FALSE, 6); + gtk_container_add(GTK_CONTAINER(hbox), rbox); + gtk_container_add(GTK_CONTAINER(hbox), cbox); - hbox = gtk_hbox_new(FALSE, 6); - gtk_container_add(GTK_CONTAINER(hbox), rbox); - gtk_container_add(GTK_CONTAINER(hbox), cbox); + gtk_box_pack_start(GTK_BOX(vbox), dbox, TRUE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), sbox, TRUE, FALSE, 0); + gtk_container_add(GTK_CONTAINER(vbox), hbox); - gtk_box_pack_start(GTK_BOX(vbox), dbox, TRUE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), sbox, TRUE, FALSE, 0); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + check_extra = gtk_check_button_new_with_mnemonic(_("E_xtra options:")); + g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_extra", + g_object_ref(check_extra), (GDestroyNotify)g_object_unref); + gtk_button_set_focus_on_click(GTK_BUTTON(check_extra), FALSE); - check_extra = gtk_check_button_new_with_mnemonic(_("E_xtra options:")); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "check_extra", - g_object_ref(check_extra), (GDestroyNotify)g_object_unref); - gtk_button_set_focus_on_click(GTK_BUTTON(check_extra), FALSE); + entry_extra = gtk_entry_new(); + if (search_prefs.fif_extra_options) + gtk_entry_set_text(GTK_ENTRY(entry_extra), search_prefs.fif_extra_options); + gtk_widget_set_sensitive(entry_extra, FALSE); + gtk_tooltips_set_tip(tooltips, entry_extra, + _("Other options to pass to Grep"), NULL); + find_in_files.extra_entry = entry_extra; - entry_extra = gtk_entry_new(); - if (search_prefs.fif_extra_options) - gtk_entry_set_text(GTK_ENTRY(entry_extra), search_prefs.fif_extra_options); - gtk_widget_set_sensitive(entry_extra, FALSE); - g_object_set_data_full(G_OBJECT(widgets.find_in_files_dialog), "entry_extra", - g_object_ref(entry_extra), (GDestroyNotify)g_object_unref); - gtk_tooltips_set_tip(tooltips, entry_extra, - _("Other options to pass to Grep"), NULL); + /* enable entry_extra when check_extra is checked */ + g_signal_connect(check_extra, "toggled", + G_CALLBACK(on_extra_options_toggled), entry_extra); - /* enable entry_extra when check_extra is checked */ - g_signal_connect(check_extra, "toggled", - G_CALLBACK(on_extra_options_toggled), entry_extra); + hbox = gtk_hbox_new(FALSE, 6); + gtk_box_pack_start(GTK_BOX(hbox), check_extra, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(hbox), entry_extra, TRUE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(vbox), hbox); - hbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(hbox), check_extra, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), entry_extra, TRUE, TRUE, 0); - gtk_container_add(GTK_CONTAINER(vbox), hbox); + g_signal_connect(dir_combo, "key-press-event", + G_CALLBACK(on_widget_key_pressed_set_focus), combo); + g_signal_connect(widgets.find_in_files_dialog, "response", + G_CALLBACK(on_find_in_files_dialog_response), NULL); + g_signal_connect(widgets.find_in_files_dialog, "delete-event", + G_CALLBACK(gtk_widget_hide_on_delete), NULL); - g_signal_connect(dir_combo, "key-press-event", - G_CALLBACK(on_widget_key_pressed_set_focus), combo); - g_signal_connect(widgets.find_in_files_dialog, "response", - G_CALLBACK(on_find_in_files_dialog_response), combo); - g_signal_connect(widgets.find_in_files_dialog, "delete-event", - G_CALLBACK(gtk_widget_hide_on_delete), NULL); + gtk_widget_show_all(widgets.find_in_files_dialog); +} - gtk_widget_show_all(widgets.find_in_files_dialog); + +/* dir is the directory to search in (UTF-8 encoding), maybe NULL to determine it the usual way + * by using the current file's path */ +void search_show_find_in_files_dialog(const gchar *dir) +{ + GtkWidget *entry; /* for child GtkEntry of a GtkComboBoxEntry */ + GeanyDocument *doc = document_get_current(); + gchar *sel = NULL; + gchar *cur_dir = NULL; + + if (widgets.find_in_files_dialog == NULL) + { + create_fif_dialog(); sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); } - - entry = GTK_BIN(combo)->child; + entry = GTK_BIN(find_in_files.search_combo)->child; /* only set selection if the dialog is not already visible, or has just been created */ if (! sel && ! GTK_WIDGET_VISIBLE(widgets.find_in_files_dialog)) sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); @@ -723,7 +732,7 @@ gtk_entry_set_text(GTK_ENTRY(entry), sel); g_free(sel); - entry = GTK_BIN(dir_combo)->child; + entry = GTK_BIN(find_in_files.dir_combo)->child; if (NZV(dir)) cur_dir = g_strdup(dir); /* custom directory argument passed */ else @@ -748,9 +757,9 @@ /* put the focus to the directory entry if it is empty */ if (utils_str_equal(gtk_entry_get_text(GTK_ENTRY(entry)), "")) - gtk_widget_grab_focus(dir_combo); + gtk_widget_grab_focus(find_in_files.dir_combo); else - gtk_widget_grab_focus(combo); + gtk_widget_grab_focus(find_in_files.search_combo); gtk_widget_show(widgets.find_in_files_dialog); /* bring the dialog back in the foreground in case it is already open but the focus is away */ @@ -1102,8 +1111,7 @@ if (extra) { - gchar *text = g_strdup(gtk_entry_get_text(GTK_ENTRY( - lookup_widget(widgets.find_in_files_dialog, "entry_extra")))); + gchar *text = g_strdup(gtk_entry_get_text(GTK_ENTRY(find_in_files.extra_entry))); text = g_strstrip(text); if (*text != 0) @@ -1118,25 +1126,26 @@ static void -on_find_in_files_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) +on_find_in_files_dialog_response(GtkDialog *dialog, gint response, + G_GNUC_UNUSED gpointer user_data) { if (response == GTK_RESPONSE_ACCEPT) { const gchar *search_text = - gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(user_data)))); - GtkWidget *dir_combo = - lookup_widget(widgets.find_in_files_dialog, "dir_combo"); + gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child( + GTK_BIN(find_in_files.search_combo)))); + GtkWidget *dir_combo = find_in_files.dir_combo; const gchar *utf8_dir = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo)))); /* update extra options pref */ g_free(search_prefs.fif_extra_options); search_prefs.fif_extra_options = g_strdup(gtk_entry_get_text(GTK_ENTRY( - lookup_widget(widgets.find_in_files_dialog, "entry_extra")))); + find_in_files.extra_entry))); - if (utf8_dir == NULL || utils_str_equal(utf8_dir, "")) + if (!NZV(utf8_dir)) ui_set_statusbar(FALSE, _("Invalid directory for find in files.")); - else if (search_text && *search_text) + else if (NZV(search_text)) { gchar *locale_dir; GString *opts = get_grep_options(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3180] trunk/po
by frlan＠users.sourceforge.net 05 Nov '08

05 Nov '08

Revision: 3180 http://geany.svn.sourceforge.net/geany/?rev=3180&view=rev Author: frlan Date: 2008-11-05 23:08:24 +0000 (Wed, 05 Nov 2008) Log Message: ----------- Corrected a little typo in Hungarian translation. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/hu.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2008-11-05 18:01:26 UTC (rev 3179) +++ trunk/po/ChangeLog 2008-11-05 23:08:24 UTC (rev 3180) @@ -1,3 +1,9 @@ +2008-11-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * hu.po: Corrected a little typo in Hungarian translation. Thanks to + Gabor Kmetyko for input. + + 2008-11-03 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * fr.po: Little update of French translation. Removes a fuzzy string. Modified: trunk/po/hu.po =================================================================== --- trunk/po/hu.po 2008-11-05 18:01:26 UTC (rev 3179) +++ trunk/po/hu.po 2008-11-05 23:08:24 UTC (rev 3180) @@ -4593,7 +4593,7 @@ #: ../plugins/classbuilder.c:782 msgid "Create Cla_ss" -msgstr "O_stály létrehozása" +msgstr "O_sztály létrehozása" #: ../plugins/classbuilder.c:791 msgid "_C++ Class" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3179] branches/build-system
by ntrel＠users.sourceforge.net 05 Nov '08

05 Nov '08

Revision: 3179 http://geany.svn.sourceforge.net/geany/?rev=3179&view=rev Author: ntrel Date: 2008-11-05 18:01:26 +0000 (Wed, 05 Nov 2008) Log Message: ----------- Use GeanyProject typedef instead of struct. Modified Paths: -------------- branches/build-system/ChangeLog branches/build-system/src/build.c Modified: branches/build-system/ChangeLog =================================================================== --- branches/build-system/ChangeLog 2008-11-05 17:57:52 UTC (rev 3178) +++ branches/build-system/ChangeLog 2008-11-05 18:01:26 UTC (rev 3179) @@ -8,6 +8,8 @@ Capitalize 'project build menu commands' string, make fully translatable. Add column spacing of 6 for project commands table (Gnome HIG). + * src/build.c: + Use GeanyProject typedef instead of struct. 2008-111-01 Lex Trotman <elextr(at)gmail(dot)com> Modified: branches/build-system/src/build.c =================================================================== --- branches/build-system/src/build.c 2008-11-05 17:57:52 UTC (rev 3178) +++ branches/build-system/src/build.c 2008-11-05 18:01:26 UTC (rev 3179) @@ -1040,7 +1040,7 @@ static void create_build_menu_gen(BuildMenuItems *menu_items) { GtkWidget *menu, *item = NULL, *image, *separator; - struct GeanyProject *proj; + GeanyProject *proj; gchar *tiptext; GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(main_widgets.window, "tooltips")); @@ -1548,7 +1548,7 @@ } if( app->project!=NULL ) { - struct GeanyProject *proj = app->project; + GeanyProject *proj = app->project; newstr = gtk_entry_get_text( GTK_ENTRY( lookup_widget( GTK_WIDGET(dialog), "build_1_label" ) ) ); if( !utils_str_equal( newstr, proj->build_1_label ) ) @@ -1687,7 +1687,7 @@ { GtkWidget *align, *frame; /* in-dialog heading for the project part of the build commands dialog */ - struct GeanyProject *proj = app->project; + GeanyProject *proj = app->project; frame = ui_frame_new_with_alignment(_("Project build menu commands"), &align); gtk_container_add(GTK_CONTAINER(vbox), frame); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2008