From fee217551c12754db517d1badd448fc9064a48a8 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Thu, 26 Nov 2020 16:15:09 +1100
Subject: Drop unneeded parameters to the ScreenManager constructor

All calls to ScreenManager_new always pass the same first
five values, the orientation is always HORIZONTAL and the
y1 parameter is always the height of the passed-in header
struct pointer.  I think its safe to assert at this point
that no VERTICAL orientation will arrive (if it does, its
no harm in re-adding this then) - so we can remove unused
conditionals (and TODOs) based on orientation too.
---
 ScreenManager.c | 59 ++++++++++++++++++++++++---------------------------------
 1 file changed, 25 insertions(+), 34 deletions(-)

(limited to 'ScreenManager.c')

diff --git a/ScreenManager.c b/ScreenManager.c
index 28f289db..51ca155f 100644
--- a/ScreenManager.c
+++ b/ScreenManager.c
@@ -20,14 +20,13 @@ in the source distribution for its full text.
 #include "XUtils.h"
 
 
-ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation orientation, Header* header, const Settings* settings, const State* state, bool owner) {
+ScreenManager* ScreenManager_new(Header* header, const Settings* settings, const State* state, bool owner) {
    ScreenManager* this;
    this = xMalloc(sizeof(ScreenManager));
-   this->x1 = x1;
-   this->y1 = y1;
-   this->x2 = x2;
-   this->y2 = y2;
-   this->orientation = orientation;
+   this->x1 = 0;
+   this->y1 = header->height;
+   this->x2 = 0;
+   this->y2 = -1;
    this->panels = Vector_new(Class(Panel), owner, DEFAULT_SIZE);
    this->panelCount = 0;
    this->header = header;
@@ -48,21 +47,18 @@ inline int ScreenManager_size(ScreenManager* this) {
 }
 
 void ScreenManager_add(ScreenManager* this, Panel* item, int size) {
-   if (this->orientation == HORIZONTAL) {
-      int lastX = 0;
-      if (this->panelCount > 0) {
-         Panel* last = (Panel*) Vector_get(this->panels, this->panelCount - 1);
-         lastX = last->x + last->w + 1;
-      }
-      int height = LINES - this->y1 + this->y2;
-      if (size > 0) {
-         Panel_resize(item, size, height);
-      } else {
-         Panel_resize(item, COLS - this->x1 + this->x2 - lastX, height);
-      }
-      Panel_move(item, lastX, this->y1);
+   int lastX = 0;
+   if (this->panelCount > 0) {
+      Panel* last = (Panel*) Vector_get(this->panels, this->panelCount - 1);
+      lastX = last->x + last->w + 1;
+   }
+   int height = LINES - this->y1 + this->y2;
+   if (size > 0) {
+      Panel_resize(item, size, height);
+   } else {
+      Panel_resize(item, COLS - this->x1 + this->x2 - lastX, height);
    }
-   // TODO: VERTICAL
+   Panel_move(item, lastX, this->y1);
    Vector_add(this->panels, item);
    item->needsRedraw = true;
    this->panelCount++;
@@ -81,19 +77,16 @@ void ScreenManager_resize(ScreenManager* this, int x1, int y1, int x2, int y2) {
    this->x2 = x2;
    this->y2 = y2;
    int panels = this->panelCount;
-   if (this->orientation == HORIZONTAL) {
-      int lastX = 0;
-      for (int i = 0; i < panels - 1; i++) {
-         Panel* panel = (Panel*) Vector_get(this->panels, i);
-         Panel_resize(panel, panel->w, LINES - y1 + y2);
-         Panel_move(panel, lastX, y1);
-         lastX = panel->x + panel->w + 1;
-      }
-      Panel* panel = (Panel*) Vector_get(this->panels, panels - 1);
-      Panel_resize(panel, COLS - x1 + x2 - lastX, LINES - y1 + y2);
+   int lastX = 0;
+   for (int i = 0; i < panels - 1; i++) {
+      Panel* panel = (Panel*) Vector_get(this->panels, i);
+      Panel_resize(panel, panel->w, LINES - y1 + y2);
       Panel_move(panel, lastX, y1);
+      lastX = panel->x + panel->w + 1;
    }
-   // TODO: VERTICAL
+   Panel* panel = (Panel*) Vector_get(this->panels, panels - 1);
+   Panel_resize(panel, COLS - x1 + x2 - lastX, LINES - y1 + y2);
+   Panel_move(panel, lastX, y1);
 }
 
 static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTimeout, bool* redraw, bool* rescan, bool* timedOut) {
@@ -131,9 +124,7 @@ static void ScreenManager_drawPanels(ScreenManager* this, int focus) {
    for (int i = 0; i < nPanels; i++) {
       Panel* panel = (Panel*) Vector_get(this->panels, i);
       Panel_draw(panel, i == focus);
-      if (this->orientation == HORIZONTAL) {
-         mvvline(panel->y, panel->x + panel->w, ' ', panel->h + 1);
-      }
+      mvvline(panel->y, panel->x + panel->w, ' ', panel->h + 1);
    }
 }
 
-- 
cgit v1.2.3