diff --git a/data/colorschemes/alt.conf b/data/colorschemes/alt.conf index 15c0376b..cfc4a3db 100644 --- a/data/colorschemes/alt.conf +++ b/data/colorschemes/alt.conf @@ -1,24 +1,96 @@ [theme_info] name=Alternate description=Alternate Geany color scheme with styles like the Geany <= 0.19 Python/script defaults with gray comments. +version=0.01 +author= +url= [named_styles] -# see filetypes.common for details -default=0x000000;0xffffff +default=0x000000;0xffffff;false;false +error=0xffffff;0xff0000 + +# Editor styles +#------------------------------------------------------------------------------- + +selection=0x000000;0xc0c0c0;false;false +current_line=0x000000;0xf0f0f0;true +brace_good=0x0000ff;0xFFFFFF;true;false +brace_bad=0xff0000;0xFFFFFF;true;false +margin_line_number=0x000000;0xd0d0d0 +margin_folding=0x000000;0xdfdfdf +fold_symbol_highlight=0xffffff +indent_guide=0xc0c0c0 +caret=0x000000;0x000000;false +marker_line=0x000000;0xffff00 +marker_search=0x000000;0x0000f0 +marker_mark=0x000000;0xb8f4b8 +call_tips=0xc0c0c0;0xffffff;false;false +white_space=0xc0c0c0;0xffffff;true;false + +# Programming languages +#------------------------------------------------------------------------------- + comment=0x808080 -commentdoc=0x404000 +comment_doc=0x404000 +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc,bold +comment_doc_keyword_error=comment_doc,italic + number=0x400080 -keyword=0x600080;;true -keyword2=0x9f0200;;true -string=0x008000 -preprocessor=0x808000 -operator=0x300080 -stringeol=0x000000;0xe0c0e0 -# this is a bit dim, may want to change -type=0x003030;;true +number_1=number +number_2=number_1 + +type=0x2E8B57;;true +class=type function=0x000080 -extra=0x404080 +parameter=function +keyword=0x003030;;true +keyword_1=keyword +keyword_2=0x9f0200;;true +keyword_3=keyword_1 +keyword_4=keyword_1 +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 +string=0x008000 +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=0x000000;0xe0c0e0 +character=string_1 +backtick=string_2 +here_doc=string_2 + +scalar=string_2 +label=default,bold +preprocessor=0x808000 +regex=number_1 +operator=0x300080 +decorator=string_1,bold +other=0x404080 + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=type +tag_unknown=tag,bold +tag_end=tag,bold +attribute=keyword_1 +attribute_unknown=attribute,bold +value=string_1 +entity=default + +# Diff +#------------------------------------------------------------------------------- + +line_added=0x008B8B +line_removed=0x6A5ACD +line_changed=preprocessor diff --git a/data/filetypes.actionscript b/data/filetypes.actionscript index b69b957d..d9cbee40 100644 --- a/data/filetypes.actionscript +++ b/data/filetypes.actionscript @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.ada b/data/filetypes.ada index 72dd6a10..6a8e3b81 100644 --- a/data/filetypes.ada +++ b/data/filetypes.ada @@ -1,18 +1,18 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -word=0x00007f;0xffffff;true;false -identifier=0x000000;0xffffff;false;false -number=0x007f00;0xffffff;false;false -delimiter=0x301010;0xffffff;false;false -character=0xff901e;0xffffff;false;false -charactereol=0x000000;0xe0c0e0;false;false -string=0xff901e;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -label=0xaaaaaa;0xffffff;false;true -commentline=0xd00000;0xffffff;false;false -illegal=0xff0000;0xffffff;false;true +# Edit these in the colorscheme .conf file instead +default=default +word=keyword_1 +identifier=identifier_1 +number=number +delimiter=operator +character=string_1 +charactereol=string_eol +string=string_1 +stringeol=string_eol +label=preprocessor +commentline=comment +illegal=error [keywords] # all items must be in one line diff --git a/data/filetypes.asm b/data/filetypes.asm index f5bde3f9..fa1ed591 100644 --- a/data/filetypes.asm +++ b/data/filetypes.asm @@ -1,21 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -number=0x007f00;0xffffff;false;false -string=0xff901e;0xffffff;false;false -operator=0x000000;0xffffff;false;false -identifier=0x880000;0xffffff;false;false -cpuinstruction=0x111199;0xffffff;true;false -mathinstruction=0x7f0000;0xffffff;true;false -register=0x000000;0xffffff;true;false -directive=0x3d670f;0xffffff;true;false -directiveoperand=0xff901e;0xffffff;false;false -commentblock=0x808080;0xffffff;false;false -character=0xff901e;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -extinstruction=0x007f7f;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +number=number_1 +string=string_1 +operator=operator +identifier=identifier_1 +cpuinstruction=keyword_1 +mathinstruction=keyword_2 +register=type +directive=preprocessor +directiveoperand=keyword_3 +commentblock=comment +character=string_1 +stringeol=string_eol +extinstruction=keyword_4 [keywords] # all items must be in one line diff --git a/data/filetypes.c b/data/filetypes.c index c54c7b2a..4b22d9a3 100644 --- a/data/filetypes.c +++ b/data/filetypes.c @@ -1,28 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default comment=comment commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra +commentdoc=comment_doc +number=number_1 +word=keyword_1 +word2=keyword_2 +string=string_1 +character=string_1 +uuid=other preprocessor=preprocessor operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" and """multi-line verbatim""" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +identifier=identifier_1 +stringeol=string_eol +verbatim=string_2 +regex=regex +commentlinedoc=comment_doc +commentdockeyword=comment_doc_keyword +commentdockeyworderror=comment_doc_keyword_error +globalclass=class +# """verbatim""" +tripleverbatim=string_2 [keywords] # all items must be in one line diff --git a/data/filetypes.caml b/data/filetypes.caml index d074eef8..2738ff29 100644 --- a/data/filetypes.caml +++ b/data/filetypes.caml @@ -1,20 +1,20 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -comment1=0x808080;0xffffff;false;false -comment2=0x808080;0xffffff;false;false -comment3=0x808080;0xffffff;false;false -number=0x7f7f00;0xffffff;false;false -keyword=0x001a7f;0xffffff;true;false -keyword2=0x7f0000;0xffffff;true;false -string=0x7f007f;0xffffff;false;false -char=0x7f007f;0xffffff;false;false -operator=0x000000;0xffffff;false;false -identifier=0x111199;0xffffff;false;false -tagname=0x000000;0xffe0ff;true;false -linenum=0x000000;0xc0c0c0;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +comment1=comment +comment2=comment +comment3=comment +number=number_1 +keyword=keyword_1 +keyword2=keyword_2 +string=string_1 +char=string_1 +operator=operator +identifier=identifier_1 +tagname=preprocessor +linenum=number_2 [keywords] # all items must be in one line diff --git a/data/filetypes.cmake b/data/filetypes.cmake index ca1c29ca..6442dc5c 100644 --- a/data/filetypes.cmake +++ b/data/filetypes.cmake @@ -1,21 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] # foreground;background;bold;italic -default=0x000000;0xffffff;false;false; -comment=0x808080;0xffffff;false;false; -stringdq=0xff901e;0xffffff;false;false; -stringlq=0x008000;0xffffff;false;false; -stringrq=0x008000;0xffffff;false;false; -command=0x00007f;0xffffff;false;false; -parameters=0x991111;0xffffff;false;false; -variable=0x007f7f;0xffffff;false;false; -userdefined=0x0000d0;0xffffff;true;false; -whiledef=0x00007f;0xffffff;true;false; -foreachdef=0x00007f;0xffffff;true;false; -ifdefinedef=0x00007f;0xffffff;true;false; -macrodef=0x00007f;0xffffff;true;false; -stringvar=0x007f7f;0xffffff;false;false; -number=0x007f00;0xffffff;false;false; +default=default +comment=comment +stringdq=string_1 +stringlq=string_1 +stringrq=string_1 +command=function +parameters=parameter +variable=identifier_1 +userdefined=type +whiledef=keyword_1 +foreachdef=keyword_1 +ifdefinedef=keyword_1 +macrodef=preprocessor +stringvar=string_2 +number=number_1 [keywords] # all items must be in one line diff --git a/data/filetypes.cobol b/data/filetypes.cobol index 747da572..c308702d 100644 --- a/data/filetypes.cobol +++ b/data/filetypes.cobol @@ -1,18 +1,18 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default comment=comment commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string +commentdoc=comment_doc +number=number_1 +word=keyword_1 +word2=keyword_2 +string=string_1 +character=character operator=operator -identifier=default -quotedidentifier=default +identifier=identifier_1 +quotedidentifier=identifier_2 [keywords] # all items must be in one line diff --git a/data/filetypes.common b/data/filetypes.common index 36766d5a..423d6974 100644 --- a/data/filetypes.common +++ b/data/filetypes.common @@ -7,21 +7,21 @@ default=default # 3rd selection argument is true to override default foreground # 4th selection argument is true to override default background -selection=0x000000;0xc0c0c0;false;false +selection=selection # style for a matching brace -brace_good=0x0000ff;0xFFFFFF;true;false +brace_good=brace_good # style for a non-matching brace (a brace without a counterpart) -brace_bad=0xff0000;0xFFFFFF;true;false +brace_bad=brace_bad # the following settings define the colours of the margins on the left side -margin_linenumber=0x000000;0xd0d0d0; -margin_folding=0x000000;0xdfdfdf; -fold_symbol_highlight=0xffffff +margin_linenumber=margin_line_number +margin_folding=margin_folding +fold_symbol_highlight=fold_symbol_highlight # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) -current_line=0x000000;0xf0f0f0;true; +current_line=current_line # translucency for the current line(first argument) and the selection (second argument) # values between 0 and 256 are accepted. Note for Windows 95, 98 and ME users: @@ -29,33 +29,33 @@ current_line=0x000000;0xf0f0f0;true; translucency=256;256 # style for a highlighted line (e.g when using Goto line or goto tag) -marker_line=0x000000;0xffff00; +marker_line=marker_line # style for a marked search results (when using "Mark" in Search dialogs) # the second argument sets the background colour for the drawn rectangle # only the second argument is interpreted -marker_search=0x000000;0x0000f0; +marker_search=marker_search # style for a marked line (e.g when using the "Toggle Marker" keybinding (Ctrl-M)) -marker_mark=0x000000;0xb8f4b8; +marker_mark=marker_mark # translucency for the line marker(first argument) and the search marker (second argument) marker_translucency=256;256 # colour of the caret(the blinking cursor), only first and third argument is interpreted # set the third argument to true to change the caret into a block caret -caret=0x000000;0x000000;false; +caret=caret # width of the caret(the blinking cursor) # width in pixels, use 0 to make it invisible, maximum width is 3 caret_width=1 # set foreground and background colour of indentation guides -indent_guide=0xc0c0c0;; +indent_guide=indent_guide # third argument: if true, use this foreground color. If false, use the default value defined by the filetypes. # fourth argument: if true, use this background color. If false, use the default value defined by the filetypes. -white_space=0xc0c0c0;0xffffff;true;false +white_space=white_space # style of folding icons, valid values are: # first argument: 1 for boxes, 2 for circles, 3 for arrows, 4 for +/- @@ -91,7 +91,7 @@ line_height=0;0; # 3rd argument is true to override default foreground of calltips # 4th argument is true to override default background of calltips -calltips=0xc0c0c0;0xffffff;false;false +calltips=call_tips [settings] # which characters should be skipped when moving (or included when deleting) to word boundaries @@ -99,26 +99,77 @@ calltips=0xc0c0c0;0xffffff;false;false whitespace_chars=\s\t!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~ [named_styles] -# style names to use in filetypes.* [styling] sections -# use foreground;background;bold;italic -# normally background should be left blank to use the "default" style - +# This is the Default "built-in" color scheme default=0x000000;0xffffff;false;false -comment=0xd00000 -commentdoc=0x3f5fbf -number=0x007f00 -# keyword -keyword=0x00007f;;true;false -# usually type keywords and library type names -keyword2=0x991111;;true;false -string=0xff901e -preprocessor=0x007f7f -operator=0x301010 -# unterminated string -stringeol=0x000000;0xe0c0e0;false;false -# user type names -type=0x0000d0;;true;false -# user function names -function=0x000080 -extra=0x404080 +error=0xff0000;0xBFBFBF;false;italic +selection=0x000000;0xc0c0c0;false;false +current_line=0x000000;0xf0f0f0;true; +brace_good=0x0000ff;0xFFFFFF;true;false +brace_bad=0xff0000;0xFFFFFF;true;false +margin_line_number=0x000000;0xd0d0d0; +margin_folding=0x000000;0xdfdfdf; +fold_symbol_highlight=0xffffff +indent_guide=0xc0c0c0;; +caret=0x000000;0x000000;false; +marker_line=0x000000;0xffff00; +marker_search=0x000000;0x0000f0; +marker_mark=0x000000;0xb8f4b8; +call_tips=0xc0c0c0;0xffffff;false;false +white_space=0xc0c0c0;0xffffff;true;false + +comment=0xd00000 +comment_doc=0x3f5fbf +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc,bold +comment_doc_keyword_error=comment_doc,italic + +number=0x007f00 +number_1=number +number_2=number_1 + +type=0x0000d0;;true;false +class=type +function=0x000080 +parameter=function + +keyword=0x00007f;;true;false +keyword_1=keyword +keyword_2=0x991111;;true;false +keyword_3=keyword_1 +keyword_4=keyword_1 + +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=0xff901e +string_1=string +string_2=string_1 +string_eol=0x000000;0xe0c0e0;false;false +character=string_1 +backtick=string_2 +here_doc=string_2 + +scalar=string_2 +label=default,bold +preprocessor=0x007f7f +regex=number_1 +operator=0x301010 +decorator=string_1,bold +other=0x404080 + +tag=type +tag_unknown=tag,bold +tag_end=tag,bold +attribute=keyword_1 +attribute_unknown=attribute,bold +value=string_1 +entity=default + +line_added=0x34b034;0xffffff;false;false +line_removed=0xff2727;0xffffff;false;false +line_changed=0x7f007f;0xffffff;false;false diff --git a/data/filetypes.conf b/data/filetypes.conf index df9ca0e5..9b661791 100644 --- a/data/filetypes.conf +++ b/data/filetypes.conf @@ -1,12 +1,12 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x7f0000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -section=0x000090;0xffffff;true;false -key=0x00007f;0xffffff;false;false -assignment=0x000000;0xffffff;false;false -defval=0x00007f;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=value +comment=comment +section=tag +key=attribute +assignment=operator +defval=value # the lexer doesn't support keywords diff --git a/data/filetypes.cpp b/data/filetypes.cpp index 1687d707..85cf4adb 100644 --- a/data/filetypes.cpp +++ b/data/filetypes.cpp @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.cs b/data/filetypes.cs index 711d1e6f..42b34601 100644 --- a/data/filetypes.cs +++ b/data/filetypes.cs @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.css b/data/filetypes.css index dc38f976..7b56f4d7 100644 --- a/data/filetypes.css +++ b/data/filetypes.css @@ -1,29 +1,29 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x003399;0xffffff;false;false -comment=0x808080;0xffffff;false;false -tag=0x2166a4;0xffffff;true;false -class=0x007f00;0xffffff;true;false -pseudoclass=0x660010;0xffffff;true;true -unknown_pseudoclass=0xff0099;0xffffff;false;false -unknown_identifier=0xff0099;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000099;0xffffff;true;false -doublestring=0x330066;0xffffff;false;false -singlestring=0x330066;0xffffff;false;false -attribute=0x007f00;0xffffff;false;false -value=0x303030;0xffffff;false;false -id=0xff9000;0xffffff;true;false -identifier2=0x6b6bff;0xffffff;true;false -important=0x990000;0xffffff;true;false -directive=0x006bff;0xffffff;false;true -identifier3=0x00c8ff;0xffffff;true;false -pseudoelement=0x666610;0xffffff;true;true -extended_identifier=0x9090a0;0xffffff;true;false -extended_pseudoclass=0x907080;0xffffff;true;true -extended_pseudoelement=0x909080;0xffffff;true;true -media=0x006bff;0xffffff;false;true +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +tag=tag +class=class +pseudoclass=class +unknown_pseudoclass=class +unknown_identifier=class +operator=operator +identifier=keyword_1 +doublestring=string_1 +singlestring=string_1 +attribute=attribute +value=value +id=number +identifier2=keyword_2 +important=extra +directive=preprocessor +identifier3=keyword_3 +pseudoelement=element +extended_identifier=keyword_4 +extended_pseudoclass=class +extended_pseudoelement=element +media=string_2 [keywords] # CSS 1 properties diff --git a/data/filetypes.d b/data/filetypes.d index 8a92ded7..a263e2db 100644 --- a/data/filetypes.d +++ b/data/filetypes.d @@ -1,24 +1,24 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default comment=comment commentline=comment -commentdoc=commentdoc -commentdocnested=commentdoc -number=number -word=keyword -word2=keyword2 -word3=keyword2 +commentdoc=comment_doc +commentdocnested=comment_doc +number=number_1 +word=keyword_1 +word2=keyword_2 +word3=keyword_3 typedef=type -string=string -stringeol=stringeol -character=string +string=string_1 +stringeol=string_eol +character=string_1 operator=operator -identifier=default -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc +identifier=identifier_1 +commentlinedoc=comment_doc +commentdockeyword=comment_doc_keyword +commentdockeyworderror=comment_doc_keyword_error [keywords] # all items must be in one line diff --git a/data/filetypes.diff b/data/filetypes.diff index b7a7e919..732d1d5f 100644 --- a/data/filetypes.diff +++ b/data/filetypes.diff @@ -1,14 +1,14 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -command=0x7f7f00;0xffffff;false;false -header=0x7f0000;0xffffff;false;false -position=0x00007f;0xffffff;false;false -deleted=0xff2727;0xffffff;false;false -added=0x34b034;0xffffff;false;false -changed=0x7f007f;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +command=function +header=preprocessor +position=number +deleted=line_removed +added=line_added +changed=line_changed [settings] @@ -30,4 +30,3 @@ context_action_cmd= #width=4 # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - diff --git a/data/filetypes.docbook b/data/filetypes.docbook index ab2449d1..0930e559 100644 --- a/data/filetypes.docbook +++ b/data/filetypes.docbook @@ -1,35 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -tag=0x000099;0xffffff;false;false -tagunknown=0xff0000;0xffffff;false;false -attribute=0x007f00;0xffffff;false;false -attributeunknown=0xff0000;0xffffff;false;false -number=0x800080;0xffffff;false;false -doublestring=0xff901e;0xffffff;false;false -singlestring=0xff901e;0xffffff;false;false -other=0x800080;0xffffff;false;false -comment=0x808080;0xffffff;false;false -entity=0x800080;0xffffff;false;false -tagend=0x000099;0xffffff;false;false -xmlstart=0x000099;0xffffff;false;false -xmlend=0x000099;0xffffff;false;false -cdata=0x660099;0xffffff;false;false -question=0x0000ff;0xffffff;false;false -value=0x660099;0xffffff;false;false -xccomment=0x660099;0xffffff;false;false -sgml_default=0x000000;0xffffff;false;false -sgml_comment=0x303030;0xffffff;false;false -sgml_special=0x007f00;0xffffff;false;false -sgml_command=0x111199;0xffffff;true;false -sgml_doublestring=0xff901e;0xffffff;false;false -sgml_simplestring=0x202020;0xffffff;false;false -sgml_1st_param=0x404080;0xffffff;false;false -sgml_entity=0x301010;0xffffff;false;false -sgml_block_default=0x000000;0xffffff;false;false -sgml_1st_param_comment=0x406090;0xffffff;false;false -sgml_error=0xff0000;0xffffff;false;false +[styling=XML] [keywords] # all items must be in one line diff --git a/data/filetypes.erlang b/data/filetypes.erlang index a4adb285..c1eea768 100644 --- a/data/filetypes.erlang +++ b/data/filetypes.erlang @@ -1,28 +1,28 @@ [styling] -# Each of these (...) refers to the lexer state SCE_ERLANG_(...) +# Edit these in the colorscheme .conf file instead default=default comment=comment variable=default -number=number -keyword=keyword -string=string +number=number_1 +keyword=keyword_1 +string=string_1 operator=operator atom=default -function_name=default,bold -character=default +function_name=function +character=character macro=preprocessor record=type preproc=preprocessor node_name=default comment_function=comment comment_module=comment -comment_doc=comment -comment_doc_macro=comment +comment_doc=comment_doc +comment_doc_macro=comment_doc atom_quoted=default macro_quoted=default record_quoted=default node_name_quoted=default -bifs=keyword2 +bifs=keyword_2 modules=default modules_att=preprocessor unknown=default diff --git a/data/filetypes.f77 b/data/filetypes.f77 index 040cb0ec..7f0fe038 100644 --- a/data/filetypes.f77 +++ b/data/filetypes.f77 @@ -1,23 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -number=0x007f00;0xffffff;false;false -string=0xff901e;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -string2=0x111199;0xffffff;true;false -word=0x7f0000;0xffffff;true;false -word2=0x000099;0xffffff;true;false -word3=0x3d670f;0xffffff;true;false -preprocessor=0x007f7f;0xffffff;false;false -operator2=0x301010;0xffffff;true;false -continuation=0x000000;0xffffff;false;false -#continuation=0xff901e;0xf0e080;false;false -stringeol=0x000000;0xe0c0e0;false;false -label=0xa861a8;0xffffff;true;false - +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +number=number_1 +string=string_1 +operator=operator +identifier=identifier_1 +string2=string_2 +word=keyword_1 +word2=keyword_2 +word3=keyword_3 +preprocessor=preprocessor +operator2=operator +continuation=default +stringeol=string_eol +label=type [keywords] # all items must be in one line diff --git a/data/filetypes.ferite b/data/filetypes.ferite index 1dbc252b..db5b6223 100644 --- a/data/filetypes.ferite +++ b/data/filetypes.ferite @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.forth b/data/filetypes.forth index ba6090d7..46545766 100644 --- a/data/filetypes.forth +++ b/data/filetypes.forth @@ -1,18 +1,18 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default -comment=commentdoc -commentml=comment -identifier=default -control=0x301010;0xffffff;true;false -keyword=0x301060;0xffffff;true;false -defword=0x000080;;false;true -preword1=0x000000;0xe0c0e0;false;false -preword2=0xaaaaaa;0xffffff;false;true -number=0x007f00;0xffffff;false;false -string=string -locale=0xff0000;0xffffff;false;true +comment=comment +commentml=comment_doc +identifier=identifier_1 +control=keyword_1 +keyword=keyword_1 +defword=keyword_2 +preword1=keyword_3 +preword2=keyword_4 +number=number_1 +string=string_1 +locale=other [keywords] # all items must be in one line @@ -27,7 +27,7 @@ extension=fs #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 # single comments, like # in this file -comment_single=\\ +comment_single=\\ # multiline comments comment_open=( comment_close= ) diff --git a/data/filetypes.fortran b/data/filetypes.fortran index fb35c203..7a5c058d 100644 --- a/data/filetypes.fortran +++ b/data/filetypes.fortran @@ -1,23 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -number=0x007f00;0xffffff;false;false -string=0xff901e;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -string2=0x111199;0xffffff;true;false -word=0x7f0000;0xffffff;true;false -word2=0x000099;0xffffff;true;false -word3=0x3d670f;0xffffff;true;false -preprocessor=0x007f7f;0xffffff;false;false -operator2=0x301010;0xffffff;true;false -continuation=0x000000;0xffffff;false;false -#continuation=0xff901e;0xf0e080;false;false -stringeol=0x000000;0xe0c0e0;false;false -label=0xa861a8;0xffffff;true;false - +[styling=F77] [keywords] # all items must be in one line @@ -55,7 +37,6 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension diff --git a/data/filetypes.freebasic b/data/filetypes.freebasic index eb8a5477..43404774 100644 --- a/data/filetypes.freebasic +++ b/data/filetypes.freebasic @@ -1,26 +1,25 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false; -comment=0x808080;0xffffff;false;false; -number=0x007f00;0xffffff;false;false; -word=0x00007f;0xffffff;true;false; -string=0xff901e;0xffffff;false;false; -preprocessor=0x007f7f;0xffffff;false;false; -operator=0x301010;0xffffff;false;false; -identifier=0x000000;0xffffff;false;false; -date=0x1a6500;0xffffff;false;false; -stringeol=0x000000;0xe0c0e0;false;false; -word2=0x007f7f;0xffffff;true;false; -word3=0x991111;0xffffff;false;false; -word4=0x0000d0;0xffffff;false;false; -constant=0x007f7f;0xffffff;false;false; -# asm is still unused -asm=0x105090;0xffffff;false;false; -label=0x007f7f;0xffffff;false;false; -error=0xd00000;0xffffff;false;false; -hexnumber=0x007f00;0xffffff;false;false; -binnumber=0x007f00;0xffffff;false;false; +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +number=number_1 +word=keyword_1 +string=string_1 +preprocessor=preprocessor +operator=operator +identifier=identifier_1 +date=number_2 +stringeol=string_eol +word2=keyword_2 +word3=keyword_3 +word4=keyword_4 +constant=identifier_2 +asm=type +label=identifier_3 +error=error +hexnumber=number_1 +binnumber=number_1 [keywords] # all items must be in one line diff --git a/data/filetypes.glsl b/data/filetypes.glsl index 22d9b5ff..597d238c 100644 --- a/data/filetypes.glsl +++ b/data/filetypes.glsl @@ -1,31 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type -# whether arguments of preprocessor commands should be styled (only first argument is used) -# 1 to enable, 0 to disable -styling_within_preprocessor=1;0;false;false +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.haskell b/data/filetypes.haskell index 6c36da3f..d182d399 100644 --- a/data/filetypes.haskell +++ b/data/filetypes.haskell @@ -1,23 +1,23 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -commentline=0x808080;0xffffff;false;false -commentblock=0x808080;0xffffff;false;false -commentblock2=0x808080;0xffffff;false;false -commentblock3=0x808080;0xffffff;false;false -number=0x007f00;0xffffff;false;false -keyword=0x00007f;0xffffff;true;false -import=0x991111;0xffffff;false;false -string=0xff901e;0xffffff;false;false -character=0x7f007f;0xffffff;false;false -class=0x0000d0;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -instance=0x000000;0xffffff;false;false -capital=0x635b00;0xffffff;false;false -module=0x007f7f;0xffffff;false;false -data=0x000000;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +commentline=comment +commentblock=comment +commentblock2=comment +commentblock3=comment +number=number_1 +keyword=keyword_1 +import=preprocessor +string=string_1 +character=string_2 +class=class +operator=operator +identifier=identifier_1 +instance=type +capital=string_2 +module=function +data=number_2 [keywords] # all items must be in one line diff --git a/data/filetypes.haxe b/data/filetypes.haxe index b14a93df..56919c79 100644 --- a/data/filetypes.haxe +++ b/data/filetypes.haxe @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.java b/data/filetypes.java index d2a647a5..7cab8e7f 100644 --- a/data/filetypes.java +++ b/data/filetypes.java @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] primary=abstract assert break case catch class const continue default do else enum extends final finally for future generic goto if implements import inner instanceof interface native new outer package private protected public rest return static super switch synchronized this throw throws transient try var volatile while true false null @@ -61,7 +38,6 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension diff --git a/data/filetypes.javascript b/data/filetypes.javascript index 8e8c4462..e4637112 100644 --- a/data/filetypes.javascript +++ b/data/filetypes.javascript @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.latex b/data/filetypes.latex index a95bd87b..d455b8ef 100644 --- a/data/filetypes.latex +++ b/data/filetypes.latex @@ -1,11 +1,11 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x00002f;0xffffff;false;false -command=0xff0000;0xffffff;true;false -tag=0x007f7f;0xffffff;true;false -math=0x00007f;0xffffff;false;false -comment=0x007f00;0xffffff;false;true +# Edit these in the colorscheme .conf file instead +default=default +command=keyword_1 +tag=tag +math=number_1 +comment=comment [keywords] # all items must be in one line diff --git a/data/filetypes.lisp b/data/filetypes.lisp index 637f33a3..4fc766ee 100644 --- a/data/filetypes.lisp +++ b/data/filetypes.lisp @@ -1,21 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default comment=comment multicomment=comment -number=number -keyword=0x0071FD;;true;false -special_keyword=0x0071FD;;true;false -symbol=keyword2 -string=string -stringeol=stringeol -identifier=default -operator=default -special=keyword -character=default -macro=keyword2 -macrodispatch=keyword2 +number=number_1 +keyword=keyword_1 +special_keyword=type +symbol=keyword_2 +string=string_1 +stringeol=string_eol +identifier=identifier_1 +operator=operator +special=function +character=character +macro=preprocessor +macrodispatch=number_2 [keywords] # all items must be in one line diff --git a/data/filetypes.lua b/data/filetypes.lua index 594b8dac..89a62226 100644 --- a/data/filetypes.lua +++ b/data/filetypes.lua @@ -1,26 +1,26 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;true;false -number=0x007f00;0xffffff;false;false -word=0x00007f;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0x008000;0xffffff;false;false -literalstring=0x008020;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -function_basic=0x991111;0xffffff;false;false -function_other=0x690000;0xffffff;false;false -coroutines=0x66005c;0xffffff;false;false -word5=0x7979ff;0xffffff;false;false -word6=0xad00ff;0xffffff;false;false -word7=0x03D000;0xffffff;false;false -word8=0xff7600;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +commentline=comment_line +commentdoc=comment_line_doc +number=number_1 +word=keyword_1 +string=string_1 +character=character +literalstring=string_2 +preprocessor=preprocess +operator=operator +identifier=identifier_1 +stringeol=string_eol +function_basic=function +function_other=type +coroutines=class +word5=keyword_1 +word6=keyword_2 +word7=keyword_3 +word8=keyword_4 [keywords] # all items must be in one line diff --git a/data/filetypes.makefile b/data/filetypes.makefile index 81947d4a..e131acc6 100644 --- a/data/filetypes.makefile +++ b/data/filetypes.makefile @@ -1,16 +1,13 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x00002f;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false -identifier=0x007f00;0xffffff;false;false -operator=0x301010;0xffffff;false;false -target=0x0000ff;0xffffff;false;false -ideol=0x008000;0xffffff;false;false - -# there are no keywords available otherwise mail me - +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +preprocessor=preprocessor +identifier=identifier_4 +operator=operator +target=label +ideol=type [settings] # default extension used when saving files diff --git a/data/filetypes.markdown b/data/filetypes.markdown index 01b21598..bc21ad05 100644 --- a/data/filetypes.markdown +++ b/data/filetypes.markdown @@ -1,23 +1,23 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -strong=0xff0000;0xffffff;false;false -emphasis=0xff0000;0xffffff;false;false -header1=0x0000bb;0xffffff;false;false -header2=0x0000bb;0xffffff;false;false -header3=0x0000bb;0xffffff;false;false -header4=0x0000bb;0xffffff;false;false -header5=0x0000bb;0xffffff;false;false -header6=0x0000bb;0xffffff;false;false -ulist_item=0x007f00;0xffffff;false;false -olist_item=0x007f00;0xffffff;false;false -blockquote=0xff0000;0xffffff;false;false -strikeout=0xaa00ff;0xffffff;false;false -hrule=0xff901e;0xffffff;false;false -link=0x0000ff;0xffffff;false;false -code=0x009f00;0xffffff;false;false -codebk=0x005f00;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +strong=string_3 +emphasis=string_4 +header1=keyword_1 +header2=keyword_1 +header3=keyword_1 +header4=keyword_1 +header5=keyword_1 +header6=keyword_1 +ulist_item=tag_unknown +olist_item=tag_unknown +blockquote=tag_unknown +strikeout=tag_unknown +hrule=tag_unknown +link=keyword_1 +code=attribute_unknown +codebk=attribute_unknown [settings] # default extension used when saving files diff --git a/data/filetypes.matlab b/data/filetypes.matlab index 0e53ed8e..d566adc1 100644 --- a/data/filetypes.matlab +++ b/data/filetypes.matlab @@ -1,15 +1,15 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -command=0x111199;0xffffff;true;false -number=0x007f00;0xffffff;false;false -keyword=0x001a7f;0xffffff;true;false -string=0xff901e;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -doublequotedstring=0xff901e;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +command=function +number=number_1 +keyword=keyword_1 +string=string_1 +operator=operator +identifier=identifier_1 +doublequotedstring=string_2 [keywords] # all items must be in one line diff --git a/data/filetypes.nsis b/data/filetypes.nsis index 0b75cba5..d23a4c9d 100644 --- a/data/filetypes.nsis +++ b/data/filetypes.nsis @@ -1,26 +1,25 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false; -comment=0x808080;0xffffff;false;false; -stringdq=0xff901e;0xffffff;false;false; -stringlq=0x008000;0xffffff;false;false; -stringrq=0x008000;0xffffff;false;false; -function=0x00007f;0xffffff;false;false; -variable=0x991111;0xffffff;false;false; -label=0x007f7f;0xffffff;false;false; -userdefined=0x0000d0;0xffffff;true;false; -sectiondef=0x00007f;0xffffff;true;false; -subsectiondef=0x00007f;0xffffff;true;false; -ifdefinedef=0x00007f;0xffffff;true;false; -macrodef=0x00007f;0xffffff;true;false; -stringvar=0x991111;0xffffff;false;false; -number=0x007f00;0xffffff;false;false; -sectiongroup=0x00007f;0xffffff;true;false; -pageex=0x00007f;0xffffff;true;false; -functiondef=0x00007f;0xffffff;true;false; -commentbox=0x808080;0xffffff;false;false; - +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +stringdq=string_1 +stringlq=string_2 +stringrq=string_2 +function=keyword_1 +variable=type +label=label +userdefined=keyword_2 +sectiondef=keyword_1 +subsectiondef=keyword_1 +ifdefinedef=keyword_1 +macrodef=keyword_1 +stringvar=string_1 +number=number_1 +sectiongroup=keyword_1 +pageex=keyword_1 +functiondef=keyword_1 +commentbox=comment [keywords] # all items must be in one line and in lowercase diff --git a/data/filetypes.pascal b/data/filetypes.pascal index 0943ef5c..64aafdb9 100644 --- a/data/filetypes.pascal +++ b/data/filetypes.pascal @@ -1,21 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -comment2=0x3f5fbf;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false -preprocessor2=0x007f7f;0xffffff;false;false -number=0x007F00;0xffffff;false;false -hexnumber=0x007F00;0xffffff;false;false -word=0x111199;0xffffff;true;false -string=0xff901e;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -character=0x404000;0xffffff;false;false -operator=0x301010;0xffffff;false;false -asm=0x804080;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +identifier=identifier_1 +comment=comment +comment2=comment +commentline=comment +preprocessor=preprocessor +preprocessor2=preprocessor +number=number_1 +hexnumber=number_1 +word=keyword_1 +string=string +stringeol=string_eol +character=character +operator=operator +asm=number_2 [keywords] diff --git a/data/filetypes.perl b/data/filetypes.perl index d5403ba4..29423d25 100644 --- a/data/filetypes.perl +++ b/data/filetypes.perl @@ -1,43 +1,43 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -error=0xff0000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x111199;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0xff901e;0xffffff;false;false -preprocessor=0x007f7f;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -scalar=0x7f0000;0xffffff;true;false -pod=0x035650;0xffffff;false;true -regex=0x105090;0xffffff;false;false -array=0x105090;0xffffff;false;false -hash=0x105090;0xffffff;false;false -symboltable=0x105090;0xffffff;false;false -backticks=0x000000;0xe0c0e0;false;false -pod_verbatim=0x004000;0xc0ffc0;false;false -reg_subst=0x000000;0xf0e080;false;false -datasection=0x600000;0xfff0d8;false;false -here_delim=0x000000;0xddd0dd;false;false -here_q=0x7f007f;0xddd0dd;false;false -here_qq=0x7f007f;0xddd0dd;true;false -here_qx=0x7f007f;0xddd0dd;false;true -string_q=0x7f007f;0xffffff;false;false -string_qq=0xff901e;0xffffff;false;false -string_qx=0x000000;0xe0c0e0;false;false -string_qr=0x105090;0xffffff;false;false -string_qw=0x105090;0xffffff;false;false -variable_indexer=0x000000;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +error=error +commentline=comment +number=number_1 +word=keyword_1 +string=string_1 +character=character +preprocessor=preprocessor +operator=operator +identifier=identifier_1 +scalar=scalar +pod=comment_doc +regex=regex +array=regex +hash=regex +symboltable=number_2 +backticks=backticks +pod_verbatim=comment_doc_keyword +reg_subst=regex +datasection=value +here_delim=here_doc +here_q=here_doc +here_qq=here_doc +here_qx=here_doc +string_q=string_2 +string_qq=string_2 +string_qx=string_2 +string_qr=string_2 +string_qw=string_2 +variable_indexer=default # not used -punctuation=0x000000;0xffffff;false;false +punctuation=default # obsolete: replaced by qq, qx, qr, qw -longquote=0x000000;0xffffff;false;false -sub_prototype=0x301010;0xffffff;false;true -format_ident=0xc000c0;0xffffff;true;false -format=0xc000c0;0xffffff;false;false +longquote=perl_here_qq +sub_prototype=perl_here_qx +format_ident=perl_string_qr +format=perl_string_qw [keywords] primary=NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode bless caller chdir chmod chomp chop chown chr chroot close closedir cmp connect continue cos crypt dbmclose dbmopen defined delete die do dump each else elsif endgrent endhostent endnetent endprotoent endpwent endservent eof eq eval exec exists exit exp fcntl fileno flock for foreach fork format formline ge getc getgrent getgrgid getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr getnetbyname getnetent getpeername getpgrp getppid getpriority getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid getservbyname getservbyport getservent getsockname getsockopt glob gmtime goto grep gt hex if index int ioctl join keys kill last lc lcfirst le length link listen local localtime lock log lstat lt m map mkdir msgctl msgget msgrcv msgsnd my ne next no not oct open opendir or ord our pack package pipe pop pos print printf prototype push q qq qr quotemeta qu qw qx rand read readdir readline readlink readpipe recv redo ref rename require reset return reverse rewinddir rindex rmdir s scalar seek seekdir select semctl semget semop send setgrent sethostent setnetent setpgrp setpriority setprotoent setpwent setservent setsockopt shift shmctl shmget shmread shmwrite shutdown sin sleep socket socketpair sort splice split sprintf sqrt srand stat study sub substr symlink syscall sysopen sysread sysseek system syswrite tell telldir tie tied time times tr truncate uc ucfirst umask undef unless unlink unpack unshift untie until use utime values vec wait waitpid wantarray warn while write x xor y diff --git a/data/filetypes.po b/data/filetypes.po index 71c95c14..b613f4c0 100644 --- a/data/filetypes.po +++ b/data/filetypes.po @@ -1,18 +1,15 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x7f0000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -msgid=0x00007f;0xffffff;true;false -msgid_text=0x00007f;0xffffff;false;false -msgstr=0x7f0000;0xffffff;true;false -msgstr_text=0x7f0000;0xffffff;false;false -msgctxt=0x007f00;0xffffff;true;false -msgctxt_text=0x007f00;0xffffff;false;false -fuzzy=0xffa500;0xffffff;true;false - -# the lexer don't support keywords - +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +msgid=keyword_1 +msgid_text=string_1 +msgstr=keyword_2 +msgstr_text=string_1 +msgctxt=keyword_3 +msgctxt_text=string_1 +fuzzy=comment_doc_keyword [settings] # default extension used when saving files @@ -43,7 +40,6 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension diff --git a/data/filetypes.python b/data/filetypes.python index b4cf03be..66b109e9 100644 --- a/data/filetypes.python +++ b/data/filetypes.python @@ -1,23 +1,22 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default commentline=comment -number=number -string=string -character=string -word=keyword -triple=string -tripledouble=commentdoc -classname=type,bold +number=number_1 +string=string_1 +character=character +word=keyword_1 +triple=string_2 +tripledouble=string_2 +classname=type defname=function operator=operator -identifier=default +identifier=identifier_1 commentblock=comment -stringeol=stringeol -# flip bold for identifiers -word2=keyword2,bold -decorator=preprocessor +stringeol=string_eol +word2=keyword_2 +decorator=decorator [keywords] # all items must be in one line diff --git a/data/filetypes.r b/data/filetypes.r index ece66d80..0514a1f8 100644 --- a/data/filetypes.r +++ b/data/filetypes.r @@ -1,23 +1,18 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -# primary keyword -kword=0x00007f;0xffffff;false;false -operator=0x301010;0xffffff;false;false -# package keyword -basekword=0x991111;0xffffff;false;false -# package_other keyword -otherkword=0x991111;0xffffff;false;false -number=0x007f00;0xffffff;false;false -# "blah" string -string=0xff901e;0xffffff;false;false -# 'blah' string -string2=0xff901e;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -infix=0x008000;0xffffff;false;false -infixeol=0x000000;0xe0c0e0;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +kword=keyword_1 +operator=operator +basekword=keyword_2 +otherkword=keyword_3 +number=number_1 +string=string_1 +string2=string_2 +identifier=identifier +infix=function +infixeol=function [keywords] # all items must be in one line diff --git a/data/filetypes.ruby b/data/filetypes.ruby index 3d64c5ab..31f911cf 100644 --- a/data/filetypes.ruby +++ b/data/filetypes.ruby @@ -1,41 +1,40 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false -commentline=0xd00000;0xffffff;false;false -number=0x400080;0xffffff;false;false -string=0x008000;0xffffff;false;false -character=0x008000;0xffffff;false;false -word=0x111199;0xffffff;true;false -global=0x111199;0xffffff;false;false -symbol=0x008020;0xffffff;false;false -classname=0x7f0000;0xffffff;true;false -defname=0x7f0000;0xffffff;false;false -operator=0x000000;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -modulename=0x111199;0xffffff;true;false -backticks=0x000000;0xe0c0e0;false;false -instancevar=0x000000;0xffffff;false;true -classvar=0x000000;0xffffff;true;true -datasection=0x000000;0xffffff;false;false -heredelim=0x000000;0xffffff;false;false -worddemoted=0x111199;0xffffff;false;false -stdin=0x000000;0xffffff;false;false -stdout=0x000000;0xffffff;false;false -stderr=0x000000;0xffffff;false;false -datasection=0x600000;0xfff0d8;false;false -regex=0x105090;0xffffff;false;false -here_q=0x7f007f;0xddd0dd;false;false -here_qq=0x7f007f;0xddd0dd;true;false -here_qx=0x7f007f;0xddd0dd;false;true -string_q=0x7f007f;0xffffff;false;false -string_qq=0xff901e;0xffffff;false;false -string_qx=0x000000;0xe0c0e0;false;false -string_qr=0x105090;0xffffff;false;false -string_qw=0x105090;0xffffff;false;false -upper_bound=0x000000;0xffffff;false;false -error=0xe500cc;0xffffff;false;false -pod=0x035650;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +commentline=comment +number=number_1 +string=string_1 +character=character +word=keyword_1 +global=type +symbol=preprocessor +classname=class +defname=function +operator=operator +identifier=identifier_1 +modulename=type +backticks=backticks +instancevar=default +classvar=default +datasection=default +heredelim=operator +worddemoted=keyword_1 +stdin=default +stdout=default +stderr=default +regex=regex +here_q=here_doc +here_qq=here_doc +here_qx=here_doc +string_q=string_2 +string_qq=string_2 +string_qx=string_2 +string_qr=string_2 +string_qw=string_2 +upper_bound=default +error=error +pod=comment_doc [keywords] # all items must be in one line diff --git a/data/filetypes.sh b/data/filetypes.sh index 5d77b576..d2beb39a 100644 --- a/data/filetypes.sh +++ b/data/filetypes.sh @@ -1,20 +1,20 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -number=0x007f00;0xffffff;false;false -word=0x111199;0xffffff;true;false -string=0xff901e;0xffffff;false;false -character=0x404000;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -backticks=0x000000;0xd0d0d0;false;false -param=0x009f00;0xffffff;false;false -scalar=0x105090;0xffffff;false;false -error=0xff0000;0xffffff;false;false -here_delim=0x000000;0xddd0dd;false;false -here_q=0x7f007f;0xddd0dd;false;false +# Edit these in the colorscheme .conf file instead +default=default +commentline=comment +number=number_1 +word=keyword_1 +string=string_1 +character=string_1 +operator=operator +identifier=identifier_1 +backticks=backtick +param=parameter +scalar=scalar +error=error +here_delim=here_doc +here_q=here_doc [keywords] primary=break case continue do done elif else esac eval exit export fi for function goto if in integer return set shift then until while diff --git a/data/filetypes.sql b/data/filetypes.sql index 52498602..b53033f6 100644 --- a/data/filetypes.sql +++ b/data/filetypes.sql @@ -1,21 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -commentline=0x808080;0xffffff;false;false -commentdoc=0x3f5fbf;0xffffff;false;false -number=0x7f7f00;0xffffff;false;false -word=0x001a7f;0xffffff;true;false -word2=0x7f0000;0xffffff;true;false -string=0x7f007f;0xffffff;false;false -character=0x000000;0xffffff;false;false -operator=0x000000;0xffffff;true;false -identifier=0x111199;0xffffff;false;false -sqlplus=0x000000;0xffffff;false;false -sqlplus_prompt=0x000000;0xffffff;false;false -sqlplus_comment=0x000000;0xffffff;false;false -quotedidentifier=0x111199;0xffffff;false;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +commentline=comment_line +commentdoc=comment_doc +number=number_1 +word=keyword_1 +word2=keyword_2 +string=string_1 +character=character +operator=operator +identifier=identifier_1 +sqlplus=default +sqlplus_prompt=default +sqlplus_comment=default +quotedidentifier=identifier_2 [keywords] # all items must be in one line diff --git a/data/filetypes.tcl b/data/filetypes.tcl index 1d0c32e5..fa12c644 100644 --- a/data/filetypes.tcl +++ b/data/filetypes.tcl @@ -1,23 +1,22 @@ # For complete documentation of this file; please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -commentline=0xd00000;0xffffff;false;false -number=0x007f00;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0xa20000;0xffffff;false;false -wordinquote=0x7f007f;0xffffff;false;false -inquote=0x7f007f;0xffffff;false;false -substitution=0x111199;0xffffff;false;false -modifier=0x7f007f;0xffffff;false;false -expand=0x000000;0xffffff;false;false -wordtcl=0x111199;0xffffff;true;false -wordtk=0x7f0000;0xffffff;true;false -worditcl=0x111199;0xffffff;true;false -wordtkcmds=0x7f0000;0xffffff;true;false -wordexpand=0x7f0000;0xffffff;true;false - +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +commentline=comment_line +number=number_1 +operator=operator +identifier=identifier_1 +wordinquote=string_1 +inquote=string_1 +substitution=function +modifier=operator +expand=default +wordtcl=keyword_1 +wordtk=keyword_2 +worditcl=keyword_3 +wordtkcmds=keyword_4 +wordexpand=keyword_4 [keywords] # all items must be in one line @@ -56,7 +55,6 @@ context_action_cmd= # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - [build_settings] # %f will be replaced by the complete filename # %e will be replaced by the filename without extension diff --git a/data/filetypes.txt2tags b/data/filetypes.txt2tags index 6669a1e6..c56a5edc 100644 --- a/data/filetypes.txt2tags +++ b/data/filetypes.txt2tags @@ -1,28 +1,28 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -strong=0x445675;0xffffff;true;false -emphasis=0x653A39;0xffffff;false;true -underlined=0x386742;0xffffff;false;false -header1=0xE20700;0xffffff;true;false -header2=0xE20700;0xffffff;true;false -header3=0xA81D05;0xffffff;true;false -header4=0x871704;0xffffff;true;false -header5=0x871704;0xffffff;true;false -header6=0x871704;0xffffff;true;false -ulist_item=0xE300EE;0xffffff;false;false -olist_item=0xE300EE;0xffffff;false;false -blockquote=0x015F52;0xffffff;false;false -strikeout=0x644A9B;0xffffff;false;false -hrule=0xff901e;0xffffff;false;false -link=0x0930DE;0xffffff;false;true -code=0x009f00;0xffffff;false;false -codebk=0x005f00;0xffffff;false;false -comment=0x777777;0xffffff;false;false -option=0xC0036E;0xffffff;false;true -preproc=0x848B00;0xffffff;false;true -postproc=0xC05600;0xffffff;false;true +# Edit these in the colorscheme .conf file instead +default=default +strong=tag +emphasis=tag +underlined=tag +header1=tag +header2=tag +header3=tag +header4=tag +header5=tag +header6=tag +ulist_item=tag +olist_item=tag +blockquote=tag +strikeout=tag +hrule=tag +link=function +code=identifier_1 +codebk=identifier_2 +comment=comment +option=operator +preproc=preprocessor +postproc=preprocessor [settings] # default extension used when saving files diff --git a/data/filetypes.vala b/data/filetypes.vala index 15520cec..c493f6de 100644 --- a/data/filetypes.vala +++ b/data/filetypes.vala @@ -1,28 +1,5 @@ # For complete documentation of this file, please see Geany's main documentation -[styling] -# foreground;background;bold;italic -default=default -comment=comment -commentline=comment -commentdoc=commentdoc -number=number -word=keyword -word2=keyword2 -string=string -character=string -uuid=extra -preprocessor=preprocessor -operator=operator -identifier=default -stringeol=stringeol -# @"verbatim" -verbatim=extra -# (/regex/) -regex=extra -commentlinedoc=commentdoc,bold -commentdockeyword=commentdoc,bold,italic -commentdockeyworderror=commentdoc -globalclass=type +[styling=C] [keywords] # all items must be in one line diff --git a/data/filetypes.verilog b/data/filetypes.verilog index 9e64263a..dbda7025 100644 --- a/data/filetypes.verilog +++ b/data/filetypes.verilog @@ -1,19 +1,19 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic +# Edit these in the colorscheme .conf file instead default=default comment=comment -comment_line=comment -comment_line_bang=comment -number=number -word=keyword -word2=keyword2 -word3=0x5ea01f;;true -string=string +comment_line=comment_line +comment_line_bang=comment_line +number=number_1 +word=keyword_1 +word2=keyword_2 +word3=keyword_3 +string=string_1 preprocessor=preprocessor operator=operator -identifier=default -stringeol=stringeol +identifier=identifier_1 +stringeol=string_eol userword=type [keywords] @@ -50,5 +50,3 @@ context_action_cmd= #width=4 # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - - diff --git a/data/filetypes.vhdl b/data/filetypes.vhdl index 142eaeb2..a756b0a1 100644 --- a/data/filetypes.vhdl +++ b/data/filetypes.vhdl @@ -1,21 +1,21 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0xd00000;0xffffff;false;false -comment_line_bang=0x3f5fbf;0xffffff;false;false; -number=0x007f00;0xffffff;false;false -string=0xff901e;0xffffff;false;false -operator=0x301010;0xffffff;false;false -identifier=0x000000;0xffffff;false;false -stringeol=0x000000;0xe0c0e0;false;false -keyword=0x001a7f;0xffffff;true;false -stdoperator=0x007f7f;0xffffff;false;false -attribute=0x804020;0xffffff;false;false -stdfunction=0x808020;0xffffff;true;false -stdpackage=0x208020;0xffffff;false;false -stdtype=0x208080;0xffffff;false;false -userword=0x804020;0xffffff;true;false +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +comment_line_bang=comment_line +number=number_1 +string=string_1 +operator=operator +identifier=identifier_1 +stringeol=string_eol +keyword=keyword_1 +stdoperator=operator +attribute=attribute +stdfunction=function +stdpackage=preprocessor +stdtype=type +userword=keyword_2 [keywords] # all items must be in one line @@ -55,5 +55,3 @@ context_action_cmd= #width=4 # 0 is spaces, 1 is tabs, 2 is tab & spaces #type=1 - - diff --git a/data/filetypes.xml b/data/filetypes.xml index 55ca4682..df60ec56 100644 --- a/data/filetypes.xml +++ b/data/filetypes.xml @@ -1,76 +1,66 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -html_default=0x000000;0xffffff;false;false -html_tag=0x000099;0xffffff;false;false -html_tagunknown=0xff0000;0xffffff;false;false -html_attribute=0x007f00;0xffffff;false;false -html_attributeunknown=0xff0000;0xffffff;false;false -html_number=0x800080;0xffffff;false;false -html_doublestring=0xff901e;0xffffff;false;false -html_singlestring=0xff901e;0xffffff;false;false -html_other=0x800080;0xffffff;false;false -html_comment=0x808080;0xffffff;false;false -html_entity=0x800080;0xffffff;false;false -html_tagend=0x000080;0xffffff;false;false -# -html_xmlend=0x000099;0xf0f0f0;false;false -# ), Python styles from -# filetypes.python are used +jscript_start=tag +jscript_default=default +jscript_comment=comment +jscript_commentline=comment +jscript_commentdoc=comment_doc +jscript_number=number_1 +jscript_word=number_2 +jscript_keyword=keyword_1 +jscript_doublestring=string_1 +jscript_singlestring=string_1 +jscript_symbols=operator +jscript_stringeol=string_eol +jscript_regex=regex [keywords] html=a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em embed fieldset font form frame frameset h1 h2 h3 h4 h5 h6 head hr html i iframe img input ins isindex kbd label legend li link map menu meta noframes noscript object ol optgroup option p param pre q quality s samp script select small span strike strong style sub sup table tbody td textarea tfoot th thead title tr tt u ul var xmlns leftmargin topmargin abbr accept-charset accept accesskey action align alink alt archive axis background bgcolor border cellpadding cellspacing char charoff charset checked cite class classid clear codebase codetype color cols colspan compact content coords data datafld dataformatas datapagesize datasrc datetime declare defer dir disabled enctype face for frame frameborder selected headers height href hreflang hspace http-equiv id ismap label lang language link longdesc marginwidth marginheight maxlength media framespacing method multiple name nohref noresize noshade nowrap object onblur onchange onclick ondblclick onfocus onkeydown onkeypress onkeyup onload onmousedown onmousemove onmouseover onmouseout onmouseup onreset onselect onsubmit onunload profile prompt pluginspage readonly rel rev rows rowspan rules scheme scope scrolling shape size span src standby start style summary tabindex target text title type usemap valign value valuetype version vlink vspace width text password checkbox radio submit reset file hidden image public doctype xml xml:lang article aside audio canvas command details datalist figure figcaption footer header hgroup keygen mark meter nav output progress section time video wbr async autocomplete autofocus contenteditable contextmenu draggable formaction formenctype formnovalidate formtarget list manifest max min novalidate pattern ping placeholder required reversed role sandbox scoped seamless sizes spellcheck srcdoc step ^data- ^aria- diff --git a/data/filetypes.yaml b/data/filetypes.yaml index b210df8a..b50fa399 100644 --- a/data/filetypes.yaml +++ b/data/filetypes.yaml @@ -1,17 +1,16 @@ # For complete documentation of this file, please see Geany's main documentation [styling] -# foreground;background;bold;italic -default=0x000000;0xffffff;false;false -comment=0x808080;0xffffff;false;false -identifier=0x000088;0xffffff;true;false -keyword=0x991111;0xffffff;true;false -number=0x007f00;0xffffff;false;false -reference=0x008888;0xffffff;false;false -document=0x000088;0xffffff;false;false -text=0x333366;0xffffff;false;false -error=0xff0000;0xffffff;true;true -operator=0x301010;0xffffff;false;false - +# Edit these in the colorscheme .conf file instead +default=default +comment=comment +identifier=identifier +keyword=keyword_1 +number=number_1 +reference=function +document=preprocessor +text=string_1 +error=error +operator=operator [keywords] # all items must be in one line diff --git a/src/about.c b/src/about.c index d96af8f1..63d91204 100644 --- a/src/about.c +++ b/src/about.c @@ -277,18 +277,18 @@ static GtkWidget *create_dialog(void) gtk_misc_set_alignment(GTK_MISC(label), 0, 0); row++; - g_snprintf(buffer, sizeof(buffer), "Nick Treleaven - %s", _("maintainer")); + g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("maintainer")); ROW(buffer, row, 0, 0, 0, 1); row++; - ROW("<nick.treleaven@btinternet.com>", row, 0, 0, 0, 1); + ROW("<lists.ban@herbesfolles.org>", row, 0, 0, 0, 1); row++; ROW("", row, 0, 0, 0, 0); row++; - g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("developer")); + g_snprintf(buffer, sizeof(buffer), "Nick Treleaven - %s", _("developer")); ROW(buffer, row, 0, 0, 0, 1); row++; - ROW("<lists.ban@herbesfolles.org>", row, 0, 0, 0, 1); + ROW("<nick.treleaven@btinternet.com>", row, 0, 0, 0, 1); row++; ROW("", row, 0, 0, 0, 0); row++; diff --git a/src/dialogs.c b/src/dialogs.c index 2a4b3918..9d013980 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -170,14 +170,13 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) static void on_file_open_notify(GObject *filechooser, GParamSpec *pspec, gpointer data) { - GValue *value; + GValue value = { 0 }; - value = g_new0(GValue, 1); - g_value_init(value, pspec->value_type); - g_object_get_property(filechooser, pspec->name, value); + g_value_init(&value, pspec->value_type); + g_object_get_property(filechooser, pspec->name, &value); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( - ui_lookup_widget(GTK_WIDGET(filechooser), "check_hidden")), g_value_get_boolean(value)); + ui_lookup_widget(GTK_WIDGET(filechooser), "check_hidden")), g_value_get_boolean(&value)); } @@ -833,7 +832,7 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc) { gchar *msg, *short_fn = NULL; const gchar *msg2; - gint ret; + gint response; gboolean old_quitting_state = main_status.quitting; /* display the file tab to remind the user of the document */ @@ -843,33 +842,32 @@ gboolean dialogs_show_unsaved_file(GeanyDocument *doc) short_fn = document_get_basename_for_display(doc, -1); - msg = g_strdup_printf(_("The file '%s' is not saved."), - (short_fn != NULL) ? short_fn : GEANY_STRING_UNTITLED); + msg = g_strdup_printf(_("The file '%s' is not saved."), short_fn); msg2 = _("Do you want to save it before closing?"); g_free(short_fn); - ret = run_unsaved_dialog(msg, msg2); + response = run_unsaved_dialog(msg, msg2); g_free(msg); - switch (ret) + switch (response) { case GTK_RESPONSE_YES: { if (document_need_save_as(doc)) { - ret = dialogs_show_save_as(); + return dialogs_show_save_as(); } else /* document_save_file() returns the status if the file could be saved */ - ret = document_save_file(doc, FALSE); - break; + return document_save_file(doc, FALSE); } - case GTK_RESPONSE_NO: ret = TRUE; break; + case GTK_RESPONSE_NO: + return TRUE; + case GTK_RESPONSE_CANCEL: /* fall through to default and leave the function */ - default: ret = FALSE; break; + default: + return FALSE; } - - return (gboolean) ret; } diff --git a/src/document.c b/src/document.c index 0e5f58fe..5cdffe01 100644 --- a/src/document.c +++ b/src/document.c @@ -278,6 +278,10 @@ void document_init_doclist() void document_finalize() { + guint i; + + for (i = 0; i < documents_array->len; i++) + g_free(documents[i]); g_ptr_array_free(documents_array, TRUE); } diff --git a/src/geanymenubuttonaction.c b/src/geanymenubuttonaction.c index 31cae1a7..d52f1e03 100644 --- a/src/geanymenubuttonaction.c +++ b/src/geanymenubuttonaction.c @@ -194,7 +194,12 @@ static void menu_items_changed_cb(GtkContainer *container, GtkWidget *widget, Ge priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(action); if (priv->menu != NULL) - enable = (g_list_length(gtk_container_get_children(GTK_CONTAINER(priv->menu))) > 0); + { + GList *children = gtk_container_get_children(GTK_CONTAINER(priv->menu)); + + enable = (g_list_length(children) > 0); + g_list_free(children); + } else enable = FALSE; diff --git a/src/sidebar.c b/src/sidebar.c index 8d41a33a..cbdd1b9e 100644 --- a/src/sidebar.c +++ b/src/sidebar.c @@ -540,12 +540,9 @@ void sidebar_remove_document(GeanyDocument *doc) if (GTK_IS_WIDGET(doc->priv->tag_tree)) { - gtk_widget_destroy(doc->priv->tag_tree); - if (GTK_IS_TREE_VIEW(doc->priv->tag_tree)) - { - /* Because it was ref'd in sidebar_update_tag_list, it needs unref'ing */ - g_object_unref((gpointer)doc->priv->tag_tree); - } + gtk_widget_destroy(doc->priv->tag_tree); /* make GTK release its references, if any */ + /* Because it was ref'd in sidebar_update_tag_list, it needs unref'ing */ + g_object_unref(doc->priv->tag_tree); doc->priv->tag_tree = NULL; } } @@ -1056,11 +1053,8 @@ void sidebar_finalize(void) { if (WIDGET(tv.default_tag_tree)) { - g_object_unref(tv.default_tag_tree); - /* This is not exactly clean, default_tag_tree's ref_count is 2 when it is shown, - * 1 oherwise. We should probably handle the ref_count more accurate. */ - if (WIDGET(tv.default_tag_tree)) - gtk_widget_destroy(tv.default_tag_tree); + gtk_widget_destroy(tv.default_tag_tree); /* make GTK release its references, if any... */ + g_object_unref(tv.default_tag_tree); /* ...and release our own */ } if (WIDGET(tv.popup_taglist)) gtk_widget_destroy(tv.popup_taglist);