X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=windows.c;h=6a649a325b187894c8ddc46b6eb34b51f680f68f;hb=a470e49ace2874380e6018a6166dd2a61e3c689c;hp=ebf6ecf7af55148f8ed27222a5090644a9576010;hpb=336d57bf85ed4b64307dea367c696ec9b477504a;p=plomrogue

diff --git a/windows.c b/windows.c
index ebf6ecf..6a649a3 100644
--- a/windows.c
+++ b/windows.c
@@ -13,6 +13,7 @@ struct WinMeta init_win_meta (WINDOW * screen) {
   win_meta.chain_end = 0;
   win_meta.pad_offset = 0;
   win_meta.pad = newpad(win_meta.height, 1);
+  win_meta.active = 0;
   return win_meta; }
 
 void scroll_pad (struct WinMeta * win_meta, char dir) {
@@ -22,7 +23,7 @@ void scroll_pad (struct WinMeta * win_meta, char dir) {
   else if ('-' == dir && win_meta->pad_offset > 0)
     win_meta->pad_offset--; }
 
-struct Win init_window (struct WinMeta * win_meta, char * title) {
+struct Win init_window (struct WinMeta * win_meta, char * title, void * data, void * func) {
 // Create and populate Win struct with sane default values.
   struct Win win;
   win.prev = 0;
@@ -31,6 +32,8 @@ struct Win init_window (struct WinMeta * win_meta, char * title) {
   win.title = title;
   win.width = 20;
   win.height = win_meta->height - 1;
+  win.data = data;
+  win.draw = func;
   return win; }
 
 void append_window (struct WinMeta * win_meta, struct Win * win) {
@@ -191,17 +194,11 @@ void draw_all_windows (struct WinMeta * win_meta) {
     free(all_corners); }
   doupdate(); }
 
-void resize_window (struct WinMeta * win_meta, char change) {
+void resize_active_window (struct WinMeta * win_meta, int height, int width) {
 // Grow or shrink currently active window. Correct its geometry and that of its followers.
-  if (0 != win_meta->active) {
-    if      (change == '-' && win_meta->active->height > 1)
-      win_meta->active->height--;
-    else if (change == '+' && win_meta->active->height < win_meta->height - 1)
-      win_meta->active->height++;
-    else if (change == '_' && win_meta->active->width > 1)
-      win_meta->active->width--;
-    else if (change == '*')
-      win_meta->active->width++;
+  if (0 != win_meta->active && width > 0 && height > 0 && height < win_meta->height) {
+    win_meta->active->height = height;
+    win_meta->active->width  = width;
     update_windows(win_meta, win_meta->chain_start); } }
 
 void cycle_active_window (struct WinMeta * win_meta, char dir) {
@@ -218,7 +215,7 @@ void cycle_active_window (struct WinMeta * win_meta, char dir) {
       else
         win_meta->active = win_meta->chain_end; } } }
 
-void shift_window (struct WinMeta * win_meta, char dir) {
+void shift_active_window (struct WinMeta * win_meta, char dir) {
 // Move active window forward/backward in window chain. If jumping beyond start/end, move to other chain end.
   if (0 != win_meta->active && win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
     int i, i_max;