summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/windowmanager-sdl.cc
Commit message (Collapse)AuthorAgeFilesLines
* Drop unnecessary parentheses from return statements.Adam Borowski2013-11-151-16/+16
|
* SDL 2.0 always obeys system key repeat settings.Adam Borowski2013-07-251-0/+2
| | | | | | The option to set it is neither needed nor supported. Which is good if you want consistency with about every other program on your box, and bad if you want to fine-tune Crawl differently.
* No need to enable Unicode in SDL 2.0.Adam Borowski2013-07-251-0/+2
| | | | We need to adjust keyboard input to not use dropped interfaces, though.
* ASSERT_RANGEs other than >= <.Adam Borowski2013-06-081-2/+1
| | | | | | Committing separately as I'm not sure whether checking, for example, ASSERT_RANGE(level, 1, 28) is that nice. Perhaps 27 + 1 could be better? Perhaps some other syntax?
* Fix directory for SDL include in MSVC (xFleury)Pete Hurst2013-05-191-1/+5
| | | | | It's not known why but the include path for SDL needs to be different for SDL in MSVC.
* Refactor ASSERT(a && b) -> ASSERT(a); ASSERT(b);Brendan Hickey2013-04-281-1/+2
| | | | | | | Convert conjunctive assertions into separate assertions. This ought to be correctness preserving. I ran the stress tests and didn't notice anything unusual. While I have confidence in it, if you are the slightest bit suspicious of this, please roll it back. Found instances with `ASSERT(\([^(|]*\) && \([^)|]*\))` Manually inspected each instance.
* Remove a number of dead assignments (SLi).Neil Moore2013-02-211-2/+0
| | | | | | | | | | In the case in spl-data.cc, the comment made it sound like the line was supposed to set min_dist instead of the dead variable dist. However, we could only reach this code path if min_dist == dist, so that assignment wouldn't do anything anyway. I left a few reported dead assignments that I think make the code more maintainable.
* Rename WM_* to WME_*, because Windows.Adam Borowski2013-01-201-20/+20
| | | | | It's a bad idea to reuse the names of one of core win32 concepts for something similar but distinct.
* Delete an unused function and related enums.Adam Borowski2013-01-201-7/+0
|
* improved laggy input on android by ignoring custom events (possibly ↵Chris West2013-01-191-0/+5
| | | | emulator-specific?)
* merge of small-screen changes from old build envChris West2013-01-051-0/+8
|
* Formatting fixes.Neil Moore2012-12-281-2/+2
|
* Use ASSERT() not assert().Adam Borowski2012-10-241-1/+1
| | | | The latter may become no-op if you're not careful, lacks debug messages.
* Remove unnecessary includes from header files.Jay3.14152012-10-231-0/+1
| | | | | | | | | | For most header files, this only saves on having to recompile a small number of source files, but there are also a few headers where small changes would now take significantly less time. This is most obvious for the Tiles build for which the dependencies have been greatly reduced, so that the only additional includes when compared to console are strictly library or tile related.
* added new include for Android-specific SDL callsfrogbotherer2012-09-161-0/+1
|
* Android port.frogbotherer2012-09-081-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2 files are added to the root of the repository: * AndroidAppSettings.cfg: settings file required for Android SDL port. Will change on each minor release to reset configuration. * AndroidBuild.sh: script called by the Android SDL port to commence building the game itself It might be nice to be able to move them elsewhere, but for now, their presence here is required. The build process is documented in docs/develop/android.txt There's a TOUCH_UI compiler flag which sets all the things specific to a touch screen interface. There has been a large amount of changes in the Makefile for redefining where the dat/, saves/, etc. directories go, because the "install" part of the make isn't the final destination for these files under Android - the environment we deploy to is a separate device from the build environment. There is also a number of changes to the tiles interface. Some are specific to the TOUCH_UI, but others are also changed in USE_TILE_LOCAL. Touch only: * 'a'bilities menu goes straight to menu without prompting first * tap menu header to toggle/submit * menu instead of prompt to select which corpse to butcher * same for eating food from the floor (those 2 could go in local tiles too) * show_more defaults to false and less --more-- messages * pickup mode defaults to menu * defaults for tile_layout_priority is different (commands are more important than inventory) * popup for yes/no prompts, level-up stat gain and swapping rings (should be used for all prompts, and probably local tiles too) * spell casting: force selection menu * map mode: left-click rather than right-click for mouse mode; autotravel on left-click removed * remove skills training and memorisation panels Also local tiles (some could also be integrated in webtiles): * commands below description are clickable * clickable shopping menu (uses PrecisionMenu) * split the command panel in 2 (common actions and system commands) * add a map command panel * tapping or left-clicking the player is smarter: * picks up the item if there's one on the tile, otherwise * shows pick-up menu if there's several items on the tile, otherwise * traverses stairs (or enters a portal or shop) if one is present, otherwise * prays if an altar is present, otherwise * waits one turn * right-clicking the map enters map mode and brings the map commands tab to the front; map mode stays until exited rather than upon release of mouse Some more details can be found in android_patch_notes.txt on #5677 (although some TODOs are already obsolete). Signed-off-by: Raphael Langella <raphael.langella@gmail.com>
* Use std namespace.Raphael Langella2012-08-261-13/+13
| | | | | | | | | | | | | I had to rename distance() (in coord.h) to distance2() because it conflicts with the STL function to compare 2 iterators. Not a bad change given how it returns the square of the distance anyway. I also had to rename the message global variable (in message.cc) to buffer. I tried to fix and improve the coding style has much as I could, but I probably missed a few given how huge and tedious it is. I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool and util/levcomp.*, because I have no clue about those.
* Fix loading of RGB images.Florian Diebold2012-07-241-1/+1
|
* Some more return deparenthesization.Adam Borowski2012-07-051-2/+2
|
* Remove parentheses around return (simple_function_call).Adam Borowski2012-07-051-3/+3
| | | | For way too paranoid and underinclusive values of "simple".
* Drop parentheses around scalar values in "return".Adam Borowski2012-07-051-23/+23
|
* First prototype of webtiles.Florian Diebold2011-06-261-2/+2
| | | | | | Conflicts: crawl-ref/source/startup.cc
* Non-BMP characters are not ASCII.Adam Borowski2011-04-101-1/+1
|
* Fix #3772: Don't "die" if an invalid key symbol is entered.Johanna Ploog2011-04-091-3/+1
|
* Don't assert on function keys that produce a symbol.Adam Borowski2011-04-021-14/+1
| | | | | | | | | Arrow keys for example produce digits if by a mistake NumLock is on. This is an user error as NumLock keys should be ripped away from all keyboards, but there might be actual valid cases like this :p I'm not sure if the opposite case can happen, but since there's no obvious thing to do I'm leaving the assertion there for now.
* Mention more data in an assertion.Adam Borowski2011-04-011-2/+15
|
* Evict all non-character key codes to negative values (tiles).Adam Borowski2011-03-311-3/+8
|
* Merge branch 'master' into unicodeAdam Borowski2011-03-131-0/+3
|\
| * Bind Tab to autofight, shift-Tab to autofight_nomove.Adam Borowski2011-02-281-0/+3
| |
* | Merge branch 'master' into unicodeAdam Borowski2011-01-111-0/+3
|\| | | | | | | Conflicts galore...
| * Don't treat pressing and releasing the mouse button as the same event.Raphael Langella2010-12-311-0/+3
| | | | | | | | It doesn't fix any bug, but it could prevents futur problems.
* | Merge branch 'master' into unicodeAdam Borowski2010-12-021-7/+12
|\|
| * Win/Tiles: Fine tune window placement and sizeRaphael Langella2010-11-111-7/+12
| |
* | Merge branch 'master' into unicodeAdam Borowski2010-11-091-0/+58
|\|
| * Don't change window size/placement in fullscreenRaphael Langella2010-11-011-42/+49
| |
| * fix window placement for side and top window taskbarRaphael Langella2010-10-261-7/+31
| | | | | | | | Also resize the window to keep it inside the screen if necessary
| * some taskbar offset adjustmentRaphael Langella2010-10-211-1/+1
| | | | | | | | made a special case for windows 7 because its taskbar behave strangely
| * slightly reduce the taskbar offsetRaphael Langella2010-10-201-1/+1
| |
| * remove tile_align_at_top option (much better taskbar overlap fix)Raphael Langella2010-10-181-0/+27
| | | | | | | | | | taskbar overlap is now automatically detected, and the window is placed just above it.
* | Merge branch 'master' into unicodeAdam Borowski2010-10-151-8/+14
|\|
| * Allow setting of the window size relatively to the screen size.Raphael Langella2010-10-121-8/+7
| |
| * New option tile_align_at_top (windows only)Raphael Langella2010-10-121-0/+7
| | | | | | | | | | | | When set, the window will be aligned at the top of the screen instead of being centered (avoid taskbar overlap, see mantis 2043). In theory, it would be possible to give the player full control of the window position, but it's more complicated and I don't see any use for it. It can easily be added if anyone ever request it.
* | Handle filenames with non-ascii characters.Adam Borowski2010-09-171-1/+2
|/ | | | | Only iostreams functions are left; on Windows they don't support Unicode so a workaround will be needed.
* OpenGLES porting, part 1.Adam Borowski2010-07-281-0/+4
|
* Fix tiles mingw warnings.Enne Walker2010-05-301-1/+1
|
* Created a static WindowManager::shutdown() fxnIxtli2010-05-011-7/+11
| | | | | | | tilesdl.cc now calls this after GLStateManager::shutdown() so that it is not responsible for managing the wm pointer. Signed-off-by: Enne Walker <enne.walker@gmail.com>
* Don't allow event_count to return a negative.Enne Walker2010-04-241-1/+2
| | | | | If SDL considers -1 to be an error, just handle that internally and don't pollute the API with that.
* Move specific create funcs out of generic files.Enne Walker2010-04-241-0/+10
| | | | | | | glwrapper-ogl.cc, windowmanager-sdl.cc, and fontwrapper-ft.cc now contain the static functions for their parent class's factory create. This allows new implementations to be added without requiring modification of the generic file (with #ifdefs).
* General coding standards update.Enne Walker2010-04-241-33/+35
| | | | | | No spaces on parens. Line up function params. Sort includes more rationally. Put curly braces on their own line. Don't C-style typedef enum and structs. Put if-clauses on their own line.
* Removing lines with just whitespace.Enne Walker2010-04-241-7/+7
|