X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=src%2Fwindows.h;h=4b622338cdf341ead4016ba6e0ff426be46f2874;hb=350ef2e2d17e8122e2991466f76a9a083a6303e7;hp=f5f4056c473fcd89d800b8c5fc033bd248933156;hpb=918a7b6c22411b67f5c5aa2aa4d1c166ad765aca;p=plomrogue
diff --git a/src/windows.h b/src/windows.h
index f5f4056..4b62233 100644
--- a/src/windows.h
+++ b/src/windows.h
@@ -20,13 +20,6 @@
* that thrones over enough space to fit them in; failing that, they are placed
* to the right of the window with the rightmost border.
*
- * Functions that return uint8_t return these error codes:
- * 0 - success
- * 1 - memory allocation error
- * 2 - would force virtual screen to grow beyond width or height of 2^16 cells
- *
- * TODO: Expose less internals to the API.
- *
* TODO: Think up a more intuitive window positioning algorithm or at least make
* the chain that windows are positioned by visible.
*/
@@ -34,37 +27,30 @@
#ifndef WINDOWS_H
#define WINDOWS_H
-
-
#include /* for uint8_t, uint16_t, uint32_t */
-#include /* for the WINDOW typedef */
-#include "yx_uint16.h" /* for yx_uint16 coordinates */
+#include /* for the WINDOW and chtype typedefs */
+#include "yx_uint16.h" /* for yx_uint16 struct */
-/* Individual windows consist of potential (real only if window is visible
- * inside the virtual screen) ncurses WINDOWs wrapped inside Frame structs (that
- * keep a window's designated size even when it is invisible) wrapped inside
- * metadata-rich Win structs. Win structs are chained into a linked list of all
- * the windows visible on the virtual screen and also contain pointers to what
- * content is to be drawn inside the window, and by use of what method.
+/* Individual windows are represented by "Win" structs. They describe frames
+ * located inside the virtual screen pad through which "winmaps" are visible,
+ * 2-dimensional maps of ncurses chtypes. Win structs are chained into a linked
+ * list of all the windows visible on the virtual screen and also contain
+ * pointers to what content is to be drawn inside the window, and by use of what
+ * method.
*/
-
-struct Frame /* If Frame is Win's "frame", "size" is the */
-{ /* designated size of curses_win's ncurses WINDOW. */
- WINDOW * curses_win; /* If Frame is WinMeta's "padframe", curses_win is */
- struct yx_uint16 size; /* the ncurses pad representing the virtual screen */
-}; /* and "size" desribes the terminal screen size. */
-
struct Win
{
struct Win * prev; /* chain pointers; if 0, they mark the start or end */
struct Win * next; /* of the chain; if both are 0, Win is outside chain */
- struct yx_uint16 start; /* upper left corner of "frame" WINDOW */
+ struct yx_uint16 framesize; /* window frame size to see winmap through */
+ struct yx_uint16 start; /* upper left corner of window in pad */
+ struct yx_uint16 center; /* window content center to focus window on */
char * title; /* title to be used in window title bar */
void (* draw) (struct Win *); /* how to draw window content ("data") */
- struct Frame frame;
- void * data; /* window content to be drawn by _draw() */
+ chtype * winmap; /* sequence of cells, sorted into lines ... */
+ struct yx_uint16 winmapsize; /* ... with these geometry infos */
};
@@ -75,10 +61,11 @@ struct Win
struct WinMeta
{
WINDOW * screen; /* ncurses' pointer to the terminal screen */
+ WINDOW * pad; /* ncurses pad of virtual screen */
+ uint16_t pad_offset; /* number of cells view is moved to the right */
+ struct yx_uint16 padsize; /* virtual screen size */
struct Win * chain_start; /* first Win in chain; its _prev == 0 */
struct Win * chain_end; /* last Win in chain; its _next == 0 */
- uint16_t pad_offset; /* number of cells view is moved to the right */
- struct Frame padframe; /* virtual screen fitted into terminal screen */
struct Win * active; /* Win highlighted/selected for manipulation */
};
@@ -87,15 +74,14 @@ struct WinMeta
/* Initialize empty WinMeta "wmeta" on the terminal "screen". (Note that
* emptiness is marked by WinMeta.chain_start=0.) Other struct members are also
* initialized 0, except for the virtual screen (height = that of the terminal
- * screen; width = 1) amd its frame sized to the size of the terminal screen.
+ * screen; width = 1) sized to the size of the terminal screen.
*/
-extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta ** wmeta);
+extern void init_win_meta(WINDOW * screen);
/* Initialize a window child of "wmeta" to "title", "height" and "width" and
- * appointing "func"() to interpret and draw the content stored at "data" when
- * the window is visible.
+ * appointing "func"() to interpret and draw the window when it's visible.
*
* Pass 0 for "width" to make the window as wide as the terminal screen. Pass
* negative values for "width" to make the width so many cells smaller than that
@@ -108,27 +94,20 @@ extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta ** wmeta);
*
* Other members of the Win struct are initialized to 0.
*/
-extern uint8_t init_win(struct WinMeta * wmeta, struct Win ** w, char * title,
- int16_t height, int16_t width,
- void * data, void * func);
-
-
+extern void init_win(struct Win ** wp, char * title, int16_t height,
+ int16_t width, void * func);
-/* Free allocated memory for an initialized Win / WinMeta struct. */
-extern void free_winmeta(struct WinMeta * wmeta);
+/* Free allocated memory for an initialized Win / WinMeta structs. */
+extern void free_winmeta();
extern void free_win(struct Win * win);
-
-
/* Append/suspend window "w" to/from chain of visible windows below "wmeta".
* Appended windows will become active. Suspended active windows will move the
* active window selection to their successor in the window chain or, failing
* that, their predecessor; if no window remains, none will be active.
*/
-extern uint8_t append_win(struct WinMeta * wmeta, struct Win * w);
-extern uint8_t suspend_win(struct WinMeta * wmeta, struct Win * w);
-
-
+extern void append_win(struct Win * w);
+extern void suspend_win(struct Win * w);
/* Apply scrolling offset "new_offset" to virtual screen if it is sane, i.e.
* it's equal/greater zero and does not push the view (further) beyond the
@@ -136,51 +115,32 @@ extern uint8_t suspend_win(struct WinMeta * wmeta, struct Win * w);
* border due to it having shrunk after suspension of windows, only allow view
* movement leftwards.
*/
-extern void reset_pad_offset(struct WinMeta * wmeta, uint16_t new_offset);
-
-
+extern void reset_pad_offset(uint16_t new_offset);
/* Apply new size "size" to the active window, but only if it provides for at
* least one cell width/height and is in height at least one cell smaller than
* the screen's vertical height (to provide space for the title bar). Does
* nothing if no window is active.
*/
-extern uint8_t resize_active_win(struct WinMeta * wmeta, struct yx_uint16 size);
-
-
+extern void resize_active_win(struct yx_uint16 size);
/* Cycle active window selection forwards ("dir" == "f") or backwards (any
* other "dir"). Wrap around in the windows chain if start / end of it is met.
* Does nothing if no window is active.
*/
-extern void cycle_active_win(struct WinMeta * wmeta, char dir);
-
-
+extern void cycle_active_win(char dir);
/* Move active window forwards ("dir" == "f") or backwards (any other "dir").
* Wrap around in the window chain if start / end of it is met. Does nothing if
* no window is active.
*/
-extern uint8_t shift_active_win(struct WinMeta * wmeta, char dir);
-
-
-
-/* Draw virtual screen including all windows. Also add scroll hints (see comment
- * on draw_scroll_hint()) for where the edges of the terminal screen hit
- * non-edges of and inside the virtual screen. Then update the terminal screen.
- */
-extern uint8_t draw_all_wins(struct WinMeta * wmeta);
-
-
+extern void shift_active_win(char dir);
-/* Draw scroll hint (a line stating that there is more to see on scrolling
- * further into a certain direction) into "frame" at position "pos" (describing
- * a column or a row dependent on "dir" being *either* "<"/">" *or* something
- * else). It will consist of a line of "dir" symbols bracketing a descriptive
- * text stating the number of rows/columns further available beyond the hint.
+/* Draw virtual screen including all windows. Also add scroll hints for where
+ * the edges of the terminal screen hit non-edges of and inside the virtual
+ * screen. Then update the terminal screen.
*/
-extern uint8_t draw_scroll_hint(struct Frame * frame, uint16_t pos,
- uint32_t dist, char dir);
+extern void draw_all_wins();