basic choices view

driver/Makefile

@@ -14,7 +14,7 @@ OBJ_CLI  = cli.o
 CFLAGS   = -std=c++14 -O3 -Wall -Wextra
 LDFLAGS  = -lcurses
 OBJECTS_DRV  = drv/usart.o drv/b15f.o drv/plottyfile.o drv/dot.o
-OBJECTS_UI   = ui/view.o ui/view_main.o ui/view_info.o
+OBJECTS_UI   = ui/view.o ui/view_selection.o ui/view_info.o
 
 COMPILE = $(COMPILER_PATH) $(CFLAGS)
 

driver/cli.cpp

@@ -1,3 +1,10 @@
+/** TODO
+ * 
+ * - throw exception -> raise SIGINT
+ * 
+ */
+
+
 #include <stdio.h>
 #include <ncurses.h> // sudo apt-get install libncurses5-dev
 #include <vector>
@@ -7,9 +14,9 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <signal.h>
-#include "ui/view_main.h"
+#include "ui/view_selection.h"
 #include "ui/view_info.h"
-#include "drv/b15f.h"
+//#include "drv/b15f.h"
 
 // global error message
 std::string ERR_MSG;
@@ -46,7 +53,7 @@ void signal_handler(int signal)
 void init()
 {
 	// init b15 driver
-	B15F::getInstance();
+	//B15F::getInstance();
 	
 	// init all ncurses stuff
 	initscr();
@@ -108,10 +115,11 @@ void show_info(int)
 
 void show_main(int)
 {
-	ViewMain* view = new ViewMain();	
+	ViewSelection* view = new ViewSelection();	
 	view->setTitle("B15F - Command Line Interface");
-	view->addCall(&show_info);
+	view->addChoice("[ Informationen ]", &show_info);
-	view->addCall(&finish);
+	view->addChoice("", nullptr);
+	view->addChoice("[ Beenden ]", &finish);
 	view->repaint();
 	
 	win_stack.push_back(view);

driver/ui/view.cpp

@@ -23,11 +23,24 @@ WINDOW* View::getWinContext()
 	return win;
 }
 
-void View::addCall(std::function<void(int)> call)
+// from: https://stackoverflow.com/a/37454181
+std::vector<std::string> View::str_split(const std::string& str, const std::string delim)
 {
-	calls.push_back(call);
+    std::vector<std::string> tokens;
+    size_t prev = 0, pos = 0;
+    do
+    {
+        pos = str.find(delim, prev);
+        if (pos == std::string::npos) pos = str.length();
+        std::string token = str.substr(prev, pos-prev);
+        if (!token.empty()) tokens.push_back(token);
+        prev = pos + delim.length();
+    }
+    while (pos < str.length() && prev < str.length());
+    return tokens;
 }
 
+
 void View::setTitle(std::string title)
 {
 	this->title = title;
@@ -59,20 +72,3 @@ void View::repaint()
 	refresh();
 	wrefresh(win);
 }
-
-// from: https://stackoverflow.com/a/37454181
-std::vector<std::string> View::str_split(const std::string& str, const std::string delim)
-{
-    std::vector<std::string> tokens;
-    size_t prev = 0, pos = 0;
-    do
-    {
-        pos = str.find(delim, prev);
-        if (pos == std::string::npos) pos = str.length();
-        std::string token = str.substr(prev, pos-prev);
-        if (!token.empty()) tokens.push_back(token);
-        prev = pos + delim.length();
-    }
-    while (pos < str.length() && prev < str.length());
-    return tokens;
-}

driver/ui/view.h

@@ -19,14 +19,11 @@ public:
 	
 	static void setWinContext(WINDOW* win);
 	static WINDOW* getWinContext(void);
-
+	static std::vector<std::string> str_split(const std::string& str, const std::string delim);
-	virtual void addCall(std::function<void(int)> call);
 	
-	void setSize(int width, int height);
+	virtual void setTitle(std::string title);
-	void setTitle(std::string title);
 	
 	virtual void repaint(void);
-	static std::vector<std::string> str_split(const std::string& str, const std::string delim);
 	
 	virtual void draw(void) = 0;
 	virtual std::function<void(int)> keypress(int& key) = 0;
@@ -38,9 +35,8 @@ protected:
 	std::string title;
 	std::vector<std::function<void(int)>> calls;
 	
-	constexpr static int KEY_ENT = 10;
-	
 	static WINDOW* win;
+	constexpr static int KEY_ENT = 10;
 };
 
 #endif // VIEW_H

driver/ui/view_info.cpp

@@ -2,6 +2,7 @@
 
 ViewInfo::ViewInfo()
 {
+	calls.push_back(nullptr);
 }
 
 void ViewInfo::setText(std::string text)
@@ -14,6 +15,11 @@ void ViewInfo::setLabelClose(std::string label)
 	this->label_close = label;
 }
 
+void ViewInfo::setCall(std::function<void(int)> call)
+{
+	calls[0] = call;
+}
+
 void ViewInfo::draw()
 {
 	int li = 0;
@@ -30,7 +36,6 @@ void ViewInfo::draw()
 
 std::function<void(int)> ViewInfo::keypress(int& key)
 {
-	std::function<void(int)> ret = nullptr;
 	switch(key)
 	{
 		
@@ -53,5 +58,5 @@ std::function<void(int)> ViewInfo::keypress(int& key)
 		default:
 			break;
 	}
-	return ret;
+	return calls[0];
 }

driver/ui/view_info.h

@@ -8,11 +8,12 @@ class ViewInfo : public View
 public:
 	ViewInfo(void);
 	virtual void setText(std::string text);
-	virtual void setLabelClose(std::string label);
+	virtual void setLabelClose(std::string label);;
+	virtual void setCall(std::function<void(int)> call);
 	virtual void draw(void) override;
 	virtual std::function<void(int)> keypress(int& key) override;
 
-private:
+protected:
 	std::string text;
 	std::string label_close;
 	int close_offset_x = 0;

driver/ui/view_selection.cpp

@@ -1,6 +1,6 @@
-#include "view_main.h"
+#include "view_selection.h"
 
-void ViewMain::draw()
+void ViewSelection::draw()
 {
 	
 	for(size_t i = 0; i < choices.size(); i++)
@@ -13,16 +13,26 @@ void ViewMain::draw()
 	}
 }
 
-std::function<void(int)> ViewMain::keypress(int& key)
+void ViewSelection::addChoice(std::string name, std::function<void(int)> call)
+{
+	choices.push_back(name);
+	calls.push_back(call);
+}
+
+std::function<void(int)> ViewSelection::keypress(int& key)
 {
 	std::function<void(int)> ret = nullptr;
 	switch(key)
 	{
 		case KEY_UP:
-			selection = (selection - 1) % choices.size();
+			do
+				selection = (selection - 1 + choices.size()) % choices.size();
+			while(!choices[selection].length() && choices.size());
 			break;
 		case KEY_DOWN:
-			selection = (selection + 1) % choices.size();
+			do
+				selection = (selection + 1) % choices.size();
+			while(!choices[selection].length() && choices.size());
 			break;
 		case KEY_MOUSE:
 		{
@@ -35,7 +45,7 @@ std::function<void(int)> ViewMain::keypress(int& key)
 				size_t row_start = start_y + choice_offset_y;
 				size_t mouse_x = event.x, mouse_y = event.y;
 				for(size_t i = 0; i < choices.size(); i++)
-					if(mouse_y == row_start + i && mouse_x >= column_start && mouse_x < column_start + choices[i].length())
+					if(choices[i].length() && mouse_y == row_start + i && mouse_x >= column_start && mouse_x < column_start + choices[i].length())
 					{
 						if(selection == i || event.bstate & BUTTON1_DOUBLE_CLICKED)
 							hit = true;

driver/ui/view_selection.h

@@ -1,24 +1,24 @@
-#ifndef VIEW_MAIN_H
+#ifndef VIEW_SELECTION_H
-#define VIEW_MAIN_H
+#define VIEW_SELECTION_H
 
 #include <vector>
 #include <string>
 #include "view.h"
 
-class ViewMain : public View
+class ViewSelection : public View
 {
 public:
 	virtual void draw(void) override;
+	virtual void addChoice(std::string name, std::function<void(int)> call);
 	virtual std::function<void(int)> keypress(int& key) override;
+	
 
-private:
+protected:
+	size_t selection = 0;
+	std::vector<std::string> choices;
+	
 	constexpr static int choice_offset_x = 2;
 	constexpr static int choice_offset_y = 3;
-	size_t selection = 0;
-	const std::vector<std::string> choices = {
-		"[ Informationen ]",
-		"[ Beenden ]"
-	};
 };
 
-#endif // VIEW_MAIN_H
+#endif // VIEW_SELECTION_H