Maarten ter Huurne
fd642ffe9a
SettingsDialog: Code layout cleanup.
...
No functional changes, except for fetching "topBarHeight" only once.
2012-04-10 22:09:20 +02:00
Maarten ter Huurne
ed8b0c38ba
Don't overwrite link action provided to constructor.
...
Fixes bug introduced in 57ad81e3df
.
This bug would prevent applications from launching, so it's pretty serious.
I did test before committing, but apparently I didn't test the right binary.
2012-04-10 20:30:36 +02:00
Maarten ter Huurne
92d221a1bd
Fixed GCC warning about initialization order.
2012-04-10 19:28:01 +02:00
Maarten ter Huurne
d2413d8233
Added missing #includes.
...
Fixes compilation with GCC 4.7.0.
2012-03-24 12:00:25 +01:00
Maarten ter Huurne
57ad81e3df
Merged LinkAction class into its base class.
...
LinkApp now calls its launch method via the delegate mechanism instead of
via an overridden virtual method. This should make it easier to move the
launch method out of LinkApp and into the GMenu2X main class.
2012-03-24 11:57:21 +01:00
Paul Cercueil
2d81b13459
Reinitialize the powersaver timer when a suspend has been detected.
2012-02-02 23:36:26 +01:00
Paul Cercueil
a0b9fc026b
Fix the filename for the user-specified input conf file.
2012-01-23 12:29:58 +01:00
Paul Cercueil
273770dad3
InputManager: prevent unmapped buttons from generating events.
2012-01-22 21:49:52 +01:00
Maarten ter Huurne
0043ea5909
Made LinkApp::launch() private.
...
It was already never called outside the class.
2011-12-23 15:51:54 +01:00
Maarten ter Huurne
4ae4fc675e
Mark Link::run() as pure virtual.
...
This is better than providing an empty default implementation, since it
forces subclasses to override the method.
2011-12-23 15:49:09 +01:00
Maarten ter Huurne
d90ed635be
Removed per-app gamma setting.
...
This functionality was half-removed already: some code missing, other
essential parts commented out.
I don't see the point of this either: RGB graphics are created for a certain
gamma value; if that differs from the screen gamma it is up to the application
to do something about it: gamma correct the graphics and/or change the screen
gamma. It doesn't make sense to make this user configurable.
2011-12-23 15:39:53 +01:00
Maarten ter Huurne
0622c4227f
Removed ability to configure custom working directory.
...
Working directory was only configurable in the ini files, not in the GUI.
Many GP2X/Dingoo applications break if the working directory is changed
because they use relative paths for locating their data files.
I don't see a reason to keep this feature, since I don't know of a realistic
scenario where it would be useful. In any case, the functionality can be
re-created by using a wrapper script to change the working directory based on
a parameter value.
2011-12-23 15:20:28 +01:00
Maarten ter Huurne
c2afbfdc91
Made two fields that are only used on GP2X available only on that platform.
...
It seems the "#endif" was inserted at the wrong spot.
2011-12-23 14:07:06 +01:00
Maarten ter Huurne
1ad6b2f25a
Made GMenu2X::ts private.
...
Pass Touchscreen reference to constructors instead of pulling it from
the GMenu2X class.
2011-12-23 14:03:05 +01:00
Maarten ter Huurne
944ab86f9c
Cleanup of touch screen code.
...
Initialize in constructor and clean up in destructor instead of having separate init() and deinit() methods.
Don't close file descriptor if open failed (ts_fd == -1).
Renamed initialized() to available(), since it tests whether the touch screen was found, not whether an initialization was attempted.
Improved code layout and minor other cleanups.
2011-12-23 12:30:15 +01:00
Ayla
c7af4b1aea
Removed per-application volume setting.
...
The volume should not depend of the application which is in use.
2011-11-19 14:47:55 +01:00
Xiangfu Liu
5d6dcfb2bf
update nanonote backlight to new driver
2011-11-10 15:05:37 +08:00
Xiangfu Liu
1cd60895d5
use the contrast for brightness in nanonote
2011-11-10 14:59:45 +08:00
Maarten ter Huurne
cf8ebbca5e
gmenu2x.cpp: Re-ordered includes.
...
Put our own header includes before system includes, to avoid masking missing
system includes in our own headers.
2011-10-23 17:32:46 +02:00
Maarten ter Huurne
f28e4f6d89
Minimized gmenu2x.h.
...
Everything that does not need to be shared was moved to gmenu2x.cpp.
2011-10-23 17:27:29 +02:00
Maarten ter Huurne
aea1c44020
utilities: Replace min/max functions by the versions from STL.
2011-10-23 17:00:23 +02:00
Maarten ter Huurne
40c510a28a
utilities: Removed unused functions.
2011-10-23 16:51:59 +02:00
Maarten ter Huurne
a01d892eb6
More header cleanups.
...
This time the focus was on removing namespace imports from headers.
2011-10-23 16:43:56 +02:00
Maarten ter Huurne
e0e7e87ebc
Massive header cleanup.
...
The main goal is to avoid including "gmenu2x.h" from headers.
But I did various other cleanups as well while I was at it.
2011-10-23 16:13:02 +02:00
Maarten ter Huurne
33e7f1ef56
cpu: Include header instead of repeating function declaration.
2011-10-23 15:24:35 +02:00
Maarten ter Huurne
14bae043c0
LinkApp: various cleanups.
...
Log a warning message if setsid() fails.
Also improved code layout.
2011-10-23 13:03:11 +02:00
Maarten ter Huurne
40fcd5137e
InputDialog: header cleanup.
2011-10-23 12:46:52 +02:00
Maarten ter Huurne
cfd294b9ae
IconButton: header cleanup.
2011-10-23 12:37:39 +02:00
Maarten ter Huurne
62facf4dc7
IconButton: removed unused functionality.
...
Labels were always right-aligned: this was the default and no other alignment
was ever selected.
Also removed unused getter and setter methods.
2011-10-23 12:30:20 +02:00
Maarten ter Huurne
abe9130de9
IconButton: fixed up-to-date check in setPosition().
...
Recalculate size if either x or y changed, not necessarily both of them.
2011-10-23 12:06:59 +02:00
Maarten ter Huurne
76613d1810
IconButton: removed unused local variable.
2011-10-23 12:05:27 +02:00
Maarten ter Huurne
55cabcea49
InputDialog: do not return anything from drawVirtualKeyboard().
...
The returned value (action) was ignored, so don't bother returning it.
2011-10-23 12:00:46 +02:00
Maarten ter Huurne
fa5a9816db
InputDialog: re-layouted code.
...
No functional changes.
2011-10-23 11:57:50 +02:00
Maarten ter Huurne
0b878c1b77
SettingsDialog: removed unused action variable and macros.
2011-10-23 11:41:44 +02:00
Maarten ter Huurne
9e876a6f90
MessageBox: header cleanups.
2011-10-23 11:32:16 +02:00
Maarten ter Huurne
3252c777c3
MessageBox: Use arrays instead of vectors for buttons.
...
There is no need for the overhead of std::vector if we know the number
of elements at compile time.
This shaves off about 2 kB of the stripped binary size.
2011-10-23 11:24:20 +02:00
Maarten ter Huurne
28f6cd2122
InputManager: removed "clear" and "manual" logical buttons.
...
These are not used in the GUI anymore.
2011-10-23 11:12:34 +02:00
Maarten ter Huurne
a685b436ec
InputManager: improved config file parsing.
...
Do not test whether config file exists; just open it and handle failure.
Config file was not closed on errors, fixed now.
Make sure unconfigured entries of the button map are properly initialized.
Ignore lines with invalid keywords instead of aborting parsing.
Made log messages more specific.
2011-10-23 10:46:26 +02:00
Maarten ter Huurne
9548aa0a41
InputManager: Don't break if joystick support is disabled in SDL.
...
Early Dingux versions had joystick support disabled, but many programs
broke on that, so booboo enabled joystick support later.
2011-10-23 10:35:33 +02:00
Maarten ter Huurne
433be5daf7
InputManager: have "joystick" as a member instead of a global.
2011-10-23 09:59:22 +02:00
Maarten ter Huurne
641c989934
MenuSettingBool: Support toggling of boolean settings using left/right.
2011-10-23 09:47:51 +02:00
Maarten ter Huurne
a38c283e17
SettingsDialog: simplify code using InputManager::waitForPressedButton().
...
Replaced MenuSetting::manageInput() by handleButtonPress(), because we will
only pass pressed buttons to it, not the entire input event.
2011-10-23 09:38:59 +02:00
Maarten ter Huurne
40fd35d764
MessageBox: minor cleanup.
...
Declare local variables where they are used, not way in advance.
2011-10-23 09:24:42 +02:00
Maarten ter Huurne
ccf55e5d61
BrowseDialog: simplify code using InputManager::waitForPressedButton().
2011-10-23 09:11:06 +02:00
Maarten ter Huurne
315bf0a180
InputManager: C++-style type definitions.
...
There is no need to typedef enums and structs in C++.
Put types defined by InputManager inside the class namespace.
Changed type names to CamelCase.
2011-10-23 09:04:12 +02:00
Maarten ter Huurne
c6db9ff21b
InputManager: reduce namespace pollution.
...
Moved dependency on SDL to implementation file.
Don't import std namespace in header.
If we need std::string, import <string>, not something else.
2011-10-23 08:15:23 +02:00
Maarten ter Huurne
ba6003606e
Include SDL header as <SDL.h> instead of <SDL/SDL.h>.
...
SDL headers are located using "sdl-config --cflags", which outputs
the actual directory that the headers are in, not its parent.
2011-10-23 07:54:10 +02:00
Maarten ter Huurne
f9696971ad
InputManager: re-layouted code.
...
I don't really care for tabs vs spaces, but it's impractical to use tabs
in one source file and spaces in another.
2011-10-23 07:51:41 +02:00
Maarten ter Huurne
0cb1645c03
InputManager: SDL_NumJoysticks is a function, try calling it.
2011-10-23 07:22:55 +02:00
Maarten ter Huurne
ae685a9729
PowerSaver: re-layouted code.
...
No functional changes.
2011-10-23 07:05:54 +02:00
Maarten ter Huurne
e73a8d06ea
Removed per-application brightness setting.
...
The desired backlight level depends on the amount of light coming in from
the environment, not on the application that is run. Setting the brightness
when launching an application discards what is probably the right value
for this location (indoor/outdoor) and time of day. So we decided that this
is not a desirable feature and therefore removed it.
2011-09-23 01:51:53 +02:00
Maarten ter Huurne
7a978222b8
Use existing brightness value instead of overriding it.
2011-09-23 01:36:56 +02:00
Maarten ter Huurne
84ec66c7ce
Minor cleanup: better usage of fscanf.
...
Instead of having fscanf() read into a string buffer (with the risk of
overflowing it if sysfs returns an unexpectedly long string) and converting
the value to integer with atoi() afterwards, just use fscanf() to read
an integer.
2011-09-23 01:23:53 +02:00
Maarten ter Huurne
799bb13f0f
Minor cleanup: group handle init code together.
2011-09-23 01:01:57 +02:00
Maarten ter Huurne
0acbd35fb4
Corrected name of USB power supply device.
...
As far as I can see in the 3.0 kernel sources, both the Dingoo and
the NanoNote use "usb" in lower case.
2011-09-23 00:57:27 +02:00
Maarten ter Huurne
53a73cabc7
Call deinit() method on exit.
...
This prevents file descriptors to sysfs files from staying open as the
selected application is executed.
2011-09-23 00:48:13 +02:00
Maarten ter Huurne
b997485859
Backlight: use different sysfs name for NanoNote and Dingoo.
...
Fixes backlight control on Dingoo.
2011-09-23 00:38:43 +02:00
Maarten ter Huurne
6729e30acb
Fixed mistake in 8bcd03962f
.
...
"iclock" is not a local variable: it is a field, so it should be updated.
2011-09-19 16:49:30 +02:00
Maarten ter Huurne
03ea679a1d
Corrected capitalization of megahertz.
...
"Mhz" -> "MHz"
2011-09-19 16:33:19 +02:00
Maarten ter Huurne
8bcd03962f
Do not constrain the max CPU frequency for apps on setting the string value.
...
It is already constrained on editing and when actually applying the frequency.
The string value constrain is problematic because it happens in a class that
has no knowledge of the actual CPU limits, so it can only contrain to
hardcoded limits.
With this change you'll actually be able to run apps at 432 MHz.
2011-09-19 16:27:53 +02:00
Maarten ter Huurne
8d04cf1064
Removed one last occurrence of hardcoded minimum CPU frequency.
...
Well, I hope it was really the last one now.
2011-09-19 16:26:42 +02:00
Maarten ter Huurne
a014a331f4
Put platform specific defaults in systemwide gmenu2x.conf.
...
It is simpler to maintain them there instead of in the code.
2011-09-19 01:12:34 +02:00
Maarten ter Huurne
19064b4c4a
Work around lack of vsynced page flipping in OpenDingux kernel.
2011-09-18 21:16:12 +02:00
Maarten ter Huurne
41650aaad7
Use 16 bpp by default on the Dingoo.
...
Other platforms keep using 32 bpp.
2011-09-18 18:42:53 +02:00
Maarten ter Huurne
d354eb85a4
Improved CPU frequency control.
...
The maximum frequency for applications was set to 430 MHz before,
while some Dingoos can handle higher frequencies. Now the limit is set to
the theoretical maximum frequency of 500 MHz.
For the menu itself the maximum frequency is set to a safer 408 MHz,
to avoid over-eager users from putting their system in an unusable state
that is difficult to recover from.
Also the frequency settings are now done in 24 MHz increments, to match
the limitations of the current JZ4740 kernel. Note that only new entries
are rounded to 24 MHz multiples, existing entries stay as they are.
2011-09-18 18:27:03 +02:00
Ayla
3995133fa5
When deleting a link, check if the icon is used elsewhere before unloading it.
2011-09-18 13:22:02 +02:00
Ayla
cf8bd84362
Added debug message which is displayed when surfaces are deleted from memory.
2011-09-18 13:21:03 +02:00
Ayla
cca367745b
Dingux port: The SD card root is now hardcoded to /boot for the getDiskFree() function only.
...
That function was not working as CARD_ROOT does not necessarily point to the mount point of a filesystem.
2011-09-18 12:42:08 +02:00
Ayla
759eefd676
The files "a.png" and "b.png" have been renamed to "cancel.png" and "accept.png".
2011-09-18 03:40:33 +02:00
Ayla
16b050be05
Modified the key shortcuts for the small popups (deleting a link...).
2011-09-18 03:33:10 +02:00
Ayla
826d622285
Modified the key shortcuts for the generic file/dir selector class.
2011-09-18 03:23:47 +02:00
Ayla
38cfd321f6
Modified the key shortcuts for the wallpaper dialog.
2011-09-18 03:16:08 +02:00
Ayla
d0cfe7c60d
Modified the key shortcuts for the text display dialog.
2011-09-18 03:05:25 +02:00
Ayla
5dd6d31b25
Modified the key shortcuts of the file input dialog.
2011-09-18 02:21:04 +02:00
Ayla
b5131c1db9
Modified the key shortcuts of the text input dialog, so that the X and Y keys are not used.
2011-09-18 02:05:15 +02:00
Ayla
87106cdf56
Modified the button icons displayed when modifying an integer parameter.
2011-09-18 01:47:29 +02:00
Ayla
1aac93f36d
The (gp2x) A button is now used instead of X to clear string inputs (like link names).
2011-09-18 01:40:23 +02:00
Ayla
c9a51af4a6
The WallpaperDialog object now uses a ButtonBox to print the key mapping at the bottom of the screen.
2011-09-18 01:34:19 +02:00
Ayla
d82e262662
Rewrite of the MenuSettingRGBA class so that it won't use the CLEAR/MENU buttons.
2011-09-18 01:33:11 +02:00
Ayla
7f2c7db8e2
Rewrite of how the events are handled by the menusetting* objects.
2011-09-15 20:20:35 +02:00
Ayla
fdee206d93
The ButtonBox now features a clear() function which empties the list of buttons.
2011-09-15 20:12:02 +02:00
Ayla
6ac012348d
Disactivate the binding of the app's manual on the 'Y' button.
2011-09-15 11:33:46 +02:00
Ayla
5f69930d07
The contextual menu now features a "show manual" entry.
2011-09-15 11:18:07 +02:00
Ayla
03a26a859b
Dingoo port: The help menu now displays help for dingoo's controls.
2011-09-04 03:02:17 +02:00
Ayla
9768a74d07
The conf file does not need to be saved on exit.
2011-09-04 02:37:10 +02:00
Xiangfu Liu
46d680990a
gmenu2x wallpaper only support .png
2011-08-22 15:13:44 +08:00
Ayla
8c1f4abb5b
The input manager should check whether a powersaver instance is running, to not create one when it's not needed.
2011-08-17 00:46:43 +02:00
Ayla
fca8c8e8a1
Create the powersaver instance on demand and destroy it when not needed.
2011-08-17 00:46:11 +02:00
Ayla
f31828667f
Added a boolean function to know if the powersaver is running.
2011-08-17 00:44:45 +02:00
Ayla
bffef7cfea
GMenu2X does not need to init the audio subsystem of SDL.
2011-08-16 02:18:09 +02:00
Ayla
e282f8a55d
Enable the SDL timer subsystem only if the backlight timeout is enabled.
2011-08-16 02:17:21 +02:00
Ayla
4fd4b234dc
Set card root to /media by default for the Dingux port.
2011-08-11 03:42:18 +02:00
Ayla
3d3e0fa566
Read config file(s) present on both system and user-specific directories.
2011-08-11 03:40:36 +02:00
Ayla
7f08e854ea
Shorted a too long caption on the contextual menu. (2)
2011-08-08 23:34:43 +02:00
Ayla
5b49bf0afb
Shorted a too long caption on the contextual menu.
2011-08-08 17:40:27 +02:00
Ayla
5f77e3baf7
Cleaned GP2X-specific code that was built on all platforms.
...
There was a lot of gp2x-specific code which was built for
all platform. For instance, the code was compiled for all
the platforms with the constant "TARGET_GP2X" defined.
This obviously had to be fixed.
2011-07-29 01:13:35 +02:00
Ayla
f6c456f35b
GMenu2X now won't clear the framebuffer on exit.
...
Instead, the loading screen image will remain even when GMenu2X is not running anymore.
This require a patched SDL; the patch can be found at
https://github.com/mthuurne/opendingux-buildroot/blob/opendingux-2010.11/package/sdl/sdl-fbcon-clear-onexit.patch
2011-07-28 01:48:12 +02:00
Ayla
4636a84eef
Create the "sections" user directory if required, when creating a new link.
...
It previously assumed that this directory was present, which isn't
the case all the time.
2011-07-25 12:05:24 +02:00
Ayla
81a607c36e
Fixed a good number of memory leaks.
...
The objects created with "new" were destroyed with "free()",
instead of "delete"; as a result, the destructors were never called.
2011-07-20 13:43:25 +02:00
Ayla
3a85cabf37
The SurfaceCollection won't load the files selection.png, bottombar.png or topbar.png from the Default skin if they are missing in the current skin.
2011-07-11 18:16:38 +02:00
Ayla
11e58c8ca5
Revert "GMenu2X now won't load skin files from the Default skin when using another skin."
...
This reverts commit 439d25c292
.
Refusing to load files of the Default skin for a different one is a bad idea; it requires
that skin to provide every single PNG file needed by gmenu2x.
2011-07-11 18:14:27 +02:00
Ayla
00d8a04e00
Removed a bug where the Default skin was chosen even if another (working) skin was defined on the config file.
2011-07-11 12:39:31 +02:00
Ayla
0993a48eca
Add a function which unlocks the virtual terminal before and after each execution of a binary.
...
It ensures that GMenu2X can restart after a SDL program segfaulted or crashed.
It also allow GMenu2X to exit without clearing the screen, so that the "loading" screen appears
until the launched binary starts using the framebuffer.
2011-07-11 11:27:38 +02:00
Ayla
55dad4171d
Merge branch 'install_locations'
...
Conflicts:
configure.in
2011-07-11 11:19:18 +02:00
Ayla
f7817b19ab
The links will now be loaded from both the system and the user-specific directories.
2011-07-11 02:49:44 +02:00
Ayla
439d25c292
GMenu2X now won't load skin files from the Default skin when using another skin.
...
This was causing trouble when the current skin does not provide graphical files on purpose (ie. skin with no top/bottom bar).
2011-07-09 01:49:09 +02:00
Sergey Kukunin
28fe39ce54
Fix segmentation fault when try show Manual on Explorer or other service apps
2011-06-11 02:41:52 +03:00
kyak
6646525731
Zero-pad hex values when saving config
...
writeSkinConfig() had a very naughty bug when RGBA values were written
to config file unpadded. This lead to a problem that, for example,
0x00000080 was written as 0x00080 in config file (Somehow gmenu2x
reads and re-saves config on selection). This, in turn, led
to problem when reading skin config file in strtorgba function,
because it parses the color string in token of two symbols
(substr(0,2) and etc).
2011-06-06 11:38:26 +04:00
Maarten ter Huurne
7aeb7a4f0a
PNG: Use libpng directly instead of via SDL_image.
...
This eliminates the build-time dependency on SDL_image and the run-time
dependencies on all libraries used by SDL_image except SDL and libpng.
In addition we now let libpng convert to ARGB format while decoding the
image, rather than letting SDL convert the surface afterwards.
2011-06-05 05:58:47 +02:00
Maarten ter Huurne
2394a075d7
Surface: Work around bug in SDL that loses per-surface alpha.
...
A bug in SDL_ConvertSurface() leaves the per-surface alpha undefined when
converting from RGBA to RGBA. This can cause problems if the surface is
later converted to a format without an alpha channel, such as the display
format.
2011-06-05 05:27:28 +02:00
Maarten ter Huurne
36260e999d
PNG: Only add alpha channel on surface if loaded image has an alpha channel.
...
This fixes a bug where a loaded image could have an alpha of 0.
Also it avoids expensive alpha blending where it is unnecessary.
2011-06-03 12:47:49 +02:00
Maarten ter Huurne
8a81837c04
Surface: Make pixel format conversion explicit.
...
Instead of having the copy constructor convert to display format, the new
copy constructor preserves the pixel format and a separate method was
introduced to convert surfaces to display format.
The code was made more robust as well: it should no longer crash if the
wallpaper cannot be loaded.
2011-06-03 11:46:36 +02:00
Maarten ter Huurne
7861e07eb0
Surface: Made "raw" field private.
...
I cheated a bit by declaring ASFont as friend, but all other outside
access now happens via methods.
I removed the "saveScreenshot" method since the code calling it is
commented out and I never heard anyone complain about missing this
feature.
2011-06-02 22:44:04 +02:00
Maarten ter Huurne
25e8e62622
Surface: Minor cleanups.
...
Removed unused "locked" field.
Inlined format() private method: since "raw" can no longer be NULL, the method became trivial.
2011-06-02 22:32:08 +02:00
Maarten ter Huurne
52f4686e4a
Surface: Load image with factory method instead of constructor.
...
If loading fails, the factory method returns NULL, while previously the
constructor would create a Surface object with a NULL "raw" field.
However, since most of the methods dereference "raw" without checking,
such a Surface would likely crash the application when used.
2011-06-02 22:09:03 +02:00
Maarten ter Huurne
0a9229ff3f
Surface: Use the destructor as intended.
...
There is no reason to have an explicit free() method instead of just
destructing the Surface object and doing cleanup in the destructor.
2011-06-02 18:15:15 +02:00
Maarten ter Huurne
0c867aabbf
Surface: Fixed memory leak in previous commit.
...
I forgot to initialize freeWhenDone in two of the three constructors.
2011-06-02 18:07:17 +02:00
Maarten ter Huurne
7dac306c16
Surface: Removed fake double buffering.
...
Use real double buffering instead.
I checked the SDL code and if the hardware cannot provide double buffering
it will use a shadow surface to ensure that a frame is not displayed until
it has been fully painted.
Also disable mouse cursor before opening the output surface. The reason it
was disabled after the surface was opened is that SDL on GP2X has a bug.
However, this means the cursor is visible for a short time during startup
which looks ugly.
2011-06-02 17:59:26 +02:00
Ayla
ef4b012026
Merge branch 'master' of projects.qi-hardware.com:gmenu2x into install_locations
...
Conflicts:
data/platform/nanonote/sections/terminals/ash
src/gmenu2x.cpp
src/surface.cpp
2011-06-02 12:16:26 +02:00
Maarten ter Huurne
5b6d922f11
Fixed bug: wallpaper does not use alpha channel.
...
The unnecessary alpha channel might harm performance but is not a big deal.
However, the fact that the alpha flag (bool) is somehow automatically
converted by C++ into a skin name (string) causes the entire screen to
stay black.
The black screen was fixed by removing the alpha flag.
For optimum blitting performance, the wallpaper surface is then converted
to the pixel format of the frame buffer.
Bug was introduced in 52c89d6005
.
2011-06-02 07:13:59 +02:00
Maarten ter Huurne
8b17e2ef62
PNG: Make loadPNG() responsible for creating an RGBA surface.
...
Before this commit loadPNG() could return any surface format and the caller
was responsible for converting it to the desired format. However, in practice
all callers want a surface with an alpha channel and SDL only supports that
with 32bpp surfaces, so RGBA or a permutation thereof. So I changed the
contract for loadPNG() so it is required to return an RGBA surface, and
removed the conversion code in the callers.
The next step is to replace IMG_Load() by a function that calls libpng
directly and loads a fixed 32bpp pixel format. That way, we can drop the
SDL_image dependency and avoid unnecessary pixel format conversions.
2011-06-02 06:19:21 +02:00
Maarten ter Huurne
7877fee3fa
Surface: Remove alpha flag.
...
As for SurfaceCollection, the alpha flag passed to the Surface constructor
was also always true. Therefore there is no need to have the flag.
2011-06-02 06:02:45 +02:00
Maarten ter Huurne
44ca4e3460
SurfaceCollection: Removed alpha flag.
...
In the existing code the alpha flag is always true, so there is no point
in passing it around.
2011-06-02 05:52:47 +02:00
Maarten ter Huurne
af3ed78496
Merge branch 'master' of projects.qi-hardware.com:gmenu2x
2011-06-02 05:46:25 +02:00
Sergey Kukunin
240286df11
Add powersaver class
2011-06-02 06:32:39 +03:00
Maarten ter Huurne
52c89d6005
Surface: Removed duplicate constructor.
...
There were two constructors that took an image path, skin name and alpha flag
as their arguments, but in different orders. We need only one of them.
2011-06-02 04:57:21 +02:00
Maarten ter Huurne
b2896d6bac
ASFont: Refactored string drawing methods.
...
Renamed methods that draw a single line from write() to writeLine().
There is now only one write() method left: the public method.
Pass surface to draw on as wrapped Surface instead of SDL_Surface.
At the end of the call chain we still use SDL directly though.
2011-06-02 04:29:19 +02:00
Maarten ter Huurne
b6a5d89bc8
Surface: Removed unused code and restricted access.
...
Removed all methods that are never called.
Made methods that are only called by Surface itself private.
One ugly thing remaining is outside access to the "raw" field.
2011-06-02 03:39:34 +02:00
Maarten ter Huurne
a382a425a9
ASFont: access font pixels efficiently.
...
Previous commit ensures that the font surface is always 32 bpp.
Therefore we can read font pixels directly through a pointer.
2011-05-12 02:10:40 +02:00
Maarten ter Huurne
41e6e4693e
ASFont: only convert font surface if it is not already in a 32bpp format.
2011-05-12 01:20:26 +02:00
Maarten ter Huurne
db5ebff16f
Fixed debug print.
...
GCC 4.5.1 has stricter checking of format strings and refused to compile this.
2011-05-11 02:31:41 +02:00
Maarten ter Huurne
8592038f95
Merge branch 'master' of projects.qi-hardware.com:gmenu2x
2011-05-11 01:37:57 +02:00
Maarten ter Huurne
bff04d2418
ASFont: removed duplication of horizontal alignment code.
2011-05-10 02:43:15 +02:00
Maarten ter Huurne
b4f3cde526
ASFont: merged SFontPlus class into ASFont class.
2011-05-10 02:37:10 +02:00
Maarten ter Huurne
1bc55392cd
ASFont: cleanups in text write methods.
2011-05-10 02:23:13 +02:00
Maarten ter Huurne
ff546cdcb0
ASFont: have a single routine for computing text width that also handles newlines.
...
This way the text has to be scanned only once and no copying is needed.
2011-05-10 02:08:14 +02:00
Maarten ter Huurne
e4b71138b9
ASFont: removed precalculation of half heights.
...
There is no point in precalculating something so cheap to recalculate.
Also, the majority of uses was to compensate for passing the wrong alignment argument.
2011-05-10 00:31:45 +02:00
Ayla
3998e19e49
The log.txt file will now be saved on the user-specific directory.
2011-05-09 19:21:14 +02:00
Maarten ter Huurne
492a36b9df
ASFont: simplified object initialization and cleanup.
...
Do initialization and cleanup in constructor and destructor respectively.
Removed constructors that are not used by gmenu2x.
2011-05-09 14:54:11 +02:00
Maarten ter Huurne
ec5d426d83
ASFont: moved SFontPlus code into ASFont source files.
...
This is in preparation of merging the classes.
2011-05-09 14:25:16 +02:00
Maarten ter Huurne
a35a7e2c35
Introduced enums for text alignment in the ASFont class.
2011-05-09 05:17:25 +02:00
Maarten ter Huurne
c54dec90f5
Minor cleanups in SFontPlus and ASFont.
...
Removed unused includes.
Avoid importing classes into default namespace in headers.
Don't use a type alias if it does not add value.
2011-05-09 04:29:59 +02:00
Maarten ter Huurne
e6be835038
Isolate all PNG loading in a separate source/header.
...
This is in preparation of replacing SDL_image with direct use of libpng.
2011-05-09 03:56:57 +02:00
Ayla
38a83dd385
On the skin menu, the ALTLEFT/ALTRIGHT buttons will now respectively decrease/increase the ARGB values by 10.
2011-04-14 19:35:50 +02:00
Ayla
6cb7ce1c0b
Fixed the renameSection() and deleteSection() functions to use the new directories. The sections can now be renamed and deleted.
2011-04-14 12:08:10 +02:00
Ayla
d0a24ac5ce
Merge branch 'install_locations' of projects.qi-hardware.com:gmenu2x into install_locations
2011-04-14 11:26:24 +02:00
Ayla
6c97139113
The FileLister won't list a file if a previous one has the same file name (without path).
...
This is useful when the files/directories lists are not cleared; then it is possible to define priorities between the files.
For instance, the skin "Default" will be shown only once, even if the directory "Default" exists both in the system and the user directories.
As the skin and translation loading functions does check both directories, there is no problem in doing that.
2011-04-14 11:16:16 +02:00
Maarten ter Huurne
c22cc4d663
Cleaned up link flags.
...
Use the flags found by "configure" and nothing more.
The hardcoded "-lpng12" broke linking with libpng 1.4.
2011-04-13 03:40:36 +02:00
Maarten ter Huurne
23042f3122
Cleaned up link flags.
...
Use the flags found by "configure" and nothing more.
The hardcoded "-lpng12" broke linking with libpng 1.4.
2011-04-13 03:36:47 +02:00
Maarten ter Huurne
f9db1fbd53
Merge remote branch 'origin/master'
2011-04-13 03:14:45 +02:00
Maarten ter Huurne
34a3d55d10
Added missing #include.
...
Fixes compile error when compiling with GCC 4.5.1.
2011-04-13 03:14:10 +02:00
Maarten ter Huurne
8995a3c196
Added missing #include.
...
Fixes compile error when compiling with GCC 4.5.1.
2011-04-13 01:51:23 +02:00
Ayla
f10bb60717
Merge branch 'master' into install_locations
2011-04-12 13:25:00 +02:00
Ayla
ba9fef5c42
The locale configuration will now be saved.
2011-04-12 13:24:35 +02:00
Ayla
12a7fe4e95
The user skin directories were not created when saving the skin.conf file; Thus it was never saved.
2011-04-12 10:19:00 +02:00
Ayla
f2b34f383b
The wallpapers will now be loaded from the system and the user-specific skin directories.
2011-04-12 10:18:10 +02:00
Ayla
f4b03108c1
The "configure skin" will now list all the skins present on the system and the user-specific directories.
2011-04-12 10:16:28 +02:00
Ayla
c18c230f7a
The translations can now be located on the system directory, or on the user-specific directory.
...
The language selector on gmenu2x's settings will list the languages present on both directories.
2011-04-12 09:59:32 +02:00
Ayla
301e16e8ee
Define a default wallpaper path, that will be chosen if no wallpaper is defined on the config.
2011-04-03 11:49:00 +02:00
Ayla
fe25cf341d
The skin images will now be loaded using SurfaceCollection::getSkinFilePath().
2011-04-03 11:45:35 +02:00
Ayla
114fe594d0
The sections directories shall now be found under the user-specific directory.
2011-04-03 11:44:08 +02:00
Ayla
8336c83129
If the "sections/" directory is missing, we create it as well as some default sections (settings, applications...).
2011-04-03 11:34:40 +02:00
Ayla
d8204706d7
The method FileLister::browse() now takes an optional boolean argument.
...
If set to "false", the previous list of files/directories won't be cleared when browsing another directory.
It will allow us to have file choosers that list files contained on different directories.
2011-04-03 11:30:25 +02:00
Ayla
3db5844f3c
The function SurfaceCollection::getSkinPath() will return the path of a skin directory from its name given as a parameter.
2011-03-30 16:15:09 +02:00
Ayla
02b54d38a3
Overloaded the function SurfaceCollection::getSkinFilePath(), so that it can also be called with a skin as parameter.
2011-03-30 16:15:09 +02:00
Ayla
d59b713e9b
Rewrote the function SurfaceCollection::getSkinFilePath() so that it'll search inside the right directories.
2011-03-30 16:15:09 +02:00
Ayla
ead9706ffd
The skin.conf file will now be loaded/written from/to the user-specific directory.
...
It will also be loaded from the system dir if missing on the user-specific directory
(For instance, when using a default theme of gmenu2x).
2011-03-30 16:15:09 +02:00
Ayla
cf42f7d192
The gmenu2x.conf file is now located on the user-specific directory.
...
If inexistant, it will be written as soon as the configuration is changed.
2011-03-30 16:15:09 +02:00
Ayla
83d6b954fb
The input.conf file will now be loaded from the user-specific directory or if missing, from the system directory.
2011-03-30 16:15:08 +02:00
Ayla
8693dff072
Added a static function GMenu2X::getHome() that returns GMenu2X's user-specific directory (usually ~/.gmenu2x).
2011-03-30 16:14:03 +02:00
Ayla
758b7b183c
The GMENU2X_SYSTEM_DIR macro on gmenu2x.h now contains the installation path of GMenu2X (default: /usr/share/gmenu2x).
2011-03-30 16:13:26 +02:00
Ayla
ec000e0214
Changed an error message, that was displaying "Error:" twice. Plus, it now more meaningful.
2011-03-30 15:44:32 +02:00
David Kühling
5300921fab
gmenu2x: make console the foreground console before launching applications
...
Emacs didn't like how it was launched before
2011-02-21 23:54:07 +01:00
Xiangfu Liu
91d3fea2ec
fixed section display not correct in ben nanonote
2011-01-13 17:20:17 +08:00
Xiangfu Liu
bfe772b690
using STDOUT_FILENO, remove tcsetpgrp
2011-01-05 22:11:54 +08:00
David Kühling
dd0709e1da
Fix problems with missing tty for launched applications
2010-12-26 17:58:22 +01:00
Xiangfu Liu
be9c6b9220
update the brightness file path to NanoNote
...
Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
2010-11-17 17:26:34 +08:00
Ayla
69c702f88c
When adding a new link, the default brightness is now -1.
...
Note that the brightness values between -1 and 5 won't be accepted, and will be set back to 5.
2010-10-13 22:15:55 +02:00
Ayla
5cd92b76ae
The selector filters will now match also the files with an extension in uppercase.
...
Please note that the selector filters have to be entered in lowercase.
2010-10-13 22:09:43 +02:00
Ayla
ffdc8de2ac
User can now increase/decrease by 10 the values of clock, brightness etc.
2010-09-19 00:50:16 +02:00
Ayla
08468776f4
When a foo.dge file is loaded, the image file foo.png will be automatically assigned.
2010-09-18 21:28:54 +02:00
Ayla
563cb34a89
Rewrote the whole input system.
...
Gmenu2X will no longer eat 100% CPU ;)
2010-09-17 22:34:26 +02:00
Ayla
c6c3dfe8e0
Added some signal handlers, so that gmenu2x will exit correctly if a TERM signal occurs or after a segfault.
2010-09-17 22:32:41 +02:00
Ayla
7c9364780b
Replaced every message output by calls to the log macros.
2010-09-17 22:31:09 +02:00
Ayla
7d0c0e958c
Adding a new file, debug.h, containing useful macros to output information:
...
DEBUG, INFO, WARNING, ERROR. The log level can be set using the LOG_LEVEL define.
2010-09-17 22:28:23 +02:00
bartbes
5c05348ba9
Automatically switches CARD_ROOT to / when CARD_ROOT doesn't exist
2010-09-01 22:50:43 +02:00
bartbes
cf9628a4cc
More fixed for when CARD_ROOT doesn't exist
2010-09-01 22:11:24 +02:00
bartbes
6381674f57
Fixed segfault when CARD_ROOT didn't exist & added _CARD_ROOT
...
compile-time define to set CARD_ROOT
Note that you shouldn't set CARD_ROOT (or _CARD_ROOT) to /, because that
might mess things up.
2010-09-01 17:37:27 +02:00
bartbes
e9941dc4fd
Now only allows file browsing up to /, CARD_ROOT is /card/
2010-08-03 17:49:34 +02:00
bartbes
ba9af53c21
Changed the file browser to use / as root and added ability to see extensionless files (i.e. executables)
2010-08-03 17:32:54 +02:00
Maarten ter Huurne
b54a595e26
Improved conversion from color enum to string and vice versa.
...
The stringToColor() and colorToString() methods were changed into file-scope functions, so they can be inlined by the compiler.
The colorNames array is now used for lookups in both directions, removing duplication of the color names.
The missing "selectionBg" entry was added to the colorNames array.
2010-07-28 16:15:52 +02:00
Maarten ter Huurne
c91a190f28
Remove support for exceptions.
...
This reduces the binary size by almost 150K.
2010-07-28 03:55:00 +02:00
Maarten ter Huurne
599628fa38
Remove Google sparsehash library.
...
GMenu2X now uses tr1::unordered_map instead, which results in a much smaller binary.
The Google library might have its uses when high performance is required, but for us a smaller binary is more important since that reduces startup time.
2010-07-28 03:37:40 +02:00
Maarten ter Huurne
4ddc189847
Use tr1::unordered_map instead of google::dense_hash_map in class GMenu2X.
...
This reduces the binary size by about 260K.
2010-07-28 03:31:41 +02:00
Maarten ter Huurne
4dade329f7
Use tr1::unordered_map instead of google::dense_hash_map in SurfaceCollection.
...
This reduces the binary size by about 45K.
2010-07-28 03:16:40 +02:00
Maarten ter Huurne
c84fea65a2
Minimize namespace pollution by SurfaceCollection class.
2010-07-28 03:13:27 +02:00
Maarten ter Huurne
d082f7f280
Minimize namespace pollution in MenuSetting class hierarchy.
...
This should be done for all source files, but it is too much to do all at once.
2010-07-28 02:36:46 +02:00
Maarten ter Huurne
961e030670
Made MenuSettingMultiString a subclass of MenuSettingStringBase.
2010-07-28 02:06:49 +02:00
Maarten ter Huurne
44bed79d5c
Give adjustInput() an empty default implementation and remove empty overrides.
...
Again a slight reduction in binary size.
2010-07-28 01:52:05 +02:00
Maarten ter Huurne
d1d55a7666
Added MenuSettingStringBase, an abstract base class for MenuSettingString, MenuSettingFile and MenuSettingDir.
...
This removes a lot of duplicate source code and also decreases the binary size slightly.
2010-07-28 01:46:32 +02:00