Commit Graph

60 Commits

Author SHA1 Message Date
Jacek Jendrzej
9112865e66 fix stack buffer overflow if icon pic is broken
Origin commit data
------------------
Commit: d8d07eddf7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-03-09 (Sat, 09 Mar 2019)
2019-03-09 21:05:49 +01:00
vanhofen
6622c995a9 move compatibility headers to /lib/hardware
Origin commit data
------------------
Commit: 651a56aab8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-21 (Fri, 21 Dec 2018)

Origin message was:
------------------
- move compatibility headers to /lib/hardware
2018-12-21 22:30:34 +01:00
Thilo Graf
f4e1fe88c2 src/driver/fb_generic.cpp/h: use methode showFrame() as bool function
Allows the evaluation of this function for conditions if needed.


Origin commit data
------------------
Commit: ecb1190014
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-10-03 (Wed, 03 Oct 2018)
2018-10-03 18:01:22 +02:00
Thilo Graf
1b5f90384a src/driver/fb_generic.cpp: unifiy path search in showFrame()
This allows to use same paths for images like for icons.

Was a request, because images inside theme directories were not found.
Thanks bellum for this hint.


Origin commit data
------------------
Commit: f47bbbfe7b
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)
2018-09-01 15:58:24 +02:00
Thilo Graf
aeed0a83af src/driver/fb_generic.cpp: add possibility to use images with full name
Keep parameter file_type empty to use filenames with file name extension.


Origin commit data
------------------
Commit: e3c6a54a81
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)
2018-09-01 15:58:23 +02:00
Thilo Graf
90bf89e1ff CFrameBuffer: add more possible icon paths in order of priority
This gives possibility to use theme relevant icon sets.

scheme:
	/path/to/theme/icons/file.png

example:
	/usr/share/tuxbox/neutrino/themes/Neutrino-3.0/icons/file.png


Origin commit data
------------------
Commit: bc794bab56
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)
2018-04-11 23:58:15 +02:00
Stefan Seyfried
b065c816ac fb_generic: remove unused virtual_fb variable
Origin commit data
------------------
Commit: 264124e7c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
2018-02-25 21:36:45 +01:00
vanhofen
7bbe802a14 fb_generic: fix compiler warning
Origin commit data
------------------
Commit: 4ce4c6f2fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)

Origin message was:
------------------
- fb_generic: fix compiler warning
2018-02-25 21:36:45 +01:00
Stefan Seyfried
00ea329ecd fb_generic: blit2FB: implement "transp" parameter
also try to document the calling convention of this function


Origin commit data
------------------
Commit: 0c757d85c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
2018-02-25 21:36:44 +01:00
Stefan Seyfried
41b0802d6a fb_generic: fix blit2FB for big endian processors
Origin commit data
------------------
Commit: 87b7985892
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
2018-02-25 21:36:44 +01:00
vanhofen
ec95250a62 framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.
2018-01-22 12:06:15 +01:00
TangoCash
ae2405aea6 start implementing hardware acceleration for armbox
you have to compile neutrino with "--enable-reschange" to use FullHD-OSD


Origin commit data
------------------
Commit: 9cc0e702d8
Author: TangoCash <eric@loxat.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)
2017-10-05 12:52:53 +02:00
vanhofen
b327436c94 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 10:37:47 +02:00
vanhofen
a0f5a94440 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
2017-08-08 15:54:12 +02:00
Thilo Graf
215c96aae6 CFrameBuffer: fb-generic.cpp - add methode for clean up icon cache
This could be required eg. on changed resoulutions or
changed iconsets on runtime.


Origin commit data
------------------
Commit: 4e66739ff5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
vanhofen
ff7fc4971a Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	src/neutrino.cpp


Origin commit data
------------------
Commit: 7f989a3625
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)
2017-03-31 17:47:29 +02:00
vanhofen
d98f9e816c framebuffer: fix unscaled paintings; this fixes our starbar
Origin commit data
------------------
Commit: f6f1a71b39
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- framebuffer: fix unscaled paintings; this fixes our starbar
2017-03-28 12:36:26 +02:00
Jacek Jendrzej
22d9954976 src/driver/fb_generic.cpp fix possible memleak and possible double free
Origin commit data
------------------
Commit: 66ea57d710
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
2017-03-17 15:04:11 +01:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 21:55:50 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:36:23 +01:00
Michael Liebmann
71998d0131 osd resolution: Add 'mode' to osd_resolution_struct_t
- Use COsdSetup::OSDMODE_XXX enums to identify various resolutions


Origin commit data
------------------
Commit: 653e574937
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
2017-02-28 15:04:09 +01:00
vanhofen
25f833735d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)
2017-02-21 15:14:31 +01:00
Michael Liebmann
a26c4afdd5 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: eb0d7afa95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)
2017-02-21 06:39:24 +01:00
Michael Liebmann
91c174e733 fb_generic: use more swidth variables in fbCopyArea()
Origin commit data
------------------
Commit: 8bee8b4c6d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-21 (Tue, 21 Feb 2017)
2017-02-21 06:38:48 +01:00
Stefan Seyfried
712cc8f86d fb_generic: use 32bit pointers instead of 8bit
Origin commit data
------------------
Commit: dd653288d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)
2017-02-21 06:38:48 +01:00
Stefan Seyfried
0f4ed6c34a fb_generic: add swidth variable, "stride in fb_pixel_t units"
this should allow to use fb_pixel_t pointer arithmetics more often
instead of byte pointers


Origin commit data
------------------
Commit: 7c7d5f08dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-21 06:38:48 +01:00
vanhofen
321a2f470f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-20 12:29:23 +01:00
Michael Liebmann
2821cf8d16 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: d76c9c536c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-20 00:11:48 +01:00
Michael Liebmann
6fa6152445 framebuffer: Add fbCopyArea function
- Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
 without hardware acceleration


Origin commit data
------------------
Commit: cc5a1b3b31
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-19 (Sun, 19 Feb 2017)

Origin message was:
------------------
framebuffer: Add fbCopyArea function

 - Copies areas within the frame buffer
 - Hardware accelerated function for cs hd2
 - Copying overlapping areas does not always work correctly
  without hardware acceleration
2017-02-20 00:09:46 +01:00
vanhofen
298fdbfe36 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/fb_generic.h


Origin commit data
------------------
Commit: 3ff64707df
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-15 21:52:59 +01:00
Michael Liebmann
15c81625d6 Merge branch 'master' into pu/fb-setmode
Fix merge conflict


Origin commit data
------------------
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:11:08 +01:00
Stefan Seyfried
78419473da implement getWidth4FB_HW_ACC in fb_accel class
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.


Origin commit data
------------------
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
2017-02-14 20:01:55 +01:00
vanhofen
8704cb914a Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:04 +01:00
Michael Liebmann
0c20bf9af6 neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)


Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)

Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware

 - At the moment supported hardware: CS HD2

 Currently known problems:
 -------------------------
 - Display menus after changing resolution (Reboot required)
 - Display headers after changing resolution hd => fullhd (Reboot required)
 - Display infobar after changing resolution hd => fullhd (Reboot required)
 - Screenshot broken (With new driver and set resolution to 1280x720)
2017-02-13 12:51:14 +01:00
vanhofen
999b2cf2ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 23:01:15 +01:00
Stefan Seyfried
75355dda2b fb_generic: add sanity check and missing mark() to painIcon8
Origin commit data
------------------
Commit: ec40cf7986
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 22:59:11 +01:00
Stefan Seyfried
f2bfc73bd5 fb_generic: initialization and deinitialization fixes
* initialize variables locked and cache_size in constructor
* set lfb pointer to NULL after munmap(), fd to -1 after close
* remove unused tty fd close()


Origin commit data
------------------
Commit: 1dd47e00c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-12 22:49:30 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
0e6e6db7bd pu/fb-modules: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Commit: 987dbe7f1d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
pu/fb-modules: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:24:51 +01:00
vanhofen
4d15c4d61b Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 20:22:37 +01:00
Stefan Seyfried
7a63618598 fb_generic: remove unused VT switching / restoring code
Origin commit data
------------------
Commit: d498917594
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
792a14b2f0 fb_accel: add TripleDragon framebuffer code
Origin commit data
------------------
Commit: b04b1d7f8c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:18 +01:00
Stefan Seyfried
79931d6c88 fb_generic: open device O_CLOEXEC, better diagnostic output
Origin commit data
------------------
Commit: 8441a719cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-09 12:57:18 +01:00
vanhofen
f7b4d9e941 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: 1e5b102802
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 20:38:28 +01:00
Michael Liebmann
adbb76744c fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2
Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp


Origin commit data
------------------
Commit: a4afe1e8e0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSApollo class => CFbAccelCSHD2

 Rename fb_accel_cs_apollo.cpp => fb_accel_cs_hd2.cpp
2017-02-08 12:52:26 +01:00
Michael Liebmann
af6d3fb79a fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1
Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp


Origin commit data
------------------
Commit: 58bd8a4a63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
fb_accel: Rename CFbAccelCSNevis class => CFbAccelCSHD1

 Rename fb_accel_cs_nevis.cpp => fb_accel_cs_hd1.cpp
2017-02-08 12:52:25 +01:00
vanhofen
b2210d8a75 fix build; try to port our framebuffer changes (need fixes!)
Origin commit data
------------------
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)
2017-02-08 09:45:53 +01:00
Stefan Seyfried
e8c40d8b1d fb_accel: add backend for GL framebuffer
Origin commit data
------------------
Commit: 2498ebb314
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-07 17:23:42 +01:00