notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit the initial support for the Nokia 770. This does not include packaging (which should be done outside this tree, imho), and is not finished yet, but it works.

Browse source
This commit is contained in:
Christian Hammond 2006-01-08 02:16:29 +00:00
parent b9fdccaf2c
commit 0a466d36af
3 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -201,6 +201,13 @@ win32:
ARCH_HEADERS="src/win32_print.h" \ ARCH_HEADERS="src/win32_print.h" \
ARCH_LIBS="obj/win32_print.o obj/resource.o" ARCH_LIBS="obj/win32_print.o obj/resource.o"
# "make nokia770" builds the program for the Nokia 770.
nokia770:
make \
DATA_PREFIX=/var/lib/install/usr/share/tuxpaint \
CFLAGS="-DNOKIA_770"
# "make install" installs all of the various parts # "make install" installs all of the various parts
# (depending on the *PREFIX variables at the top, you probably need # (depending on the *PREFIX variables at the top, you probably need
# to do this as superuser ("root")) # to do this as superuser ("root"))
@ -488,6 +495,21 @@ install-gnome:
fi fi
# Install a launcher icon for the Nokia 770.
install-nokia770:
@echo
@echo "...Installing launcher icon into the Nokia 770..."
@if [ "x$(NOKIA770_PREFIX)" != "x" ]; then \
install -d $(PKG_ROOT)$(NOKIA770_PREFIX)/share/pixmaps; \
cp data/images/icon.png $(PKG_ROOT)/$(NOKIA770_PREFIX)/share/pixmaps/tuxpaint.png; \
chmod 644 $(PKG_ROOT)$(NOKIA770_PREFIX)/share/pixmaps/tuxpaint.png; \
install -d $(PKG_ROOT)$(NOKIA770_PREFIX)/share/applications/hildon; \
cp hildon/tuxpaint.desktop $(PKG_ROOT)$(NOKIA770_PREFIX)/share/applications/hildon/; \
chmod 644 $(PKG_ROOT)$(NOKIA770_PREFIX)/share/applications/hildon/tuxpaint.desktop; \
fi
# Install a launcher icon in the KDE menu... # Install a launcher icon in the KDE menu...
install-kde: install-kde:

9
hildon/tuxpaint.desktop Normal file
View file

@ -0,0 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Tux Paint
Type=Application
Exec=/var/lib/install/usr/bin/tuxpaint
Icon=tuxpaint
Terminal=false
GenericName=Drawing program
Comment=A drawing program for children.

22
src/tuxpaint.c
View file

@ -32,11 +32,14 @@
/* Color depth for Tux Paint to run in, and store canvases in: */ /* Color depth for Tux Paint to run in, and store canvases in: */
//#define VIDEO_BPP 15 // saves memory #ifdef NOKIA_770
//#define VIDEO_BPP 16 // causes discoloration # define VIDEO_BPP 15
//#define VIDEO_BPP 24 // compromise #else
#define VIDEO_BPP 32 // might be fastest, if conversion funcs removed //# define VIDEO_BPP 15 // saves memory
//# define VIDEO_BPP 16 // causes discoloration
//# define VIDEO_BPP 24 // compromise
# define VIDEO_BPP 32 // might be fastest, if conversion funcs removed
#endif
// plan to rip this out as soon as it is considered stable // plan to rip this out as soon as it is considered stable
//#define THREADED_FONTS //#define THREADED_FONTS
@ -7717,7 +7720,11 @@ static void setup(int argc, char * argv[])
use_sound = 1; use_sound = 1;
mute = 0; mute = 0;
#ifdef NOKIA_770
fullscreen = 1;
#else
fullscreen = 0; fullscreen = 0;
#endif
noshortcuts = 0; noshortcuts = 0;
dont_do_xor = 0; dont_do_xor = 0;
keymouse = 0; keymouse = 0;
@ -7740,8 +7747,13 @@ static void setup(int argc, char * argv[])
disable_stamp_controls = 0; disable_stamp_controls = 0;
// WINDOW_WIDTH = 640; // WINDOW_WIDTH = 640;
// WINDOW_HEIGHT = 480; // WINDOW_HEIGHT = 480;
#ifdef NOKIA_770
WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 480;
#else
WINDOW_WIDTH = 800; WINDOW_WIDTH = 800;
WINDOW_HEIGHT = 600; WINDOW_HEIGHT = 600;
#endif
playfile = NULL; playfile = NULL;
recording = 0; recording = 0;
playing = 0; playing = 0;