frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Changes for ncurses version 6

Browse Source
This commit is contained in:
Klaus Schmidinger 2019-03-12 12:26:05 +01:00
parent 61ea56a1bd
commit 71461c6082
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PLUGINS/src/skincurses/HISTORY
View File

@ -141,3 +141,7 @@ VDR Plugin 'skincurses' Revision History
2018-04-15: Version 2.4.0 2018-04-15: Version 2.4.0
- Official release. - Official release.
2019-03-12: Version 2.4.1
- Changes for ncurses version 6 (thanks to Ulrick Eckhardt).

18
PLUGINS/src/skincurses/skincurses.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: skincurses.c 4.3 2018/04/10 13:01:00 kls Exp $ * $Id: skincurses.c 4.4 2019/03/12 12:24:34 kls Exp $
*/ */
#include <ncurses.h> #include <ncurses.h>
@ -12,7 +12,7 @@
#include <vdr/skins.h> #include <vdr/skins.h>
#include <vdr/videodir.h> #include <vdr/videodir.h>
static const char *VERSION = "2.4.0"; static const char *VERSION = "2.4.1";
static const char *DESCRIPTION = trNOOP("A text only skin"); static const char *DESCRIPTION = trNOOP("A text only skin");
static const char *MAINMENUENTRY = NULL; static const char *MAINMENUENTRY = NULL;
@ -127,8 +127,12 @@ void cCursesOsd::SaveRegion(int x1, int y1, int x2, int y2)
void cCursesOsd::RestoreRegion(void) void cCursesOsd::RestoreRegion(void)
{ {
int begy, begx;
int maxy, maxx;
getmaxyx(savedRegion, maxy,maxx);
getbegyx(savedRegion, begy,begx);
if (savedRegion) { if (savedRegion) {
copywin(savedRegion, window, 0, 0, savedRegion->_begy, savedRegion->_begx, savedRegion->_maxy - savedRegion->_begy, savedRegion->_maxx - savedRegion->_begx, false); copywin(savedRegion, window, 0, 0, begy, begx, maxy - begy, maxx - begx, false);
delwin(savedRegion); delwin(savedRegion);
savedRegion = NULL; savedRegion = NULL;
} }
@ -828,9 +832,13 @@ bool cPluginSkinCurses::Initialize(void)
{ {
// Initialize any background activities the plugin shall perform. // Initialize any background activities the plugin shall perform.
WINDOW *w = initscr(); WINDOW *w = initscr();
int begy, begx;
int maxy, maxx;
getmaxyx(w, maxy,maxx);
getbegyx(w, begy,begx);
if (w) { if (w) {
ScOsdWidth = w->_maxx - w->_begx + 1; ScOsdWidth = maxx - begx + 1;
ScOsdHeight = w->_maxy - w->_begy + 1; ScOsdHeight = maxy - begy + 1;
return true; return true;
} }
return false; return false;