Commit Graph

46 Commits

Author SHA1 Message Date
Matt Wozniski
b0bab84bfe Process Normal first without sorting
Instead of sorting the entire list of all highlight groups in order to
make sure that Normal is handled first, just pluck out the Normal group
from the list and move it to the front.  Seems to be slightly better for
speed, and yields slightly more readable code anyway.
2009-03-28 21:00:15 -04:00
Matt Wozniski
7171f7976c Default to using builtin rgb.txt maps
Provide a variable to override this behavior and use showrgb instead.
This sacrifices a tiny bit of accuracy in favor of a large speed boost.
2009-03-28 20:59:26 -04:00
Matt Wozniski
b5ea2fa88d Move guisp retrieval into a separate function.
No idea why this is faster... but it is, profiling proves it.
2009-03-28 20:59:26 -04:00
Matt Wozniski
7522e9b3d7 Limit calls to synIDattr() in s:Highlights()
Modify s:Highlights() to only check modes it's explicitly told to.
s:CSApproxImpl() needs only gui colors, s:CSApproxSnapshot() needs gui,
cterm, and term.
2009-03-28 20:59:08 -04:00
Matt Wozniski
df73d5e798 Calculate colors_name for snapshots at runtime 2009-03-28 03:29:41 -04:00
Matt Wozniski
fe8d4e6acf Fix another regression
Colors weren't restored after running :CSApproxSnapshot.  Make one extra
call to s:CSApprox() after restoring the konsole and eterm markers, and
&t_Co
2009-03-28 02:55:20 -04:00
Matt Wozniski
4eb86232c6 Fix major regression in CSApproxSnapshot
After 4091aca090 dumping colors with
CSApproxSnapshot was completely broken.  That commit stopped changing
&t_Co from reverting changes to colors not made by the colorscheme by
preventing the colorscheme from being re-sourced every time &t_Co
changed.  Unfortunately, that stopped the ColorScheme autocmd from
firing, which stopped s:CSApprox() from calculating the colors, which
meant we would dump the same colors regardless of &t_Co, and regardless
of {xterm,konsole,eterm}.

Fix this problem by calling s:CSApprox() explicitly after changing &t_Co
2009-03-27 13:50:15 -04:00
Matt Wozniski
9babf1dfd3 First try showrgb, then our own (cooked) rgb.txt
Only using showrgb would fail on systems that have 256 colors terminals
but don't have xorg, such as OS X.
2009-02-28 18:29:12 -05:00
Matt Wozniski
eee8d8dab0 Use 'showrgb' instead of searching for rgb.txt
Replace the logic of searching for an rgb.txt file on the system with
making a call to the 'showrgb' binary on the system and parsing its
output.  This should be available on all X11 systems, regardless of
whether or not the system has rgb.txt.
2009-02-27 18:38:11 -05:00
Matt Wozniski
4e35c3dcc9 Fix up some documentation 2009-02-26 01:13:27 -05:00
Matt Wozniski
a55012c758 Fix a silly mistake.
This bug would stop CSApprox from ever choosing #080808 (or the lowest
color on the greyscale ramp of another palette) as the closest match for
any color.
2009-02-06 02:26:17 -05:00
Matt Wozniski
148a307714 Changelog + timestamp updates for 3.05 2009-01-31 04:18:43 -05:00
Matt Wozniski
4091aca090 Fix a bug dumping colors not set in the scheme
CSApproxSnapshot should make a snapshot of the currently used colors,
rather than the colors defined in the colorscheme.  But, when
CSApproxSnapshot() changed &t_Co, the scheme was reloaded, causing :hi
clear to run and delete all colors.  Definitely not desired.  Stop that
from happening in the same way as it is prevented in CSApprox().
2009-01-31 04:18:13 -05:00
Matt Wozniski
25191dfdf4 Fix a (harmless) E121 in CSApprox.vim
The konsole and eterm flags were being saved/restored without first
checking for their existence.
2009-01-31 04:08:38 -05:00
Matt Wozniski
5b57902f3c Finalize 3.0 release.
Bump version numbers and timestamps.

Massive documentation update to make CSApproxSnapshot well-documented,
rather than just a side-note.

Add a slight tweak to the plugin to match the updated docs: it's no
longer enough for g:CSApprox_eterm or g:CSApprox_konsole to simply
exist, they must also evaluate as True.
2009-01-21 19:39:41 -05:00
Matt Wozniski
5e1e7f076e Make snapshots not error in vim built with -eval 2009-01-21 19:35:44 -05:00
Matt Wozniski
33f33f8378 Fix bugs when using CSApproxSnapshot in gvim
Don't accidentally remove g:CSApprox_{konsole,eterm} if they were set.

Can't :unlet both in one line, or the 2nd might not get unlet.
2009-01-21 19:35:44 -05:00
Matt Wozniski
5988674c15 Fix broken eterm/konsole detection on TERM=screen
A typo - I used ==# where I meant =~#
2009-01-21 19:35:44 -05:00
Matt Wozniski
ba187f34ef Add docs on how to skip CSApprox for a scheme 2009-01-17 02:07:21 -05:00
Matt Wozniski
6ae5bdc943 Make snapshots work on vim6, eterm, konsole
Before, snapshotted schemes could contain guisp= attributes, or
term=undercurl, which caused errors when used with vim 6.  Now, if the
colorscheme detects that vim 6 is running, it will strip those from the
:highlight commands that get used.  More incompatibilities might exist
that I can't think of, though...

And, add logic to snapshotted schemes to make them recognize konsole and
eterm in the same way as CSApprox proper, and, if they're found, use the
appropriate colors.
2009-01-17 01:36:04 -05:00
Matt Wozniski
e5ebdd692f Skip "abort if high color set" logic for snapshots
Before, snapshots wouldn't work right for high color schemes, since
CSApproxImpl aborted early when a high color was found.  If the user
wanted this, though, they wouldn't have called CSApproxSnapshot.  So,
skip this logic in that case.
2009-01-17 01:26:57 -05:00
Matt Wozniski
f8019878d0 Don't run CSApproxImpl unless t_Co is sane.
This was set up to allow CSApproxImpl() to run if either t_Co was set to
88 or 256, or if we were running in gui vim.  Presumably this was added
for CSApproxSnapshot, but that sets t_Co to something sane even in gvim.
This was causing errors slightly later when t_Co was unset.
2009-01-17 01:22:39 -05:00
Matt Wozniski
8a50ea7462 add a .gitignore file 2009-01-17 01:18:00 -05:00
Matt Wozniski
98a75481a7 Clarify some CSApprox docs 2009-01-15 14:09:20 -05:00
Matt Wozniski
450d37a373 Add support for hooks, finalize 2.0 release info 2009-01-15 13:19:43 -05:00
Matt Wozniski
5418f85ed0 Fix a bug handling high-color themes
Thank goodness I caught this before releasing CSApprox 2.0!  Two
misplaced lines meant that it would crap all over already 256 color
themes, like inkpot.vim and vividchalk.vim, because they cleared the old
cterm colors before the test that made sure that none of the old cterm
colors were over 15.
2009-01-15 13:19:43 -05:00
Matt Wozniski
7e4ffb4b2a Rewrite of CSApproxSnapshot
Now it's much less hacky, and looks much more like a well-designed
feature.  I doubt it's perfect, but it seems to work well in every test
case I have, as long as it's run from gvim.  I've discovered that it
doesn't work when run from terminal vim, and it seems unlikely that it
ever will - it's capable of spitting out the right cterm colors in that
case, but can't reproduce the proper gui colors.
2009-01-15 13:19:43 -05:00
Matt Wozniski
147d3c9f71 Update CSApprox now that synIDattr supports guisp
Docs are updated to reference the required patch number (7.2.052) and
the code is updated to test based on the existence of that patch, rather
than brute forcing.
2009-01-15 13:19:43 -05:00
Matt Wozniski
e7db246c9d Add a tweak to CSApprox
Add a message suggesting reading the help for suggestions when vim
doesn't have +gui
2009-01-15 13:19:43 -05:00
Matt Wozniski
28bc8de86c CSApprox version 1.50 released.
This release adds the CSApproxSnapshot command allowing an 88-/256-color
colorscheme to be created from a colorscheme in gvim or a +gui terminal
vim.
2009-01-15 13:19:43 -05:00
Matt Wozniski
084ad4cc01 Initial support for creating 88/256 color schemes
Added a new function, CSApproxSnapshot(filename [, force=0]).  This
function will take the current colors and dump them out to a new
colorscheme script stored at `filename', unless that file already exists
and `force' is not set.  This may still have some bugs to work out, I'm
surprised it was this easy...  Not surprisingly, it falls apart if the
colorscheme didn't set g:colors_name...  And it doesn't handle
highlights the user made himself, outside of the scheme.  Still, it's
a good first draft.
2009-01-15 13:19:43 -05:00
Matt Wozniski
cb1d299c94 Update changelogs/timestamps for 1.10 release 2009-01-15 13:19:43 -05:00
Matt Wozniski
ddb4da57bc Distribute an rgb.txt with CSApprox.
Add the most recent rgb.txt from upstream as part of the package,
installed to ~/.vim.  Accordingly, CSApprox.vim will now search in all
dirs in &rtp, in order, before deciding that no rgb.txt could be found.
2009-01-15 13:19:42 -05:00
Matt Wozniski
5703a98365 Finish CSApprox 1.0 release
- Update "Last Changed", version number, and changelog

- Suggest installing larger vim packages as a workaround for no +gui

- Modify the way g:CSApprox_verbose_level works; now 'verbose' is set to
  the max of that variable and &verbose

- Fix a minor bug causing a complaint that not enough colors are
  available when changing colorschemes after a :gui

- Fix some comments
2009-01-15 13:19:42 -05:00
Matt Wozniski
c0bd88e741 Fix an important bug in CSApprox.
As reported by A. S. Budden, CSApprox caused the set GUI colors to be
overwritten when the cterm colors were set.  This happened because vim
attempts to reset some colors back to their defaults whenever the colors
for the Normal group change by calling syntax/syncolor.vim (I couldn't
find any documentation that explained this behavior).  The global
syncolor.vim allows any syncolor.vim before it in the runtimepath to
override its behavior by setting the variable g:syntax_cmd to something
not recognized, so I now work around this problem by doing exactly that
for the duration of the run.

See http://groups.google.com/group/vim_use/msg/2c6a7f5917f76057
2009-01-15 13:19:42 -05:00
Matt Wozniski
09e4f32e67 Fix minor typo in CSApprox help 2009-01-15 13:19:42 -05:00
Matt Wozniski
6643594d33 Updated docs for speed improvements 2009-01-15 13:19:42 -05:00
Matt Wozniski
ea294285a1 Fix a stupid bug - recalculating highlight groups
Also, cleans up the rgb.txt hashing by making the values be #rrggbb
instead of just rrggbb
2009-01-15 13:19:42 -05:00
Matt Wozniski
c3e7c42207 Clean up some ugly code in s:Highlights() 2009-01-15 13:19:42 -05:00
Matt Wozniski
94d110f5a5 Fix some broken logic gathering highlights
Before, we would break the loop if we hit a highlight group with an
empty name.  In that case, we should actually continue the loop.
I moved the loop index increment to the beginning of the loop to make
this easier.
2009-01-15 13:19:42 -05:00
Matt Wozniski
7b00efcb8f Speed tweak - reorganize a loop 2009-01-15 13:19:42 -05:00
Matt Wozniski
46f20b0782 CSApprox speedup - caching in approximator
The default approximator has been modified to cache both the sorted list
of all possible components and the closest cterm color to a given rgb
color - drops execution time by about one quarter.
2009-01-15 13:19:42 -05:00
Matt Wozniski
60e43e82d0 Fix broken behavior in compatible mode. 2009-01-15 13:19:42 -05:00
Matt Wozniski
c1a258526b Work around another vim bug.
Vim allows highlight groups with no name to be created; but doesn't
support getting any information for them.  Two commas in a row in a
"syn match" creates a new highlight group that's named "".  This bug is
triggered by the distributed doxygen.vim.

syn match doxygenStartSkip2 +^\s*\*$+ contained
\ nextgroup=doxygenBody,doxygenStartSpecial,,doxygenStartSkip skipwhite skipnl
                                           ^^
2009-01-15 13:19:42 -05:00
Matt Wozniski
fa556ebcd8 Completed beta release of CSApprox.vim 2009-01-15 13:18:20 -05:00
Matt Wozniski
48ce53f0d4 Initial commit 2009-01-15 13:17:50 -05:00