Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-10-04 02:47:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxlsock.h Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxldserv.h 29 Sep 2006 22:22:06 -0000 1.17 --- wxldserv.h 2 Oct 2006 21:19:24 -0000 1.18 *************** *** 19,22 **** --- 19,23 ---- #include "wxluasocket/include/wxlsock.h" + class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerBase; class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServer; class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent; *************** *** 25,29 **** // ---------------------------------------------------------------------------- // wxLuaSocketDebuggeeEvents_Type - These are socket events sent from debuggee ! // to debugger to notify the debugger that action has been taken. // ---------------------------------------------------------------------------- --- 26,33 ---- // ---------------------------------------------------------------------------- // wxLuaSocketDebuggeeEvents_Type - These are socket events sent from debuggee ! // to debugger to notify the debugger that action has been taken which was ! // probably a result of a previously received ! // wxLuaSocketDebuggerCommands_Type. ! // These socket events should be sent with wxLuaSocketBase::Read/WriteCmd() // ---------------------------------------------------------------------------- *************** *** 49,52 **** --- 53,57 ---- // debugger to debuggee to direct the debuggee to take action, which will // then return with a wxLuaSocketDebuggeeEvents_Type when done. + // These socket commands should be sent with wxLuaSocketBase::Read/WriteCmd() // ---------------------------------------------------------------------------- *************** *** 76,79 **** --- 81,88 ---- // ---------------------------------------------------------------------------- // wxLuaDebuggerServerInterface - a wxLuaInterface for the wxLuaDebuggerServer + // If you want to show a wxLuaStackDialog for a program being debugged, + // create this interface and the wxLuaStackDialog in the wxLuaDebuggerServer + // debugger process and then this will act as a middle man to get the + // wxLuaDebugData from the socket connection which may be delayed. // ---------------------------------------------------------------------------- *************** *** 81,87 **** { public: ! wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server); virtual ~wxLuaDebuggerServerInterface(); virtual wxLuaDebugData EnumerateStack(); virtual wxLuaDebugData EnumerateStackEntry(int nEntry); --- 90,99 ---- { public: ! wxLuaDebuggerServerInterface(wxLuaDebuggerBase* debugger); virtual ~wxLuaDebuggerServerInterface(); + // instruct the wxLuaDebuggerServer to send cmds to the debuggee which + // responds to the debugger with events and the required data, see + // wxLuaDebuggerBase::OnDebugStackEnum, OnDebugStackEntryEnum, OnDebugTableEnum virtual wxLuaDebugData EnumerateStack(); virtual wxLuaDebugData EnumerateStackEntry(int nEntry); *************** *** 89,96 **** virtual wxLuaDebugData GetGlobalData(); ! virtual bool IsDebugServer() const { return true; } private: ! wxLuaDebuggerServer* m_pServer; }; --- 101,108 ---- virtual wxLuaDebugData GetGlobalData(); ! virtual bool IsDebugger() const { return true; } private: ! wxLuaDebuggerBase* m_luaDebugger; }; Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlsock.h 29 Sep 2006 22:22:06 -0000 1.16 --- wxlsock.h 2 Oct 2006 21:19:24 -0000 1.17 *************** *** 161,171 **** } - // Test if the socket is writeable - bool IsWritable() const - { - return ((m_sockstate != SOCKET_CONNECTED) || - (m_sockstate == SOCKET_WRITE_BLOCKED)); - } - // Get the address of the socket wxString GetAddress() const; --- 161,164 ---- *************** *** 182,186 **** bool Close(); ! private: // Prevent copying and assignment of this class wxLuaSocket(const wxLuaSocket&); --- 175,179 ---- bool Close(); ! protected: // Prevent copying and assignment of this class wxLuaSocket(const wxLuaSocket&); *************** *** 191,194 **** --- 184,188 ---- SocketState m_sockstate; + private: DECLARE_ABSTRACT_CLASS(wxLuaSocket); }; |
|
From: John L. <jr...@us...> - 2006-10-04 02:46:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxluadebug/src Modified Files: staktree.cpp wxldebug.cpp Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxldebug.cpp 13 Sep 2006 04:13:47 -0000 1.19 --- wxldebug.cpp 2 Oct 2006 21:19:24 -0000 1.20 *************** *** 241,245 **** if (tableRef == -1) { ! lua_pushvalue(L, LUA_GLOBALSINDEX); int nRef = wxlState.tinsert(-1); Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0)); --- 241,245 ---- if (tableRef == -1) { ! wxlState.GetGlobals(); int nRef = wxlState.tinsert(-1); Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0)); *************** *** 438,448 **** } - int wxLuaInterface::Ref() - { - int nReference = m_wxlState.tinsert(-1); - m_references.Add(nReference); - return nReference; - } - wxLuaDebugData wxLuaInterface::EnumerateStack() { --- 438,441 ---- *************** *** 469,475 **** { wxLuaDebugData debugData; ! m_wxlState.GetGlobals(); ! int nRef = Ref(); ! debugData.Add(new wxLuaDebugDataItem(wxT("Globals"), wxT(""), wxT(""), wxT(""), nRef, 0)); return debugData; } --- 462,466 ---- { wxLuaDebugData debugData; ! debugData.EnumerateTable(m_wxlState, -1, -1, m_references); // Get global table return debugData; } Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** staktree.cpp 8 Sep 2006 22:43:47 -0000 1.28 --- staktree.cpp 2 Oct 2006 21:19:24 -0000 1.29 *************** *** 39,47 **** BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog) - EVT_SIZE(wxLuaStackDialog::OnSizeWindow) - EVT_COMBOBOX( ID_WXLUA_STACKDIALOG_COMBO, wxLuaStackDialog::OnSelectStack) EVT_TREE_ITEM_EXPANDING(ID_WXLUA_STACKDIALOG_STACKTREE, wxLuaStackDialog::OnItemExpanding) - EVT_BUTTON( ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, wxLuaStackDialog::OnCloseDialog) END_EVENT_TABLE() --- 39,44 ---- *************** *** 69,89 **** return false; ! m_stackComboBox = new wxComboBox( this, ID_WXLUA_STACKDIALOG_COMBO, wxEmptyString, ! wxPoint(0, 0), wxDefaultSize, 0, NULL, wxCB_DROPDOWN | wxCB_READONLY); ! m_scrolledWindow = new wxSplitterScrolledWindow(this, ID_WXLUA_STACKDIALOG_SCRWIN, ! wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL); - m_dismissButton = new wxButton(this, ID_WXLUA_STACKDIALOG_DISMISS_BUTTON, - _("Cancel"), - wxDefaultPosition, wxDefaultSize, - wxBU_EXACTFIT); - m_dismissButton->SetDefault(); - m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow, ID_WXLUA_STACKDIALOG_SPLITWIN, --- 66,82 ---- return false; ! wxPanel* panel = new wxPanel(this, wxID_ANY); ! ! m_stackComboBox = new wxComboBox( panel, ID_WXLUA_STACKDIALOG_COMBO, wxEmptyString, ! wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN | wxCB_READONLY); ! m_scrolledWindow = new wxSplitterScrolledWindow(panel, ID_WXLUA_STACKDIALOG_SCRWIN, ! wxDefaultPosition, wxSize(400, 350), wxNO_BORDER | wxCLIP_CHILDREN | wxVSCROLL); m_treeSplitter = new wxThinSplitterWindow(m_scrolledWindow, ID_WXLUA_STACKDIALOG_SPLITWIN, *************** *** 131,139 **** SetIcon(wxICON(LUA)); ! int nWidth, nHeight; ! GetClientSize(&nWidth, &nHeight); ! SizeWindow(nWidth, nHeight); ! if (m_luaInterface->IsDebugServer()) m_luaInterface->EnumerateStack(); else --- 124,135 ---- SetIcon(wxICON(LUA)); ! wxBoxSizer* rootSizer = new wxBoxSizer(wxVERTICAL); ! rootSizer->Add(m_stackComboBox, 0, wxEXPAND|wxBOTTOM, 4); ! rootSizer->Add(m_scrolledWindow, 1, wxEXPAND); ! rootSizer->SetMinSize(450, 400); ! panel->SetSizer(rootSizer); ! rootSizer->SetSizeHints(this); ! if (m_luaInterface->IsDebugger()) m_luaInterface->EnumerateStack(); else *************** *** 174,201 **** } - void wxLuaStackDialog::OnSizeWindow(wxSizeEvent &event) - { - wxSize size = GetClientSize(); //event.GetSize(); event size no good in > 2.5.3 at least - SizeWindow(size.x, size.y); - event.Skip(); - } - - void wxLuaStackDialog::SizeWindow(int nWidth, int nHeight) - { - int nComboWidth, nComboHeight, nButtonWidth, nButtonHeight; - m_stackComboBox->GetSize(&nComboWidth, &nComboHeight); - m_dismissButton->GetSize(&nButtonWidth, &nButtonHeight); - nComboHeight += 2; // makes it look a little better - m_stackComboBox->SetSize(0, 0, nWidth, -1); - m_scrolledWindow->SetSize(0, - nComboHeight, - nWidth, - nHeight - 15 - nComboHeight - nButtonHeight); - m_dismissButton->SetSize((nWidth / 2) - (nButtonWidth / 2), - nHeight - 5 - nButtonHeight, - nButtonWidth, - nButtonHeight); - } - void wxLuaStackDialog::OnSelectStack(wxCommandEvent &event) { --- 170,173 ---- *************** *** 209,213 **** int nEntry = (int) m_stackComboBox->GetClientData(nCurrentSel); ! if (m_luaInterface->IsDebugServer()) { m_luaInterface->EnumerateStackEntry(nEntry); --- 181,185 ---- int nEntry = (int) m_stackComboBox->GetClientData(nCurrentSel); ! if (m_luaInterface->IsDebugger()) { m_luaInterface->EnumerateStackEntry(nEntry); *************** *** 226,264 **** m_treeControl->AdjustRemoteScrollbars(); ! size_t idx, count = debugData.GetCount(); ! for (idx = 0; idx < count; ++idx) ! { ! const wxLuaDebugDataItem *item = debugData.Item(idx); ! int nOffset = (item->GetReference() != LUA_NOREF) ? 0 : 1; ! ! wxTreeItemId treeNode = m_treeControl->AppendItem(rootItem, ! item->GetName(), ! nOffset, ! nOffset, ! new wxLuaDebugDataItem(*item)); ! ! if (item->GetReference() != LUA_NOREF) ! m_treeControl->SetItemHasChildren(treeNode); ! } // If at global scope, process globals if (m_nCurrentSel == (int)m_stackComboBox->GetCount() - 1) { ! if (m_luaInterface->IsDebugServer()) m_luaInterface->EnumerateTable(-1, -1, (long)rootItem.m_pItem); else { wxLuaDebugData globalDebugData = m_luaInterface->GetGlobalData(); ! const wxLuaDebugDataItem *item = globalDebugData.Item(0); ! ! wxTreeItemId treeNode = m_treeControl->AppendItem( rootItem, ! item->GetName(), ! 0, ! 0, ! new wxLuaDebugDataItem(*item)); ! ! if (item->GetReference() != LUA_NOREF) ! m_treeControl->SetItemHasChildren(treeNode); ! GetDerivedAndTrackedItems(m_treeControl, rootItem); } --- 198,213 ---- m_treeControl->AdjustRemoteScrollbars(); ! if (debugData.GetCount() > 0u) ! FillTableEntry(rootItem, debugData); // If at global scope, process globals if (m_nCurrentSel == (int)m_stackComboBox->GetCount() - 1) { ! if (m_luaInterface->IsDebugger()) m_luaInterface->EnumerateTable(-1, -1, (long)rootItem.m_pItem); else { wxLuaDebugData globalDebugData = m_luaInterface->GetGlobalData(); ! FillTableEntry(rootItem, globalDebugData); GetDerivedAndTrackedItems(m_treeControl, rootItem); } *************** *** 317,321 **** int nIndex = pDebugDataItem->GetIndex() + 1; ! if (m_luaInterface->IsDebugServer()) { m_luaInterface->EnumerateTable(nRef, nIndex, (long)itemNode.m_pItem); --- 266,270 ---- int nIndex = pDebugDataItem->GetIndex() + 1; ! if (m_luaInterface->IsDebugger()) { m_luaInterface->EnumerateTable(nRef, nIndex, (long)itemNode.m_pItem); *************** *** 328,332 **** } } ! else if (!m_luaInterface->IsDebugServer() && m_luaInterface->GetwxLuaState().Ok() && ((pDebugDataItem->GetName() == _("Tracked List")) || --- 277,281 ---- } } ! else if (!m_luaInterface->IsDebugger() && m_luaInterface->GetwxLuaState().Ok() && ((pDebugDataItem->GetName() == _("Tracked List")) || *************** *** 346,362 **** for (it = hashMap->begin(); it != hashMap->end(); ++it) { wxObject* obj = (wxObject*)it->second; if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) { ! wxString name(obj->GetClassInfo()->GetClassName()); ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) ! { ! names.Add(name); ! counts.Add(1); ! } ! else ! counts[idx]++; } } } --- 295,314 ---- for (it = hashMap->begin(); it != hashMap->end(); ++it) { + wxString name(wxT("Unknown Tracked Item")); + wxObject* obj = (wxObject*)it->second; if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) + name = obj->GetClassInfo()->GetClassName(); + + //name = wxString::Format(wxT("%p "), obj) + name; + + int idx = names.Index(name); + if (idx == wxNOT_FOUND) { ! names.Add(name); ! counts.Add(1); } + else + counts[idx]++; } } *************** *** 368,372 **** wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData(); wxCHECK_RET(pCallback, wxT("Invalid wxLuaCallback")); ! wxString name = wxString::Format(wxT("Evt type %d"), (int)pCallback->GetEventType()); int idx = names.Index(name); if (idx == wxNOT_FOUND) --- 320,337 ---- wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData(); wxCHECK_RET(pCallback, wxT("Invalid wxLuaCallback")); ! ! wxString evtName; ! if (wxlState.GetLuaBindingList()) ! { ! wxLuaBindingList::Node *bindNode = wxlState.GetLuaBindingList()->GetFirst(); ! for (; bindNode; bindNode = bindNode->GetNext()) ! { ! wxLuaBinding* binding = bindNode->GetData(); ! evtName = binding->GetEventTypeName(pCallback->GetEventType()); ! if (!evtName.IsEmpty()) break; ! } ! } ! ! wxString name = wxString::Format(wxT("%d %s"), (int)pCallback->GetEventType(), evtName.c_str()); int idx = names.Index(name); if (idx == wxNOT_FOUND) *************** *** 445,453 **** } - void wxLuaStackDialog::OnCloseDialog(wxCommandEvent & WXUNUSED(event)) - { - EndModal(0); - } - // ---------------------------------------------------------------------------- // wxLuaStackTree --- 410,413 ---- *************** *** 459,465 **** wxLuaStackTree::wxLuaStackTree( wxWindow *parent, wxWindowID id, ! const wxPoint &pt, const wxSize &sz, long style) ! : wxRemotelyScrolledTreeCtrl(parent, id, pt, sz, style) { m_imageList = new wxImageList(16, 16, true); --- 419,425 ---- wxLuaStackTree::wxLuaStackTree( wxWindow *parent, wxWindowID id, ! const wxPoint &pos, const wxSize &sz, long style) ! : wxRemotelyScrolledTreeCtrl(parent, id, pos, sz, style) { m_imageList = new wxImageList(16, 16, true); *************** *** 494,522 **** void wxLuaStackDataWindow::DrawItem(wxDC &dc, wxTreeItemId id, const wxRect &rect) { ! if (m_treeControl) ! { ! wxLuaDebugDataItem *itemData = (wxLuaDebugDataItem *) m_treeControl->GetItemData(id); ! if (itemData != NULL) ! { ! dc.SetTextForeground(*wxBLACK); ! dc.SetBackgroundMode(wxTRANSPARENT); ! int textWidth, textHeight = 0; ! if (m_fFirst) ! dc.GetTextExtent(itemData->GetType(), &textWidth, &textHeight); ! else ! dc.GetTextExtent(itemData->GetValue(), &textWidth, &textHeight); ! int x = 5; ! int y = (rect.GetHeight() - textHeight) / 2; // try to center it, else pin to top ! y = rect.GetY() + wxMax(0, y); ! if (m_fFirst) ! dc.DrawText(itemData->GetType(), x, y); ! else ! dc.DrawText(itemData->GetValue(), x, y); ! } } } --- 454,481 ---- void wxLuaStackDataWindow::DrawItem(wxDC &dc, wxTreeItemId id, const wxRect &rect) { ! if (!m_treeControl) return; ! wxLuaDebugDataItem *itemData = (wxLuaDebugDataItem *) m_treeControl->GetItemData(id); ! if (itemData != NULL) ! { ! dc.SetTextForeground(*wxBLACK); ! dc.SetBackgroundMode(wxTRANSPARENT); ! int textWidth, textHeight = 0; ! if (m_fFirst) ! dc.GetTextExtent(itemData->GetType(), &textWidth, &textHeight); ! else ! dc.GetTextExtent(itemData->GetValue(), &textWidth, &textHeight); ! int x = 5; ! int y = (rect.GetHeight() - textHeight) / 2; // try to center it, else pin to top ! y = rect.GetY() + wxMax(0, y); ! ! if (m_fFirst) ! dc.DrawText(itemData->GetType(), x, y); ! else ! dc.DrawText(itemData->GetValue(), x, y); } } |
|
From: John L. <jr...@us...> - 2006-10-04 02:46:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxluadebug/include Modified Files: staktree.h wxldebug.h Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: staktree.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/staktree.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** staktree.h 8 Sep 2006 22:43:46 -0000 1.12 --- staktree.h 2 Oct 2006 21:19:24 -0000 1.13 *************** *** 26,30 **** // ---------------------------------------------------------------------------- ! enum { ID_WXLUA_STACKDIALOG = 2000, --- 26,30 ---- // ---------------------------------------------------------------------------- ! enum { ID_WXLUA_STACKDIALOG = 2000, *************** *** 35,40 **** ID_WXLUA_STACKDIALOG_VALUE_SPLITWIN, ID_WXLUA_STACKDIALOG_VALUE_WIN1, ! ID_WXLUA_STACKDIALOG_VALUE_WIN2, ! ID_WXLUA_STACKDIALOG_DISMISS_BUTTON }; --- 35,39 ---- ID_WXLUA_STACKDIALOG_VALUE_SPLITWIN, ID_WXLUA_STACKDIALOG_VALUE_WIN1, ! ID_WXLUA_STACKDIALOG_VALUE_WIN2 }; *************** *** 63,74 **** wxLuaInterface* luaInterface); - void OnSizeWindow(wxSizeEvent& event); void OnSelectStack(wxCommandEvent &event); void OnItemExpanding(wxTreeEvent &event); - void OnCloseDialog(wxCommandEvent &event); void SelectStack(int nCurrentSel); void ItemExpanding(const wxTreeItemId &itemId); - void SizeWindow(int nWidth, int nHeight); void FillStackCombobox(const wxLuaDebugData& debugData); --- 62,70 ---- *************** *** 84,88 **** wxThinSplitterWindow *m_valueSplitter; wxSplitterScrolledWindow *m_scrolledWindow; - wxButton *m_dismissButton; wxLuaStackDataWindow *m_firstValueWindow; wxLuaStackDataWindow *m_secondValueWindow; --- 80,83 ---- Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxldebug.h 30 Sep 2006 18:20:03 -0000 1.25 --- wxldebug.h 2 Oct 2006 21:19:24 -0000 1.26 *************** *** 153,164 **** virtual wxLuaDebugData GetGlobalData(); ! // allows for this to be subclassed for use with the wxLuaDebuggerServer ! virtual bool IsDebugServer() const { return false; } wxLuaState GetwxLuaState() const { return m_wxlState; } protected: - int Ref(); - wxLuaState m_wxlState; wxArrayInt m_references; --- 153,162 ---- virtual wxLuaDebugData GetGlobalData(); ! // allows for this to be subclassed for use with the wxLuaDebuggerBase ! virtual bool IsDebugger() const { return false; } wxLuaState GetwxLuaState() const { return m_wxlState; } protected: wxLuaState m_wxlState; wxArrayInt m_references; |
|
From: John L. <jr...@us...> - 2006-10-04 02:42:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxlbind.h 28 Aug 2006 05:26:20 -0000 1.23 --- wxlbind.h 2 Oct 2006 21:19:23 -0000 1.24 *************** *** 355,358 **** --- 355,362 ---- bool SetBaseClassTag(WXLUACLASS *pClass); + // Look up the event type name as a string, from the wxEventType number + // in the WXLUAEVENT* struct list of this binding. + wxString GetEventTypeName(wxEventType e_type); + // Get all the bindings that were created static wxLuaBindingList* GetBindingList() { return &sm_bindings; } |
|
From: John L. <jr...@us...> - 2006-10-04 02:41:58
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxlbind.cpp 13 Sep 2006 04:13:46 -0000 1.39 --- wxlbind.cpp 2 Oct 2006 21:19:24 -0000 1.40 *************** *** 716,717 **** --- 716,730 ---- return false; } + + wxString wxLuaBinding::GetEventTypeName(wxEventType e_type) + { + size_t n = 0, count = GetLuaEventCount(); + for (n = 0; n < count; n++) + { + WXLUAEVENT *pEvent = &m_eventList[n]; + if (*pEvent->eventType == (int)e_type) + return lua2wx(pEvent->eventName); + } + + return wxEmptyString; + } |
|
From: John L. <jr...@us...> - 2006-10-04 02:41:45
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23774/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxldtarg.cpp wxlsock.cpp Log Message: add GetEventTypeName(int) to bindings to lookup event name string use sizers in stack dialog simplify the stackdialog by unifying all treectrl item adding better comments in headers Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxldtarg.cpp 29 Sep 2006 22:22:06 -0000 1.26 --- wxldtarg.cpp 2 Oct 2006 21:19:24 -0000 1.27 *************** *** 329,333 **** m_wxlState.tremove(iItem); } ! // FIXME - should we also remove the array items break; } --- 329,333 ---- m_wxlState.tremove(iItem); } ! m_references.Clear(); break; } Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxldserv.cpp 29 Sep 2006 22:22:06 -0000 1.24 --- wxldserv.cpp 2 Oct 2006 21:19:24 -0000 1.25 *************** *** 92,113 **** // ---------------------------------------------------------------------------- ! wxLuaDebuggerServerInterface::wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server) :wxLuaInterface(wxNullLuaState) { ! m_pServer = server; ! wxCHECK_RET(m_pServer != NULL, wxT("Invalid wxLuaDebuggerServer in wxLuaDebuggerServerInterface")); } wxLuaDebuggerServerInterface::~wxLuaDebuggerServerInterface() { ! if (m_pServer != NULL) ! { ! m_pServer->CleanupDebugReferences(); ! } } wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStack() { ! m_pServer->EnumerateStack(); return wxLuaDebugData(); } --- 92,112 ---- // ---------------------------------------------------------------------------- ! wxLuaDebuggerServerInterface::wxLuaDebuggerServerInterface(wxLuaDebuggerBase* server) :wxLuaInterface(wxNullLuaState) { ! m_luaDebugger = server; ! wxCHECK_RET(m_luaDebugger != NULL, wxT("Invalid wxLuaDebuggerServer in wxLuaDebuggerServerInterface")); } wxLuaDebuggerServerInterface::~wxLuaDebuggerServerInterface() { ! if (m_luaDebugger != NULL) ! m_luaDebugger->CleanupDebugReferences(); } wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStack() { ! wxCHECK_MSG(m_luaDebugger, wxLuaDebugData(), wxT("Invalid wxLuaDebuggerServer")); ! m_luaDebugger->EnumerateStack(); return wxLuaDebugData(); } *************** *** 115,119 **** wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStackEntry(int nEntry) { ! m_pServer->EnumerateStackEntry(nEntry); return wxLuaDebugData(); } --- 114,119 ---- wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStackEntry(int nEntry) { ! wxCHECK_MSG(m_luaDebugger, wxLuaDebugData(), wxT("Invalid wxLuaDebuggerServer")); ! m_luaDebugger->EnumerateStackEntry(nEntry); return wxLuaDebugData(); } *************** *** 121,125 **** wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateTable(int nRef, int nEntry, long data) { ! m_pServer->EnumerateTable(nRef, nEntry, data); return wxLuaDebugData(); } --- 121,126 ---- wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateTable(int nRef, int nEntry, long data) { ! wxCHECK_MSG(m_luaDebugger, wxLuaDebugData(), wxT("Invalid wxLuaDebuggerServer")); ! m_luaDebugger->EnumerateTable(nRef, nEntry, data); return wxLuaDebugData(); } Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlsock.cpp 29 Sep 2006 20:47:15 -0000 1.16 --- wxlsock.cpp 2 Oct 2006 21:19:24 -0000 1.17 *************** *** 236,254 **** wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteString"), wxString::Format(wxT("len %u val '%s'"), buflen, value.c_str())); ! try ! { ! bool ok = Write((const char*)&buflen, sizeof(wxUint32)) == sizeof(wxUint32); ! if (ok && (buflen > 0)) ! { ! ok = Write(buf.GetData(), buflen) == (int)buflen; ! } ! ! return ok; ! } ! catch(wxLuaSocketException &) ! { ! } ! return false; } bool wxLuaSocketBase::WriteDebugData(const wxLuaDebugData& debugData) --- 236,244 ---- wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteString"), wxString::Format(wxT("len %u val '%s'"), buflen, value.c_str())); ! bool ok = Write((const char*)&buflen, sizeof(wxUint32)) == sizeof(wxUint32); ! if (ok && (buflen > 0)) ! ok = Write(buf.GetData(), buflen) == (int)buflen; ! return ok; } bool wxLuaSocketBase::WriteDebugData(const wxLuaDebugData& debugData) |
|
From: John L. <jr...@us...> - 2006-10-04 02:41:12
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31238/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxluaedit.cpp 15 Sep 2006 00:14:51 -0000 1.23 --- wxluaedit.cpp 28 Sep 2006 22:26:02 -0000 1.24 *************** *** 38,43 **** extern bool wxLuaBinding_wxluasocket_init(); - class LuaHandler; - wxWindowID ID_WXLUASTATE_DEBUG = 200; --- 38,41 ---- *************** *** 85,95 **** void OnLua(wxLuaEvent &event); - void OnDebugStackEnum(wxLuaDebuggerEvent &event); - void OnDebugTableEnum(wxLuaDebuggerEvent &event); - void OnDebugStackEntryEnum(wxLuaDebuggerEvent &event); void DisplayError(const wxString &strError) const; - LuaHandler *m_luaHandler; wxLuaDebugTarget *m_pDebugTarget; wxLuaState m_wxlState; --- 83,89 ---- *************** *** 100,119 **** }; - // --------------------------------------------------------------------------- - // LuaHandler - routes commands from the wxLuaHandler to the app - // --------------------------------------------------------------------------- - - class LuaHandler : public wxLuaHandler - { - public: - LuaHandler(wxLuaEditorApp *app) : m_app(app) {} - - virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); } - virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); } - virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); } - - wxLuaEditorApp *m_app; - }; - // ---------------------------------------------------------------------------- // wxLuaEditorFrame --- 94,97 ---- *************** *** 154,166 **** EVT_LUA_ERROR (ID_WXLUASTATE_DEBUG, wxLuaEditorApp::OnLua) EVT_LUA_DEBUG_HOOK (ID_WXLUASTATE_DEBUG, wxLuaEditorApp::OnLua) - - EVT_WXLUA_DEBUGGER_STACK_ENUM( wxLuaEditorApp::OnDebugStackEnum) - EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(wxLuaEditorApp::OnDebugStackEntryEnum) - EVT_WXLUA_DEBUGGER_TABLE_ENUM( wxLuaEditorApp::OnDebugTableEnum) END_EVENT_TABLE() bool wxLuaEditorApp::OnInit() { - m_luaHandler = new LuaHandler(this); m_pDebugTarget = NULL; m_programName = argv[0]; --- 132,139 ---- *************** *** 341,345 **** m_wxlState.CloseLuaState(true); m_wxlState.Destroy(); - delete m_luaHandler; } --- 314,317 ---- *************** *** 374,401 **** } - void wxLuaEditorApp::OnDebugStackEnum(wxLuaDebuggerEvent &event) - { - if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) - wxLuaHandler::GetHandler().GetStackDialog()->FillStackCombobox(event.GetDebugData()); - else - event.Skip(); - } - - void wxLuaEditorApp::OnDebugStackEntryEnum(wxLuaDebuggerEvent &event) - { - if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) - wxLuaHandler::GetHandler().GetStackDialog()->FillStackEntry(event.GetReference(), event.GetDebugData()); - else - event.Skip(); - } - - void wxLuaEditorApp::OnDebugTableEnum(wxLuaDebuggerEvent &event) - { - if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) - wxLuaHandler::GetHandler().GetStackDialog()->FillTableEntry(wxTreeItemId((wxTreeItemIdValue)event.GetReference()), event.GetDebugData()); - else - event.Skip(); - } - void wxLuaEditorApp::DisplayError(const wxString &errorStr) const { --- 346,349 ---- |
|
From: John L. <jr...@us...> - 2006-10-04 02:41:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31238/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** wx_bind.cpp 20 Sep 2006 04:24:27 -0000 1.56 --- wx_bind.cpp 28 Sep 2006 22:26:04 -0000 1.57 *************** *** 3123,3126 **** --- 3123,3147 ---- + // %override wxLua_function_CompileLuaScript + // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) + static int LUACALL wxLua_function_CompileLuaScript(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // const wxString fileName + const wxString fileName = lua2wx(wxlState.GetStringType(2)); + // const wxString luaScript + const wxString luaScript = lua2wx(wxlState.GetStringType(1)); + wxString errMsg; + int line_num = -1; + wxLuaState wxlState2(true); // create a brand new empty lua state to compile in + returns = wxlState2.CompileString(luaScript, fileName, &errMsg, &line_num); + // push the result number + lua_pushnumber(L, returns); + lua_pushstring(L, wx2lua(errMsg)); + lua_pushnumber(L, line_num); + return 3; + } + // %function void wxBell() static int LUACALL wxLua_function_wxBell(lua_State *L) *************** *** 4932,4935 **** --- 4953,4957 ---- #endif // (wxUSE_NUMBERDLG) && (wxLUA_USE_wxPointSizeRect) + { LuaGlobal, "CompileLuaScript", wxLua_function_CompileLuaScript, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaGlobal, "wxBell", wxLua_function_wxBell, 0, 0, { 0 } }, { LuaGlobal, "wxCHECK_VERSION", wxLua_function_wxCHECK_VERSION, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, |
|
From: John L. <jr...@us...> - 2006-10-04 02:41:12
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31238/wxLua/bindings/wxwidgets Modified Files: override.hpp wxlua.i Log Message: Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlua.i 24 May 2006 04:50:00 -0000 1.16 --- wxlua.i 28 Sep 2006 22:26:03 -0000 1.17 *************** *** 8,11 **** --- 8,16 ---- // ============================================================================ + // Compile the luaScript of the given name and return the lua error code, a message + // and the line number (or -1) of the error. + // %override [int return, lua_string err_msg, int line_number] CompileLuaScript(const wxString& luaScript, const wxString& fileName) + %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) + //----------------------------------------------------------------------------- // wxLuaState Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** override.hpp 2 Aug 2006 04:13:41 -0000 1.52 --- override.hpp 28 Sep 2006 22:26:03 -0000 1.53 *************** *** 4351,4354 **** --- 4351,4376 ---- // ---------------------------------------------------------------------------- + %override wxLua_function_CompileLuaScript + // %function int CompileLuaScript(const wxString& luaScript, const wxString& fileName) + static int LUACALL wxLua_function_CompileLuaScript(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // const wxString fileName + const wxString fileName = lua2wx(wxlState.GetStringType(2)); + // const wxString luaScript + const wxString luaScript = lua2wx(wxlState.GetStringType(1)); + wxString errMsg; + int line_num = -1; + wxLuaState wxlState2(true); // create a brand new empty lua state to compile in + returns = wxlState2.CompileString(luaScript, fileName, &errMsg, &line_num); + // push the result number + lua_pushnumber(L, returns); + lua_pushstring(L, wx2lua(errMsg)); + lua_pushnumber(L, line_num); + return 3; + } + %end + %override wxLua_wxLuaObject_constructor // wxLuaObject(void *object) |
|
From: John L. <jr...@us...> - 2006-10-04 02:40:36
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5969/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxlsock.h Log Message: make sockets work again in MSW Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxldserv.h 28 Sep 2006 22:26:05 -0000 1.15 --- wxldserv.h 29 Sep 2006 20:47:15 -0000 1.16 *************** *** 171,175 **** protected: virtual void *Entry(); // thread execution starts here ! virtual void OnExit() {} // called when the thread exits wxLuaDebuggerServer *m_pServer; --- 171,175 ---- protected: virtual void *Entry(); // thread execution starts here ! virtual void OnExit(); // called when the thread exits wxLuaDebuggerServer *m_pServer; Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxlsock.h 28 Sep 2006 22:26:05 -0000 1.14 --- wxlsock.h 29 Sep 2006 20:47:15 -0000 1.15 *************** *** 35,42 **** // This is the MSW version of SHUT_RDWR for ::shutdown(sock, how=SHUT_RDWR) ! #ifndef SD_RECEIVE #define SD_RECEIVE SHUT_RD #define SD_SEND SHUT_WR #define SD_BOTH SHUT_RDWR #endif // SD_RECEIVE --- 35,48 ---- // This is the MSW version of SHUT_RDWR for ::shutdown(sock, how=SHUT_RDWR) ! // Note that these are defined in winsock2.h, but if you try to include it ! // you get errors about redefinitions since it include winsock.h anyway ! #if !defined(SD_RECEIVE) && defined(SHUT_RD) #define SD_RECEIVE SHUT_RD #define SD_SEND SHUT_WR #define SD_BOTH SHUT_RDWR + #else if !defined(SD_RECEIVE) + #define SD_RECEIVE 0 + #define SD_SEND 1 + #define SD_BOTH 2 #endif // SD_RECEIVE *************** *** 82,85 **** --- 88,94 ---- wxString m_name; // a readable name for the socket, for debugging + + private: + DECLARE_ABSTRACT_CLASS(wxLuaSocketBase); }; *************** *** 149,153 **** { return ((m_sockstate == SOCKET_CONNECTED) || ! (m_sockstate == SOCKET_ACCEPTING)); } --- 158,162 ---- { return ((m_sockstate == SOCKET_CONNECTED) || ! (m_sockstate == SOCKET_ACCEPTED)); } *************** *** 181,184 **** --- 190,195 ---- sockaddr_in m_sockaddress; SocketState m_sockstate; + + DECLARE_ABSTRACT_CLASS(wxLuaSocket); }; *************** *** 214,220 **** SocketErrorCode GetCode() const { return m_code; } - int errnum() const { return m_errnum; } ! const wxString& description() const { return m_description; } private: --- 225,230 ---- SocketErrorCode GetCode() const { return m_code; } int errnum() const { return m_errnum; } ! wxString description() const { return m_description; } private: |
|
From: John L. <jr...@us...> - 2006-10-04 02:40:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11829/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxldtarg.h wxlsock.h Log Message: more cleanup, fix wrong #elif statement Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxldserv.h 29 Sep 2006 20:47:15 -0000 1.16 --- wxldserv.h 29 Sep 2006 22:22:06 -0000 1.17 *************** *** 96,100 **** // ---------------------------------------------------------------------------- ! // wxLuaDebuggerBase - Debugger interface base class // // ---------------------------------------------------------------------------- --- 96,100 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerBase - Socket debugger interface base class // // ---------------------------------------------------------------------------- *************** *** 109,129 **** // and the appropriate data to the debuggee. ! virtual bool AddBreakPoint(const wxString &fileName, int lineNumber); ! virtual bool RemoveBreakPoint(const wxString &fileName, int lineNumber); ! virtual bool DisableBreakPoint(const wxString &fileName, int lineNumber); ! virtual bool EnableBreakPoint(const wxString &fileName, int lineNumber); ! virtual bool ClearAllBreakPoints(); ! virtual bool Run(const wxString &fileName, const wxString &buffer); ! virtual bool Step(); ! virtual bool StepOver(); ! virtual bool StepOut(); ! virtual bool Continue(); ! virtual bool Break(); ! virtual bool Reset(); ! virtual bool EnumerateStack(); ! virtual bool EnumerateStackEntry(int stackEntry); ! virtual bool EnumerateTable(int tableRef, int nIndex, long nItemNode); ! virtual bool CleanupDebugReferences(); ! virtual bool EvaluateExpr(int exprRef, const wxString &strExpression); // compile the buffer in a temp lua_State returning true on success. --- 109,129 ---- // and the appropriate data to the debuggee. ! bool AddBreakPoint(const wxString &fileName, int lineNumber); ! bool RemoveBreakPoint(const wxString &fileName, int lineNumber); ! bool DisableBreakPoint(const wxString &fileName, int lineNumber); ! bool EnableBreakPoint(const wxString &fileName, int lineNumber); ! bool ClearAllBreakPoints(); ! bool Run(const wxString &fileName, const wxString &buffer); ! bool Step(); ! bool StepOver(); ! bool StepOut(); ! bool Continue(); ! bool Break(); ! bool Reset(); ! bool EnumerateStack(); ! bool EnumerateStackEntry(int stackEntry); ! bool EnumerateTable(int tableRef, int nIndex, long nItemNode); ! bool CleanupDebugReferences(); ! bool EvaluateExpr(int exprRef, const wxString &strExpression); // compile the buffer in a temp lua_State returning true on success. *************** *** 131,135 **** bool Compile(const wxString &fileName, const wxString &buffer); ! virtual int HandleDebuggeeEvent(wxLuaSocketDebuggeeEvents_Type event_type); // Get the debugger socket to read/write data to --- 131,136 ---- bool Compile(const wxString &fileName, const wxString &buffer); ! // Handle the wxLuaSocketDebuggeeEvents_Type event sent by the debuggee ! virtual int HandleDebuggeeEvent(int event_type); // Get the debugger socket to read/write data to Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxlsock.h 29 Sep 2006 20:47:15 -0000 1.15 --- wxlsock.h 29 Sep 2006 22:22:06 -0000 1.16 *************** *** 36,45 **** // This is the MSW version of SHUT_RDWR for ::shutdown(sock, how=SHUT_RDWR) // Note that these are defined in winsock2.h, but if you try to include it ! // you get errors about redefinitions since it include winsock.h anyway #if !defined(SD_RECEIVE) && defined(SHUT_RD) #define SD_RECEIVE SHUT_RD #define SD_SEND SHUT_WR #define SD_BOTH SHUT_RDWR ! #else if !defined(SD_RECEIVE) #define SD_RECEIVE 0 #define SD_SEND 1 --- 36,45 ---- // This is the MSW version of SHUT_RDWR for ::shutdown(sock, how=SHUT_RDWR) // Note that these are defined in winsock2.h, but if you try to include it ! // you get errors about redefinitions since it includes winsock.h anyway #if !defined(SD_RECEIVE) && defined(SHUT_RD) #define SD_RECEIVE SHUT_RD #define SD_SEND SHUT_WR #define SD_BOTH SHUT_RDWR ! #elif !defined(SD_RECEIVE) #define SD_RECEIVE 0 #define SD_SEND 1 *************** *** 64,68 **** virtual bool IsConnected() = 0; ! // Read the number of bytes length into buffer buffer from the socket // the buffer must be large enough to hold the data. virtual int Read(char *buffer, wxUint32 length) = 0; --- 64,68 ---- virtual bool IsConnected() = 0; ! // Read the number of bytes length into buffer from the socket // the buffer must be large enough to hold the data. virtual int Read(char *buffer, wxUint32 length) = 0; Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxldtarg.h 28 Sep 2006 22:26:05 -0000 1.17 --- wxldtarg.h 29 Sep 2006 22:22:06 -0000 1.18 *************** *** 52,57 **** void ThreadFunction(); ! int HandleDebuggerCmd(int cmd); ! void DisplayError(const wxString &strError); protected: --- 52,57 ---- void ThreadFunction(); ! int HandleDebuggerCmd(int cmd); ! void DisplayError(const wxString& errorMsg) { NotifyError(errorMsg); } protected: |
|
From: John L. <jr...@us...> - 2006-09-26 22:22:05
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11834/wxLua/samples Modified Files: calculator.wx.lua choices.wx.lua dialog.wx.lua fldemo.wx.lua mdi.wx.lua scribble.wx.lua sizer.wx.lua wxluasudoku.wx.lua Removed Files: debugtest.wx.lua Log Message: sample cleanup to make them more readable Index: sizer.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/sizer.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** sizer.wx.lua 24 Apr 2006 02:33:27 -0000 1.5 --- sizer.wx.lua 26 Sep 2006 22:22:00 -0000 1.6 *************** *** 9,17 **** ----------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.wxNull, -1, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) ! textEntry = wx.wxTextCtrl(frame, -1, "Enter URL"); ! button = wx.wxButton(frame, -1, "test") -- Put them in a vertical sizer, with ratio 3 units for the text entry, 5 for button --- 9,17 ---- ----------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) ! textEntry = wx.wxTextCtrl(frame, wx.wxID_ANY, "Enter URL"); ! button = wx.wxButton(frame, wx.wxID_ANY, "test") -- Put them in a vertical sizer, with ratio 3 units for the text entry, 5 for button Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mdi.wx.lua 20 Sep 2006 04:07:38 -0000 1.10 --- mdi.wx.lua 26 Sep 2006 22:22:00 -0000 1.11 *************** *** 20,24 **** child:SetTitle("Child "..numChildren) ! function Paint(event) local id = event:GetId() local win = event:GetEventObject():DynamicCast("wxWindow") --- 20,24 ---- child:SetTitle("Child "..numChildren) ! function OnPaint(event) local id = event:GetId() local win = event:GetEventObject():DynamicCast("wxWindow") *************** *** 27,34 **** dc:DrawRoundedRectangle(20, 20, 280, 280, 20); dc:DrawEllipse(30, 30, 260, 260); ! dc:DrawText("A test string for window Id "..tostring(id), 50, 150); dc:Delete() -- ALWAYS Delete() any wxDCs created when done end ! child:Connect(wx.wxEVT_PAINT, Paint) child:Show(true) end --- 27,34 ---- dc:DrawRoundedRectangle(20, 20, 280, 280, 20); dc:DrawEllipse(30, 30, 260, 260); ! dc:DrawText("A test string for window Id "..tostring(win:GetId()), 50, 150); dc:Delete() -- ALWAYS Delete() any wxDCs created when done end ! child:Connect(wx.wxEVT_PAINT, OnPaint) child:Show(true) end Index: fldemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/fldemo.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fldemo.wx.lua 20 Sep 2006 04:07:38 -0000 1.5 --- fldemo.wx.lua 26 Sep 2006 22:22:00 -0000 1.6 *************** *** 30,75 **** end ! function main() ! -- return the path part of the currently executing file ! local strAt = string.byte('@') ! function getPath() ! function findLast(filePath) ! local lastOffset = nil ! local offset ! repeat ! offset = string.find(filePath, "\\") ! if offset == nil then ! offset = string.find(filePath, "/") ! end ! if offset then ! if not lastOffset then ! lastOffset = offset ! else ! lastOffset = lastOffset + offset ! end ! filePath = string.sub(filePath, offset + 1) ! end ! until not offset ! return lastOffset ! end ! local filePath = debug.getinfo(1, "S").source ! if string.byte(filePath) == strAt then ! local offset = findLast(filePath) ! if offset ~= nil then ! -- remove the @ at the front up to just before the path separator ! filePath = string.sub(filePath, 2, offset - 1) ! else ! filePath = "." ! end else ! filePath = wx.wxGetCwd().."/Examples" end ! return filePath end ! local bitmapPath = getPath().."/bitmaps/" newBitmap = wx.wxBitmapFromFile(bitmapPath.."new.bmp", wx.wxBITMAP_TYPE_BMP) openBitmap = wx.wxBitmapFromFile(bitmapPath.."open.bmp", wx.wxBITMAP_TYPE_BMP) --- 30,72 ---- end ! -- --------------------------------------------------------------------------- ! -- return the path part of the currently executing file ! function GetExePath() ! local function findLast(filePath) -- find index of last / or \ in string ! local lastOffset = nil ! local offset = nil ! repeat ! offset = string.find(filePath, "\\") or string.find(filePath, "/") ! if offset then ! lastOffset = (lastOffset or 0) + offset ! filePath = string.sub(filePath, offset + 1) ! end ! until not offset ! return lastOffset ! end ! local filePath = debug.getinfo(1, "S").source ! ! if string.byte(filePath) == string.byte('@') then ! local offset = findLast(filePath) ! if offset ~= nil then ! -- remove the @ at the front up to just before the path separator ! filePath = string.sub(filePath, 2, offset - 1) else ! filePath = "." end ! else ! filePath = wx.wxGetCwd() end ! return filePath ! end ! ! ! function main() ! ! local bitmapPath = GetExePath().."/bitmaps/" newBitmap = wx.wxBitmapFromFile(bitmapPath.."new.bmp", wx.wxBITMAP_TYPE_BMP) openBitmap = wx.wxBitmapFromFile(bitmapPath.."open.bmp", wx.wxBITMAP_TYPE_BMP) --- debugtest.wx.lua DELETED --- Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** wxluasudoku.wx.lua 20 Sep 2006 04:07:38 -0000 1.56 --- wxluasudoku.wx.lua 26 Sep 2006 22:22:00 -0000 1.57 *************** *** 26,30 **** -- make the number or bool into a bool or number function inttobool(n) ! if (n == nil) or (n == 0) then return false end return true end --- 26,30 ---- -- make the number or bool into a bool or number function inttobool(n) ! if (n == nil) or (n == 0) then return false end return true end Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dialog.wx.lua 20 Sep 2006 04:07:38 -0000 1.7 --- dialog.wx.lua 26 Sep 2006 22:22:00 -0000 1.8 *************** *** 1,5 **** -------------------------------------------------------------------------=--- -- Name: dialog.wx.lua ! -- Purpose: Dialog wxLua sample -- Based on the C++ version by Marco Ghislanzoni -- Author: J Winwood --- 1,5 ---- -------------------------------------------------------------------------=--- -- Name: dialog.wx.lua ! -- Purpose: Dialog wxLua sample, a temperature converter -- Based on the C++ version by Marco Ghislanzoni -- Author: J Winwood Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** choices.wx.lua 20 Sep 2006 04:07:38 -0000 1.9 --- choices.wx.lua 26 Sep 2006 22:22:00 -0000 1.10 *************** *** 12,16 **** function HandleEvents(event) -- Note: event.GetEventObject() returns a wxObject, but we know that all ! -- events sent to this function will be from wxWindow derived -- class, whose base class is a wxObject. -- Use DynamicCast to call functions from the wxWindow base class. --- 12,16 ---- function HandleEvents(event) -- Note: event.GetEventObject() returns a wxObject, but we know that all ! -- events sent to this function will be from a wxWindow derived -- class, whose base class is a wxObject. -- Use DynamicCast to call functions from the wxWindow base class. *************** *** 22,26 **** -- create the hierarchy: frame -> notebook frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua Choices", ! wx.wxPoint(20, 20), wx.wxSize(450, 350)) frame:CreateStatusBar(1) frame:SetStatusText("wxEvents from controls will be displayed here", 0) --- 22,26 ---- -- create the hierarchy: frame -> notebook frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua Choices", ! wx.wxDefaultPosition, wx.wxSize(550, 350)) frame:CreateStatusBar(1) frame:SetStatusText("wxEvents from controls will be displayed here", 0) *************** *** 73,79 **** choiceBoxStaticBoxSizer:AddWindow(choice, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) sizer2:AddSizer(comboBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) sizer2:AddSizer(choiceBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddWindow(checkListBox, 1, wx.wxALL + wx.wxGROW, 5) panel2:SetSizer(sizer2) sizer2:SetSizeHints(panel2) --- 73,83 ---- choiceBoxStaticBoxSizer:AddWindow(choice, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) + local checkListBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxCheckListBox") + local checkListBoxStaticBoxSizer = wx.wxStaticBoxSizer( checkListBoxStaticBox, wx.wxVERTICAL ); + checkListBoxStaticBoxSizer:AddWindow(checkListBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) + sizer2:AddSizer(comboBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) sizer2:AddSizer(choiceBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(checkListBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel2:SetSizer(sizer2) sizer2:SetSizeHints(panel2) Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** scribble.wx.lua 20 Sep 2006 04:07:38 -0000 1.10 --- scribble.wx.lua 26 Sep 2006 22:22:00 -0000 1.11 *************** *** 12,15 **** --- 12,16 ---- frame = nil -- the main wxFrame + panel = nil -- the child wxPanel in the wxFrame to draw on mouseDown = false -- left mouse button is down pointsList = {} -- list of the points added to the drawing *************** *** 19,22 **** --- 20,24 ---- redrawRequired = true -- redraw the image fileName = "" -- filename to save to + ID_SAVEBITMAP = wx.wxID_HIGHEST + 1 penColours = { "Red", "Orange", "Yellow", "Green", "Blue", "Purple", "Black", "Grey" } *************** *** 25,36 **** bitmap = wx.wxEmptyBitmap(screenWidth, screenHeight) function DrawPoints(drawDC) for listIndex = 1, #pointsList do local listValue = pointsList[listIndex] - local lastX, lastY drawDC:SetPen(pens[listValue.penColour]) local pointsValue = listValue[1] ! lastX, lastY = pointsValue.x, pointsValue.y for pointsIndex = 2, #listValue do pointsValue = listValue[pointsIndex] --- 27,41 ---- bitmap = wx.wxEmptyBitmap(screenWidth, screenHeight) + for key, value in pairs(penColours) do + table.insert(pens, wx.wxPenFromColourName(value, 3, wx.wxSOLID)) + end + function DrawPoints(drawDC) for listIndex = 1, #pointsList do local listValue = pointsList[listIndex] drawDC:SetPen(pens[listValue.penColour]) local pointsValue = listValue[1] ! local lastX, lastY = pointsValue.x, pointsValue.y for pointsIndex = 2, #listValue do pointsValue = listValue[pointsIndex] *************** *** 42,56 **** end function OnPaint(event) ! local dc = wx.wxPaintDC(frame) if redrawRequired then if isRunning then ! local bitmapDC = wx.wxMemoryDC() ! bitmapDC:SelectObject( bitmap ) ! bitmapDC:Clear() ! DrawPoints(bitmapDC) ! bitmapDC:SelectObject(wx.wxNullBitmap) ! bitmapDC:Delete() end redrawRequired = false --- 47,65 ---- end + function DrawBitmap(bmp) + local bitmapDC = wx.wxMemoryDC() -- create off screen dc to draw on + bitmapDC:SelectObject(bmp) -- select our bitmap to draw into + bitmapDC:Clear() + DrawPoints(bitmapDC) + bitmapDC:SelectObject(wx.wxNullBitmap) -- release our bitmap + bitmapDC:Delete() -- ALWAYS Delete() any wxDCs created when done + end + function OnPaint(event) ! local dc = wx.wxPaintDC(panel) if redrawRequired then if isRunning then ! DrawBitmap(bitmap) end redrawRequired = false *************** *** 70,89 **** itemColour = itemColour + 1 ! if penColours[itemColour] == nil then itemColour = 1 end local points = { x = event:GetX(), y = event:GetY() } ! ! pointItem.n = 1 ! pointItem[1] = points ! table.insert(pointsList, pointItem) ! if (not frame:HasCapture()) then frame:CaptureMouse() end mouseDown = true isModified = true redrawRequired = true ! frame:Refresh() end --- 79,95 ---- itemColour = itemColour + 1 ! if penColours[itemColour] == nil then -- have colours wrap around itemColour = 1 end local points = { x = event:GetX(), y = event:GetY() } ! table.insert(pointItem, points) table.insert(pointsList, pointItem) ! if (not panel:HasCapture()) then panel:CaptureMouse() end mouseDown = true isModified = true redrawRequired = true ! panel:Refresh() end *************** *** 93,100 **** table.insert(pointsList[#pointsList], points) ! if (frame:HasCapture()) then frame:ReleaseMouse() end mouseDown = false redrawRequired = true ! frame:Refresh() end --- 99,106 ---- table.insert(pointsList[#pointsList], points) ! if panel:HasCapture() then panel:ReleaseMouse() end mouseDown = false redrawRequired = true ! panel:Refresh() end *************** *** 109,116 **** table.insert(pointsList[#pointsList], points) redrawRequired = true ! frame:Refresh() ! elseif (frame:HasCapture()) then ! frame:ReleaseMouse() mouseDown = false end --- 115,123 ---- table.insert(pointsList[#pointsList], points) + mouseDown = true redrawRequired = true ! panel:Refresh() ! elseif panel:HasCapture() then -- just in case we lost focus somehow ! panel:ReleaseMouse() mouseDown = false end *************** *** 120,127 **** local dialog = wx.wxMessageDialog( frame, "Document has changed. Do you wish to save the changes?", ! "Save Changes?", wx.wxYES_NO + wx.wxCANCEL + wx.wxCENTRE + wx.wxICON_QUESTION ) local result = dialog:ShowModal() dialog:Destroy() return result end --- 127,139 ---- local dialog = wx.wxMessageDialog( frame, "Document has changed. Do you wish to save the changes?", ! "wxLua Scribble Save Changes?", wx.wxYES_NO + wx.wxCANCEL + wx.wxCENTRE + wx.wxICON_QUESTION ) local result = dialog:ShowModal() dialog:Destroy() + + if result == wx.wxID_YES then + if not SaveChanges() then return wx.wxID_CANCEL end + end + return result end *************** *** 133,177 **** -- modified from the lua sample save.lua ! function savevar (n, v) if v ~= nil then ! io.write(n, "=") if type(v) == "string" then ! io.write(format("%q", v)) elseif type(v) == "table" then ! io.write("{}\n") for r,f in pairs(v) do if type(r) == 'string' then ! savevar(n.."."..r, f) else ! savevar(n.."["..r.."]", f) end end else ! io.write(tostring(v)) end ! io.write("\n") end end function SaveScribbles() ! io.output(fileName) ! savevar("pointsList", pointsList) ! io.output() ! return 1 end function Open() - local result = false local fileDialog = wx.wxFileDialog(frame, ! "Open file", "", "", "Scribble files(*.scribble)|*.scribble", ! wx.wxOPEN) if fileDialog:ShowModal() == wx.wxID_OK then fileName = fileDialog:GetPath() result = LoadScribbles() if result then ! frame:SetTitle("Scribble Demo - " .. fileName) end end --- 145,197 ---- -- modified from the lua sample save.lua ! function savevar(fh, n, v) if v ~= nil then ! fh:write(n, "=") if type(v) == "string" then ! fh:write(format("%q", v)) elseif type(v) == "table" then ! fh:write("{}\n") for r,f in pairs(v) do if type(r) == 'string' then ! savevar(fh, n.."."..r, f) else ! savevar(fh, n.."["..r.."]", f) end end else ! fh:write(tostring(v)) end ! fh:write("\n") end end function SaveScribbles() ! local fh, msg = io.open(fileName, "w+") ! if fh then ! savevar(fh, "pointsList", pointsList) ! fh:close() ! return true ! end ! ! wx.wxMessageBox("Unable to save file:'"..fileName.."'.\n"..msg, ! "wxLua Scribble Save error", ! wx.wxOK + wx.wxICON_ERROR, ! frame) ! return false end function Open() local fileDialog = wx.wxFileDialog(frame, ! "Open wxLua scribble file", "", "", "Scribble files(*.scribble)|*.scribble", ! wx.wxOPEN + wx.wxFILE_MUST_EXIST) ! local result = false if fileDialog:ShowModal() == wx.wxID_OK then fileName = fileDialog:GetPath() result = LoadScribbles() if result then ! frame:SetTitle("wxLua Scribble - " .. fileName) end end *************** *** 182,186 **** function SaveAs() local fileDialog = wx.wxFileDialog(frame, ! "Save file as", "", "", --- 202,206 ---- function SaveAs() local fileDialog = wx.wxFileDialog(frame, ! "Save wxLua scribble file as", "", "", *************** *** 192,196 **** result = SaveScribbles() if result then ! frame:SetTitle("Scribble Demo - " .. fileName) end end --- 212,216 ---- result = SaveScribbles() if result then ! frame:SetTitle("wxLua Scribble - " .. fileName) end end *************** *** 200,204 **** function SaveChanges() ! local isOKToContinue if fileName == "" then isOKToContinue = SaveAs() --- 220,224 ---- function SaveChanges() ! local isOKToContinue = false if fileName == "" then isOKToContinue = SaveAs() *************** *** 211,241 **** function main() ! ! for key, value in pairs(penColours) do ! table.insert(pens, wx.wxPenFromColourName(value, 3, wx.wxSOLID)) ! end ! ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "Scribble Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) ! frame:Connect(wx.wxEVT_PAINT, OnPaint) ! frame:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) ! frame:Connect(-1, wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! frame:Connect(-1, wx.wxEVT_LEFT_UP, OnLeftUp ) ! frame:Connect(-1, wx.wxEVT_MOTION, OnMotion ) local fileMenu = wx.wxMenu() ! fileMenu:Append( wx.wxID_NEW, "&New", "Begin a new drawing") ! fileMenu:Append( wx.wxID_OPEN, "&Open", "Open an existing drawing") ! fileMenu:Append( wx.wxID_SAVE, "&Save", "Save the drawing") ! fileMenu:Append( wx.wxID_SAVEAS, "Save &as", "Save the drawing to a new file") fileMenu:AppendSeparator() ! fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Minimal Application") local menuBar = wx.wxMenuBar() --- 231,260 ---- function main() ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua Scribble", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) ! panel = wx.wxPanel(frame, wx.wxID_ANY) ! ! panel:Connect(wx.wxEVT_PAINT, OnPaint) ! panel:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) -- do nothing ! panel:Connect(wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! panel:Connect(wx.wxEVT_LEFT_UP, OnLeftUp ) ! panel:Connect(wx.wxEVT_MOTION, OnMotion ) local fileMenu = wx.wxMenu() ! fileMenu:Append(wx.wxID_NEW, "&New", "Begin a new drawing") ! fileMenu:Append(wx.wxID_OPEN, "&Open...", "Open an existing drawing") fileMenu:AppendSeparator() ! fileMenu:Append(wx.wxID_SAVE, "&Save", "Save the drawing lines") ! fileMenu:Append(wx.wxID_SAVEAS, "Save &as...", "Save the drawing lines to a new file") ! fileMenu:Append(ID_SAVEBITMAP, "Save &bitmap...", "Save the drawing as a bitmap file") ! fileMenu:AppendSeparator() ! fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About...", "About the wxLua Minimal Application") local menuBar = wx.wxMenuBar() *************** *** 245,250 **** frame:SetMenuBar(menuBar) ! frame:CreateStatusBar(3) ! frame:SetStatusText("Welcome to wxLua.") frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, --- 264,271 ---- frame:SetMenuBar(menuBar) ! local statusBar = frame:CreateStatusBar(3) ! local status_width = statusBar:GetTextExtent("88888, 88888") ! frame:SetStatusWidths({ -1, status_width, status_width }) ! frame:SetStatusText("Welcome to wxLua Scribble.") frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, *************** *** 255,299 **** frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local isOKToContinue = 1 ! if isModified then ! local response = QuerySaveChanges() ! if response == wx.wxID_YES then ! isOKToContinue = SaveChanges() ! elseif response == wx.wxID_CANCEL then ! isOKToContinue = nil ! end ! end ! if isOKToContinue then ! fileName = "" ! frame:SetTitle( "Scribble Demo") ! pointsList = {} ! redrawRequired = true ! frame:Refresh() ! isModified = false end end ) frame:Connect(wx.wxID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local isOKToContinue = 1 ! if isModified then ! local response = QuerySaveChanges() ! if response == wx.wxID_YES then ! isOKToContinue = SaveChanges() ! elseif response == wx.wxID_CANCEL then ! isOKToContinue = nil ! end end ! if isOKToContinue then ! Open() ! redrawRequired = true ! frame:Refresh() isModified = false end end ) frame:Connect(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local isSaved if fileName == "" then isSaved = SaveAs() --- 276,307 ---- frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! if isModified and (QuerySaveChanges() == wx.wxID_CANCEL) then ! return end + + fileName = "" + frame:SetTitle( "wxLua Scribble") + pointsList = {} + redrawRequired = true + isModified = false + panel:Refresh() end ) frame:Connect(wx.wxID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! if isModified and (QuerySaveChanges() == wx.wxID_CANCEL) then ! return end ! ! if Open() then isModified = false end + redrawRequired = true + panel:Refresh() end ) frame:Connect(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local isSaved = false if fileName == "" then isSaved = SaveAs() *************** *** 308,316 **** frame:Connect(wx.wxID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local isSaved = SaveAs() ! if isSaved then isModified = false end end ) frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, --- 316,344 ---- frame:Connect(wx.wxID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! if SaveAs() then isModified = false end end ) + frame:Connect(ID_SAVEBITMAP, wx.wxEVT_COMMAND_MENU_SELECTED, + function (event) + local w, h = panel:GetClientSize() + local bmp = wx.wxEmptyBitmap(w, h) + DrawBitmap(bmp) + local img = bmp:ConvertToImage() + + local fileDialog = wx.wxFileDialog(frame, + "Save wxLua scribble file as", + "", + "", + "PNG (*.png)|*.png|PCX (*.pcx)|*.pcx|Bitmap (*.bmp)|*.bmp|Jpeg (*.jpg,*.jpeg)|*.jpg,*.jpeg|Tiff (*.tif,*.tiff)|*.tif,*.tiff", + wx.wxSAVE + wx.wxOVERWRITE_PROMPT) + if fileDialog:ShowModal() == wx.wxID_OK then + img:SaveFile(fileDialog:GetPath()) + end + + fileDialog:Destroy() + bmp:Delete() + img:Delete() + end ) frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, *************** *** 318,322 **** wx.wxMessageBox('This is the "About" dialog of the Scribble wxLua Sample.\n'.. wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, frame ) --- 346,350 ---- wx.wxMessageBox('This is the "About" dialog of the Scribble wxLua Sample.\n'.. wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "About wxLua Scribble", wx.wxOK + wx.wxICON_INFORMATION, frame ) *************** *** 325,329 **** frame:Connect(wx.wxEVT_CLOSE_WINDOW, function (event) ! local isOkToClose = 1 if isModified then local dialog = wx.wxMessageDialog( frame, --- 353,357 ---- frame:Connect(wx.wxEVT_CLOSE_WINDOW, function (event) ! local isOkToClose = true if isModified then local dialog = wx.wxMessageDialog( frame, Index: calculator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/calculator.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** calculator.wx.lua 20 Sep 2006 04:07:38 -0000 1.6 --- calculator.wx.lua 26 Sep 2006 22:22:00 -0000 1.7 *************** *** 45,78 **** -- --------------------------------------------------------------------------- - -- This is a little awkward, but it's how it's done in C++ too - bitmap = wx.wxBitmapFromXPMData(xpmdata) - icon = wx.wxDefaultIcon() - icon:CopyFromBitmap(bitmap) - - -- --------------------------------------------------------------------------- -- return the path part of the currently executing file ! function GetPath() ! ! function findLast(filePath) local lastOffset = nil ! local offset repeat ! offset = string.find(filePath, "\\") ! if offset == nil then ! offset = string.find(filePath, "/") ! end if offset then ! if not lastOffset then ! lastOffset = offset ! else ! lastOffset = lastOffset + offset ! end filePath = string.sub(filePath, offset + 1) end until not offset return lastOffset end local filePath = debug.getinfo(1, "S").source if string.byte(filePath) == string.byte('@') then local offset = findLast(filePath) --- 45,67 ---- -- --------------------------------------------------------------------------- -- return the path part of the currently executing file ! function GetExePath() ! local function findLast(filePath) -- find index of last / or \ in string local lastOffset = nil ! local offset = nil repeat ! offset = string.find(filePath, "\\") or string.find(filePath, "/") ! if offset then ! lastOffset = (lastOffset or 0) + offset filePath = string.sub(filePath, offset + 1) end until not offset + return lastOffset end local filePath = debug.getinfo(1, "S").source + if string.byte(filePath) == string.byte('@') then local offset = findLast(filePath) *************** *** 86,89 **** --- 75,79 ---- filePath = wx.wxGetCwd() end + return filePath end *************** *** 111,121 **** if string.len(displayString) < 12 then if numberId == ID_DECIMAL then ! -- If the first pressed char is "." then we want "0." ! if string.len(displayString) == 0 then ! displayString = displayString.."0." ! else ! displayString = displayString.."." end else local idTable = { [ID_0] = 0, [ID_1] = 1, [ID_2] = 2, [ID_3] = 3, [ID_4] = 4, [ID_5] = 5, [ID_6] = 6, [ID_7] = 7, --- 101,114 ---- if string.len(displayString) < 12 then if numberId == ID_DECIMAL then ! if not string.find(displayString, ".", 1, 1) then ! -- If the first pressed char is "." then we want "0." ! if string.len(displayString) == 0 then ! displayString = displayString.."0." ! else ! displayString = displayString.."." ! end end else + -- map button window ids to numeric values local idTable = { [ID_0] = 0, [ID_1] = 1, [ID_2] = 2, [ID_3] = 3, [ID_4] = 4, [ID_5] = 5, [ID_6] = 6, [ID_7] = 7, *************** *** 203,207 **** xmlResource = wx.wxXmlResourceGetDefault() xmlResource:InitAllHandlers() ! local xrcFilename = GetPath().."/calculator.xrc" -- try to load the resource and ask for path to it if not found --- 196,200 ---- xmlResource = wx.wxXmlResourceGetDefault() xmlResource:InitAllHandlers() ! local xrcFilename = GetExePath().."/calculator.xrc" -- try to load the resource and ask for path to it if not found *************** *** 234,238 **** --- 227,238 ---- end + -- ----------------------------------------------------------------------- + -- This is a little awkward, but it's how it's done in C++ too + bitmap = wx.wxBitmapFromXPMData(xpmdata) + icon = wx.wxDefaultIcon() + icon:CopyFromBitmap(bitmap) dialog:SetIcon(icon) + bitmap:Delete() + icon:Delete() bestSize = dialog:GetBestSize() |
|
From: John L. <jr...@us...> - 2006-09-26 05:06:00
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25542/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_bind.cpp Log Message: update stc bindings to 2.6.3 more editor cleanup Index: wxstc_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxstc_bind.cpp 19 Jul 2006 22:08:27 -0000 1.11 --- wxstc_bind.cpp 26 Sep 2006 05:05:55 -0000 1.12 *************** *** 32,35 **** --- 32,37 ---- #endif // !wxCHECK_VERSION(2,5,0) + { &wxEVT_STC_AUTOCOMP_SELECTION, "wxEVT_STC_AUTOCOMP_SELECTION", &s_wxluatag_wxStyledTextEvent }, + { &wxEVT_STC_CALLTIP_CLICK, "wxEVT_STC_CALLTIP_CLICK", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_CHANGE, "wxEVT_STC_CHANGE", &s_wxluatag_wxStyledTextEvent }, { &wxEVT_STC_CHARADDED, "wxEVT_STC_CHARADDED", &s_wxluatag_wxStyledTextEvent }, *************** *** 39,42 **** --- 41,46 ---- [...1018 lines suppressed...] + { "wxSTC_WRAPVISUALFLAG_START", wxSTC_WRAPVISUALFLAG_START }, + { "wxSTC_WRAP_CHAR", wxSTC_WRAP_CHAR }, { "wxSTC_WRAP_NONE", wxSTC_WRAP_NONE }, { "wxSTC_WRAP_WORD", wxSTC_WRAP_WORD }, *************** *** 659,662 **** --- 1348,1360 ---- { "wxSTC_WS_VISIBLEAFTERINDENT", wxSTC_WS_VISIBLEAFTERINDENT }, { "wxSTC_WS_VISIBLEALWAYS", wxSTC_WS_VISIBLEALWAYS }, + { "wxSTC_YAML_COMMENT", wxSTC_YAML_COMMENT }, + { "wxSTC_YAML_DEFAULT", wxSTC_YAML_DEFAULT }, + { "wxSTC_YAML_DOCUMENT", wxSTC_YAML_DOCUMENT }, + { "wxSTC_YAML_ERROR", wxSTC_YAML_ERROR }, + { "wxSTC_YAML_IDENTIFIER", wxSTC_YAML_IDENTIFIER }, + { "wxSTC_YAML_KEYWORD", wxSTC_YAML_KEYWORD }, + { "wxSTC_YAML_NUMBER", wxSTC_YAML_NUMBER }, + { "wxSTC_YAML_REFERENCE", wxSTC_YAML_REFERENCE }, + { "wxSTC_YAML_TEXT", wxSTC_YAML_TEXT }, #if wxCHECK_VERSION(2,5,0) Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** stc.cpp 9 Jun 2006 22:51:34 -0000 1.15 --- stc.cpp 26 Sep 2006 05:05:55 -0000 1.16 *************** *** 29,41 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) ! // int FormatRange(bool doDraw, int startPos, int endPos, wxDC *draw, wxDC *target, wxRect &renderRect, wxRect &pageRect) static int LUACALL wxLua_wxStyledTextCtrl_FormatRange(lua_State *L) { wxLuaState wxlState(L); int returns; ! // wxRect pageRect ! wxRect * pageRect = (wxRect *)wxlState.GetUserDataType(8, s_wxluatag_wxRect); ! // wxRect renderRect [...6821 lines suppressed...] { LuaGetProp, "Message", wxLua_wxStyledTextEvent_GetMessage, 0, 0, {0} }, { LuaSetProp, "Message", wxLua_wxStyledTextEvent_SetMessage, 1, 1, {0} }, { LuaGetProp, "WParam", wxLua_wxStyledTextEvent_GetWParam, 0, 0, {0} }, { LuaSetProp, "WParam", wxLua_wxStyledTextEvent_SetWParam, 1, 1, {0} }, { LuaGetProp, "LParam", wxLua_wxStyledTextEvent_GetLParam, 0, 0, {0} }, { LuaSetProp, "LParam", wxLua_wxStyledTextEvent_SetLParam, 1, 1, {0} }, { LuaGetProp, "ListType", wxLua_wxStyledTextEvent_GetListType, 0, 0, {0} }, { LuaSetProp, "ListType", wxLua_wxStyledTextEvent_SetListType, 1, 1, {0} }, { LuaGetProp, "X", wxLua_wxStyledTextEvent_GetX, 0, 0, {0} }, { LuaSetProp, "X", wxLua_wxStyledTextEvent_SetX, 1, 1, {0} }, { LuaGetProp, "Y", wxLua_wxStyledTextEvent_GetY, 0, 0, {0} }, { LuaSetProp, "Y", wxLua_wxStyledTextEvent_SetY, 1, 1, {0} }, { LuaGetProp, "DragText", wxLua_wxStyledTextEvent_GetDragText, 0, 0, {0} }, { LuaSetProp, "DragText", wxLua_wxStyledTextEvent_SetDragText, 1, 1, {0} }, { LuaGetProp, "DragAllowMove", wxLua_wxStyledTextEvent_GetDragAllowMove, 0, 0, {0} }, { LuaSetProp, "DragAllowMove", wxLua_wxStyledTextEvent_SetDragAllowMove, 1, 1, {0} }, { LuaGetProp, "Shift", wxLua_wxStyledTextEvent_GetShift, 0, 0, {0} }, { LuaGetProp, "Control", wxLua_wxStyledTextEvent_GetControl, 0, 0, {0} }, { LuaGetProp, "Alt", wxLua_wxStyledTextEvent_GetAlt, 0, 0, {0} }, { LuaDelete, "wxStyledTextEvent", wxLua_wxStyledTextEvent_destructor, 0, 0, {0} }, |
|
From: John L. <jr...@us...> - 2006-09-26 05:05:59
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25542/wxLua/bindings/wxstc Modified Files: override.hpp stc.i wxstc_datatypes.lua Log Message: update stc bindings to 2.6.3 more editor cleanup Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** stc.i 19 Jul 2006 22:08:27 -0000 1.5 --- stc.i 26 Sep 2006 05:05:55 -0000 1.6 *************** *** 7,18 **** ///////////////////////////////////////////////////////////////////////////// %include "wx/stc/stc.h" %define wxSTC_INVALID_POSITION %define wxSTC_START %define wxSTC_OPTIONAL_START %define wxSTC_LEXER_START - %define wxSTC_CMD_REDO - %define wxSTC_CMD_SELECTALL [...3649 lines suppressed...] + %property=Text, read, write + %property=Length, read, write + %property=LinesAdded, read, write + %property=Line, read, write + %property=FoldLevelNow, read, write + %property=FoldLevelPrev, read, write + %property=Margin, read, write + %property=Message, read, write + %property=WParam, read, write + %property=LParam, read, write + %property=ListType, read, write + %property=X, read, write + %property=Y, read, write + %property=DragText, read, write + %property=DragAllowMove, read, write + %property=DragResult, read, write + %property=Shift, read + %property=Control, read %property=Alt, read %endclass Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** override.hpp 23 Apr 2006 19:36:49 -0000 1.4 --- override.hpp 26 Sep 2006 05:05:55 -0000 1.5 *************** *** 57,92 **** } %end - - - %override wxLua_wxStyledTextEvent_GetDragResult - // wxDragResult GetDragResult() - static int LUACALL wxLua_wxStyledTextEvent_GetDragResult(lua_State *L) - { - wxLuaState wxlState(L); - wxDragResult returns; - // get this - wxStyledTextEvent *self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); - // call GetDragResult - returns = self->GetDragResult(); - // push the result datatype - lua_pushnumber(L, (long) returns); - // return the number of parameters - return 1; - } - %end - - %override wxLua_wxStyledTextEvent_SetDragResult - // void SetDragResult(wxDragResult val) - static int LUACALL wxLua_wxStyledTextEvent_SetDragResult(lua_State *L) - { - wxLuaState wxlState(L); - // wxDragResult val - wxDragResult val = (wxDragResult)(int)lua_tonumber(L, 2); - // get this - wxStyledTextEvent *self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); - // call SetDragResult - self->SetDragResult(val); - // return the number of parameters - return 0; - } - %end --- 57,58 ---- Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxstc_datatypes.lua 26 May 2006 20:22:08 -0000 1.30 --- wxstc_datatypes.lua 26 Sep 2006 05:05:55 -0000 1.31 *************** *** 1484,1487 **** --- 1484,1499 ---- Name = "wxHtmlWindow", }, + wxHtmlWindowInterface = { + Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)", + DefType = "class", + Intrinsic = false, + Name = "wxHtmlWindowInterface", + }, + ["wxHtmlWindowInterface::HTMLCursor"] = { + Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)", + DefType = "enum", + Intrinsic = true, + Name = "wxHtmlWindowInterface::HTMLCursor", + }, wxICOHandler = { BaseClass = "wxBMPHandler", |
|
From: John L. <jr...@us...> - 2006-09-26 05:05:59
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25542/wxLua/samples Modified Files: editor.wx.lua Log Message: update stc bindings to 2.6.3 more editor cleanup Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** editor.wx.lua 25 Sep 2006 22:24:46 -0000 1.25 --- editor.wx.lua 26 Sep 2006 05:05:55 -0000 1.26 *************** *** 56,60 **** local ID_ABOUT = wx.wxID_ABOUT -- Watch window menu items ! local ID_WATCH_WINDOW = NewID() local ID_ADDWATCH = NewID() local ID_EDITWATCH = NewID() --- 56,60 ---- local ID_ABOUT = wx.wxID_ABOUT -- Watch window menu items ! local ID_WATCH_LISTCTRL = NewID() local ID_ADDWATCH = NewID() local ID_EDITWATCH = NewID() *************** *** 621,625 **** watchWindow:SetMenuBar(watchMenuBar) ! watchListCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_WINDOW, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS) --- 621,625 ---- watchWindow:SetMenuBar(watchMenuBar) ! watchListCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_LISTCTRL, wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS) *************** *** 666,673 **** watchListCtrl:EditLabel(row) end) - watchWindow:Connect(ID_ADDWATCH, wx.wxEVT_UPDATE_UI, - function (event) - event:Enable(true) - end) watchWindow:Connect(ID_EDITWATCH, wx.wxEVT_COMMAND_MENU_SELECTED, --- 666,669 ---- *************** *** 695,706 **** end) - watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_UPDATE_UI, - function (event) - event:Enable(watchListCtrl:GetItemCount() > 0) - end) watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ProcessWatches() end) watchListCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT, --- 691,702 ---- end) watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ProcessWatches() end) + watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_UPDATE_UI, + function (event) + event:Enable(watchListCtrl:GetItemCount() > 0) + end) watchListCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT, *************** *** 774,778 **** editor:MarkerDeleteAll(BREAKPOINT_MARKER) editor:MarkerDeleteAll(CURRENT_LINE_MARKER) ! editor:InsertText(0, st) SetupKeywords(editor, IsLuaFile(filePath)) editor:EmptyUndoBuffer() --- 770,774 ---- editor:MarkerDeleteAll(BREAKPOINT_MARKER) editor:MarkerDeleteAll(CURRENT_LINE_MARKER) ! editor:AppendText(st) SetupKeywords(editor, IsLuaFile(filePath)) editor:EmptyUndoBuffer() |
|
From: John L. <jr...@us...> - 2006-09-26 05:05:59
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25542/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: update stc bindings to 2.6.3 more editor cleanup Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** editor.h 25 Sep 2006 22:24:46 -0000 1.20 --- editor.h 26 Sep 2006 05:05:55 -0000 1.21 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 72568; ! const unsigned char wxLuaEditor[72569] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 72429; ! const unsigned char wxLuaEditor[72430] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 68,72 **** 108,111, 99, 97,108, 32, 73, 68, 95, 65, 66, 79, 85, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 73, 68, 95, 65, 66, 79, 85, 84, 10, 45, 45, 32, 87, 97,116, 99,104, 32,119,105,110,100,111,119, 32,109,101,110,117, 32,105,116,101,109,115, 10, ! 108,111, 99, 97,108, 32, 73, 68, 95, 87, 65, 84, 67, 72, 95, 87, 73, 78, 68, 79, 87, 32, 32, 32, 32, 32, 61, 32, 78,101,119, 73, 68, 40, 41, 10, 108,111, 99, 97,108, 32, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32, 78,101,119, 73, 68, 40, 41, 10, 108,111, 99, 97,108, 32, 73, 68, 95, 69, 68, 73, 84, 87, 65, 84, 67, 72, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32, 78,101,119, 73, 68, 40, 41, 10, --- 68,72 ---- 108,111, 99, 97,108, 32, 73, 68, 95, 65, 66, 79, 85, 84, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 73, 68, 95, 65, 66, 79, 85, 84, 10, 45, 45, 32, 87, 97,116, 99,104, 32,119,105,110,100,111,119, 32,109,101,110,117, 32,105,116,101,109,115, 10, ! 108,111, 99, 97,108, 32, 73, 68, 95, 87, 65, 84, 67, 72, 95, 76, 73, 83, 84, 67, 84, 82, 76, 32, 32, 32, 61, 32, 78,101,119, 73, 68, 40, 41, 10, 108,111, 99, 97,108, 32, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32, 78,101,119, 73, 68, 40, 41, 10, 108,111, 99, 97,108, 32, 73, 68, 95, 69, 68, 73, 84, 87, 65, 84, 67, 72, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32, 78,101,119, 73, 68, 40, 41, 10, *************** *** 633,637 **** 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 83,101,116, 77,101,110,117, 66, 97,114, 40,119, 97,116, 99,104, 77,101,110,117, 66, 97,114, 41, 10, 10, ! 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32, 61, 32,119,120, 46,119,120, 76,105,115,116, 67,116,114,108, 40,119, 97,116, 99,104, 87,105,110,100,111,119, 44, 32, 73, 68, 95, 87, 65, 84, 67, 72, 95, 87, 73, 78, 68, 79, 87, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 68,101,102, 97,117,108,116, 80,111,115,105,116,105,111,110, 44, 32,119,120, 46,119,120, 68,101,102, 97,117,108,116, 83,105,122,101, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 76, 67, 95, 82, 69, 80, 79, 82, 84, 32, 43, 32,119,120, 46,119,120, 76, 67, 95, 69, 68, 73, 84, 95, 76, 65, 66, 69, 76, 83, 41, 10, --- 633,637 ---- 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 83,101,116, 77,101,110,117, 66, 97,114, 40,119, 97,116, 99,104, 77,101,110,117, 66, 97,114, 41, 10, 10, ! 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32, 61, 32,119,120, 46,119,120, 76,105,115,116, 67,116,114,108, 40,119, 97,116, 99,104, 87,105,110,100,111,119, 44, 32, 73, 68, 95, 87, 65, 84, 67, 72, 95, 76, 73, 83, 84, 67, 84, 82, 76, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 68,101,102, 97,117,108,116, 80,111,115,105,116,105,111,110, 44, 32,119,120, 46,119,120, 68,101,102, 97,117,108,116, 83,105,122,101, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 76, 67, 95, 82, 69, 80, 79, 82, 84, 32, 43, 32,119,120, 46,119,120, 76, 67, 95, 69, 68, 73, 84, 95, 76, 65, 66, 69, 76, 83, 41, 10, *************** *** 678,685 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 69,100,105,116, 76, 97, 98,101,108, 40,114,111,119, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, - 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,116,114,117,101, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 69, 68, 73, 84, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, --- 678,681 ---- *************** *** 707,718 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, - 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 69, 86, 65, 76, 85, 65, 84, 69, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 71,101,116, 73,116,101,109, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 69, 86, 65, 76, 85, 65, 84, 69, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 80,114,111, 99,101,115,115, 87, 97,116, 99,104,101,115, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 76, 73, 83, 84, 95, 69, 78, 68, 95, 76, 65, 66, 69, 76, 95, 69, 68, 73, 84, 44, 10, --- 703,714 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 69, 86, 65, 76, 85, 65, 84, 69, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 80,114,111, 99,101,115,115, 87, 97,116, 99,104,101,115, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, + 32, 32, 32, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 69, 86, 65, 76, 85, 65, 84, 69, 87, 65, 84, 67, 72, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 71,101,116, 73,116,101,109, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 41, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, 32, 32, 32, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 76, 73, 83, 84, 95, 69, 78, 68, 95, 76, 65, 66, 69, 76, 95, 69, 68, 73, 84, 44, 10, *************** *** 786,790 **** 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,108,101,116,101, 65,108,108, 40, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,108,101,116,101, 65,108,108, 40, 67, 85, 82, 82, 69, 78, 84, 95, 76, 73, 78, 69, 95, 77, 65, 82, 75, 69, 82, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 73,110,115,101,114,116, 84,101,120,116, 40, 48, 44, 32,115,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 73,115, 76,117, 97, 70,105,108,101, 40,102,105,108,101, 80, 97,116,104, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 69,109,112,116,121, 85,110,100,111, 66,117,102,102,101,114, 40, 41, 10, --- 782,786 ---- 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,108,101,116,101, 65,108,108, 40, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,108,101,116,101, 65,108,108, 40, 67, 85, 82, 82, 69, 78, 84, 95, 76, 73, 78, 69, 95, 77, 65, 82, 75, 69, 82, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 65,112,112,101,110,100, 84,101,120,116, 40,115,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 73,115, 76,117, 97, 70,105,108,101, 40,102,105,108,101, 80, 97,116,104, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 69,109,112,116,121, 85,110,100,111, 66,117,102,102,101,114, 40, 41, 10, |
|
From: John L. <jr...@us...> - 2006-09-25 22:24:50
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1920/wxLua/samples Modified Files: editor.wx.lua Log Message: more cleanup in editor, fix debugger exit socket error add more process debugging to socket code Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** editor.wx.lua 25 Sep 2006 19:22:27 -0000 1.24 --- editor.wx.lua 25 Sep 2006 22:24:46 -0000 1.25 *************** *** 306,310 **** if filePath and (string.len(filePath) > 0) and oldModTime and oldModTime:IsValid() then local modTime = GetFileModTime(filePath) ! if modTime:IsValid() and oldModTime:IsEarlierThan(modTime) then local ret = wx.wxMessageBox(fileName.." has been modified on disk. Do you want to reload it?", "wxLua Message", --- 306,310 ---- if filePath and (string.len(filePath) > 0) and oldModTime and oldModTime:IsValid() then local modTime = GetFileModTime(filePath) ! if modTime and modTime:IsValid() and oldModTime:IsEarlierThan(modTime) then local ret = wx.wxMessageBox(fileName.." has been modified on disk. Do you want to reload it?", "wxLua Message", *************** *** 355,359 **** editor:StyleSetFont(1, fontItalic) --editor:StyleSetUnderline(1, false) ! editor:StyleSetForeground(2, wx.wxColour(0, 127, 0)) -- Line Comment editor:StyleSetFont(2, fontItalic) -- Doc. Comment --editor:StyleSetUnderline(2, false) --- 355,359 ---- editor:StyleSetFont(1, fontItalic) --editor:StyleSetUnderline(1, false) ! editor:StyleSetForeground(2, wx.wxColour(0, 127, 0)) -- Line Comment editor:StyleSetFont(2, fontItalic) -- Doc. Comment --editor:StyleSetUnderline(2, false) *************** *** 398,404 **** editor:StyleSetForeground(32, wx.wxColour(224, 192, 224)) -- Line number editor:StyleSetBackground(33, wx.wxColour(192, 192, 192)) -- Brace highlight ! editor:StyleSetForeground(34, wx.wxColour(0, 0, 255)) editor:StyleSetBold(34, true) -- Brace incomplete highlight ! editor:StyleSetForeground(35, wx.wxColour(255, 0, 0)) editor:StyleSetBold(35, true) -- Indentation guides editor:StyleSetForeground(37, wx.wxColour(192, 192, 192)) --- 398,404 ---- editor:StyleSetForeground(32, wx.wxColour(224, 192, 224)) -- Line number editor:StyleSetBackground(33, wx.wxColour(192, 192, 192)) -- Brace highlight ! editor:StyleSetForeground(34, wx.wxColour(0, 0, 255)) editor:StyleSetBold(34, true) -- Brace incomplete highlight ! editor:StyleSetForeground(35, wx.wxColour(255, 0, 0)) editor:StyleSetBold(35, true) -- Indentation guides editor:StyleSetForeground(37, wx.wxColour(192, 192, 192)) *************** *** 433,448 **** local ch = event:GetKey() if (ch == char_CR) or (ch == char_LF) then ! local lineNum = editor:LineFromPosition(editor:GetCurrentPos()) ! local lineLength = editor:LineLength(lineNum) ! if (lineNum > 0) and (lineLength <= 2) then ! lineNum = lineNum - 1 ! local lineLength = editor:LineLength(lineNum) ! local prevLine = editor:GetLine(lineNum) ! for lineOffset = 1, lineLength do ! ch = string.byte(prevLine, lineOffset) ! if (ch ~= char_Sp) and (ch ~= char_Tab) then ! editor:ReplaceSelection(string.sub(prevLine, 1, lineOffset - 1)) ! break ! end end end --- 433,444 ---- local ch = event:GetKey() if (ch == char_CR) or (ch == char_LF) then ! local pos = editor:GetCurrentPos() ! local line = editor:LineFromPosition(pos) ! ! if (line > 0) and (editor:LineLength(line) == 0) then ! local indent = editor:GetLineIndentation(line - 1) ! if indent > 0 then ! editor:SetLineIndentation(line, indent) ! editor:GotoPos(pos + indent) end end *************** *** 474,478 **** editor:Connect(wx.wxEVT_STC_SAVEPOINTREACHED, function (event) ! SetDocumentModified(editor:GetId(), nil, false) end) --- 470,474 ---- editor:Connect(wx.wxEVT_STC_SAVEPOINTREACHED, function (event) ! SetDocumentModified(editor:GetId(), false, false) end) *************** *** 490,499 **** local id = editor:GetId() local document = {} - document.isModified = nil - document.fileName = nil - document.filePath = nil document.editor = editor document.index = notebook:GetSelection() document.modTime = nil openDocuments[id] = document end --- 486,495 ---- local id = editor:GetId() local document = {} document.editor = editor document.index = notebook:GetSelection() + document.fileName = nil + document.filePath = nil document.modTime = nil + document.isModified = nil openDocuments[id] = document end *************** *** 503,507 **** function IsLuaFile(filePath) ! return string.lower(string.sub(filePath, -4)) == ".lua" end --- 499,503 ---- function IsLuaFile(filePath) ! return (string.len(filePath) > 4) and (string.lower(string.sub(filePath, -4)) == ".lua") end *************** *** 593,608 **** -- Create the watch window - function FindSelectedWatchItem() - local count = watchListCtrl:GetSelectedItemCount() - if count > 0 then - for idx = 0, watchListCtrl:GetItemCount() - 1 do - if watchListCtrl:GetItemState(idx, wx.wxLIST_STATE_FOCUSED) ~= 0 then - return idx - end - end - end - return -1 - end - function ProcessWatches() if watchListCtrl and debugServer then --- 589,592 ---- *************** *** 623,627 **** function CreateWatchWindow() ! watchWindow = wx.wxFrame( frame, wx.wxID_ANY, "wxLua Watch Window", wx.wxDefaultPosition, wx.wxSize(190, 160)) local watchMenu = wx.wxCreateMenu{ --- 607,613 ---- function CreateWatchWindow() ! local width = 180 ! watchWindow = wx.wxFrame(frame, wx.wxID_ANY, "wxLua Watch Window", ! wx.wxDefaultPosition, wx.wxSize(width, 160)) local watchMenu = wx.wxCreateMenu{ *************** *** 630,653 **** { ID_REMOVEWATCH, "&Remove Watch" }, { ID_EVALUATEWATCH, "Evaluate &Watches" }} - local watchMenuBar = wx.wxMenuBar() watchMenuBar:Append(watchMenu, "&Watches") watchWindow:SetMenuBar(watchMenuBar) - local x, y = watchWindow:GetClientSize() watchListCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_WINDOW, ! wx.wxPoint(0, 0), wx.wxSize(x, y), wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS) - x, y = watchListCtrl:GetClientSize() - local info = wx.wxListItem() info:SetMask(wx.wxLIST_MASK_TEXT + wx.wxLIST_MASK_WIDTH) info:SetText("Expression") ! info:SetWidth(x / 2) watchListCtrl:InsertColumn(0, info) info:SetText("Value") ! info:SetWidth(x / 2) watchListCtrl:InsertColumn(1, info) --- 616,636 ---- { ID_REMOVEWATCH, "&Remove Watch" }, { ID_EVALUATEWATCH, "Evaluate &Watches" }} + local watchMenuBar = wx.wxMenuBar() watchMenuBar:Append(watchMenu, "&Watches") watchWindow:SetMenuBar(watchMenuBar) watchListCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_WINDOW, ! wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS) local info = wx.wxListItem() info:SetMask(wx.wxLIST_MASK_TEXT + wx.wxLIST_MASK_WIDTH) info:SetText("Expression") ! info:SetWidth(width / 2) watchListCtrl:InsertColumn(0, info) info:SetText("Value") ! info:SetWidth(width / 2) watchListCtrl:InsertColumn(1, info) *************** *** 656,671 **** watchWindow:Show(true) watchWindow:Connect( wx.wxEVT_CLOSE_WINDOW, function (event) ConfigSaveFramePosition(watchWindow, "WatchWindow") - event:Skip() watchWindow = nil watchListCtrl = nil - end) - - watchWindow:Connect( wx.wxEVT_SIZE, - function (event) - local x, y = watchWindow:GetClientSize() - watchListCtrl:SetSize(x, y) event:Skip() end) --- 639,659 ---- watchWindow:Show(true) + local function FindSelectedWatchItem() + local count = watchListCtrl:GetSelectedItemCount() + if count > 0 then + for idx = 0, watchListCtrl:GetItemCount() - 1 do + if watchListCtrl:GetItemState(idx, wx.wxLIST_STATE_FOCUSED) ~= 0 then + return idx + end + end + end + return -1 + end + watchWindow:Connect( wx.wxEVT_CLOSE_WINDOW, function (event) ConfigSaveFramePosition(watchWindow, "WatchWindow") watchWindow = nil watchListCtrl = nil event:Skip() end) *************** *** 731,735 **** function UpdateUIMenuItems() if frame and frame:GetMenuBar() then ! for n = 0, frame:GetMenuBar():GetMenuCount() do frame:GetMenuBar():GetMenu(n):UpdateUI() end --- 719,723 ---- function UpdateUIMenuItems() if frame and frame:GetMenuBar() then ! for n = 0, frame:GetMenuBar():GetMenuCount()-1 do frame:GetMenuBar():GetMenu(n):UpdateUI() end *************** *** 751,755 **** function NewFile(event) local editor = CreateEditor("Untitled") ! SetupKeywords(editor, 1) end --- 739,743 ---- function NewFile(event) local editor = CreateEditor("Untitled") ! SetupKeywords(editor, true) end *************** *** 760,765 **** local editor = nil for id, document in pairs(openDocuments) do ! local filePath = document.filePath ! if (not document.isModified) and (not filePath) and not (document.editor:GetReadOnly() == true) then editor = document.editor --- 748,753 ---- local editor = nil for id, document in pairs(openDocuments) do ! if (document.editor:GetLength() == 0) and ! (not document.isModified) and (not document.filePath) and not (document.editor:GetReadOnly() == true) then editor = document.editor *************** *** 792,796 **** openDocuments[id].filePath = filePath openDocuments[id].fileName = fileName ! SetDocumentModified(id, nil, true) result = editor end --- 780,784 ---- openDocuments[id].filePath = filePath openDocuments[id].fileName = fileName ! SetDocumentModified(id, false, true) result = editor end *************** *** 822,826 **** handle:close() editor:EmptyUndoBuffer() ! SetDocumentModified(editor:GetId(), nil, true) return true end --- 810,814 ---- handle:close() editor:EmptyUndoBuffer() ! SetDocumentModified(editor:GetId(), false, true) return true end *************** *** 902,906 **** SaveFileAs(editor) elseif SaveFile(editor, filePath) then ! SetDocumentModified(editor:GetId(), nil, false) end end --- 890,894 ---- SaveFileAs(editor) elseif SaveFile(editor, filePath) then ! SetDocumentModified(editor:GetId(), false, false) end end *************** *** 1562,1565 **** --- 1550,1554 ---- if debugServer then debugServer:Reset() + wx.wxMilliSleep(500) -- allow client to exit cleanly debugServer:Delete() debugServer = nil *************** *** 1954,1962 **** else local editor = CreateEditor("Untitled") ! SetupKeywords(editor, 1) end else local editor = CreateEditor("Untitled") ! SetupKeywords(editor, 1) end --- 1943,1951 ---- else local editor = CreateEditor("Untitled") ! SetupKeywords(editor, true) end else local editor = CreateEditor("Untitled") ! SetupKeywords(editor, true) end |
|
From: John L. <jr...@us...> - 2006-09-25 22:24:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1920/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp wxldtarg.cpp wxlsock.cpp Log Message: more cleanup in editor, fix debugger exit socket error add more process debugging to socket code Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxldtarg.cpp 18 Sep 2006 18:18:54 -0000 1.22 --- wxldtarg.cpp 25 Sep 2006 22:24:46 -0000 1.23 *************** *** 65,68 **** --- 65,70 ---- m_pThread(NULL) { + m_clientSocket.m_name = wxString::Format(wxT("wxLuaDebugTarget::m_clientSocket (%ld)"), (long)wxGetProcessId()); + lua_State* L = m_wxlState.GetLuaState(); lua_pushlightuserdata(L, this); Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxldserv.cpp 15 Sep 2006 00:10:56 -0000 1.20 --- wxldserv.cpp 25 Sep 2006 22:24:46 -0000 1.21 *************** *** 677,680 **** --- 677,682 ---- if (m_serverSocket != NULL) { + m_serverSocket->m_name = wxString::Format(wxT("wxLuaDebuggerServer::m_serverSocket (%ld)"), (long)wxGetProcessId()); + try { *************** *** 759,762 **** --- 761,766 ---- { wxLuaSocket closeSocket; + closeSocket.m_name = wxString::Format(wxT("wxLuaDebuggerServer closeSocket (%ld)"), (long)wxGetProcessId()); + #ifdef __WXMSW__ closeSocket.Connect(GetNetworkName(), *************** *** 805,808 **** --- 809,814 ---- if (m_acceptedSocket != NULL) { + m_acceptedSocket->m_name = wxString::Format(wxT("wxLuaDebuggerServer::m_acceptedSocket (%ld)"), (long)wxGetProcessId()); + wxLuaSocket *serverSocket = m_serverSocket; m_serverSocket = NULL; Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlsock.cpp 15 Sep 2006 00:10:56 -0000 1.13 --- wxlsock.cpp 25 Sep 2006 22:24:46 -0000 1.14 *************** *** 88,92 **** void wxLuaSocketDebugMsg(const wxString& title, const wxString& msg) { ! wxSafeShowMessage(title, wxString::Format(wxT("PID %d TIME %s "), getpid(), wxT(__TIME__)) + msg); } #else --- 88,92 ---- void wxLuaSocketDebugMsg(const wxString& title, const wxString& msg) { ! wxSafeShowMessage(title, wxString::Format(wxT("PID %ld TIME %s "), (long)wxGetProcessId(), wxT(__TIME__)) + msg); } #else *************** *** 102,106 **** unsigned char value = 0; bool ok = Read((char *) &value, sizeof(unsigned char)) == sizeof(unsigned char); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::ReadByte"), wxString::Format(wxT("ok %d val %d "), (int)ok, (int)value) + wxLuaSocketCmdEventMsg(value)); if (ok) value_ = value; return ok; --- 102,106 ---- unsigned char value = 0; bool ok = Read((char *) &value, sizeof(unsigned char)) == sizeof(unsigned char); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadByte"), wxString::Format(wxT("ok %d val %d "), (int)ok, (int)value) + wxLuaSocketCmdEventMsg(value)); if (ok) value_ = value; return ok; *************** *** 111,115 **** wxInt32 value = 0; bool ok = Read((char *) &value, sizeof(wxInt32)) == sizeof(wxInt32); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::ReadInt32"), wxString::Format(wxT("ok %d val %d"), (int)ok, value)); if (ok) value_ = value; return ok; --- 111,115 ---- wxInt32 value = 0; bool ok = Read((char *) &value, sizeof(wxInt32)) == sizeof(wxInt32); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadInt32"), wxString::Format(wxT("ok %d val %d"), (int)ok, value)); if (ok) value_ = value; return ok; *************** *** 120,124 **** wxUint32 value = 0; bool ok = Read((char *) &value, sizeof(wxUint32)) == sizeof(wxUint32); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::ReadUInt32"), wxString::Format(wxT("ok %d val %u"), (int)ok, value)); if (ok) value_ = value; return value; --- 120,124 ---- wxUint32 value = 0; bool ok = Read((char *) &value, sizeof(wxUint32)) == sizeof(wxUint32); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadUInt32"), wxString::Format(wxT("ok %d val %u"), (int)ok, value)); if (ok) value_ = value; return value; *************** *** 132,136 **** bool ok = Read(buf, 64) == 64; if (ok) ok = lua2wx(buf).ToLong(&value); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::ReadLong"), wxString::Format(wxT("ok %d val %ld '%s'"), (int)ok, value, lua2wx(buf).c_str())); if (ok) value_ = value; return ok; --- 132,136 ---- bool ok = Read(buf, 64) == 64; if (ok) ok = lua2wx(buf).ToLong(&value); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadLong"), wxString::Format(wxT("ok %d val %ld '%s'"), (int)ok, value, lua2wx(buf).c_str())); if (ok) value_ = value; return ok; *************** *** 153,157 **** } ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::ReadString"), wxString::Format(wxT("ok %d len %u val '%s'"), (int)ok, length, value_.c_str())); if (ok) value_ = value; --- 153,157 ---- } ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadString"), wxString::Format(wxT("ok %d len %u val '%s'"), (int)ok, length, value.c_str())); if (ok) value_ = value; *************** *** 169,173 **** ok = ReadInt32(idxMax); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::ReadDebugData"), wxString::Format(wxT("items %d"), idxMax)); for (idx = 0; ok && (idx < idxMax); ++idx) --- 169,173 ---- ok = ReadInt32(idxMax); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadDebugData"), wxString::Format(wxT("items %d"), idxMax)); for (idx = 0; ok && (idx < idxMax); ++idx) *************** *** 221,240 **** bool wxLuaSocketBase::WriteByte(char value) { ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::WriteByte"), wxString::Format(wxT("val %d "), (int)value) + wxLuaSocketCmdEventMsg(value)); return Write((const char*)&value, sizeof(char)); } bool wxLuaSocketBase::WriteInt32(wxInt32 value) { ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::WriteInt32"), wxString::Format(wxT("val %d"), value)); return Write((const char*)&value, sizeof(wxInt32)); } bool wxLuaSocketBase::WriteUInt32(wxUint32 value) { ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::WriteUInt32"), wxString::Format(wxT("val %u"), value)); return Write((const char*)&value, sizeof(wxUint32)); } bool wxLuaSocketBase::WriteLong(long value) { ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::WriteLong"), wxString::Format(wxT("val %ld"), value)); // make sure that long really works for 32 and 64 bit platforms, use a string char buf[65] = { 0 }; memset(buf, 0, 65); --- 221,240 ---- bool wxLuaSocketBase::WriteByte(char value) { ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteByte"), wxString::Format(wxT("val %d "), (int)value) + wxLuaSocketCmdEventMsg(value)); return Write((const char*)&value, sizeof(char)); } bool wxLuaSocketBase::WriteInt32(wxInt32 value) { ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteInt32"), wxString::Format(wxT("val %d"), value)); return Write((const char*)&value, sizeof(wxInt32)); } bool wxLuaSocketBase::WriteUInt32(wxUint32 value) { ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteUInt32"), wxString::Format(wxT("val %u"), value)); return Write((const char*)&value, sizeof(wxUint32)); } bool wxLuaSocketBase::WriteLong(long value) { ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteLong"), wxString::Format(wxT("val %ld"), value)); // make sure that long really works for 32 and 64 bit platforms, use a string char buf[65] = { 0 }; memset(buf, 0, 65); *************** *** 248,252 **** wxUint32 buflen = (wxUint32)buf.Length(); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::WriteString"), wxString::Format(wxT("len %u val '%s'"), buflen, value.c_str())); try --- 248,252 ---- wxUint32 buflen = (wxUint32)buf.Length(); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteString"), wxString::Format(wxT("len %u val '%s'"), buflen, value.c_str())); try *************** *** 272,276 **** wxInt32 idx, idxMax = debugData.GetCount(); ! wxLuaSocketDebugMsg(wxT("wxLuaSocketBase::WriteDebugData"), wxString::Format(wxT("items %d"), idxMax)); WriteInt32(idxMax); --- 272,276 ---- wxInt32 idx, idxMax = debugData.GetCount(); ! wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteDebugData"), wxString::Format(wxT("items %d"), idxMax)); WriteInt32(idxMax); |
|
From: John L. <jr...@us...> - 2006-09-25 22:24:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1920/wxLua/modules/wxluasocket/include Modified Files: wxlsock.h Log Message: more cleanup in editor, fix debugger exit socket error add more process debugging to socket code Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlsock.h 15 Sep 2006 00:10:56 -0000 1.12 --- wxlsock.h 25 Sep 2006 22:24:46 -0000 1.13 *************** *** 76,79 **** --- 76,81 ---- bool WriteString(const wxString &value); bool WriteDebugData(const wxLuaDebugData& debugData); + + wxString m_name; // a name for the socket, for debugging }; |
|
From: John L. <jr...@us...> - 2006-09-25 22:24:49
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1920/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: more cleanup in editor, fix debugger exit socket error add more process debugging to socket code Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** editor.h 22 Sep 2006 22:29:21 -0000 1.19 --- editor.h 25 Sep 2006 22:24:46 -0000 1.20 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 72886; ! const unsigned char wxLuaEditor[72887] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 72568; ! const unsigned char wxLuaEditor[72569] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 91,102 **** 102, 72, 97,118,101, 70,111,117,110,100, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,115,116,114,105,110,103, 32,104, 97,115, 32, 98,101,101,110, 32,102,111,117,110,100, 10, 101,100,105,116,111,114, 65,112,112, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 10, 100,101, 98,117,103, 83,101,114,118,101,114, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 76,117, 97, 68,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32,111, 98,106,101, 99,116, 32,119,104,101,110, 32,100,101, 98,117,103,103,105,110,103, 10, 102, 73,115, 82,117,110,110,105,110,103, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,116,104,101, 32,100,101, 98,117,103,103,101,101, 32,105,115, 32,114,117,110,110,105,110,103, 10, 102, 73,115, 67,111,110,110,101, 99,116,101,100, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32, 97, 32, 99,108,105,101,110,116, 32,104, 97,115, 32, 99,111,110,110,101, 99,116,101,100, 10, 112,111,114,116, 78,117,109, 98,101,114, 32, 32, 32, 32, 32, 32, 32, 61, 32, 49, 53, 53, 49, 32, 32, 32, 45, 45, 32,116,104,101, 32,112,111,114,116, 32, 35, 32,116,111, 32,117,115,101, 32,102,111,114, 32,100,101, 98,117,103,103,105,110,103, 10, 119, 97,116, 99,104, 87,105,110,100,111,119, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,104,101, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 10, 119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,104,101, 32, 99,104,105,108,100, 32,108,105,115,116, 99,116,114,108, 32,105,110, 32,116,104,101, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 10, ! 110,111,116,101, 98,111,111,107, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,104,101, 32,110,111,116,101, 98,111,111,107, 32,111,102, 32,101,100,105,116,111,114,115, 10, ! 101,114,114,111,114, 76,111,103, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,104,101, 32,108,111,103, 32,119,105,110,100,111,119, 32,102,111,114, 32,101,114,114,111,114,115, 10, 111,112,101,110, 68,111, 99,117,109,101,110,116,115, 32, 32, 32, 32, 61, 32,123,125, 32, 32, 32, 32, 32, 45, 45, 32,116, 97, 98,108,101, 32,111,102, 32,111,112,101,110, 32,100,111, 99,117,109,101,110,116,115, 91,119,105,110, 73,100, 93, 32, 61, 32,123,101,100,105,116,111,114, 44, 32,105,110,100,101,120, 44, 32,102,105,108,101, 80, 97,116,104, 44, 32,102,105,108,101, 78, 97,109,101, 44, 32,109,111,100, 84,105,109,101, 44, 32,105,115, 77,111,100,105,102,105,101,100,125, 10, 105,103,110,111,114,101,100, 70,105,108,101,115, 76,105,115,116, 32, 61, 32,123,125, 10, --- 91,108 ---- 102, 72, 97,118,101, 70,111,117,110,100, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,115,116,114,105,110,103, 32,104, 97,115, 32, 98,101,101,110, 32,102,111,117,110,100, 10, 101,100,105,116,111,114, 65,112,112, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 10, + 10, 100,101, 98,117,103, 83,101,114,118,101,114, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 76,117, 97, 68,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32,111, 98,106,101, 99,116, 32,119,104,101,110, 32,100,101, 98,117,103,103,105,110,103, 10, 102, 73,115, 82,117,110,110,105,110,103, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,116,104,101, 32,100,101, 98,117,103,103,101,101, 32,105,115, 32,114,117,110,110,105,110,103, 10, 102, 73,115, 67,111,110,110,101, 99,116,101,100, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32, 97, 32, 99,108,105,101,110,116, 32,104, 97,115, 32, 99,111,110,110,101, 99,116,101,100, 10, 112,111,114,116, 78,117,109, 98,101,114, 32, 32, 32, 32, 32, 32, 32, 61, 32, 49, 53, 53, 49, 32, 32, 32, 45, 45, 32,116,104,101, 32,112,111,114,116, 32, 35, 32,116,111, 32,117,115,101, 32,102,111,114, 32,100,101, 98,117,103,103,105,110,103, 10, + 10, + 45, 45, 32,119,120, 87,105,110,100,111,119, 32,118, 97,114,105, 97, 98,108,101,115, 10, + 102,114, 97,109,101, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 70,114, 97,109,101, 32,116,104,101, 32,109, 97,105,110, 32,116,111,112, 32,108,101,118,101,108, 32,119,105,110,100,111,119, 10, + 115,112,108,105,116,116,101,114, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 83,112,108,105,116,116,101,114, 87,105,110,100,111,119, 32,102,111,114, 32,116,104,101, 32,110,111,116,101, 98,111,111,107, 32, 97,110,100, 32,101,114,114,111,114, 76,111,103, 10, + 110,111,116,101, 98,111,111,107, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 78,111,116,101, 98,111,111,107, 32,111,102, 32,101,100,105,116,111,114,115, 10, + 101,114,114,111,114, 76,111,103, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 83,116,121,108,101,100, 84,101,120,116, 67,116,114,108, 32,108,111,103, 32,119,105,110,100,111,119, 32,102,111,114, 32,101,114,114,111,114,115, 10, 119, 97,116, 99,104, 87,105,110,100,111,119, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,104,101, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 10, 119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,104,101, 32, 99,104,105,108,100, 32,108,105,115,116, 99,116,114,108, 32,105,110, 32,116,104,101, 32,119, 97,116, 99,104, 87,105,110,100,111,119, 10, ! 10, 111,112,101,110, 68,111, 99,117,109,101,110,116,115, 32, 32, 32, 32, 61, 32,123,125, 32, 32, 32, 32, 32, 45, 45, 32,116, 97, 98,108,101, 32,111,102, 32,111,112,101,110, 32,100,111, 99,117,109,101,110,116,115, 91,119,105,110, 73,100, 93, 32, 61, 32,123,101,100,105,116,111,114, 44, 32,105,110,100,101,120, 44, 32,102,105,108,101, 80, 97,116,104, 44, 32,102,105,108,101, 78, 97,109,101, 44, 32,109,111,100, 84,105,109,101, 44, 32,105,115, 77,111,100,105,102,105,101,100,125, 10, 105,103,110,111,114,101,100, 70,105,108,101,115, 76,105,115,116, 32, 61, 32,123,125, 10, *************** *** 105,124 **** 97,117,116,111, 67,111,109,112,108,101,116,101, 69,110, 97, 98,108,101, 32, 61, 32,116,114,117,101, 10, 119,120,107,101,121,119,111,114,100,115, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32, 97, 32,115,116,114,105,110,103, 32,111,102, 32,116,104,101, 32,107,101,121,119,111,114,100,115, 32,102,111,114, 32,115, 99,105,110,116,105,108,108, 97, 32,111,102, 32,119,120, 76,117, 97, 39,115, 32,119,120, 46, 88, 88, 88, 32,105,116,101,109,115, 10, 10, ! 45, 45, 32, 70,111,110,116,115, 32,116,111, 32,117,115,101, 32,102,111,114, 32,116,104,101, 32,101,100,105,116,111,114, 10, ! 102,117,110, 99,116,105,111,110, 32, 71,101,116, 70,111,110,116,115, 40, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,111,110,116, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 10, ! 32, 32, 32, 32,105,102, 32,119,120, 46, 95, 95, 87, 88, 77, 83, 87, 95, 95, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,111,110,116, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34, 65,110,100, 97,108,101, 32, 77,111,110,111, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,111,110,116, 73,116, 97,108,105, 99, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 70, 79, 78, 84, 83, 84, 89, 76, 69, 95, 73, 84, 65, 76, 73, 67, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34, 65,110,100, 97,108,101, 32, 77,111,110,111, 34, 41, 10, ! 32, 32, 32, 32,101,108,115,101, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,111,110,116, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34,108,117, 99,105,100, 97,116,121,112,101,119,114,105,116,101,114, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,111,110,116, 73,116, 97,108,105, 99, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 70, 79, 78, 84, 83, 84, 89, 76, 69, 95, 73, 84, 65, 76, 73, 67, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34,108,117, 99,105,100, 97,116,121,112,101,119,114,105,116,101,114, 34, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,114,101,116,117,114,110, 32,102,111,110,116, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 10, ! 101,110,100, 10, 10, ! 102,111,110,116, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 32, 61, 32, 71,101,116, 70,111,110,116,115, 40, 41, 10, 10, 45, 45, 32, 73,110,105,116,105, 97,108,105,122,101, 32,116,104,101, 32,119,120, 67,111,110,102,105,103, 32,102,111,114, 32,108,111, 97,100,105,110,103, 47,115, 97,118,105,110,103, 32,116,104,101, 32,112,114,101,102,101,114,101,110, 99,101,115, 10, 101,100,105,116,111,114, 65,112,112, 58, 83,101,116, 86,101,110,100,111,114, 78, 97,109,101, 40, 34, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 34, 41, 10, --- 111,128 ---- 97,117,116,111, 67,111,109,112,108,101,116,101, 69,110, 97, 98,108,101, 32, 61, 32,116,114,117,101, 10, 119,120,107,101,121,119,111,114,100,115, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32, 97, 32,115,116,114,105,110,103, 32,111,102, 32,116,104,101, 32,107,101,121,119,111,114,100,115, 32,102,111,114, 32,115, 99,105,110,116,105,108,108, 97, 32,111,102, 32,119,120, 76,117, 97, 39,115, 32,119,120, 46, 88, 88, 88, 32,105,116,101,109,115, 10, + 102,111,110,116, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,102,111,110,116,115, 32,116,111, 32,117,115,101, 32,102,111,114, 32,116,104,101, 32,101,100,105,116,111,114, 10, + 102,111,110,116, 73,116, 97,108,105, 99, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 10, 10, ! 45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10, 10, ! 105,102, 32,119,120, 46, 95, 95, 87, 88, 77, 83, 87, 95, 95, 32,116,104,101,110, 10, ! 32, 32, 32, 32,102,111,110,116, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34, 65,110,100, 97,108,101, 32, 77,111,110,111, 34, 41, 10, ! 32, 32, 32, 32,102,111,110,116, 73,116, 97,108,105, 99, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 70, 79, 78, 84, 83, 84, 89, 76, 69, 95, 73, 84, 65, 76, 73, 67, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34, 65,110,100, 97,108,101, 32, 77,111,110,111, 34, 41, 10, ! 101,108,115,101, 10, ! 32, 32, 32, 32,102,111,110,116, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34,108,117, 99,105,100, 97,116,121,112,101,119,114,105,116,101,114, 34, 41, 10, ! 32, 32, 32, 32,102,111,110,116, 73,116, 97,108,105, 99, 32, 61, 32,119,120, 46,119,120, 70,111,110,116, 40, 49, 48, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,119,120, 46,119,120, 70, 79, 78, 84, 83, 84, 89, 76, 69, 95, 73, 84, 65, 76, 73, 67, 44, 32,119,120, 46,119,120, 78, 79, 82, 77, 65, 76, 44, 32,102, 97,108,115,101, 44, 32, 34,108,117, 99,105,100, 97,116,121,112,101,119,114,105,116,101,114, 34, 41, 10, ! 101,110,100, 10, 10, + 45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10, 45, 45, 32, 73,110,105,116,105, 97,108,105,122,101, 32,116,104,101, 32,119,120, 67,111,110,102,105,103, 32,102,111,114, 32,108,111, 97,100,105,110,103, 47,115, 97,118,105,110,103, 32,116,104,101, 32,112,114,101,102,101,114,101,110, 99,101,115, 10, 101,100,105,116,111,114, 65,112,112, 58, 83,101,116, 86,101,110,100,111,114, 78, 97,109,101, 40, 34, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 34, 41, 10, *************** *** 246,250 **** 102,117,110, 99,116,105,111,110, 32, 71,101,116, 69,100,105,116,111,114, 40,115,101,108,101, 99,116,105,111,110, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32,110,105,108, 10, ! 32, 32, 32, 32,105,102, 32,110,111,116, 32,115,101,108,101, 99,116,105,111,110, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32,115,101,108,101, 99,116,105,111,110, 32, 61, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 83,101,108,101, 99,116,105,111,110, 40, 41, 10, 32, 32, 32, 32,101,110,100, 10, --- 250,254 ---- 102,117,110, 99,116,105,111,110, 32, 71,101,116, 69,100,105,116,111,114, 40,115,101,108,101, 99,116,105,111,110, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32,110,105,108, 10, ! 32, 32, 32, 32,105,102, 32,115,101,108,101, 99,116,105,111,110, 32, 61, 61, 32,110,105,108, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32,115,101,108,101, 99,116,105,111,110, 32, 61, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 83,101,108,101, 99,116,105,111,110, 40, 41, 10, 32, 32, 32, 32,101,110,100, 10, *************** *** 295,300 **** 45, 45, 32, 71,101,116, 47, 67,104,101, 99,107, 32,102,105,108,101, 32,111,110, 32,100,105,115,107, 32,100, 97,116,101,116,105,109,101, 32, 97,110,100, 32,105,102, 32,109,111,100,105,102,105,101,100, 10, 102,117,110, 99,116,105,111,110, 32, 71,101,116, 70,105,108,101, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32,114,101,116,117,114,110, 32,102,105,108,101, 78, 97,109,101, 58, 71,101,116, 77,111,100,105,102,105, 99, 97,116,105,111,110, 84,105,109,101, 40, 41, 59, 10, 101,110,100, 10, 10, --- 299,310 ---- 45, 45, 32, 71,101,116, 47, 67,104,101, 99,107, 32,102,105,108,101, 32,111,110, 32,100,105,115,107, 32,100, 97,116,101,116,105,109,101, 32, 97,110,100, 32,105,102, 32,109,111,100,105,102,105,101,100, 10, 102,117,110, 99,116,105,111,110, 32, 71,101,116, 70,105,108,101, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32,105,102, 32,102,105,108,101, 80, 97,116,104, 32, 97,110,100, 32, 40,115,116,114,105,110,103, 46,108,101,110, 40,102,105,108,101, 80, 97,116,104, 41, 32, 62, 32, 48, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,110, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,110, 58, 70,105,108,101, 69,120,105,115,116,115, 40, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,114,101,116,117,114,110, 32,102,110, 58, 71,101,116, 77,111,100,105,102,105, 99, 97,116,105,111,110, 84,105,109,101, 40, 41, 59, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 10, ! 32, 32, 32, 32,114,101,116,117,114,110, 32,119,120, 46,119,120, 68, 97,116,101, 84,105,109,101, 40, 41, 32, 45, 45, 32,105,110,118, 97,108,105,100, 32,100, 97,116,101,116,105,109,101, 10, 101,110,100, 10, 10, *************** *** 308,312 **** 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,105,108,101, 80, 97,116,104, 32, 97,110,100, 32, 40,115,116,114,105,110,103, 46,108,101,110, 40,102,105,108,101, 80, 97,116,104, 41, 32, 62, 32, 48, 41, 32, 97,110,100, 32,111,108,100, 77,111,100, 84,105,109,101, 32, 97,110,100, 32,111,108,100, 77,111,100, 84,105,109,101, 58, 73,115, 86, 97,108,105,100, 40, 41, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,109,111,100, 84,105,109,101, 32, 61, 32, 71,101,116, 70,105,108,101, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,109,111,100, 84,105,109,101, 58, 73,115, 86, 97,108,105,100, 40, 41, 32, 97,110,100, 32,111,108,100, 77,111,100, 84,105,109,101, 58, 73,115, 69, 97,114,108,105,101,114, 84,104, 97,110, 40,109,111,100, 84,105,109,101, 41, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,101,116, 32, 61, 32,119,120, 46,119,120, 77,101,115,115, 97,103,101, 66,111,120, 40,102,105,108,101, 78, 97,109,101, 46, 46, 34, 32,104, 97,115, 32, 98,101,101,110, 32,109,111,100,105,102,105,101,100, 32,111,110, 32,100,105,115,107, 46, 32, 68,111, 32,121,111,117, 32,119, 97,110,116, 32,116,111, 32,114,101,108,111, 97,100, 32,105,116, 63, 34, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34,119,120, 76,117, 97, 32, 77,101,115,115, 97,103,101, 34, 44, 10, --- 318,322 ---- 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,105,108,101, 80, 97,116,104, 32, 97,110,100, 32, 40,115,116,114,105,110,103, 46,108,101,110, 40,102,105,108,101, 80, 97,116,104, 41, 32, 62, 32, 48, 41, 32, 97,110,100, 32,111,108,100, 77,111,100, 84,105,109,101, 32, 97,110,100, 32,111,108,100, 77,111,100, 84,105,109,101, 58, 73,115, 86, 97,108,105,100, 40, 41, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,109,111,100, 84,105,109,101, 32, 61, 32, 71,101,116, 70,105,108,101, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,109,111,100, 84,105,109,101, 32, 97,110,100, 32,109,111,100, 84,105,109,101, 58, 73,115, 86, 97,108,105,100, 40, 41, 32, 97,110,100, 32,111,108,100, 77,111,100, 84,105,109,101, 58, 73,115, 69, 97,114,108,105,101,114, 84,104, 97,110, 40,109,111,100, 84,105,109,101, 41, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,101,116, 32, 61, 32,119,120, 46,119,120, 77,101,115,115, 97,103,101, 66,111,120, 40,102,105,108,101, 78, 97,109,101, 46, 46, 34, 32,104, 97,115, 32, 98,101,101,110, 32,109,111,100,105,102,105,101,100, 32,111,110, 32,100,105,115,107, 46, 32, 68,111, 32,121,111,117, 32,119, 97,110,116, 32,116,111, 32,114,101,108,111, 97,100, 32,105,116, 63, 34, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34,119,120, 76,117, 97, 32, 77,101,115,115, 97,103,101, 34, 44, 10, *************** *** 323,330 **** 10, 102,117,110, 99,116,105,111,110, 32, 83,101,116, 68,111, 99,117,109,101,110,116, 77,111,100,105,102,105,101,100, 40,105,100, 44, 32,109,111,100,105,102,105,101,100, 44, 32,114,101,115,101,116, 77,111,100, 84,105,109,101, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,102,105,108,101, 78, 97,109,101, 10, ! 32, 32, 32, 32,105,102, 32,110,111,116, 32,102,105,108,101, 78, 97,109,101, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 34, 85,110,116,105,116,108,101,100, 34, 10, ! 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32,105,102, 32,109,111,100,105,102,105,101,100, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,105,115, 77,111,100,105,102,105,101,100, 32, 61, 32,116,114,117,101, 10, --- 333,338 ---- 10, 102,117,110, 99,116,105,111,110, 32, 83,101,116, 68,111, 99,117,109,101,110,116, 77,111,100,105,102,105,101,100, 40,105,100, 44, 32,109,111,100,105,102,105,101,100, 44, 32,114,101,115,101,116, 77,111,100, 84,105,109,101, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,102,105,108,101, 78, 97,109,101, 32,111,114, 32, 34, 85,110,116,105,116,108,101,100, 34, 10, ! 10, 32, 32, 32, 32,105,102, 32,109,111,100,105,102,105,101,100, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,105,115, 77,111,100,105,102,105,101,100, 32, 61, 32,116,114,117,101, 10, *************** *** 355,409 **** 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,110,116, 40,119,120, 46,119,120, 83, 84, 67, 95, 83, 84, 89, 76, 69, 95, 68, 69, 70, 65, 85, 76, 84, 44, 32,102,111,110,116, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 48, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 56, 44, 32, 49, 50, 56, 44, 32, 49, 50, 56, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 87,104,105,116,101, 32,115,112, 97, 99,101, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 48, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 67,111,109,109,101,110,116, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,110,116, 40, 49, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 41, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 85,110,100,101,114,108,105,110,101, 40, 49, 44, 32,102, 97,108,115,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 48, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 76,105,110,101, 32, 67,111,109,109,101,110,116, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,110,116, 40, 50, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 68,111, 99, 46, 32, 67,111,109,109,101,110,116, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 85,110,100,101,114,108,105,110,101, 40, 50, 44, 32,102, 97,108,115,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 78,117,109, 98,101,114, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 52, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 75,101,121,119,111,114,100, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 53, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 48, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 68,111,117, 98,108,101, 32,113,117,111,116,101,100, 32,115,116,114,105,110,103, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 53, 44, 32, 32,116,114,117,101, 41, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 85,110,100,101,114,108,105,110,101, 40, 53, 44, 32,102, 97,108,115,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 54, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 83,105,110,103,108,101, 32,113,117,111,116,101,100, 32,115,116,114,105,110,103, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 55, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32,110,111,116, 32,117,115,101,100, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 56, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 76,105,116,101,114, 97,108, 32,115,116,114,105,110,103,115, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 57, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 49, 50, 55, 44, 32, 48, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 80,114,101,112,114,111, 99,101,115,115,111,114, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 48, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 48, 44, 32, 48, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 79,112,101,114, 97,116,111,114,115, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 49, 48, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 49, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 48, 44, 32, 48, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 73,100,101,110,116,105,102,105,101,114,115, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 48, 44, 32, 48, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 85,110,116,101,114,109,105,110, 97,116,101,100, 32,115,116,114,105,110,103,115, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 49, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 50, 52, 44, 32, 49, 57, 50, 44, 32, 50, 50, 52, 41, 41, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 49, 50, 44, 32,116,114,117,101, 41, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 69, 79, 76, 70,105,108,108,101,100, 40, 49, 50, 44, 32,116,114,117,101, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 48, 44, 32, 57, 53, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 75,101,121,119,111,114,100, 32,104,105,103,104,108,105,103,104,116,105,110,103, 32,115,116,121,108,101,115, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 57, 53, 44, 32, 48, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 53, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 48, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 54, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 57, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 55, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 51, 53, 44, 32, 57, 53, 44, 32, 49, 55, 53, 41, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 56, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 78,101,115,116,101,100, 32,108,105,116,101,114, 97,108, 32,115,116,114,105,110,103,115, 32, 63, 63, 63, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 49, 56, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 52, 48, 44, 50, 53, 53, 44, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 57, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 49, 57, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 50, 52, 44, 50, 53, 53, 44, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 48, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 48, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 57, 50, 44, 50, 53, 53, 44, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 49, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 49, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 55, 54, 44, 50, 53, 53, 44, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 54, 48, 44, 50, 53, 53, 44, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 52, 52, 44, 50, 53, 53, 44, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 56, 44, 49, 53, 53, 44, 50, 53, 53, 41, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 50, 52, 44, 32, 49, 57, 50, 44, 32, 50, 50, 52, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 76,105,110,101, 32,110,117,109, 98,101,114, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 51, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 57, 50, 44, 32, 49, 57, 50, 44, 32, 49, 57, 50, 41, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 66,114, 97, 99,101, 32,104,105,103,104,108,105,103,104,116, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 48, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 51, 52, 44, 32,116,114,117,101, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 66,114, 97, 99,101, 32,105,110, 99,111,109,112,108,101,116,101, 32,104,105,103,104,108,105,103,104,116, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 53, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 53, 53, 44, 32, 48, 44, 32, 48, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 51, 53, 44, 32,116,114,117,101, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 73,110,100,101,110,116, 97,116,105,111,110, 32,103,117,105,100,101,115, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 55, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 57, 50, 44, 32, 49, 57, 50, 44, 32, 49, 57, 50, 41, 41, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 51, 55, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 53, 53, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, --- 363,417 ---- 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,110,116, 40,119,120, 46,119,120, 83, 84, 67, 95, 83, 84, 89, 76, 69, 95, 68, 69, 70, 65, 85, 76, 84, 44, 32,102,111,110,116, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 48, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 56, 44, 32, 49, 50, 56, 44, 32, 49, 50, 56, 41, 41, 32, 45, 45, 32, 87,104,105,116,101, 32,115,112, 97, 99,101, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 48, 41, 41, 32, 32, 32, 45, 45, 32, 67,111,109,109,101,110,116, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,110,116, 40, 49, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 41, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 85,110,100,101,114,108,105,110,101, 40, 49, 44, 32,102, 97,108,115,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 48, 41, 41, 32, 32, 32, 45, 45, 32, 76,105,110,101, 32, 67,111,109,109,101,110,116, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,110,116, 40, 50, 44, 32,102,111,110,116, 73,116, 97,108,105, 99, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 68,111, 99, 46, 32, 67,111,109,109,101,110,116, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 85,110,100,101,114,108,105,110,101, 40, 50, 44, 32,102, 97,108,115,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32, 78,117,109, 98,101,114, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 52, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32, 75,101,121,119,111,114,100, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 53, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 48, 44, 32, 32, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32, 68,111,117, 98,108,101, 32,113,117,111,116,101,100, 32,115,116,114,105,110,103, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 53, 44, 32, 32,116,114,117,101, 41, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 85,110,100,101,114,108,105,110,101, 40, 53, 44, 32,102, 97,108,115,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 54, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 32, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32, 83,105,110,103,108,101, 32,113,117,111,116,101,100, 32,115,116,114,105,110,103, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 55, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 32, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32,110,111,116, 32,117,115,101,100, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 56, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32, 76,105,116,101,114, 97,108, 32,115,116,114,105,110,103,115, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 57, 44, 32, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 49, 50, 55, 44, 32, 48, 41, 41, 32, 32, 45, 45, 32, 80,114,101,112,114,111, 99,101,115,115,111,114, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 48, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 48, 44, 32, 32, 32, 48, 41, 41, 32, 32, 32, 45, 45, 32, 79,112,101,114, 97,116,111,114,115, 10, 32, 32, 32, 32, 45, 45,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 49, 48, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 49, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 48, 44, 32, 32, 32, 48, 41, 41, 32, 32, 32, 45, 45, 32, 73,100,101,110,116,105,102,105,101,114,115, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 48, 44, 32, 32, 32, 48, 41, 41, 32, 32, 32, 45, 45, 32, 85,110,116,101,114,109,105,110, 97,116,101,100, 32,115,116,114,105,110,103,115, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 49, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 50, 52, 44, 32, 49, 57, 50, 44, 32, 50, 50, 52, 41, 41, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 49, 50, 44, 32,116,114,117,101, 41, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 69, 79, 76, 70,105,108,108,101,100, 40, 49, 50, 44, 32,116,114,117,101, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 48, 44, 32, 32, 57, 53, 41, 41, 32, 32, 32, 45, 45, 32, 75,101,121,119,111,114,100, 32,104,105,103,104,108,105,103,104,116,105,110,103, 32,115,116,121,108,101,115, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 57, 53, 44, 32, 48, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 53, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 32, 48, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 54, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 55, 44, 32, 48, 44, 32, 32, 57, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 55, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 51, 53, 44, 32, 32, 57, 53, 44, 32, 49, 55, 53, 41, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 56, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 32, 45, 45, 32, 78,101,115,116,101,100, 32,108,105,116,101,114, 97,108, 32,115,116,114,105,110,103,115, 32, 63, 63, 63, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 49, 56, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 52, 48, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 49, 57, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 49, 57, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 50, 52, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 48, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 48, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 57, 50, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 49, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 49, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 55, 54, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 54, 48, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 52, 52, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 50, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 49, 50, 55, 44, 32, 49, 50, 55, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 50, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 50, 56, 44, 32, 49, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 50, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 50, 52, 44, 32, 49, 57, 50, 44, 32, 50, 50, 52, 41, 41, 32, 32, 45, 45, 32, 76,105,110,101, 32,110,117,109, 98,101,114, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 51, 51, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 57, 50, 44, 32, 49, 57, 50, 44, 32, 49, 57, 50, 41, 41, 32, 32, 45, 45, 32, 66,114, 97, 99,101, 32,104,105,103,104,108,105,103,104,116, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 52, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 48, 44, 32, 32, 32, 48, 44, 32, 32, 32, 50, 53, 53, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 51, 52, 44, 32,116,114,117,101, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 66,114, 97, 99,101, 32,105,110, 99,111,109,112,108,101,116,101, 32,104,105,103,104,108,105,103,104,116, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 53, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 53, 53, 44, 32, 48, 44, 32, 32, 32, 48, 41, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66,111,108,100, 40, 51, 53, 44, 32,116,114,117,101, 41, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32, 73,110,100,101,110,116, 97,116,105,111,110, 32,103,117,105,100,101,115, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 70,111,114,101,103,114,111,117,110,100, 40, 51, 55, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 49, 57, 50, 44, 32, 49, 57, 50, 44, 32, 49, 57, 50, 41, 41, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,116,121,108,101, 83,101,116, 66, 97, 99,107,103,114,111,117,110,100, 40, 51, 55, 44, 32,119,120, 46,119,120, 67,111,108,111,117,114, 40, 50, 53, 53, 44, 32, 50, 53, 53, 44, 32, 50, 53, 53, 41, 41, 10, *************** *** 419,432 **** 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 87,105,100,116,104, 40, 48, 44, 32,101,100,105,116,111,114, 58, 84,101,120,116, 87,105,100,116,104, 40, 51, 50, 44, 32, 34, 57, 57, 57, 57, 57, 95, 34, 41, 41, 32, 45, 45, 32,108,105,110,101, 32, 35, 32,109, 97,114,103,105,110, 10, - 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 87,105,100,116,104, 40, 50, 44, 32, 49, 54, 41, 32, 45, 45, 32,102,111,108,100,105,110,103, 32,109, 97,114,103,105,110, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 83,101,110,115,105,116,105,118,101, 40, 49, 44, 32,116,114,117,101, 41, 32, 45, 45, 32,109, 97,114,107,101,114, 32,109, 97,114,103,105,110, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,102,105,110,101, 40, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 44, 32, 32, 32,119,120, 46,119,120, 83, 84, 67, 95, 77, 65, 82, 75, 95, 67, 73, 82, 67, 76, 69, 44, 32,119,120, 46,119,120, 71, 82, 69, 69, 78, 44, 32,119,120, 46,119,120, 71, 82, 69, 69, 78, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,102,105,110,101, 40, 67, 85, 82, 82, 69, 78, 84, 95, 76, 73, 78, 69, 95, 77, 65, 82, 75, 69, 82, 44, 32,119,120, 46,119,120, 83, 84, 67, 95, 77, 65, 82, 75, 95, 65, 82, 82, 79, 87, 44, 32, 32,119,120, 46,119,120, 82, 69, 68, 44, 32, 32, 32,119,120, 46,119,120, 82, 69, 68, 41, 10, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 83, 84, 67, 95, 77, 65, 82, 71, 73, 78, 67, 76, 73, 67, 75, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,101,100,105,116,111,114, 58, 76,105,110,101, 70,114,111,109, 80,111,115,105,116,105,111,110, 40,101,118,101,110,116, 58, 71,101,116, 80,111,115,105,116,105,111,110, 40, 41, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84,111,103,103,108,101, 68,101, 98,117,103, 77, 97,114,107,101,114, 40,101,100,105,116,111,114, 44, 32,114,111,119, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 427,441 ---- 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 87,105,100,116,104, 40, 48, 44, 32,101,100,105,116,111,114, 58, 84,101,120,116, 87,105,100,116,104, 40, 51, 50, 44, 32, 34, 57, 57, 57, 57, 57, 95, 34, 41, 41, 32, 45, 45, 32,108,105,110,101, 32, 35, 32,109, 97,114,103,105,110, 10, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 87,105,100,116,104, 40, 49, 44, 32, 49, 54, 41, 32, 32, 32, 32, 32, 32, 32, 32, 45, 45, 32,109, 97,114,107,101,114, 32,109, 97,114,103,105,110, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 84,121,112,101, 40, 49, 44, 32,119,120, 46,119,120, 83, 84, 67, 95, 77, 65, 82, 71, 73, 78, 95, 83, 89, 77, 66, 79, 76, 41, 59, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,116, 77, 97,114,103,105,110, 83,101,110,115,105,116,105,118,101, 40, 49, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,102,105,110,101, 40, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 44, 32, 32, 32,119,120, 46,119,120, 83, 84, 67, 95, 77, 65, 82, 75, 95, 82, 79, 85, 78, 68, 82, 69, 67, 84, 44, 32,119,120, 46,119,120, 87, 72, 73, 84, 69, 44, 32,119,120, 46,119,120, 82, 69, 68, 41, 10, ! 32, 32, 32, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 68,101,102,105,110,101, 40, 67, 85, 82, 82, 69, 78, 84, 95, 76, 73, 78, 69, 95, 77, 65, 82, 75, 69, 82, 44, 32,119,120, 46,119,120, 83, 84, 67, 95, 77, 65, 82, 75, 95, 65, 82, 82, 79, 87, 44, 32, 32, 32, 32, 32,119,120, 46,119,120, 66, 76, 65, 67, 75, 44, 32,119,120, 46,119,120, 71, 82, 69, 69, 78, 41, 10, 10, 32, 32, 32, 32,101,100,105,116,111,114, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 69, 86, 84, 95, 83, 84, 67, 95, 77, 65, 82, 71, 73, 78, 67, 76, 73, 67, 75, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,105,110,101, 32, 61, 32,101,100,105,116,111,114, 58, 76,105,110,101, 70,114,111,109, 80,111,115,105,116,105,111,110, 40,101,118,101,110,116, 58, 71,101,116, 80,111,115,105,116,105,111,110, 40, 41, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 84,111,103,103,108,101, 68,101, 98,117,103, 77, 97,114,107,101,114, 40,101,100,105,116,111,114, 44, 32,108,105,110,101, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 436,451 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32, 99,104, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 75,101,121, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 40, 99,104, 32, 61, 61, 32, 99,104, 97,114, 95, 67, 82, 41, 32,111,114, 32, 40, 99,104, 32, 61, 61, 32, 99,104, 97,114, 95, 76, 70, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,105,110,101, 78,117,109, 32, 61, 32,101,100,105,116,111,114, 58, 76,105,110,101, 70,114,111,109, 80,111,115,105,116,105,111,110, 40,101,100,105,116,111,114, 58, 71,101,116, 67,117,114,114,101,110,116, 80,111,115, 40, 41, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,105,110,101, 76,101,110,103,116,104, 32, 61, 32,101,100,105,116,111,114, 58, 76,105,110,101, 76,101,110,103,116,104, 40,108,105,110,101, 78,117,109, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 40,108,105,110,101, 78,117,109, 32, 62, 32, 48, 41, 32, 97,110,100, 32, 40,108,105,110,101, 76,101,110,103,116,104, 32, 60, 61, 32, 50, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,105,110,101, 78,117,109, 32, 61, 32,108,105,110,101, 78,117,109, 32, 45, 32, 49, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,105,110,101, 76,101,110,103,116,104, 32, 61, 32,101,100,105,116,111,114, 58, 76,105,110,101, 76,101,110,103,116,104, 40,108,105,110,101, 78,117,109, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,112,114,101,118, 76,105,110,101, 32, 32, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 76,105,110,101, 40,108,105,110,101, 78,117,109, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,111,114, 32,108,105,110,101, 79,102,102,115,101,116, 32, 61, 32, 49, 44, 32,108,105,110,101, 76,101,110,103,116,104, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 99,104, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40,112,114,101,118, 76,105,110,101, 44, 32,108,105,110,101, 79,102,102,115,101,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 40, 99,104, 32,126, 61, 32, 99,104, 97,114, 95, 83,112, 41, 32, 97,110,100, 32, 40, 99,104, 32,126, 61, 32, 99,104, 97,114, 95, 84, 97, 98, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 82,101,112,108, 97, 99,101, 83,101,108,101, 99,116,105,111,110, 40,115,116,114,105,110,103, 46,115,117, 98, 40,112,114,101,118, 76,105,110,101, 44, 32, 49, 44, 32,108,105,110,101, 79,102,102,115,101,116, 32, 45, 32, 49, 41, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 98,114,101, 97,107, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, --- 445,456 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32, 99,104, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 75,101,121, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 40, 99,104, 32, 61, 61, 32, 99,104, 97,114, 95, 67, 82, 41, 32,111,114, 32, 40, 99,104, 32, 61, 61, 32, 99,104, 97,114, 95, 76, 70, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,112,111,115, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 67,117,114,114,101,110,116, 80,111,115, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-09-25 19:22:34
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26951/samples Modified Files: editor.wx.lua Log Message: more cleanup and formatting Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** editor.wx.lua 22 Sep 2006 22:29:21 -0000 1.23 --- editor.wx.lua 25 Sep 2006 19:22:27 -0000 1.24 *************** *** 79,90 **** fHaveFound = nil -- true when string has been found editorApp = wx.wxGetApp() debugServer = nil -- wxLuaDebuggerServer object when debugging fIsRunning = nil -- true when the debuggee is running fIsConnected = nil -- true when a client has connected portNumber = 1551 -- the port # to use for debugging watchWindow = nil -- the watchWindow watchListCtrl = nil -- the child listctrl in the watchWindow ! notebook = nil -- the notebook of editors ! errorLog = nil -- the log window for errors openDocuments = {} -- table of open documents[winId] = {editor, index, filePath, fileName, modTime, isModified} ignoredFilesList = {} --- 79,96 ---- fHaveFound = nil -- true when string has been found editorApp = wx.wxGetApp() + debugServer = nil -- wxLuaDebuggerServer object when debugging fIsRunning = nil -- true when the debuggee is running fIsConnected = nil -- true when a client has connected portNumber = 1551 -- the port # to use for debugging + + -- wxWindow variables + frame = nil -- wxFrame the main top level window + splitter = nil -- wxSplitterWindow for the notebook and errorLog + notebook = nil -- wxNotebook of editors + errorLog = nil -- wxStyledTextCtrl log window for errors watchWindow = nil -- the watchWindow watchListCtrl = nil -- the child listctrl in the watchWindow ! openDocuments = {} -- table of open documents[winId] = {editor, index, filePath, fileName, modTime, isModified} ignoredFilesList = {} *************** *** 93,112 **** autoCompleteEnable = true wxkeywords = nil -- a string of the keywords for scintilla of wxLua's wx.XXX items ! -- Fonts to use for the editor ! function GetFonts() ! local font, fontItalic ! if wx.__WXMSW__ then ! font = wx.wxFont(10, wx.wxNORMAL, wx.wxNORMAL, wx.wxNORMAL, false, "Andale Mono") ! fontItalic = wx.wxFont(10, wx.wxNORMAL, wx.wxFONTSTYLE_ITALIC, wx.wxNORMAL, false, "Andale Mono") ! else ! font = wx.wxFont(10, wx.wxNORMAL, wx.wxNORMAL, wx.wxNORMAL, false, "lucidatypewriter") ! fontItalic = wx.wxFont(10, wx.wxNORMAL, wx.wxFONTSTYLE_ITALIC, wx.wxNORMAL, false, "lucidatypewriter") ! end ! return font, fontItalic ! end ! font, fontItalic = GetFonts() -- Initialize the wxConfig for loading/saving the preferences editorApp:SetVendorName("Lomtick Software") --- 99,116 ---- autoCompleteEnable = true wxkeywords = nil -- a string of the keywords for scintilla of wxLua's wx.XXX items + font = nil -- fonts to use for the editor + fontItalic = nil ! -- ---------------------------------------------------------------------------- ! if wx.__WXMSW__ then ! font = wx.wxFont(10, wx.wxNORMAL, wx.wxNORMAL, wx.wxNORMAL, false, "Andale Mono") ! fontItalic = wx.wxFont(10, wx.wxNORMAL, wx.wxFONTSTYLE_ITALIC, wx.wxNORMAL, false, "Andale Mono") ! else ! font = wx.wxFont(10, wx.wxNORMAL, wx.wxNORMAL, wx.wxNORMAL, false, "lucidatypewriter") ! fontItalic = wx.wxFont(10, wx.wxNORMAL, wx.wxFONTSTYLE_ITALIC, wx.wxNORMAL, false, "lucidatypewriter") ! end + -- ---------------------------------------------------------------------------- -- Initialize the wxConfig for loading/saving the preferences editorApp:SetVendorName("Lomtick Software") *************** *** 234,238 **** function GetEditor(selection) local editor = nil ! if not selection then selection = notebook:GetSelection() end --- 238,242 ---- function GetEditor(selection) local editor = nil ! if selection == nil then selection = notebook:GetSelection() end *************** *** 283,288 **** -- Get/Check file on disk datetime and if modified function GetFileModTime(filePath) ! local fileName = wx.wxFileName(filePath) ! return fileName:GetModificationTime(); end --- 287,298 ---- -- Get/Check file on disk datetime and if modified function GetFileModTime(filePath) ! if filePath and (string.len(filePath) > 0) then ! local fn = wx.wxFileName(filePath) ! if fn:FileExists() then ! return fn:GetModificationTime(); ! end ! end ! ! return wx.wxDateTime() -- invalid datetime end *************** *** 311,318 **** function SetDocumentModified(id, modified, resetModTime) ! local fileName = openDocuments[id].fileName ! if not fileName then ! fileName = "Untitled" ! end if modified then openDocuments[id].isModified = true --- 321,326 ---- function SetDocumentModified(id, modified, resetModTime) ! local fileName = openDocuments[id].fileName or "Untitled" ! if modified then openDocuments[id].isModified = true *************** *** 343,397 **** editor:StyleSetFont(wx.wxSTC_STYLE_DEFAULT, font) ! editor:StyleSetForeground(0, wx.wxColour(128, 128, 128)) -- White space ! editor:StyleSetForeground(1, wx.wxColour(0, 127, 0)) -- Comment editor:StyleSetFont(1, fontItalic) --editor:StyleSetUnderline(1, false) ! editor:StyleSetForeground(2, wx.wxColour(0, 127, 0)) -- Line Comment ! editor:StyleSetFont(2, fontItalic) -- Doc. Comment --editor:StyleSetUnderline(2, false) ! editor:StyleSetForeground(3, wx.wxColour(127, 127, 127)) -- Number ! editor:StyleSetForeground(4, wx.wxColour(0, 127, 127)) -- Keyword ! editor:StyleSetForeground(5, wx.wxColour(0, 0, 127)) -- Double quoted string editor:StyleSetBold(5, true) --editor:StyleSetUnderline(5, false) ! editor:StyleSetForeground(6, wx.wxColour(127, 0, 127)) -- Single quoted string ! editor:StyleSetForeground(7, wx.wxColour(127, 0, 127)) -- not used ! editor:StyleSetForeground(8, wx.wxColour(0, 127, 127)) -- Literal strings ! editor:StyleSetForeground(9, wx.wxColour(127, 127, 0)) -- Preprocessor ! editor:StyleSetForeground(10, wx.wxColour(0, 0, 0)) -- Operators --editor:StyleSetBold(10, true) ! editor:StyleSetForeground(11, wx.wxColour(0, 0, 0)) -- Identifiers ! editor:StyleSetForeground(12, wx.wxColour(0, 0, 0)) -- Unterminated strings editor:StyleSetBackground(12, wx.wxColour(224, 192, 224)) editor:StyleSetBold(12, true) editor:StyleSetEOLFilled(12, true) ! editor:StyleSetForeground(13, wx.wxColour(0, 0, 95)) -- Keyword highlighting styles ! editor:StyleSetForeground(14, wx.wxColour(0, 95, 0)) ! editor:StyleSetForeground(15, wx.wxColour(127, 0, 0)) ! editor:StyleSetForeground(16, wx.wxColour(127, 0, 95)) ! editor:StyleSetForeground(17, wx.wxColour(35, 95, 175)) ! editor:StyleSetForeground(18, wx.wxColour(0, 127, 127)) -- Nested literal strings ??? ! editor:StyleSetBackground(18, wx.wxColour(240,255,255)) ! editor:StyleSetForeground(19, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(19, wx.wxColour(224,255,255)) ! editor:StyleSetForeground(20, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(20, wx.wxColour(192,255,255)) ! editor:StyleSetForeground(21, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(21, wx.wxColour(176,255,255)) ! editor:StyleSetForeground(22, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(22, wx.wxColour(160,255,255)) ! editor:StyleSetForeground(23, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(23, wx.wxColour(144,255,255)) ! editor:StyleSetForeground(24, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(24, wx.wxColour(128,155,255)) ! editor:StyleSetForeground(32, wx.wxColour(224, 192, 224)) -- Line number ! editor:StyleSetBackground(33, wx.wxColour(192, 192, 192)) -- Brace highlight editor:StyleSetForeground(34, wx.wxColour(0, 0, 255)) ! editor:StyleSetBold(34, true) -- Brace incomplete highlight editor:StyleSetForeground(35, wx.wxColour(255, 0, 0)) ! editor:StyleSetBold(35, true) -- Indentation guides editor:StyleSetForeground(37, wx.wxColour(192, 192, 192)) editor:StyleSetBackground(37, wx.wxColour(255, 255, 255)) --- 351,405 ---- editor:StyleSetFont(wx.wxSTC_STYLE_DEFAULT, font) ! editor:StyleSetForeground(0, wx.wxColour(128, 128, 128)) -- White space ! editor:StyleSetForeground(1, wx.wxColour(0, 127, 0)) -- Comment editor:StyleSetFont(1, fontItalic) --editor:StyleSetUnderline(1, false) ! editor:StyleSetForeground(2, wx.wxColour(0, 127, 0)) -- Line Comment ! editor:StyleSetFont(2, fontItalic) -- Doc. Comment --editor:StyleSetUnderline(2, false) ! editor:StyleSetForeground(3, wx.wxColour(127, 127, 127)) -- Number ! editor:StyleSetForeground(4, wx.wxColour(0, 127, 127)) -- Keyword ! editor:StyleSetForeground(5, wx.wxColour(0, 0, 127)) -- Double quoted string editor:StyleSetBold(5, true) --editor:StyleSetUnderline(5, false) ! editor:StyleSetForeground(6, wx.wxColour(127, 0, 127)) -- Single quoted string ! editor:StyleSetForeground(7, wx.wxColour(127, 0, 127)) -- not used ! editor:StyleSetForeground(8, wx.wxColour(0, 127, 127)) -- Literal strings ! editor:StyleSetForeground(9, wx.wxColour(127, 127, 0)) -- Preprocessor ! editor:StyleSetForeground(10, wx.wxColour(0, 0, 0)) -- Operators --editor:StyleSetBold(10, true) ! editor:StyleSetForeground(11, wx.wxColour(0, 0, 0)) -- Identifiers ! editor:StyleSetForeground(12, wx.wxColour(0, 0, 0)) -- Unterminated strings editor:StyleSetBackground(12, wx.wxColour(224, 192, 224)) editor:StyleSetBold(12, true) editor:StyleSetEOLFilled(12, true) ! editor:StyleSetForeground(13, wx.wxColour(0, 0, 95)) -- Keyword highlighting styles ! editor:StyleSetForeground(14, wx.wxColour(0, 95, 0)) ! editor:StyleSetForeground(15, wx.wxColour(127, 0, 0)) ! editor:StyleSetForeground(16, wx.wxColour(127, 0, 95)) ! editor:StyleSetForeground(17, wx.wxColour(35, 95, 175)) ! editor:StyleSetForeground(18, wx.wxColour(0, 127, 127)) -- Nested literal strings ??? ! editor:StyleSetBackground(18, wx.wxColour(240, 255, 255)) ! editor:StyleSetForeground(19, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(19, wx.wxColour(224, 255, 255)) ! editor:StyleSetForeground(20, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(20, wx.wxColour(192, 255, 255)) ! editor:StyleSetForeground(21, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(21, wx.wxColour(176, 255, 255)) ! editor:StyleSetForeground(22, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(22, wx.wxColour(160, 255, 255)) ! editor:StyleSetForeground(23, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(23, wx.wxColour(144, 255, 255)) ! editor:StyleSetForeground(24, wx.wxColour(0, 127, 127)) ! editor:StyleSetBackground(24, wx.wxColour(128, 155, 255)) ! editor:StyleSetForeground(32, wx.wxColour(224, 192, 224)) -- Line number ! editor:StyleSetBackground(33, wx.wxColour(192, 192, 192)) -- Brace highlight editor:StyleSetForeground(34, wx.wxColour(0, 0, 255)) ! editor:StyleSetBold(34, true) -- Brace incomplete highlight editor:StyleSetForeground(35, wx.wxColour(255, 0, 0)) ! editor:StyleSetBold(35, true) -- Indentation guides editor:StyleSetForeground(37, wx.wxColour(192, 192, 192)) editor:StyleSetBackground(37, wx.wxColour(255, 255, 255)) *************** *** 407,420 **** editor:SetMarginWidth(0, editor:TextWidth(32, "99999_")) -- line # margin - editor:SetMarginWidth(2, 16) -- folding margin ! editor:SetMarginSensitive(1, true) -- marker margin ! editor:MarkerDefine(BREAKPOINT_MARKER, wx.wxSTC_MARK_CIRCLE, wx.wxGREEN, wx.wxGREEN) ! editor:MarkerDefine(CURRENT_LINE_MARKER, wx.wxSTC_MARK_ARROW, wx.wxRED, wx.wxRED) editor:Connect(wx.wxEVT_STC_MARGINCLICK, function (event) ! local row = editor:LineFromPosition(event:GetPosition()) ! ToggleDebugMarker(editor, row) end) --- 415,429 ---- editor:SetMarginWidth(0, editor:TextWidth(32, "99999_")) -- line # margin ! editor:SetMarginWidth(1, 16) -- marker margin ! editor:SetMarginType(1, wx.wxSTC_MARGIN_SYMBOL); ! editor:SetMarginSensitive(1, true) ! editor:MarkerDefine(BREAKPOINT_MARKER, wx.wxSTC_MARK_ROUNDRECT, wx.wxWHITE, wx.wxRED) ! editor:MarkerDefine(CURRENT_LINE_MARKER, wx.wxSTC_MARK_ARROW, wx.wxBLACK, wx.wxGREEN) editor:Connect(wx.wxEVT_STC_MARGINCLICK, function (event) ! local line = editor:LineFromPosition(event:GetPosition()) ! ToggleDebugMarker(editor, line) end) *************** *** 722,726 **** function UpdateUIMenuItems() if frame and frame:GetMenuBar() then ! for n = 0, frame:GetMenuBar():GetCount() do frame:GetMenuBar():GetMenu(n):UpdateUI() end --- 731,735 ---- function UpdateUIMenuItems() if frame and frame:GetMenuBar() then ! for n = 0, frame:GetMenuBar():GetMenuCount() do frame:GetMenuBar():GetMenu(n):UpdateUI() end |
|
From: John L. <jr...@us...> - 2006-09-22 22:29:26
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4748/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: unify some of the event handling Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** editor.h 19 Sep 2006 05:01:44 -0000 1.18 --- editor.h 22 Sep 2006 22:29:21 -0000 1.19 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 73599; ! const unsigned char wxLuaEditor[73600] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 72886; ! const unsigned char wxLuaEditor[72887] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 816,820 **** 10, 102,117,110, 99,116,105,111,110, 32, 83, 97,118,101, 70,105,108,101, 40,101,100,105,116,111,114, 44, 32,102,105,108,101, 80, 97,116,104, 41, 10, - 32, 32, 32, 32,108,111, 99, 97,108, 32,115, 97,118,101,100, 32, 61, 32,110,105,108, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,115,116, 32, 32, 32, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 84,101,120,116, 40, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32, 98, 97, 99,107, 80, 97,116,104, 32, 61, 32,102,105,108,101, 80, 97,116,104, 46, 46, 34, 46, 98, 97,107, 34, 10, --- 816,819 ---- *************** *** 827,833 **** 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 69,109,112,116,121, 85,110,100,111, 66,117,102,102,101,114, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116, 68,111, 99,117,109,101,110,116, 77,111,100,105,102,105,101,100, 40,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 44, 32,110,105,108, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,115, 97,118,101,100, 32, 61, 32, 49, 10, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32,114,101,116,117,114,110, 32,115, 97,118,101,100, 10, 101,110,100, 10, 10, --- 826,833 ---- 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 69,109,112,116,121, 85,110,100,111, 66,117,102,102,101,114, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 83,101,116, 68,111, 99,117,109,101,110,116, 77,111,100,105,102,105,101,100, 40,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 44, 32,110,105,108, 44, 32,116,114,117,101, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,114,101,116,117,114,110, 32,116,114,117,101, 10, 32, 32, 32, 32,101,110,100, 10, ! 10, ! 32, 32, 32, 32,114,101,116,117,114,110, 32,102, 97,108,115,101, 10, 101,110,100, 10, 10, *************** *** 891,907 **** 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, - 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 65, 86, 69, 65, 83, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, - 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,101,100,105,116,111,114, 32,116,104,101,110, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,105,100, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 32,116,104,101,110, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,105,115, 77,111,100,105,102,105,101,100, 32,126, 61, 32,110,105,108, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,108,115,101, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,102, 97,108,115,101, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, - 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, - 10, 102,117,110, 99,116,105,111,110, 32, 83, 97,118,101, 65,108,108, 40, 41, 10, 32, 32, 32, 32,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,112, 97,105,114,115, 40,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 41, 32,100,111, 10, --- 891,894 ---- *************** *** 1065,1098 **** 101,100,105,116, 77,101,110,117, 58, 67,104,101, 99,107, 40, 73, 68, 95, 65, 85, 84, 79, 67, 79, 77, 80, 76, 69, 84, 69, 95, 69, 78, 65, 66, 76, 69, 44, 32, 97,117,116,111, 67,111,109,112,108,101,116,101, 69,110, 97, 98,108,101, 41, 10, 10, ! 102,117,110, 99,116,105,111,110, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,101,100,105,116,111,114, 32,126, 61, 32,110,105,108, 41, 10, 101,110,100, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 85, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 67,117,116, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 85, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 80, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 67,111,112,121, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 80, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 80, 65, 83, 84, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 80, 97,115,116,101, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 80, 65, 83, 84, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, --- 1052,1083 ---- 101,100,105,116, 77,101,110,117, 58, 67,104,101, 99,107, 40, 73, 68, 95, 65, 85, 84, 79, 67, 79, 77, 80, 76, 69, 84, 69, 95, 69, 78, 65, 66, 76, 69, 44, 32, 97,117,116,111, 67,111,109,112,108,101,116,101, 69,110, 97, 98,108,101, 41, 10, 10, ! 102,117,110, 99,116,105,111,110, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,101,100,105,116,111,114, 32,126, 61, 32,110,105,108, 41, 10, 101,110,100, 10, 10, ! 102,117,110, 99,116,105,111,110, 32, 79,110, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,109,101,110,117, 95,105,100, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 73,100, 40, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32,105,102, 32,101,100,105,116,111,114, 32, 61, 61, 32,110,105,108, 32,116,104,101,110, 32,114,101,116,117,114,110, 32,101,110,100, 10, 10, ! 32, 32, 32, 32,105,102, 32, 32, 32, 32, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 67, 85, 84, 32, 32, 32, 32, 32, 32, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 67,117,116, 40, 41, 10, ! 32, 32, 32, 32,101,108,115,101,105,102, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 67, 79, 80, 89, 32, 32, 32, 32, 32, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 67,111,112,121, 40, 41, 10, ! 32, 32, 32, 32,101,108,115,101,105,102, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 80, 65, 83, 84, 69, 32, 32, 32, 32, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 80, 97,115,116,101, 40, 41, 10, ! 32, 32, 32, 32,101,108,115,101,105,102, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 67, 76, 69, 65, 82, 32, 32, 32, 32, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 67,108,101, 97,114, 40, 41, 10, ! 32, 32, 32, 32,101,108,115,101,105,102, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 83,101,108,101, 99,116, 65,108,108, 40, 41, 10, ! 32, 32, 32, 32,101,108,115,101,105,102, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 85, 78, 68, 79, 32, 32, 32, 32, 32, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 85,110,100,111, 40, 41, 10, ! 32, 32, 32, 32,101,108,115,101,105,102, 32,109,101,110,117, 95,105,100, 32, 61, 61, 32, 73, 68, 95, 82, 69, 68, 79, 32, 32, 32, 32, 32, 32,116,104,101,110, 32,101,100,105,116,111,114, 58, 82,101,100,111, 40, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, 10, ! 101,110,100, 10, ! 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 85, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 85, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 41, 10, ! 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 80, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 80, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 41, 10, ! 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 80, 65, 83, 84, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 80, 65, 83, 84, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, *************** *** 1110,1138 **** 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 76, 69, 65, 82, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 67,108,101, 97,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 76, 69, 65, 82, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 83,101,108,101, 99,116, 65,108,108, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 85, 78, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 85,110,100,111, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 85, 78, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, --- 1095,1105 ---- 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 76, 69, 65, 82, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 76, 69, 65, 82, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 69, 76, 69, 67, 84, 65, 76, 76, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 85, 78, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 85, 78, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, *************** *** 1141,1149 **** 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 82, 69, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 71,101,116, 69,100,105,116,111,114, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,100,105,116,111,114, 58, 82,101,100,111, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 82, 69, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, --- 1108,1112 ---- 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 82, 69, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 32, 79,110, 69,100,105,116, 77,101,110,117, 41, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 82, 69, 68, 79, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, *************** *** 1169,1176 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 85, 84, 79, 67, 79, 77, 80, 76, 69, 84, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 85, 84, 79, 67, 79, 77, 80, 76, 69, 84, 69, 95, 69, 78, 65, 66, 76, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, --- 1132,1136 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, ! 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 85, 84, 79, 67, 79, 77, 80, 76, 69, 84, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 41, 10, 10, 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 85, 84, 79, 67, 79, 77, 80, 76, 69, 84, 69, 95, 69, 78, 65, 66, 76, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10, *************** *** 1189,1193 **** 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 76, 69, 65, 82, 79, 85, 84, 80, 85, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 1149,1153 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 76, 69, 65, 82, 79, 85, 84, 80, 85, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 58, 69,110, 97, 98,108,101, 40,101,114,114,111,114, 76,111,103, 32, 97,110,100, 32,101,114,114,111,114, 76,111,103, 58, 73,115, 83,104,111,119,110, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 1416,1420 **** 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 70, 73, 78, 68, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 1376,1380 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 70, 73, 78, 68, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 1447,1451 **** 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 82, 69, 80, 76, 65, 67, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 1407,1411 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 82, 69, 80, 76, 65, 67, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 1466,1470 **** 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 71, 79, 84, 79, 76, 73, 78, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 1426,1430 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 71, 79, 84, 79, 76, 73, 78, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 1534,1538 **** 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 84, 79, 71, 71, 76, 69, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 1494,1498 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 84, 79, 71, 71, 76, 69, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 1547,1551 **** 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 77, 80, 73, 76, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 69,110, 97, 98,108,101, 69,100,105,116,111,114, 77,101,110,117, 73,116,101,109, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, --- 1507,1511 ---- 102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 77, 80, 73, 76, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 79,110, 85,112,100, 97,116,101, 85, 73, 69,100,105,116, 77,101,110,117, 40,101,118,101,110,116, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10, 10, *************** *** 1896,1900 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 99,101,110,116,101,114, 62, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 50, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 98, 62, 60, 98,114, 62,119,120, 76,117, 97, 32, 86,101,114,115,105,111,110, 32, 50, 46, 55, 60, 98,114, 62, 60, 47, 98, 62, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 47,102,111,110,116, 62, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 47, 99,101,110,116,101,114, 62, 10, --- 1856,1862 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 99,101,110,116,101,114, 62, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60,102,111,110,116, 32,115,105,122,101, 32, 61, 32, 43, 50, 32, 99,111,108,111,114, 32, 61, 32, 34, 35, 70, 70, 70, 70, 70, 70, 34, 62, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 98, 62, 60, 98,114, 62, 93, 93, 46, 46, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46, 87, 88, 76, 85, 65, 95, 86, 69, 82, 83, 73, 79, 78, 95, 83, 84, 82, 73, 78, 71, 46, 46, 34, 32, 98,117,105,108,116, 32,119,105,116,104, 32, 34, 46, 46,119,120, 46,119,120, 86, 69, 82, 83, 73, 79, 78, 95, 83, 84, 82, 73, 78, 71, 46, 46, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 91, 91, 60, 98,114, 62, 60, 47, 98, 62, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 47,102,111,110,116, 62, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 60, 47, 99,101,110,116,101,114, 62, 10, |
|
From: John L. <jr...@us...> - 2006-09-22 22:29:25
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4748/wxLua/samples Modified Files: editor.wx.lua Log Message: unify some of the event handling Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** editor.wx.lua 20 Sep 2006 04:07:38 -0000 1.22 --- editor.wx.lua 22 Sep 2006 22:29:21 -0000 1.23 *************** *** 804,808 **** function SaveFile(editor, filePath) - local saved = nil local st = editor:GetText() local backPath = filePath..".bak" --- 804,807 ---- *************** *** 815,821 **** editor:EmptyUndoBuffer() SetDocumentModified(editor:GetId(), nil, true) ! saved = 1 end ! return saved end --- 814,821 ---- editor:EmptyUndoBuffer() SetDocumentModified(editor:GetId(), nil, true) ! return true end ! ! return false end *************** *** 878,893 **** SaveFileAs(editor) end) - frame:Connect(ID_SAVEAS, wx.wxEVT_UPDATE_UI, function (event) local editor = GetEditor() ! if editor then ! local id = editor:GetId() ! if openDocuments[id] then ! event:Enable(openDocuments[id].isModified ~= nil) ! end ! else ! event:Enable(false) ! end end) --- 878,885 ---- SaveFileAs(editor) end) frame:Connect(ID_SAVEAS, wx.wxEVT_UPDATE_UI, function (event) local editor = GetEditor() ! event:Enable(editor ~= nil) end) *************** *** 1053,1126 **** editMenu:Check(ID_AUTOCOMPLETE_ENABLE, autoCompleteEnable) ! function EnableEditorMenuItem(event) local editor = GetEditor() event:Enable(editor ~= nil) end ! frame:Connect(ID_CUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:Cut() ! end) ! frame:Connect(ID_CUT, wx.wxEVT_UPDATE_UI, ! function(event) ! EnableEditorMenuItem(event) ! end) ! frame:Connect(ID_COPY, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:Copy() ! end) ! frame:Connect(ID_COPY, wx.wxEVT_UPDATE_UI, ! function(event) ! EnableEditorMenuItem(event) ! end) ! frame:Connect(ID_PASTE, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:Paste() ! end) frame:Connect(ID_PASTE, wx.wxEVT_UPDATE_UI, function (event) local editor = GetEditor() ! if editor then ! -- buggy GTK clipboard runs eventloop and can generate asserts ! if not wx.__WXGTK__ then ! event:Enable(editor:CanPaste()) ! else ! event:Enable(true) ! end ! else ! event:Enable(false) ! end end) ! frame:Connect(ID_CLEAR, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:Clear() ! end) ! frame:Connect(ID_CLEAR, wx.wxEVT_UPDATE_UI, ! function(event) ! EnableEditorMenuItem(event) ! end) ! frame:Connect(ID_SELECTALL, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:SelectAll() ! end) ! frame:Connect(ID_SELECTALL, wx.wxEVT_UPDATE_UI, ! function(event) ! EnableEditorMenuItem(event) ! end) ! frame:Connect(ID_UNDO, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:Undo() ! end) frame:Connect(ID_UNDO, wx.wxEVT_UPDATE_UI, function (event) --- 1045,1090 ---- editMenu:Check(ID_AUTOCOMPLETE_ENABLE, autoCompleteEnable) ! function OnUpdateUIEditMenu(event) -- enable if there is a valid focused editor local editor = GetEditor() event:Enable(editor ~= nil) end ! function OnEditMenu(event) ! local menu_id = event:GetId() ! local editor = GetEditor() ! if editor == nil then return end ! if menu_id == ID_CUT then editor:Cut() ! elseif menu_id == ID_COPY then editor:Copy() ! elseif menu_id == ID_PASTE then editor:Paste() ! elseif menu_id == ID_CLEAR then editor:Clear() ! elseif menu_id == ID_SELECTALL then editor:SelectAll() ! elseif menu_id == ID_UNDO then editor:Undo() ! elseif menu_id == ID_REDO then editor:Redo() ! end ! end ! ! frame:Connect(ID_CUT, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) ! frame:Connect(ID_CUT, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) ! ! frame:Connect(ID_COPY, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) ! frame:Connect(ID_COPY, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) ! ! frame:Connect(ID_PASTE, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) frame:Connect(ID_PASTE, wx.wxEVT_UPDATE_UI, function (event) local editor = GetEditor() ! -- buggy GTK clipboard runs eventloop and can generate asserts ! event:Enable(editor and (wx.__WXGTK__ or editor:CanPaste())) end) ! frame:Connect(ID_CLEAR, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) ! frame:Connect(ID_CLEAR, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) ! frame:Connect(ID_SELECTALL, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) ! frame:Connect(ID_SELECTALL, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) ! frame:Connect(ID_UNDO, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) frame:Connect(ID_UNDO, wx.wxEVT_UPDATE_UI, function (event) *************** *** 1129,1137 **** end) ! frame:Connect(ID_REDO, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local editor = GetEditor() ! editor:Redo() ! end) frame:Connect(ID_REDO, wx.wxEVT_UPDATE_UI, function (event) --- 1093,1097 ---- end) ! frame:Connect(ID_REDO, wx.wxEVT_COMMAND_MENU_SELECTED, OnEditMenu) frame:Connect(ID_REDO, wx.wxEVT_UPDATE_UI, function (event) *************** *** 1143,1146 **** --- 1103,1107 ---- function (event) local editor = GetEditor() + if (editor == nil) then return end local pos = editor:GetCurrentPos() local start_pos = editor:WordStartPosition(pos, true) *************** *** 1157,1164 **** end end) ! frame:Connect(ID_AUTOCOMPLETE, wx.wxEVT_UPDATE_UI, ! function(event) ! EnableEditorMenuItem(event) ! end) frame:Connect(ID_AUTOCOMPLETE_ENABLE, wx.wxEVT_COMMAND_MENU_SELECTED, --- 1118,1122 ---- end end) ! frame:Connect(ID_AUTOCOMPLETE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) frame:Connect(ID_AUTOCOMPLETE_ENABLE, wx.wxEVT_COMMAND_MENU_SELECTED, *************** *** 1177,1181 **** frame:Connect(ID_CLEAROUTPUT, wx.wxEVT_UPDATE_UI, function(event) ! EnableEditorMenuItem(event) end) --- 1135,1139 ---- frame:Connect(ID_CLEAROUTPUT, wx.wxEVT_UPDATE_UI, function(event) ! event:Enable(errorLog and errorLog:IsShown()) end) *************** *** 1402,1409 **** FindReplace() end) ! frame:Connect(ID_FIND, wx.wxEVT_UPDATE_UI, ! function (event) ! EnableEditorMenuItem(event) ! end) frame:Connect(ID_FINDNEXT, wx.wxEVT_COMMAND_MENU_SELECTED, --- 1360,1364 ---- FindReplace() end) ! frame:Connect(ID_FIND, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) frame:Connect(ID_FINDNEXT, wx.wxEVT_COMMAND_MENU_SELECTED, *************** *** 1433,1440 **** FindReplace(1) end) ! frame:Connect(ID_REPLACE, wx.wxEVT_UPDATE_UI, ! function (event) ! EnableEditorMenuItem(event) ! end) frame:Connect(ID_GOTOLINE, wx.wxEVT_COMMAND_MENU_SELECTED, --- 1388,1392 ---- FindReplace(1) end) ! frame:Connect(ID_REPLACE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) frame:Connect(ID_GOTOLINE, wx.wxEVT_COMMAND_MENU_SELECTED, *************** *** 1452,1459 **** end end) ! frame:Connect(ID_GOTOLINE, wx.wxEVT_UPDATE_UI, ! function (event) ! EnableEditorMenuItem(event) ! end) -- --------------------------------------------------------------------------- --- 1404,1408 ---- end end) ! frame:Connect(ID_GOTOLINE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) -- --------------------------------------------------------------------------- *************** *** 1520,1527 **** ToggleDebugMarker(editor, row) end) ! frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_UPDATE_UI, ! function(event) ! EnableEditorMenuItem(event) ! end) frame:Connect(ID_COMPILE, wx.wxEVT_COMMAND_MENU_SELECTED, --- 1469,1473 ---- ToggleDebugMarker(editor, row) end) ! frame:Connect(ID_TOGGLEBREAKPOINT, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) frame:Connect(ID_COMPILE, wx.wxEVT_COMMAND_MENU_SELECTED, *************** *** 1533,1540 **** wx.wxLuaDebuggerServerCompile(filePath, editorText) end) ! frame:Connect(ID_COMPILE, wx.wxEVT_UPDATE_UI, ! function (event) ! EnableEditorMenuItem(event) ! end) frame:Connect(ID_RUN, wx.wxEVT_COMMAND_MENU_SELECTED, --- 1479,1483 ---- wx.wxLuaDebuggerServerCompile(filePath, editorText) end) ! frame:Connect(ID_COMPILE, wx.wxEVT_UPDATE_UI, OnUpdateUIEditMenu) frame:Connect(ID_RUN, wx.wxEVT_COMMAND_MENU_SELECTED, |
|
From: John L. <jr...@us...> - 2006-09-22 19:40:04
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29720/modules/lua/src Modified Files: ldebug.c lparser.c Log Message: apply lua 5.1.1 patches, List constructors have wrong limit. and Wrong message error closeures Index: ldebug.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ldebug.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ldebug.c 29 Mar 2006 05:48:11 -0000 1.2 --- ldebug.c 22 Sep 2006 19:39:59 -0000 1.3 *************** *** 185,189 **** for (i=0; i<f->l.p->sizelineinfo; i++) setbvalue(luaH_setnum(L, t, lineinfo[i]), 1); ! sethvalue(L, L->top, t); } incr_top(L); --- 185,189 ---- for (i=0; i<f->l.p->sizelineinfo; i++) setbvalue(luaH_setnum(L, t, lineinfo[i]), 1); ! sethvalue(L, L->top, t); } incr_top(L); *************** *** 433,445 **** } case OP_CLOSURE: { ! int nup; check(b < pt->sizep); nup = pt->p[b]->nups; check(pc + nup < pt->sizecode); ! for (; nup>0; nup--) { ! OpCode op1 = GET_OPCODE(pt->code[pc+nup]); ! check(op1 == OP_GETUPVAL || op1 == OP_MOVE); ! } ! break; } case OP_VARARG: { --- 433,447 ---- } case OP_CLOSURE: { ! int nup, j; check(b < pt->sizep); nup = pt->p[b]->nups; check(pc + nup < pt->sizecode); ! for (j = 1; j <= nup; j++) { ! OpCode op1 = GET_OPCODE(pt->code[pc + j]); ! check(op1 == OP_GETUPVAL || op1 == OP_MOVE); ! } ! if (reg != NO_REG) /* tracing? */ ! pc += nup; /* do not 'execute' these pseudo-instructions */ ! break; } case OP_VARARG: { Index: lparser.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lparser.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lparser.c 12 Jun 2006 03:50:37 -0000 1.3 --- lparser.c 22 Sep 2006 19:39:59 -0000 1.4 *************** *** 490,494 **** static void listfield (LexState *ls, struct ConsControl *cc) { expr(ls, &cc->v); ! luaY_checklimit(ls->fs, cc->na, MAXARG_Bx, "items in a constructor"); cc->na++; cc->tostore++; --- 490,494 ---- static void listfield (LexState *ls, struct ConsControl *cc) { expr(ls, &cc->v); ! luaY_checklimit(ls->fs, cc->na, MAX_INT, "items in a constructor"); cc->na++; cc->tostore++; |
|
From: John L. <jr...@us...> - 2006-09-20 04:24:30
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19032/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: add wxlua_check_version Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wx_bind.cpp 20 Sep 2006 04:07:37 -0000 1.55 --- wx_bind.cpp 20 Sep 2006 04:24:27 -0000 1.56 *************** *** 3173,3176 **** --- 3173,3195 ---- } + // %function bool wxCHECK_WXLUA_VERSION(int major, int minor, int release) // actually a define + static int LUACALL wxLua_function_wxCHECK_WXLUA_VERSION(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int release + int release = (int)wxlState.GetNumberType(3); + // int minor + int minor = (int)wxlState.GetNumberType(2); + // int major + int major = (int)wxlState.GetNumberType(1); + // call wxCHECK_WXLUA_VERSION + returns = wxCHECK_WXLUA_VERSION(major, minor, release); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + // %override wxLua_function_wxClientDisplayRect // %function void wxClientDisplayRect(int *x, int *y,int *width, int *height) *************** *** 4916,4919 **** --- 4935,4939 ---- { LuaGlobal, "wxCHECK_VERSION", wxLua_function_wxCHECK_VERSION, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaGlobal, "wxCHECK_VERSION_FULL", wxLua_function_wxCHECK_VERSION_FULL, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaGlobal, "wxCHECK_WXLUA_VERSION", wxLua_function_wxCHECK_WXLUA_VERSION, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaGlobal, "wxClientDisplayRect", wxLua_function_wxClientDisplayRect, 4, 4, { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 } }, { LuaGlobal, "wxColourDisplay", wxLua_function_wxColourDisplay, 0, 0, { 0 } }, |
