[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
Hi,
I backported changes from the 5.1 branch to 5.0 in preparation
for a 5.0.7 release some time.
I put it up on github for testing. The branch is called 5.0.7-prepare.
I haven't compiled it on OS X, so that's the first thing to check.
https://github.com/wangp/allegro-testing
The list of backported commits is attached. If you can, look over them
to see if I missed anything you consider crucial. Lines starting with
'y/n' means whether the change was backported. '?' means I was
uncertain whether that change should be backported. Most
graphics-related changes are impossible to merge automatically by now.
Peter
y 7ca2e31 Rename al_toggle_display_flag to al_set_display_flag, retaining the older name for compatibility.
n a1d7d94 Replace al_toggle_display_flag compatibility function by a macro.
y 4e1cc23 Don't use outlines with a thickness of 0 in unit tests - those are expected to show undefined behavior (The OpenGL specs leave it up to implementors so we can't expect them to be similar).
n 217d5a5 Added OSX Framework support for the monolith library.
n 929b860 Removed a debug message accidentally left in the previous commit (and replaced it with a comment).
y? 43078d0 Clear mouse state after dialogs or else it gets messed up (OSX)
n e4f622c Added WANT_ANDROID_4 and WANT_GLES2 cmake variables to allow compiling for older android platforms
n 3846692 Add an ALLEGRO_NO_GLES2 define (android only now, based on platform headers) that wraps all programmable pipeline stuff (freaking everywhere). May be time to consider two separate paths for fixed and programmable pipeline.
n 5b3a356 Make android port always choose a double buffered (not triple (and not single but I don't think that's possible on android)) graphics mode. Go fullscreen (no title/status bar.
y aee989f Max Savenkov found and fixed a bug in the D3D driver where separate alpha blending was being tested for when it shouldn't have been
y 366486f wgl: Fix incorrect size argument to qsort, fortunately innocuous. Reported by Max Savenkov.
n 202a586 ogl: Delete unnecessary null check. Reported by Max Savenkov.
n 45ba785 ogl: Fix null pointer dereference if backbuffer creation fails. Reported by Max Savenkov.
n 24d8d39 d3d: Fix null pointer dereference in error path in d3d_create_bitmap_from_surface. Reported by Max Savenkov.
y b30f613 unix: Fix typo preventing get_executable_name from using System V procfs correctly. Reported by Max Savenkov.
y 9800e6d x11: Fix wrong return value in xrandr_realign_crtc_origin (never used). Reported by Max Savenkov.
y 5ce059b acodec: Delete redundant (and wrong case) in wav saving; the correct code appears earlier. Reported by Max Savenkov.
y 9a0a820 image: Fix TGA loader using more memory than necessary. Reported by Max Savenkov.
n 72e5637 video: Add assertion.
n 52b8704 Added method (temporary? Better way?) to get the JavaVM from Allegro. Fix bug in Android native image loader, speed it up a bit by not having to to the flip. The _al_ogl_upload_bitmap_memory function I believe is obsolete.
n 7be4d1d Use a slightly less messy method of ifdefing programmable pipeline stuff with ALLEGRO_NO_GLES2 defined
n 245d7b0 Hackish way to force opengl ES 1.1 instead of 1.0. Fail display creation of ALLEGRO_NO_GLES2 is defined but flag ALLEGRO_USE_PROGRAMMABLE_PIPELINE is used (Android)
n 8c288cb Include the _jni_getJavaVM declaration in aintern_android.h
n d336adb Remove incorrect GLES2 check
n 78b73d2 Rename WANT_ANDROID_4 to WANT_ANDROID_LEGACY. Set ALLEGRO_NO_GLES2 in Toolchain-android.cmake if WANT_GLES2 is turned off
n 76e3d69 Minor formatting. Make unpackAssets handle directories. Remove some stale code that didn't force ES 1.1 correctly.
n 3b50f9b On Android (2.0-2.2?) never got touch end events for touch ids > 0. Fixed that.
n df88318 Fix memory leak
n e550761 Add a change_display_option vtable entry, call it from al_change_display_option if it exists.
n? 16ada43 Do not preserve bound texture state. (this was discussed before but only done in the primitives addon). Minor cleanup. Minor fix for Android Galaxy player and possibly other Androids.
n 6c0fdf5 Additions and fixes to Android accelerometer and orientation code. Implemented all orientation functions and joystick/accelerometer device. Able to load images from APK (needs way to choose.)
n f7f95e4 Don't emit scary warning about selected Android toolchain.
n 7f4df30 Make README_android more readable, to me at least.
y 892e735 ALLEGRO_STATIC_ASSERT on the same line number in two different files could collide, if included as part of the same translation unit.
n b3b9514 Fix search/replace accident
n 10e3fa2 docs: Fix incomplete example for ALLEGRO_MENU_INFO. Reported by Mr-Hide.
n 13dcaf6 Android project: call nativeOnDestroy after context has been released. Format in OnChange wasn't and can't be used, substitute temporary value
n c06b012 Some ES 1.0/1.1 devices don't have glGet(Integer|Boolean). Just set the texture every time in primitives. If this is a problem I can #ifdef it.
n? 8f4cc2f Use the already existing ALLEGRO_BITMAP->dirty instead of D3D display internal 'modified' boolean. Handle modifications the same way as GL (set dirty in set_target_bitmap and lock_region.) Don't preserve/restore sub-bitmaps in D3D.
n? db9987f Don't restore sub bitmaps when using PRESERVE_TEXTURE
n a4fe88e Rejig a lot of android code so switch out/in is more reliable. NOTE: should be added to docs - on both ios and android there are some events that MUST be responded to, or your game will crash or lock up.
n f19e34f Workaround lack of glGetIntegerV on Android by saving current fbo whenever it's changed. Re-purposed the upload_memory function to restore lost bitmaps on android when tabbing away etc.
n 0d24c8f Remove unnecessary/redundant code
n c02e71f Define ALLEGRO_CFG_NO_GLES2 in aplatf.h
n 08d64f6 Rename ALLEGRO_NO_GLES2 to ALLEGRO_CFG_NO_GLES2
n 0959cbc Define ALLEGRO_CFG_NO_GLES2 in alplatf.h
n 6c567cc We no longer set a projection on orientation in the android port, so set one when we get the ORIENTATION event in the Android demo
n 0d58b8c Rename ALLEGRO_NO_GLES2 define to ALLEGRO_CFG_NO_GLES2. Add a workaround in al_clear_to_color for Android 2.1 when clearing the backbuffer
n ee28887 Minor formatting. glClear workaround android bits.
n bb58aa4 Removed empty directories not removable from git-svn. When are we switching to git? :P
n 537be06 Delete redundant code.
n? 52c5409 Attempt fix for D3D broken in r15469 reported by tobing
n? 91e11a2 Fix some D3D driver errors
n a2fba20 Added a temporary hack to make the XCode generator work again with XCode 4.3.x, until the issue is fixed in cmake.
n 415d7b4 Remove ALLEGRO_PRESERVE_TEXTURE flag. The idea is to always preserve textures unless directed otherwise by the user with ALLEGRO_NO_PRESERVE_TEXTURE. Plan is to make this happen on desktop GL (the only one where preserving isn't necessary) too for easier testing. Also fix some opengl code for Android where glReadPixels isn't allowed on every format, just RGBA_8888 (4 bytes) like iOS
n e31af64 fix compile error in android example s/display/dpy/
n 7a738f7 Add missing java method getOsVersion
n 54403e4 Got android-project working again (mostly, for me)
n 531190a Move variable declaration to beginning of scope
n 3d0769e Fix some issues with a5teroids on iOS. Thanks to billyquith.
n c01b37b Remove sb_start and sb_stop calls (60beat GamePad stuff that was removed due to NDA). Thanks again to billyquith.
n 7f1364c a5teroids: Consolidate USE_JOYPAD ifdefs into a single file.
n 56902bc Android port needs to hook thread create/end. Do so to obtain Java context for each thread.
n 2637934 Change some defines to use ANDROID_LEGACY instead of NO_GLES2 where it makes more sense
n 037aff2 Added a dummy mouse driver to Android port, enough to get al_get_mouse_state working. Change mouse emulation behaviour slightly on Android and iOS -- update ALLEGRO_MOUSE_STATE even if mouse emulation event source isn't attached to an event queue. Fixed a race condition in Android port. Restore functionality of loading bitmaps from the filesystem and not just directly from APK (only works with al_load_bitmap_f for now).
n 51cafa2 Minor updates to AllegroActivity
n ab166bc Fix compilation on non-android
n 2c394d2 Fix complaining about missing ASSERT
n 70d0bea Add an APK file driver for reading assets directly from android app bundles. Generate LOST->HALT .. RESUME->FOUND instead of SWITCH_IN/OUT on Android.
n fd5cbe5 Fix memory leaks
n ed6b4ad android: Fix implicit declaration warnings.
n ec5b8c1 android: Delete extraneous semicolon after ALLEGRO_DEBUG_CHANNEL.
y a1f71b0 Delete extraneous comma in enum ALLEGRO_FILE_MODE.
n 6e4eb66 Juggle a little code around so Android restores from background again
y f67d9ff Delete extraneous semicolon after ALLEGRO_DEBUG_CHANNEL.
y d02a87e Fix pedantic warnings in public headers.
n dc0c1c2 Move 'dirty' flag into top level ALLEGRO_BITMAP structure. Make it work better on Android and iOS.
n 5a0cdcb some android devices seem to not support FBO's, re-enable proper FBO checks on android
y 43cd990 test_driver: Add --no-display flag. (Tobias Hansen)
y bf04008 docs: Fix whatis entries of man pages. (Tobias Hansen)
n 08cd76d Fixed bug in al_unlock_bitmap for the OpenGL driver, introduced by not preserving texturing state any longer.
y 46068d5 Fixed inverted check for OpenGL 3.0 forward compatible context only from revision 13662 - this makes OpenGL extensions get listed again in allegro.log.
y 424a9a2 x11: Set LC_CTYPE only, and restore original locale after XOpenIM.
n c36bf4c ALLEGRO_NOFRAME toggle was inverted
y d5515ad Fixed typo in names of some OpenGL extension functions.
y 508f4e7 Display list of OpenGL extensions in allegro.log also for OpenGL 3.0. Removed outdated num_texture_units extension variable.
y 230950c Clear the OpenGL error status each frame.
y bf70baf Fix some of the warnings in gtk_dialog.c.
n? 37507ab Fix device reset problem in D3D, possibly caused by changes to set_target_bitmap or just because it's not that common.
y 4285b02 comment typo
nx e7624a9 Made the ALLEGRO_OPENGL_FORWARD_COMPATIBLE flag work with al_draw_bitmap. Some things which do not exist any longer with it: GL_LUMINANCE (can use GL_RED instead), glPushClientAttrib (removing it seemed to have no effect anyway), glVertexAttribPointer with a pointer to client member (using a single VBO and VAO now instead), any fixed pipeline calls (there were some left in the xdisplay.c for some reason). Not sure this buys us much, especially as it seems they also deprecated stuff allowed in OpenGL ES 2.x (I kinda had hoped to unify things more).
n 1e48143 Add additional checks and set render target to NULL so it's not freed twice (related to my last D3D commit)
n c6c6ea0 Fixed some issues again with D3D lost device
y 70ac810 ex_noframe was broken by r15522. Fix the confusion which caused it.
y bd0e646 gtk_dialog: Fix GLib version checks.
y 229787d ex_joystick_events: Fix display of 3-axis sticks.
y 8c67494 ex_joystick_events: Fix outdated comment and minor cleanup.
y c2867b0 ex_joystick_events: Support hotplugging.
n df7144e Increase max number of joystick "sticks".
n? e9b23a0 Remove some unneeded D3D code. Do not manage depth stencil surface, that's why we set AutoDepthStencil in present params. Arrange code a bit so that sleep and hibernate work using the release and restore callbacks. DISPLAY_LOST and FOUND should possibly be deprecated as there is no way to make sleep/hibernate work with those alone, but they may be useful for other things.
y 6436250 Trailing space ruins Allegro logo with vim syntax highlighting
y d1be10a al_acknowledge_resize is definitely not required for al_resize_display anymore
y d82312f Fixed a bug in al_unlock_bitmap where the pixel alignment mistakenly was used as row length. Also corrected the pixel alignment for RGB888 to 1 (was 4).
y b96f5a4 Remove work-around for the previously differently aligned 24-bit format.
n? 3115841 Add back overzealously removed mutex and shuffle some code in D3D. Sleeping/hibernate now works for me in games uing the D3D driver.
nx 55ab007 Make it compile again on iOS. Also use 16 or 32 bit backbuffer depending on user settings. This doesn't seem to work out well for me if I choose the wrong one, depending on Android or iOS, but it might be my game code.
y cf9efe8 Added a test for audio resampling (visualization could need improvement).
y cb8b6a1 ex_resample_test: Minor fixes. Quit on Escape.
y 4a4d508 Fix a minor component of the resampling de-sychronization issue by deferring some divisions until after all multiplications have taken place.
n 0e69492 Add additional instruction for building Android port on a mac
y d2dec0c Fixed display in ex_resample_test.
y 6cd471e Re-added the actual test to ex_resample_test.
y b5e9e14 Use Bresenham to calculate mixer positions instead of the two divisions introduced by SiegeLord.
y 6aabf7c Keep sub-sample accuracy in sample instances by storing the Bresenham error when doing resampling.
y d769b36 Finally get rid of the fractional fixed-point sample positions used until now which meant very inaccurate sample positions when resampling. Thanks a lot to _Bnu for discovering the issue and SiegeLord for devising the correct solution. Now we should have 100% accurate resampling.
y 19effbf Make Bresenham in mixer also work with backwards samples.
y 498a084 Linear resampling requires pos_bresenham_error to be current when NEXT_SAMPLE_VALUE is called.
y 2e71907 Make the visualizaion in ex_resample_test.c work even with very small buffers (with ALSA they are only about 32 samples for some reason). Also account for stereo output.
y beb5e5f ex_resample_test: Fix mixed declarations and code.
y ffcc6e6 Minor cleanup for MAKE_MIXER.
y 4cad89e Fix linear interpolation across audio stream buffer fragments.
y 4a0b6ff Rename parameter in al_create_audio_stream() for clarify.
y aff7315 docs: Add See alsos to audio documentation.
y 0abfbcb ex_audio_props: Add bidir button.
n? 46f4a7e ogl: Refactor bitmap locking into manageable functions.
n ed976e2 remove hack around a bug in some development snapshot of cmake 2.8.7 breaking xcode projects. cmake 2.8.8 works again and cmake 2.8.7 and earlier don't work under osx lion with xcode 4.3+ anyway.
n 853e46d Made the skater demo run from within xcode.
n cf1c5c0 need to find a proper text editor for osx which doesn't "auto correct" things randomly
y 24f74bb build again under linux without x11
y 4e841f1 overlooked an #if 0
y 50ac7e0 Fix missing prototype warning.
n 71cd18f Documented al_draw_filled_polygon_with_holes and added a call to it to ex_polygon.
n 2b2f2f9 documented al_draw_polygon_with_holes and fixed typos
n ed26448 commented ALLEGRO_LINE_CAP and ALLEGRO_LINE_JOIN
n 10bc57c Added another spot to change the application name on Android
n 2fed72f add argc/argv to the android prototypes for main
y 30c3e8b match function prototype
n 859dd5e start dummy implementation of opensl
n 447a011 add some opensl api calls mostly from the examples in the documentation
y 6578ee0 test_driver: Fix warning due to changed main() argument types.
n 4aad6b0 Added missing include paths from image addon for monolith built.
y 2226c7d x11: Fix unused variable warning.
y b46d758 png: Fix unused variable warnings.
y a5063f0 Fix unused variable warnings in examples.
n 1f87969 ex_polygon: Fix undeclared function.
y 8d60912 test_driver: Add --force-opengl-2.0 option.
n b14d6af ogl: Restore matrix manipulation code for unlocking backbuffer in GL <1.4 case.
n b7ab840 Redefine pixel format LUMINANCE_8 as SINGLE_CHANNEL_8.
y c29a5d2 Remove useless code
y da740a1 Use user set pixel format for fonts
n 49f29ec Implement proper eof behaviour in APK file system
n c3c89ef Make volume keys work. Use builtin EGL scoring instead of Allegro's so we can use OpenGL ES 2. Add support for creating OpenGL ES 2 contexts (with changes to Allegro base C library to follow).
n e886960 Minor change to load from APK filesystem
n daa003b Improve compatibility of touch input emulation driver with iOS one
n 092154d Add al_android_get_os_version(). Support for volume keys
n 0fdf399 Support for OGL ES2. Better switch in/out handling. Use EGL scoring
n-abi 6d7bf94 Check for OES_texture_npot as well
n? 6b102c7 Dirty flag is set higher up
n 722a676 glDisableClientState isn't in ES2
n 45633cc Platform selection was wrong
n 865f1a0 Better android compatibility and some extra debug info
y 0467a04 Remove trailing space in logo (looks bad in vim\!)
y 88bcb07 Add GL_INVALID_FRAMEBUFFER_OPERATION as valid gl error
y c10fcd1 Reduce floating point error buildup (not sure it matters)
y 28df909 Texture should be 'complete' (min/mag and wrap set) before glTexImage2D
n 15a46e7 Compatibility fixes for Android
n-abi 2aed288 Add OES_texture_npot
n ee2d715 Android fixes. Added al_create_custom_bitmap
n 1a08fd3 Android doesn't have the default, ARGB_8888 without extension
n 40b2cb1 ogl: Fix mixed declarations and code.
n dcb15b2 ogl: Reduce some of the #ifdef'ing for mobile.
n 2af481b Add documentation stub for al_create_custom_bitmap.
n 1a17776 Minor code movement.
n 735b06d Delete wrong FIXME.
n 59ce6bb Delete changelog in source file.
n 2e49984 android: Split some long log messages.
n c1549b6 Made the shader addon work in a monolith build.
n 9735433 When building the monolith library, also link examples, demos and tests against it (and don't build the other libraries at all).
y 46f1c94 Fix incorrect documentation on al_ustr_[lr]trim_ws and update test.
y d3577fa Make al_ustr_empty_string const correct.
n? 3f2de4f Disable unused array to be on the safe side
n 1373699 Android: Remove some harmful code. Set sub bitmap extra->texture to new value when recreating textures on resume.
n 3afb313 Fix a harmful logic error (see comment)
n? 5955a0a Save some memory (and possibly a little time) by only using one buffer when conversion is needed during locking. This takes advantage of the fact that the destination pixel size is always the same size or bigger than the source pixel size. Since a color value HAS to be read before it can be written, we can do the conversion in place.
n 44cc62c The shader addon was not linking against Allegro any longer.
nx 26e84cf Make sub bitmap restore properly on lost device (D3D.) Fix typo and formatting (minor)
y f67caa7 Force al_create_bitmap to not create oversized bitmaps.
y 564dbef bmp: Log reasons for failing to load a BMP.
y 3cba308 bmp: Use uint32_t for RGB bit masks.
y 3ea8811 bmp: Reject negative width instead of crashing.
y 0c907df bmp: Support RLE images with negative height instead of crashing.
y 58f2509 bmp: Don't crash on overlong RLE lines.
y 5c05024 bmp: Ensure all pixels are written in RLE images.
y 992a330 bmp: Add sanity check and some helpful comments.
y 79a6ec9 bmp: Skip (unused) palette in higher bit depth images.
y 2d94b24 bmp: Make alpha channel hack in 32-bit images contingent on non-zero alpha in at least one pixel.
y ba0837d bmp: Support V2-V5 headers, with certain supported alpha masks.
y f713bdf test_driver: Increase max number of bitmaps to 128.
y 08aa0ac tests: Add more BMP loading tests.
n 4e462ec android: Add some logging.
n faac8ea android: Add -W -Wall options to sample project.
n 9128042 android: Clean up sample project slightly.
n 3b30ac3 Fixes for Android pause/resume context creation
y e68c1f4 Some window managers want WM_NAME not _NET_WM_NAME (icewm on Ubuntu 12.04, maybe others)
n b4f27bf Added al_clear_depth_buffer and al_set_render_state functions.
n d11f6d1 make the monolith examples build with that "x" trick in cmake
y 7fea418 Added slightly more verbose debugging to the D3D display driver.
n 663af99 Added missing d3d_render_state.cpp file.
n 5aa3beb Added missing file ogl_render_state.c.
n be748a7 Added missing file render_state.h.
n a035a8c Added al_set_render_state also to OSX.
y 0ddb642 Removed initial black frame on all Allegro programs - it was #ifdefed out for iphone but I don't see a reason to have it elsewhere.
n 8e1d791 Install newly added render_state.h.
n 311e56f Move ALLEGRO_ALPHA_TEST to a render state flag.
n bcd1ade docs: Add Since markers for render state additions.
n 8b779aa Delete trailing commas.
n e38bdfd Fix formatting.
n e6ec0e1 ex_depth_mask: Fix compile problems.
n fd32be5 cmake: Fix variable names and formatting.
n 1caa084 ogl: Use glClearDepthf for Android and iPhone (untested).
n 728889b ogl: Some #ifdef shuffling.
n 6b00253 android: Restore some logging that got overwritten.
n 419462b android: Don't force 16-bit mode if no COLOR_SIZE specified.
n 70eca7a android: Update sample to respond to HALT/RESUME_DRAWING.
n d4b6747 android: Clean up ndk-build files and don't hardcode ABI.
n a7d3b0a android: Don't link with -landroid.
n 9a83820 android: Improve readme for easier copy/pasting.
n f7383b5 android: Rename al_set_apk_file_interface to al_android_set_apk_file_interface.
n 7a90987 docs: Add stubs for Android-specific additions.
n ae2662a ex_polygon: float_t -> float.
y e1497a3 Delete outdated FIXME.
n 2620d86 Log warning if al_set_render_state passed unknown value.
n ca65083 ogl: Add logging for _al_ogl_update_render_state.
n e5c171c Add call and vtable for update_render_state in iOS port
n 48ede2f Set render state at the correct location.
n d7aab61 Avoid thousands of render-state change log entries in debug mode.
n a1f00cb Made al_set_render_state work on iphone.
n ad9638c On OpenGL ES 2 you always have FBO
n 559c105 Don't try to handle alpha testing if the programmable pipeline is being used
n cb2d161 Logic used in r15659 was wrong. Even if using the programmable pipeline, on iOS and Android the 'else' block should always be executed.
n 42f9ecb Remove some trailing spaces
n 12f0edf Tiny bit of error checking. Never set the projection when using PP mode unless a program object is bound.
n 132d8af Revert some code changed in r15604 (hopefully not breaking Android in the process.) Also make setup_fbo static in ogl_display.c again since it's no longer used outside.
n 88d49a8 Make al_destroy_display handle display disconnection properly. The user will need to clean up then call al_destroy_display after receiving ALLEGRO_EVENT_DISPLAY_DISCONNECTED (iOS)
n 031d936 Disable the idle timer on iOS (screen lock) when entering airplay mode. Turn it back on afterwards.
y 8ad8473 monitor /dev/input instead of /dev on linux for hotplugging joysticks
n 1b8211a ex_depth_mask: Fix potential null pointer dereference.
y 654692f Pär Arvidsson fixed many memory leak/warnings on MacOS X.
y 4105694 Fix potential crashes under OSX in _al_osx_save_image_f and _al_osx_create_mouse_cursor.
y 2e72403 tests: Add target run_tests_wine_gl.
n f80edb4 Prepare summary of changes for 5.1.2.
n 48b2fc9 Bump version to 5.1.2 (WIP).
n 48a0462 Bump version to 5.1.3 (SVN).
y 1036f35 Fixed a missing word in the documentation.
n 11d8dfe support building android for x86
n 0cef7b2 use x86 instead of i686 to match the ndk
n 7233bb6 typo, ogl -> gl
n 910821d create opensl voice and set up a player for it
n cbdcdc1 opensl: poll for more data in a separate thread
n a63a835 opensl: use local buffers to keep opensl fed. soon to be generalized to N buffers
n 934a6bf opensl: generalize to N buffers
n 470bac4 opensl: implement starting/stopping a stream similar to how pulseaudio does it
y fda568d audio: Fix wrong use of unsigned pos in linear_spl32u.
y d843e8c Fix two minor memory leaks in the pulseaudio driver.
n 65e0fa7 jmasterx found the source of d3d locking bugs (disappearing bitmaps/font glyphs)
n 38195e1 Remove create_subbitmap vtable entry.
n 8386d16 Removed driver specific sub-bitmap handling under OSX.
n 2b343b3 Removed driver specific sub-bitmap handling in the Direct3D driver.
n 513a710 Removed driver specific sub-bitmap handling in the OpenGL driver to simplify code.
n? f3dd12e On OSX 10.7 and up all Windows have a fullscreen icon - enable that for all resizable Allegro Windows. We probably could remove all other OSX fullscreen code now (it never seemed to work for me).