xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store color/color pairs mapping in the ncurses ui instance

Browse Source
This commit is contained in:
Maxime Coste 2015-10-08 20:17:35 +01:00
parent bd01171861
commit 473196e18d
2 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/ncurses_ui.cc
View File

@ -7,7 +7,6 @@
#include "register_manager.hh" #include "register_manager.hh"
#include "utf8_iterator.hh" #include "utf8_iterator.hh"
#include <map>
#include <algorithm> #include <algorithm>
#define NCURSES_OPAQUE 0 #define NCURSES_OPAQUE 0
@ -62,15 +61,6 @@ static void set_attribute(WINDOW* window, int attribute, bool on)
wattroff(window, attribute); wattroff(window, attribute);
} }
static bool operator<(Color lhs, Color rhs)
{
if (lhs.color == rhs.color and lhs.color == Color::RGB)
return lhs.r == rhs.r ? (lhs.g == rhs.g ? lhs.b < rhs.b
: lhs.g < rhs.g)
: lhs.r < rhs.r;
return lhs.color < rhs.color;
}
template<typename T> T sq(T x) { return x * x; } template<typename T> T sq(T x) { return x * x; }
constexpr struct { unsigned char r, g, b; } builtin_colors[] = { constexpr struct { unsigned char r, g, b; } builtin_colors[] = {
@ -149,35 +139,22 @@ static void restore_colors()
} }
} }
static int nc_color(Color color) int NCursesUI::get_color(Color color)
{ {
static std::map<Color, int> colors = { auto it = m_colors.find(color);
{ Color::Default, -1 }, if (it != m_colors.end())
{ Color::Black, COLOR_BLACK },
{ Color::Red, COLOR_RED },
{ Color::Green, COLOR_GREEN },
{ Color::Yellow, COLOR_YELLOW },
{ Color::Blue, COLOR_BLUE },
{ Color::Magenta, COLOR_MAGENTA },
{ Color::Cyan, COLOR_CYAN },
{ Color::White, COLOR_WHITE },
};
static int next_color = 16;
auto it = colors.find(color);
if (it != colors.end())
return it->second; return it->second;
else if (can_change_color() and COLORS > 16) else if (can_change_color() and COLORS > 16)
{ {
kak_assert(color.color == Color::RGB); kak_assert(color.color == Color::RGB);
if (next_color > COLORS) if (m_next_color > COLORS)
next_color = 16; m_next_color = 16;
init_color(next_color, init_color(m_next_color,
color.r * 1000 / 255, color.r * 1000 / 255,
color.g * 1000 / 255, color.g * 1000 / 255,
color.b * 1000 / 255); color.b * 1000 / 255);
colors[color] = next_color; m_colors[color] = m_next_color;
return next_color++; return m_next_color++;
} }
else else
{ {
@ -200,25 +177,23 @@ static int nc_color(Color color)
} }
} }
static int get_color_pair(const Face& face) int NCursesUI::get_color_pair(const Face& face)
{ {
using ColorPair = std::pair<Color, Color>;
static UnorderedMap<ColorPair, int, MemoryDomain::Faces> colorpairs;
static int next_pair = 1; static int next_pair = 1;
ColorPair colors{face.fg, face.bg}; ColorPair colors{face.fg, face.bg};
auto it = colorpairs.find(colors); auto it = m_colorpairs.find(colors);
if (it != colorpairs.end()) if (it != m_colorpairs.end())
return it->second; return it->second;
else else
{ {
init_pair(next_pair, nc_color(face.fg), nc_color(face.bg)); init_pair(next_pair, get_color(face.fg), get_color(face.bg));
colorpairs[colors] = next_pair; m_colorpairs[colors] = next_pair;
return next_pair++; return next_pair++;
} }
} }
void set_face(WINDOW* window, Face face, const Face& default_face) void NCursesUI::set_face(NCursesWin* window, Face face, const Face& default_face)
{ {
static int current_pair = -1; static int current_pair = -1;
@ -259,7 +234,18 @@ NCursesUI::NCursesUI()
if (m_input_callback) if (m_input_callback)
m_input_callback(mode); m_input_callback(mode);
}}, }},
m_assistant(assistant_clippy) m_assistant(assistant_clippy),
m_colors{
{ Color::Default, -1 },
{ Color::Black, COLOR_BLACK },
{ Color::Red, COLOR_RED },
{ Color::Green, COLOR_GREEN },
{ Color::Yellow, COLOR_YELLOW },
{ Color::Blue, COLOR_BLUE },
{ Color::Magenta, COLOR_MAGENTA },
{ Color::Cyan, COLOR_CYAN },
{ Color::White, COLOR_WHITE },
}
{ {
initscr(); initscr();
raw(); raw();
@ -340,9 +326,9 @@ void add_str(WINDOW* win, StringView str)
waddnstr(win, str.begin(), (int)str.length()); waddnstr(win, str.begin(), (int)str.length());
} }
static void draw_line(NCursesWin* window, const DisplayLine& line, void NCursesUI::draw_line(NCursesWin* window, const DisplayLine& line,
CharCount col_index, CharCount max_column, CharCount col_index, CharCount max_column,
const Face& default_face) const Face& default_face)
{ {
for (const DisplayAtom& atom : line) for (const DisplayAtom& atom : line)
{ {

13
src/ncurses_ui.hh
View File

@ -6,6 +6,7 @@
#include "face.hh" #include "face.hh"
#include "user_interface.hh" #include "user_interface.hh"
#include "array_view.hh" #include "array_view.hh"
#include "unordered_map.hh"
namespace Kakoune namespace Kakoune
{ {
@ -55,10 +56,22 @@ private:
void check_resize(bool force = false); void check_resize(bool force = false);
void redraw(); void redraw();
int get_color(Color color);
int get_color_pair(const Face& face);
void set_face(NCursesWin* window, Face face, const Face& default_face);
void draw_line(NCursesWin* window, const DisplayLine& line,
CharCount col_index, CharCount max_column,
const Face& default_face);
NCursesWin* m_window = nullptr; NCursesWin* m_window = nullptr;
CharCoord m_dimensions; CharCoord m_dimensions;
using ColorPair = std::pair<Color, Color>;
UnorderedMap<Color, int, MemoryDomain::Faces> m_colors;
UnorderedMap<ColorPair, int, MemoryDomain::Faces> m_colorpairs;
int m_next_color = 16;
struct Window struct Window
{ {
void create(const CharCoord& pos, const CharCoord& size); void create(const CharCoord& pos, const CharCoord& size);