Begin of 640x480 support

.gitignore

@@ -16,3 +16,4 @@
 #	src/.deps/
 #	src/Makefile
 #	src/Makefile.in
+/build/

CMakeLists.txt

@@ -19,14 +19,29 @@ if (BIND_CONSOLE)
 	add_compile_definitions(BIND_CONSOLE)
 endif (BIND_CONSOLE)
 
+option(WINDOWED_MODE "Run windowed" OFF)
+if (WINDOWED_MODE)
+	add_compile_definitions(G2X_BUILD_OPTION_WINDOWED_MODE)
+endif ()
+
+option(SCREEN_WIDTH "Screen / window width" OFF)
+if (SCREEN_WIDTH)
+	add_compile_definitions(G2X_BUILD_OPTION_SCREEN_WIDTH=${SCREEN_WIDTH})
+endif ()
+
+option(SCREEN_HEIGHT "Screen / window height" OFF)
+if (SCREEN_HEIGHT)
+	add_compile_definitions(G2X_BUILD_OPTION_SCREEN_HEIGHT=${SCREEN_HEIGHT})
+endif ()
+
 set(CARD_ROOT "/media" CACHE STRING "Top-level filesystem directory")
 
-set(PLATFORMS "pc, a320, gcw0, nanonote, rs90")
+set(PLATFORMS "pc, a320, gcw0, rg350m, nanonote, rs90")
 
 set(PLATFORM "pc" CACHE STRING
 	"One of the available platforms: ${PLATFORMS}"
 )
-set_property(CACHE PLATFORM PROPERTY STRINGS pc a320 gcw0 nanonote rs90)
+set_property(CACHE PLATFORM PROPERTY STRINGS pc a320 gcw0 rg350m nanonote rs90)
 
 find_package(SDL REQUIRED)
 find_package(SDL_ttf REQUIRED)

data/platform/gcw0/gmenu2x.conf

@@ -3,6 +3,6 @@ menuClock=192
 maxClock=1020
 backlightTimeout=60
 opkPlatforms="gcw0"
-brightnessSysfs="/sys/class/backlight/board:backlight"
-powerSupplySysfs="/sys/class/power_supply/act8600-charger"
-batterySysfs="/sys/class/power_supply/jz-battery"
+brightnessSysfs="/sys/class/backlight/pwm-backlight"
+powerSupplySysfs="/sys/class/power_supply/usb"
+batterySysfs="/sys/class/power_supply/battery"

data/platform/gcw0/skins/Default/wallpapers/default.png

@@ -1 +1 @@
-320_GCW_DARK.png
+320_A_BLUE.png

data/platform/pc/gmenu2x.conf

@@ -0,0 +1,8 @@
+videoBpp=32
+menuClock=192
+maxClock=1020
+backlightTimeout=60
+opkPlatforms="gcw0"
+brightnessSysfs="/sys/class/backlight/pwm-backlight"
+powerSupplySysfs="/sys/class/power_supply/usb"
+batterySysfs="/sys/class/power_supply/battery"

data/platform/pc/input.conf

@@ -0,0 +1,10 @@
+accept=keyboard,306
+cancel=keyboard,308
+altleft=keyboard,9
+altright=keyboard,8
+menu=keyboard,27
+settings=keyboard,13
+up=keyboard,273
+down=keyboard,274
+left=keyboard,276
+right=keyboard,275

data/platform/pc/sections/applications/30_terminal

@@ -0,0 +1,6 @@
+title=Terminal
+description=Disable graphic mode
+icon=skin:icons/utilities-terminal.png
+exec=/bin/busybox
+params=sh -c 'clear; echo "The graphic mode is now disabled."; echo ""; echo "This is only useful for developers who want to test their graphical apps from telnet."; echo ""; echo "(Press START to exit to the launcher)"; read'
+consoleapp=true

data/platform/pc/sections/settings/10_poweroff

@@ -0,0 +1,6 @@
+title=Power Off
+description=Shut down the system
+launchmsg=Powering off
+icon=skin:icons/poweroff.png
+exec=/sbin/poweroff
+editable=false

data/platform/pc/sections/settings/20_reboot

@@ -0,0 +1,6 @@
+title=Reboot
+description=Reboot the system
+launchmsg=Rebooting
+icon=skin:icons/reboot.png
+exec=/sbin/reboot
+editable=false

data/platform/pc/sections/settings/40_alsamixer

@@ -0,0 +1,6 @@
+title=Sound Mixer
+description=Configure sound settings
+icon=skin:icons/alsamixer.png
+exec=/usr/bin/alsamixer
+consoleapp=true
+editable=false

data/platform/pc/sections/settings/50_system_info

@@ -0,0 +1,7 @@
+title=System Info
+description=Info about the system
+icon=skin:icons/about.png
+exec=/usr/bin/dialog
+params=--ok-label "Press START to exit" --no-shadow --msgbox "`/usr/bin/system_info`" 240 320
+consoleapp=true
+editable=false

data/platform/pc/skins/Default/wallpapers/default.png

@@ -0,0 +1 @@
+320_A_BLUE.png

data/platform/rg350m/gmenu2x.conf

@@ -0,0 +1,8 @@
+videoBpp=32
+menuClock=192
+maxClock=1020
+backlightTimeout=60
+opkPlatforms="gcw0"
+brightnessSysfs="/sys/class/backlight/pwm-backlight"
+powerSupplySysfs="/sys/class/power_supply/usb"
+batterySysfs="/sys/class/power_supply/battery"

data/platform/rg350m/input.conf

@@ -0,0 +1,10 @@
+accept=keyboard,306
+cancel=keyboard,308
+altleft=keyboard,9
+altright=keyboard,8
+menu=keyboard,27
+settings=keyboard,13
+up=keyboard,273
+down=keyboard,274
+left=keyboard,276
+right=keyboard,275

data/platform/rg350m/sections/applications/30_terminal

@@ -0,0 +1,6 @@
+title=Terminal
+description=Disable graphic mode
+icon=skin:icons/utilities-terminal.png
+exec=/bin/busybox
+params=sh -c 'clear; echo "The graphic mode is now disabled."; echo ""; echo "This is only useful for developers who want to test their graphical apps from telnet."; echo ""; echo "(Press START to exit to the launcher)"; read'
+consoleapp=true

data/platform/rg350m/sections/settings/10_poweroff

@@ -0,0 +1,6 @@
+title=Power Off
+description=Shut down the system
+launchmsg=Powering off
+icon=skin:icons/poweroff.png
+exec=/sbin/poweroff
+editable=false

data/platform/rg350m/sections/settings/20_reboot

@@ -0,0 +1,6 @@
+title=Reboot
+description=Reboot the system
+launchmsg=Rebooting
+icon=skin:icons/reboot.png
+exec=/sbin/reboot
+editable=false

data/platform/rg350m/sections/settings/40_alsamixer

@@ -0,0 +1,6 @@
+title=Sound Mixer
+description=Configure sound settings
+icon=skin:icons/alsamixer.png
+exec=/usr/bin/alsamixer
+consoleapp=true
+editable=false

data/platform/rg350m/sections/settings/50_system_info

@@ -0,0 +1,7 @@
+title=System Info
+description=Info about the system
+icon=skin:icons/about.png
+exec=/usr/bin/dialog
+params=--ok-label "Press START to exit" --no-shadow --msgbox "`/usr/bin/system_info`" 480 640
+consoleapp=true
+editable=false

data/skins/320x240/Default/skin.conf

@@ -1,3 +1,4 @@
+font="skin:fonts/SourceHanSans-Regular-04.ttf"
 messageBoxBorder=#505050ff
 topBarBg=#ffffff80
 selectionBg=#ffffff80

data/skins/640x480/Default/skin.conf

@@ -0,0 +1,12 @@
+font="skin:fonts/SourceHanSans-Regular-04.ttf"
+messageBoxBorder=#505050ff
+topBarBg=#ffffff80
+selectionBg=#ffffff80
+messageBoxBg=#00000080
+messageBoxSelection=#fffffff80
+bottomBarBg=#ffffff80
+topBarHeight=80
+bottomBarHeight=40
+linkHeight=100
+linkWidth=150
+fontsize=20

src/background.cpp

@@ -20,13 +20,13 @@ void Background::paint(Surface& s) {
 
 #ifdef ENABLE_CLOCK
 	font.write(s, clock.getTime(),
-			s.width() / 2, gmenu2x.bottomBarTextY,
+			s.width() / 2, s.height() - gmenu2x.skinConfInt["bottomBarHeight"] / 2,
 			Font::HAlignCenter, Font::VAlignMiddle);
 #endif
 
 	auto icon = battery.getIcon();
 	if (icon) {
-		icon->blit(s, s.width() - 19, gmenu2x.bottomBarIconY);
+		icon->blit(s, s.width() - (icon->width() * 1.2 ), s.height() - (gmenu2x.skinConfInt["bottomBarHeight"] + icon->height()) / 2);
 	}
 }
 

src/browsedialog.cpp

@@ -57,14 +57,15 @@ bool BrowseDialog::exec()
 		setPath(GMENU2X_CARD_ROOT);
 
 	const int topBarHeight = gmenu2x.skinConfInt["topBarHeight"];
+    const int bottomBarHeight = gmenu2x.skinConfInt["bottomBarHeight"];
 	rowHeight = gmenu2x.font->getLineSpacing() + 1; // gp2x=15+1 / pandora=19+1
-	rowHeight = std::clamp(rowHeight, 20u, 40u);
-	numRows = (gmenu2x.height() - topBarHeight - 20) / rowHeight;
+	rowHeight = stdx::clamp(rowHeight, 20u, 40u);
+	numRows = (gmenu2x.height() - topBarHeight - bottomBarHeight) / rowHeight;
 	clipRect = SDL_Rect{
 		0,
 		static_cast<Sint16>(topBarHeight + 1),
 		static_cast<Uint16>(gmenu2x.width() - 9),
-		static_cast<Uint16>(gmenu2x.height() - topBarHeight - 25)
+		static_cast<Uint16>(gmenu2x.height() - topBarHeight - bottomBarHeight)
 	};
 
 	selected = 0;
@@ -214,7 +215,7 @@ void BrowseDialog::paint()
 	drawTitleIcon(bg, "icons/explorer.png", true);
 	writeTitle(bg, title);
 	writeSubTitle(bg, subtitle);
-	buttonBox.paint(bg, 5, gmenu2x.height() - 1);
+	buttonBox.paint(bg, 5, gmenu2x.height() - gmenu2x.skinConfInt["bottomBarHeight"] / 2);
 
 	bg.convertToDisplayFormat();
 	bg.blit(s, 0, 0);
@@ -253,8 +254,9 @@ void BrowseDialog::paint()
 		} else {
 			icon = iconFile;
 		}
-		icon->blit(s, 5, offsetY);
-		gmenu2x.font->write(s, fl[i], 24, offsetY + rowHeight / 2,
+		int x = 5;
+		icon->blit(s, x, offsetY);
+		gmenu2x.font->write(s, fl[i], x + icon->width() * 1.2, offsetY + rowHeight / 2,
 				Font::HAlignLeft, Font::VAlignMiddle);
 
 		offsetY += rowHeight;

src/buttonbox.cpp

@@ -20,8 +20,9 @@ void ButtonBox::paint(Surface& s, int x, int y)
 {
 	for (auto& button : buttons) {
 		auto rect = button->getRect();
-		button->setPosition(x, y - rect.h);
+		button->setPosition(x, y - rect.h / 2);
 		button->paint(s);
-		x += button->getRect().w + 6;
+        //space 20% of current button between next button
+		x += button->getRect().w * 1.20;
 	}
 }

src/cpp_backports.h

@@ -0,0 +1,19 @@
+#ifndef __CPP_BACKPORTS__
+#define __CPP_BACKPORTS__
+
+// Backports of C++ 17 stuff to C++ 14.
+
+namespace stdx {
+template <typename _Tp>
+constexpr const _Tp& clamp(const _Tp& __val, const _Tp& __lo, const _Tp& __hi) {
+  return (__val < __lo) ? __lo : (__hi < __val) ? __hi : __val;
+}
+
+template <typename _Tp, typename _Compare>
+constexpr const _Tp& clamp(const _Tp& __val, const _Tp& __lo, const _Tp& __hi,
+                           _Compare __comp) {
+  return __comp(__val, __lo) ? __lo : __comp(__hi, __val) ? __hi : __val;
+}
+}  // namespace std
+
+#endif  // __CPP_BACKPORTS__

src/dialog.cpp

@@ -21,8 +21,7 @@ void Dialog::drawTitleIcon(Surface& s, const std::string &icon, bool skinRes)
 	if (i==NULL)
 		i = gmenu2x.sc.skinRes("icons/generic.png");
 
-	i->blit(s, 4, (gmenu2x.skinConfInt["topBarHeight"] - 32) / 2);
-}
+i->blit(s, i->width() * .2, (gmenu2x.skinConfInt["topBarHeight"] - i->height()) / 2);}
 
 void Dialog::writeTitle(Surface& s, const std::string &title)
 {