summaryrefslogtreecommitdiff
path: root/src/gui/status.c
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2016-12-30 10:38:52 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2016-12-30 10:38:52 (GMT)
commit932ea7c83c07d3982fee605c6dd9895fd2753874 (patch)
tree766ad53bab9e3e3005334c30e823493de8e84168 /src/gui/status.c
parent1b5d39bfbc48c33a0ea0924b60e48448c8b45dd4 (diff)
Rewritten the line buffers using generators and on-demand building to save memory.
Diffstat (limited to 'src/gui/status.c')
-rw-r--r--src/gui/status.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/status.c b/src/gui/status.c
index fc8eafd..daa5f91 100644
--- a/src/gui/status.c
+++ b/src/gui/status.c
@@ -36,8 +36,7 @@
#include "editem-int.h"
#include "core/global.h"
#include "../common/extstr.h"
-#include "../gtkext/gtkbufferview.h"
-#include "../gtkext/gtkblockview.h"
+#include "../gtkext/gtkbufferdisplay.h"
#include "../gtkext/gtkstatusstack.h"
@@ -71,7 +70,7 @@ static void g_status_info_dispose(GStatusInfo *);
static void g_status_info_finalize(GStatusInfo *);
/* Imprime la position du parcours courant dans le statut. */
-static void track_caret_address_for_status_info(GStatusInfo *, GtkBufferView *, const vmpa2t *);
+static void track_caret_address_for_status_info(GStatusInfo *, GtkBufferDisplay *, const vmpa2t *);
/* Concentre l'attention de l'ensemble sur une adresse donnée. */
static void focus_address_in_status_info(GStatusInfo *, GLoadedBinary *, const vmpa2t *);
@@ -209,9 +208,9 @@ GEditorItem *g_status_info_new(GObject *ref)
/******************************************************************************
* *
-* Paramètres : info = barre de statut présentant les informations. *
-* view = composant d'affichage parcouru. *
-* addr = nouvelle adresse du curseur courant. *
+* Paramètres : info = barre de statut présentant les informations. *
+* display = composant d'affichage parcouru. *
+* addr = nouvelle adresse du curseur courant. *
* *
* Description : Imprime la position du parcours courant dans le statut. *
* *
@@ -221,7 +220,7 @@ GEditorItem *g_status_info_new(GObject *ref)
* *
******************************************************************************/
-static void track_caret_address_for_status_info(GStatusInfo *info, GtkBufferView *view, const vmpa2t *addr)
+static void track_caret_address_for_status_info(GStatusInfo *info, GtkBufferDisplay *display, const vmpa2t *addr)
{
GEditorItem *item; /* Autre version de l'élément */
GLoadedBinary *binary; /* Binaire courant */
@@ -257,7 +256,7 @@ static void focus_address_in_status_info(GStatusInfo *info, GLoadedBinary *binar
item = G_EDITOR_ITEM(info);
- if (addr == NULL)
+ if (is_invalid_vmpa(addr))
gtk_status_stack_reset_current_instruction(GTK_STATUS_STACK(item->widget));
else