mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-11-28 01:00:28 +03:00
Code Issues Projects Releases Wiki Activity

Buffer: add a type property

Browse Source
This commit is contained in:
Maxime Coste 2011-10-07 14:15:55 +00:00
parent 12535e1099
commit 9db4aa9691
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buffer.cc
View File

@ -136,8 +136,10 @@ bool BufferIterator::is_end() const
return m_position == m_buffer->length(); return m_position == m_buffer->length();
} }
Buffer::Buffer(const std::string& name, const BufferString& initial_content) Buffer::Buffer(const std::string& name, Type type,
: m_name(name), m_history(1), m_history_cursor(m_history.begin()), const BufferString& initial_content)
: m_name(name), m_type(type),
m_history(1), m_history_cursor(m_history.begin()),
m_content(initial_content), m_last_save_undo_group(m_history.begin()) m_content(initial_content), m_last_save_undo_group(m_history.begin())
{ {
BufferManager::instance().register_buffer(this); BufferManager::instance().register_buffer(this);

10
src/buffer.hh
View File

@ -71,7 +71,13 @@ private:
class Buffer class Buffer
{ {
public: public:
Buffer(const std::string& name, enum class Type
{
File,
Scratch
};
Buffer(const std::string& name, Type type,
const BufferString& initial_content = ""); const BufferString& initial_content = "");
void begin_undo_group(); void begin_undo_group();
@ -107,6 +113,7 @@ public:
void delete_window(Window* window); void delete_window(Window* window);
bool is_modified() const; bool is_modified() const;
Type type() const { return m_type; }
void notify_saved(); void notify_saved();
private: private:
@ -129,6 +136,7 @@ private:
BufferString m_content; BufferString m_content;
std::string m_name; std::string m_name;
const Type m_type;
struct Modification struct Modification
{ {

2
src/file.cc
View File

@ -39,7 +39,7 @@ Buffer* create_buffer_from_file(const std::string& filename)
if (Buffer* buffer = BufferManager::instance().get_buffer(filename)) if (Buffer* buffer = BufferManager::instance().get_buffer(filename))
BufferManager::instance().delete_buffer(buffer); BufferManager::instance().delete_buffer(buffer);
return new Buffer(filename, content); return new Buffer(filename, Buffer::Type::File, content);
} }
void write_buffer_to_file(const Buffer& buffer, const std::string& filename) void write_buffer_to_file(const Buffer& buffer, const std::string& filename)

6
src/main.cc
View File

@ -371,7 +371,7 @@ void edit(const CommandParameters& params)
catch (file_not_found& what) catch (file_not_found& what)
{ {
print_status("new file " + filename); print_status("new file " + filename);
buffer = new Buffer(filename); buffer = new Buffer(filename, Buffer::Type::File);
} }
current_window = buffer->get_or_create_window(); current_window = buffer->get_or_create_window();
} }
@ -400,7 +400,7 @@ void quit(const CommandParameters& params)
{ {
for (auto& buffer : BufferManager::instance()) for (auto& buffer : BufferManager::instance())
{ {
if (buffer.is_modified()) if (buffer.type() == Buffer::Type::File and buffer.is_modified())
{ {
print_status("modified buffer remaining"); print_status("modified buffer remaining");
return; return;
@ -558,7 +558,7 @@ int main(int argc, char* argv[])
try try
{ {
auto buffer = (argc > 1) ? create_buffer_from_file(argv[1]) : new Buffer("<scratch>"); auto buffer = (argc > 1) ? create_buffer_from_file(argv[1]) : new Buffer("*scratch*", Buffer::Type::Scratch);
current_window = buffer->get_or_create_window(); current_window = buffer->get_or_create_window();
draw_window(*current_window); draw_window(*current_window);