New upstream version 3.0.5upstream/3.0.5

1 files changed, 15 insertions, 19 deletions

diff --git a/TraceScreen.c b/TraceScreen.c
index 47cf0ab..da98e02 100644
--- a/TraceScreen.c
+++ b/TraceScreen.c
@@ -33,17 +33,7 @@ static const char* const TraceScreenFunctions[] = {"Search ", "Filter ", "AutoSc
 
 static const char* const TraceScreenKeys[] = {"F3", "F4", "F8", "F9", "Esc"};
 
-static int TraceScreenEvents[] = {KEY_F(3), KEY_F(4), KEY_F(8), KEY_F(9), 27};
-
-const InfoScreenClass TraceScreen_class = {
-   .super = {
-      .extends = Class(Object),
-      .delete = TraceScreen_delete
-   },
-   .draw = TraceScreen_draw,
-   .onErr = TraceScreen_updateTrace,
-   .onKey = TraceScreen_onKey,
-};
+static const int TraceScreenEvents[] = {KEY_F(3), KEY_F(4), KEY_F(8), KEY_F(9), 27};
 
 TraceScreen* TraceScreen_new(Process* process) {
    // This initializes all TraceScreen variables to "false" so only default = true ones need to be set below
@@ -70,12 +60,8 @@ void TraceScreen_delete(Object* cast) {
    free(InfoScreen_done((InfoScreen*)this));
 }
 
-void TraceScreen_draw(InfoScreen* this) {
-   attrset(CRT_colors[PANEL_HEADER_FOCUS]);
-   mvhline(0, 0, ' ', COLS);
-   mvprintw(0, 0, "Trace of process %d - %s", this->process->pid, Process_getCommand(this->process));
-   attrset(CRT_colors[DEFAULT_COLOR]);
-   IncSet_drawBar(this->inc);
+static void TraceScreen_draw(InfoScreen* this) {
+   InfoScreen_drawTitled(this, "Trace of process %d - %s", this->process->pid, Process_getCommand(this->process));
 }
 
 bool TraceScreen_forkTracer(TraceScreen* this) {
@@ -131,7 +117,7 @@ err:
    return false;
 }
 
-void TraceScreen_updateTrace(InfoScreen* super) {
+static void TraceScreen_updateTrace(InfoScreen* super) {
    TraceScreen* this = (TraceScreen*) super;
    char buffer[1025];
 
@@ -176,7 +162,7 @@ void TraceScreen_updateTrace(InfoScreen* super) {
    }
 }
 
-bool TraceScreen_onKey(InfoScreen* super, int ch) {
+static bool TraceScreen_onKey(InfoScreen* super, int ch) {
    TraceScreen* this = (TraceScreen*) super;
    switch(ch) {
       case 'f':
@@ -195,3 +181,13 @@ bool TraceScreen_onKey(InfoScreen* super, int ch) {
    this->follow = false;
    return false;
 }
+
+const InfoScreenClass TraceScreen_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = TraceScreen_delete
+   },
+   .draw = TraceScreen_draw,
+   .onErr = TraceScreen_updateTrace,
+   .onKey = TraceScreen_onKey,
+};