timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lots of better functionality and organization

Browse Source
This commit is contained in:
Tim Warren 2015-04-02 18:00:50 -04:00
parent 779dec403e
commit 627a2abd6c
15 changed files with 7553 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,11 +1,11 @@
CXX = $(shell wx-config --cxx) -Wno-c++11-compat-deprecated-writable-strings
TARGET = build/Tyro
LDLIBS = $(shell wx-config --libs all)
WX_CXXFLAGS = -I./src -static $(shell wx-config --cxxflags)
WX_CXXFLAGS = -I./src -I./include -static $(shell wx-config --cxxflags)
DEV_CXXFLAGS = -g -Wall -Wextra $(WX_CXXFLAGS)
CXXFLAGS = -Os -s $(WX_CXXFLAGS)
SOURCES = $(wildcard src/**/*.cpp src/*.cpp)
SOURCES = $(wildcard src/**/*.cpp src/*.cpp include/**/*.cpp include/*.cpp)
OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES))
all: build $(SOURCES) $(TARGET)

255
include/json/json-forwards.h Normal file
View File

@ -0,0 +1,255 @@
/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).
/// It is intended to be used with #include "json/json-forwards.h"
/// This header provides forward declaration for all JsonCpp types.
// //////////////////////////////////////////////////////////////////////
// Beginning of content of file: LICENSE
// //////////////////////////////////////////////////////////////////////
/*
The JsonCpp library's source code, including accompanying documentation,
tests and demonstration applications, are licensed under the following
conditions...
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
jurisdictions which recognize such a disclaimer. In such jurisdictions,
this software is released into the Public Domain.
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
released under the terms of the MIT License (see below).
In jurisdictions which recognize Public Domain property, the user of this
software may choose to accept it either as 1) Public Domain, 2) under the
conditions of the MIT License (see below), or 3) under the terms of dual
Public Domain/MIT License conditions described here, as they choose.
The MIT License is about as close to Public Domain as a license can get, and is
described in clear, concise terms at:
http://en.wikipedia.org/wiki/MIT_License
The full text of the MIT License follows:
========================================================================
Copyright (c) 2007-2010 Baptiste Lepilleur
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy,
modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
========================================================================
(END LICENSE TEXT)
The MIT license is compatible with both the GPL and commercial
software, affording one all of the rights of Public Domain with the
minor nuisance of being required to keep the above copyright notice
and license text in the source code. Note also that by accepting the
Public Domain "license" you can re-license your copy using whatever
license you like.
*/
// //////////////////////////////////////////////////////////////////////
// End of content of file: LICENSE
// //////////////////////////////////////////////////////////////////////
#ifndef JSON_FORWARD_AMALGATED_H_INCLUDED
# define JSON_FORWARD_AMALGATED_H_INCLUDED
/// If defined, indicates that the source file is amalgated
/// to prevent private header inclusion.
#define JSON_IS_AMALGAMATION
// //////////////////////////////////////////////////////////////////////
// Beginning of content of file: include/json/config.h
// //////////////////////////////////////////////////////////////////////
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_CONFIG_H_INCLUDED
#define JSON_CONFIG_H_INCLUDED
/// If defined, indicates that json library is embedded in CppTL library.
//# define JSON_IN_CPPTL 1
/// If defined, indicates that json may leverage CppTL library
//# define JSON_USE_CPPTL 1
/// If defined, indicates that cpptl vector based map should be used instead of
/// std::map
/// as Value container.
//# define JSON_USE_CPPTL_SMALLMAP 1
// If non-zero, the library uses exceptions to report bad input instead of C
// assertion macros. The default is to use exceptions.
#ifndef JSON_USE_EXCEPTION
#define JSON_USE_EXCEPTION 1
#endif
/// If defined, indicates that the source file is amalgated
/// to prevent private header inclusion.
/// Remarks: it is automatically defined in the generated amalgated header.
// #define JSON_IS_AMALGAMATION
#ifdef JSON_IN_CPPTL
#include <cpptl/config.h>
#ifndef JSON_USE_CPPTL
#define JSON_USE_CPPTL 1
#endif
#endif
#ifdef JSON_IN_CPPTL
#define JSON_API CPPTL_API
#elif defined(JSON_DLL_BUILD)
#if defined(_MSC_VER)
#define JSON_API __declspec(dllexport)
#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
#endif // if defined(_MSC_VER)
#elif defined(JSON_DLL)
#if defined(_MSC_VER)
#define JSON_API __declspec(dllimport)
#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
#endif // if defined(_MSC_VER)
#endif // ifdef JSON_IN_CPPTL
#if !defined(JSON_API)
#define JSON_API
#endif
// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
// integer
// Storages, and 64 bits integer support is disabled.
// #define JSON_NO_INT64 1
#if defined(_MSC_VER) && _MSC_VER <= 1200 // MSVC 6
// Microsoft Visual Studio 6 only support conversion from __int64 to double
// (no conversion from unsigned __int64).
#define JSON_USE_INT64_DOUBLE_CONVERSION 1
// Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
// characters in the debug information)
// All projects I've ever seen with VS6 were using this globally (not bothering
// with pragma push/pop).
#pragma warning(disable : 4786)
#endif // if defined(_MSC_VER) && _MSC_VER < 1200 // MSVC 6
#if defined(_MSC_VER) && _MSC_VER >= 1500 // MSVC 2008
/// Indicates that the following function is deprecated.
#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
#elif defined(__clang__) && defined(__has_feature)
#if __has_feature(attribute_deprecated_with_message)
#define JSONCPP_DEPRECATED(message) __attribute__ ((deprecated(message)))
#endif
#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
#define JSONCPP_DEPRECATED(message) __attribute__ ((deprecated(message)))
#elif defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
#endif
#if !defined(JSONCPP_DEPRECATED)
#define JSONCPP_DEPRECATED(message)
#endif // if !defined(JSONCPP_DEPRECATED)
namespace Json {
typedef int Int;
typedef unsigned int UInt;
#if defined(JSON_NO_INT64)
typedef int LargestInt;
typedef unsigned int LargestUInt;
#undef JSON_HAS_INT64
#else // if defined(JSON_NO_INT64)
// For Microsoft Visual use specific types as long long is not supported
#if defined(_MSC_VER) // Microsoft Visual Studio
typedef __int64 Int64;
typedef unsigned __int64 UInt64;
#else // if defined(_MSC_VER) // Other platforms, use long long
typedef long long int Int64;
typedef unsigned long long int UInt64;
#endif // if defined(_MSC_VER)
typedef Int64 LargestInt;
typedef UInt64 LargestUInt;
#define JSON_HAS_INT64
#endif // if defined(JSON_NO_INT64)
} // end namespace Json
#endif // JSON_CONFIG_H_INCLUDED
// //////////////////////////////////////////////////////////////////////
// End of content of file: include/json/config.h
// //////////////////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////////////////
// Beginning of content of file: include/json/forwards.h
// //////////////////////////////////////////////////////////////////////
// Copyright 2007-2010 Baptiste Lepilleur
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#ifndef JSON_FORWARDS_H_INCLUDED
#define JSON_FORWARDS_H_INCLUDED
#if !defined(JSON_IS_AMALGAMATION)
#include "config.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
namespace Json {
// writer.h
class FastWriter;
class StyledWriter;
// reader.h
class Reader;
// features.h
class Features;
// value.h
typedef unsigned int ArrayIndex;
class StaticString;
class Path;
class PathArgument;
class Value;
class ValueIteratorBase;
class ValueIterator;
class ValueConstIterator;
} // namespace Json
#endif // JSON_FORWARDS_H_INCLUDED
// //////////////////////////////////////////////////////////////////////
// End of content of file: include/json/forwards.h
// //////////////////////////////////////////////////////////////////////
#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED

2013
include/json/json.h Normal file
View File

File diff suppressed because it is too large Load Diff

5103
include/jsoncpp.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

9
src/DocFrame.cpp
View File

@ -1,9 +0,0 @@
#include "DocFrame.h"
BEGIN_EVENT_TABLE(DocFrame, wxWindow)
END_EVENT_TABLE()
DocFrame::DocFrame(wxWindow *parent, wxWindowID id)
{
editor = new wxStyledTextCtrl(parent);
}

22
src/DocFrame.h
View File

@ -1,22 +0,0 @@
#ifndef TYRODOC_FRAME_H
#define TYRODOC_FRAME_H
#ifdef WX_PRECOMP
#include "wx_pch.h"
#endif
#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif
#include <wx/stc/stc.h>
class DocFrame: public wxWindow
{
public:
DocFrame(wxWindow *parent, wxWindowID id);
private:
wxStyledTextCtrl *editor;
DECLARE_EVENT_TABLE()
};
#endif // TYRODOC_FRAME_H

27
src/EditPane.cpp Normal file
View File

@ -0,0 +1,27 @@
#include "EditPane.h"
BEGIN_EVENT_TABLE(EditPane, wxStyledTextCtrl)
// common
/*EVT_SIZE (Edit::OnSize)
// edit
EVT_MENU (wxID_CLEAR, Edit::OnEditClear)
EVT_MENU (wxID_CUT, Edit::OnEditCut)
EVT_MENU (wxID_COPY, Edit::OnEditCopy)
EVT_MENU (wxID_PASTE, Edit::OnEditPaste)
EVT_MENU (myID_INDENTINC, Edit::OnEditIndentInc)
EVT_MENU (myID_INDENTRED, Edit::OnEditIndentRed)
EVT_MENU (wxID_SELECTALL, Edit::OnEditSelectAll)
EVT_MENU (myID_SELECTLINE, Edit::OnEditSelectLine)
EVT_MENU (wxID_REDO, Edit::OnEditRedo)
EVT_MENU (wxID_UNDO, Edit::OnEditUndo)*/
END_EVENT_TABLE()
EditPane::EditPane(
wxWindow *parent, wxWindowID id, const wxPoint &pos,
const wxSize &size, long style
) : wxStyledTextCtrl (parent, id, pos, size, style)
{
}
EditPane::~EditPane() {}

26
src/EditPane.h Normal file
View File

@ -0,0 +1,26 @@
#ifndef TYROEDIT_PANE_H
#define TYROEDIT_PANE_H
#include "common.h"
#include <wx/stc/stc.h>
class EditPane: public wxStyledTextCtrl
{
public:
EditPane(
wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint &post = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style =
#ifndef __WXMAC__
wxSUNKEN_BORDER |
#endif
wxVSCROLL
);
~EditPane();
private:
DECLARE_EVENT_TABLE()
};
#endif // TYRODOC_FRAME_H

32
src/Main.cpp
View File

@ -1,11 +1,6 @@
/***************************************************************
* Name: Main.cpp
* Purpose: Code for Application Frame
* Author: Timothy J Warren (tim@timshomepage.net)
* Created: 2015-03-30
* Copyright: Timothy J Warren (https://timshomepage.net)
* License:
**************************************************************/
/**
* Main Application Frame
*/
#ifdef WX_PRECOMP
#include "wx_pch.h"
@ -16,6 +11,7 @@
BEGIN_EVENT_TABLE(MainFrame, wxFrame)
EVT_CLOSE(MainFrame::OnClose)
EVT_MENU(wxID_NEW, MainFrame::OnMenuFileNew)
EVT_MENU(wxID_OPEN, MainFrame::OnMenuFileOpen)
EVT_MENU(wxID_SAVE, MainFrame::OnMenuFileSave)
EVT_MENU(wxID_EXIT, MainFrame::OnQuit)
@ -36,7 +32,9 @@ MainFrame::MainFrame(wxFrame *frame, const wxString& title)
// Set up control layout
wxBoxSizer *base_sizer = new wxBoxSizer(wxVERTICAL);
base_sizer->Add(CreateNotebook(), 1, wxEXPAND | wxALL, 5);
notebook = this->CreateTabContainer();
base_sizer->Add(notebook, 1, wxEXPAND | wxALL, 5);
base_sizer->SetContainingWindow(this);
base_sizer->SetMinSize(800,600);
@ -120,16 +118,11 @@ void MainFrame::SetupMenu()
SetMenuBar(mbar);
}
wxAuiNotebook *MainFrame::CreateNotebook()
TabContainer *MainFrame::CreateTabContainer()
{
TabContainer *notebook = new TabContainer(this);
wxAuiNotebook *ctrl = new wxAuiNotebook(this);
//DocFrame *editor = new DocFrame(ctrl, wxID_ANY);
wxWindow *editor = new wxWindow(ctrl, wxID_ANY);
ctrl->AddPage(editor, "Untitled");
return ctrl;
return notebook;
}
void MainFrame::OnClose(wxCloseEvent &WXUNUSED(event))
@ -137,6 +130,11 @@ void MainFrame::OnClose(wxCloseEvent &WXUNUSED(event))
Destroy();
}
void MainFrame::OnMenuFileNew(wxCommandEvent &WXUNUSED(event))
{
notebook->AddTab();
}
void MainFrame::OnMenuFileOpen(wxCommandEvent &WXUNUSED(event))
{
wxFileDialog *OpenDialog = new wxFileDialog(this, _T("Choose a file"), _(""), _(""), _("*.*"), wxFD_OPEN);

25
src/Main.h
View File

@ -1,24 +1,13 @@
/***************************************************************
* Name: Main.h
* Purpose: Defines Application Frame
* Author: Timothy J Warren (tim@timshomepage.net)
* Created: 2015-03-30
* Copyright: Timothy J Warren (https://timshomepage.net)
* License:
**************************************************************/
/**
* Main Application Frame
*/
#ifndef TYROMAIN_H
#define TYROMAIN_H
#ifdef WX_PRECOMP
#include "wx_pch.h"
#endif
#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif
#include "common.h"
#include "TyroApp.h"
#include "DocFrame.h"
#include "TabContainer.h"
class MainFrame: public wxFrame
{
@ -26,6 +15,7 @@ class MainFrame: public wxFrame
MainFrame(wxFrame *frame, const wxString &title);
~MainFrame();
private:
TabContainer *notebook;
enum
{
idMenuQuit = 1000,
@ -34,12 +24,13 @@ class MainFrame: public wxFrame
void SetupMenu();
void SetupToolbar();
void SetupStatusBar();
void OnMenuFileNew(wxCommandEvent &event);
void OnMenuFileOpen(wxCommandEvent &event);
void OnMenuFileSave(wxCommandEvent &event);
void OnClose(wxCloseEvent &event);
void OnQuit(wxCommandEvent &event);
void OnAbout(wxCommandEvent &event);
wxAuiNotebook* CreateNotebook();
TabContainer* CreateTabContainer();
DECLARE_EVENT_TABLE()
};

43
src/TabContainer.cpp Normal file
View File

@ -0,0 +1,43 @@
/**
* Wrapper around wxAuiNotebook
*/
#include "TabContainer.h"
BEGIN_EVENT_TABLE(TabContainer, wxAuiNotebook)
END_EVENT_TABLE()
static unsigned long untitled_document_count = 0;
TabContainer::TabContainer(
wxWindow* parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style
) : wxAuiNotebook(parent, id, pos, size, style)
{
this->AddTab();
}
TabContainer::~TabContainer() {}
EditPane *TabContainer::CreateEditor()
{
return new EditPane(this, wxID_ANY);
}
void TabContainer::AddTab()
{
untitled_document_count++;
wxString caption;
caption.Printf("Untitled %lu", untitled_document_count);
this->AddPage(CreateEditor(), caption);
}
void TabContainer::AddTab(wxString filePath)
{
}

36
src/TabContainer.h Normal file
View File

@ -0,0 +1,36 @@
/**
* Wrapper around wxAuiNotebook
*/
#ifndef TABCONTAINER_H
#define TABCONTAINER_H
#include "common.h"
#include <wx/aui/aui.h>
#include "EditPane.h"
static long tab_style = wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS
| wxAUI_NB_WINDOWLIST_BUTTON | wxAUI_NB_CLOSE_ON_ALL_TABS
| wxAUI_NB_MIDDLE_CLICK_CLOSE | wxAUI_NB_TOP;
class TabContainer: public wxAuiNotebook
{
public:
TabContainer(
wxWindow *parent,
wxWindowID id=wxID_ANY,
const wxPoint &pos=wxDefaultPosition,
const wxSize &size=wxDefaultSize,
long style=tab_style
);
~TabContainer();
void AddTab();
void AddTab(wxString filePath);
private:
EditPane *CreateEditor();
DECLARE_EVENT_TABLE()
};
#endif /* TABCONTAINER_H */

7
src/TyroApp.cpp
View File

@ -7,10 +7,7 @@
* License:
**************************************************************/
#ifdef WX_PRECOMP
#include "wx_pch.h"
#endif
#include "common.h"
#include "TyroApp.h"
#include "Main.h"
@ -27,7 +24,7 @@ bool TyroApp::OnInit()
return true;
}
int TyroApp::OnExit(wxCommandEvent &WXUNUSED(event))
int TyroApp::OnExit()
{
close(true);
return 1;

7
src/TyroApp.h
View File

@ -10,20 +10,17 @@
#ifndef TYROAPP_H
#define TYROAPP_H
#include "wx/wxprec.h"
#include "common.h"
#include <wx/app.h>
#include <wx/toolbar.h>
#include <wx/menu.h>
#include <wx/debug.h>
#include <wx/aui/aui.h>
class TyroApp : public wxApp
{
friend class MainFrame;
public:
virtual bool OnInit();
virtual int OnExit(wxCommandEvent &WXUNUSED(event));
virtual int OnExit();
};
#endif // TYROAPP_H

19
src/common.h Normal file
View File

@ -0,0 +1,19 @@
/**
* A common header for global includes
*/
#ifndef TYRO_COMMON_H
#define TYRO_COMMON_H
#ifdef WX_PRECOMP
#include "wx_pch.h"
#endif
#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif
using namespace std;
#include <string>
#endif // TYRO_COMMON_H