home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Window configuration can now be saved; and edited in a special window config view...
[plomrogue]
/
src
/
windows.c
diff --git
a/src/windows.c
b/src/windows.c
index af710dd34657e6c06ae2b9fdcdd61b2adbbb6b6a..bd3ec4134f00b21d10e79ccd232ec7818036a21d 100644
(file)
--- a/
src/windows.c
+++ b/
src/windows.c
@@
-362,8
+362,9
@@
static void shift_win_backward(struct WinMeta * wmeta)
-extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta *
wmeta
)
+extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta *
* wmp
)
{
{
+ struct WinMeta * wmeta = malloc(sizeof(struct WinMeta));
wmeta->_screen = screen;
uint32_t maxy_test = getmaxy(screen);
uint32_t maxx_test = getmaxx(screen);
wmeta->_screen = screen;
uint32_t maxy_test = getmaxy(screen);
uint32_t maxx_test = getmaxx(screen);
@@
-383,15
+384,21
@@
extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
}
wmeta->padframe.curses_win = pad_test;
wmeta->active = 0;
}
wmeta->padframe.curses_win = pad_test;
wmeta->active = 0;
+ *wmp = wmeta;
return 0;
}
return 0;
}
-extern uint8_t init_win(struct WinMeta * wmeta, struct Win *
w
, char * title,
+extern uint8_t init_win(struct WinMeta * wmeta, struct Win *
* wp
, char * title,
int16_t height, int16_t width,
void * data, void * func)
{
int16_t height, int16_t width,
void * data, void * func)
{
+ struct Win * w = malloc(sizeof(struct Win));
+ if (NULL == w)
+ {
+ return 1;
+ }
w->_prev = 0;
w->_next = 0;
w->frame.curses_win = 0;
w->_prev = 0;
w->_next = 0;
w->frame.curses_win = 0;
@@
-400,34
+407,47
@@
extern uint8_t init_win(struct WinMeta * wmeta, struct Win * w, char * title,
{
return 1;
}
{
return 1;
}
- sprintf(w->_title,
title, strlen(title)
);
+ sprintf(w->_title,
"%s", title
);
w->data = data;
w->_draw = func;
if (0 < width)
{
w->frame.size.x = width;
}
w->data = data;
w->_draw = func;
if (0 < width)
{
w->frame.size.x = width;
}
- else if (0 > width)
+ else if (0 >
=
width)
{
w->frame.size.x = wmeta->padframe.size.x + width;
}
{
w->frame.size.x = wmeta->padframe.size.x + width;
}
- else
- {
- w->frame.size.x = wmeta->padframe.size.x;
- }
if (0 < height && height <= wmeta->padframe.size.y - 1)
{
w->frame.size.y = height;
}
if (0 < height && height <= wmeta->padframe.size.y - 1)
{
w->frame.size.y = height;
}
- else if (0 > height && wmeta->padframe.size.y + (height - 1) > 0)
+ else if (0 >
=
height && wmeta->padframe.size.y + (height - 1) > 0)
{
w->frame.size.y = wmeta->padframe.size.y + (height - 1);
}
{
w->frame.size.y = wmeta->padframe.size.y + (height - 1);
}
- else
+ *wp = w;
+ return 0;
+}
+
+
+
+extern void free_winmeta(struct WinMeta * wmeta)
+{
+ delwin(wmeta->padframe.curses_win);
+ free(wmeta);
+}
+
+
+
+extern void free_win(struct Win * win)
+{
+ if (0 != win->frame.curses_win)
{
{
-
w->frame.size.y = wmeta->padframe.size.y - 1
;
+
delwin(win->frame.curses_win)
;
}
}
- return 0;
+ free(win->_title);
+ free(win);
}
}