aboutsummaryrefslogtreecommitdiff
path: root/src/ui_interface.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2012-05-05 16:07:14 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2012-05-20 10:41:54 +0200
commitfe4a655042f7de31dce120aeed72345579f1b59f (patch)
tree847f725c2cc3ba00f4a314382d334a7148d78ecd /src/ui_interface.h
parent563f3efda3d3230bc512b35f15598d5e4e3a5071 (diff)
downloadbitcoin-fe4a655042f7de31dce120aeed72345579f1b59f.tar.xz
Fine-grained UI updates
Gets rid of `MainFrameRepaint` in favor of specific update functions that tell the UI exactly what changed. This improves the efficiency of various handlers. Also fixes problems with mined transactions not showing up until restart. The following notifications were added: - `NotifyBlocksChanged`: Block chain changed - `NotifyKeyStoreStatusChanged`: Wallet status (encrypted, locked) changed. - `NotifyAddressBookChanged`: Address book entry changed. - `NotifyTransactionChanged`: Wallet transaction added, removed or updated. - `NotifyNumConnectionsChanged`: Number of connections changed. - `NotifyAlertChanged`: New, updated or cancelled alert. As this finally makes it possible for the UI to know when a new alert arrived, it can be shown as OS notification. These notifications could also be useful for RPC clients. However, currently, they are ignored in bitcoind (in noui.cpp). Also brings back polling with timer for numBlocks in ClientModel. This value updates so frequently during initial download that the number of signals clogs the UI thread and causes heavy CPU usage. And after initial block download, the value changes so rarely that a delay of half a second until the UI updates is unnoticable.
Diffstat (limited to 'src/ui_interface.h')
-rw-r--r--src/ui_interface.h39
1 files changed, 37 insertions, 2 deletions
diff --git a/src/ui_interface.h b/src/ui_interface.h
index 514768086d..c1ed265a01 100644
--- a/src/ui_interface.h
+++ b/src/ui_interface.h
@@ -7,6 +7,10 @@
#include <string>
#include "util.h" // for int64
+class CBasicKeyStore;
+class CWallet;
+class uint256;
+
#define wxYES 0x00000002
#define wxOK 0x00000004
#define wxNO 0x00000008
@@ -36,15 +40,46 @@
// Force blocking, modal message box dialog (not just notification)
#define wxMODAL 0x00040000
+enum ChangeType
+{
+ CT_NEW,
+ CT_UPDATED,
+ CT_DELETED
+};
+
/* These UI communication functions are implemented in bitcoin.cpp (for ui) and noui.cpp (no ui) */
extern int ThreadSafeMessageBox(const std::string& message, const std::string& caption, int style=wxOK);
extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption);
extern void ThreadSafeHandleURI(const std::string& strURI);
-extern void MainFrameRepaint();
-extern void AddressBookRepaint();
extern void QueueShutdown();
extern void InitMessage(const std::string &message);
extern std::string _(const char* psz);
+/* Block chain changed. */
+extern void NotifyBlocksChanged();
+
+/* Wallet status (encrypted, locked) changed.
+ * Note: Called without locks held.
+ */
+extern void NotifyKeyStoreStatusChanged(CBasicKeyStore *wallet);
+
+/* Address book entry changed.
+ * Note: called with lock cs_wallet held.
+ */
+extern void NotifyAddressBookChanged(CWallet *wallet, const std::string &address, const std::string &label, ChangeType status);
+
+/* Wallet transaction added, removed or updated.
+ * Note: called with lock cs_wallet held.
+ */
+extern void NotifyTransactionChanged(CWallet *wallet, const uint256 &hashTx, ChangeType status);
+
+/* Number of connections changed. */
+extern void NotifyNumConnectionsChanged(int newNumConnections);
+
+/* New, updated or cancelled alert.
+ * Note: called with lock cs_mapAlerts held.
+ */
+extern void NotifyAlertChanged(const uint256 &hash, ChangeType status);
+
#endif