summaryrefslogtreecommitdiff
path: root/src/keyboardconfig.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-10Delete local player earlier and fix a rare crashJared Adams1-0/+1
Rare crash is in KeyboardConfig, where the active keys array is accessed before it's initialized. Also remove some debug prints that made it into a previous commit.
2009-02-15Allow pressing enter with focus in port fieldBjørn Lindeijer1-1/+1
Added action event id to port field of login dialog.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-1/+3
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-13Ignore "window manager + arrow" key combinationsSteve Cotton1-1/+3
Adds two configurable "ignore" keys. Stops the character moving about if the user's window manager uses "ignore+arrow key" to switch virtual desktops.
2009-02-10Whitespace fixesBjørn Lindeijer1-2/+2
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Whitespace fixesBjørn Lindeijer1-2/+2
Mainly removed trailing whitespace. Also small fix in header of recorder.cpp.
2009-02-10Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+1
Conflicts: docs/FAQ.txt packaging/windows/make-translations.vbs src/Makefile.am src/gui/colour.cpp src/gui/colour.h src/gui/popupmenu.cpp src/gui/setup_colours.h src/main.cpp src/main.h src/resources/resourcemanager.cpp src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-7/+7
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-56/+68
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-8/+8
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Fixed copyright notice for keyboard configurationBjørn Lindeijer1-2/+2
Also credited Joshua Langley in the AUTHORS file.
2009-02-07Some more include cleanups.Ira Rice1-2/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Rather than to settle for a broken default (if it's left at space,Ira Rice1-4/+5
then you won't be able to type spaces in the NPC integer or string dialogs. And no, assigning focus to the ok button doesn't resolve anything, but makes things worse, as then the user has to click on the input field to input text, then must click the ok button, as the chat window already overrode it's confirmation action), this commit allows for both the chat input and the NPC dialog confirming to share the same key, but allows for people to change one or the other if they want to. This will still allow for the player to use the keyboard fully for NPC dialogs, but allow for people who don't like not being able to use chat with an NPC dialog open to assign confirmation to another key and get their way as well. This is a rather ugly way of resolving both sides of the issue, but it's the only way to appease both sides. The Aethyra players want things the way they were, while Bjorn wanted things a different way. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-05Three things: Split chat and NPC dialog functionality based on the TMWIra Rice1-50/+62
complaint commit d2876ad85935c5d0b181d050bd4c19a4682123b1 (btw, if you're concerned about that, return is also a bad choice for the chat window in general, which overrides the GuiChan default for use widget. Tab would also be a bad choice, as it cycles through the widgets), next, I made the text displayed by the keyboard configuration setup dialog translatable, and lastly, I exposed the rest of the previously unconfigurable keys to be configurable through the keyboard setup tab. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-27/+25
code so that only one term is used everywhere (to simplify maintainability), as well as corrected several variable names and comments where there was copy/pasted code, but it wasn't corrected. Also moved emote shortcuts back to where they were originally, to reduce player confusion when the next build comes around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-04Smiley step 1.91, the little part to make it workForge1-1/+1
TODO list of 1.9 still intact.
2009-01-02Step 1.5 of smiley update: allow usage of same key for smiley andForge1-2/+27
different purpose (as smiley are requiring a special key press, that's not a problem to assign the same key to differents purpose) The function of game.cpp get reindented in the process, but the actual change is minor. The keyboardconfig get a new function, returning directly the emoticon offset from the key pressed. (later, that function will return the index of the smiley shortcut/array that has been selected... later) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-01Customisable shortkey for smiley (defaulting to keypad 0-9/*)Forge1-1/+15
First step to more smileys... Fully functionnal, very minor modifications Provisions made for second step (windows for choosing smiley) Signed-off-by: Forge <jgrimbert@free.fr>
2008-12-09Make the window shortcuts configurableJared Adams1-1/+10
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-5/+3
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-10-28Changed the name of the old target key to stop attack, as well as making Ira Rice1-1/+1
it do exactly that in the local player. Since it already was doing this behavior anyways, I just extended it out to stop attack at any point in the attack.
2008-10-27Made targets draw on the fringe layer, as well as added t for talking to Ira Rice1-0/+2
an NPC, n for targeting an NPC, and changed basic targeting code so that it'll time out after being on a target for longer than a minute.
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-1/+2
2008-07-18Import of client treeLloyd Bryant1-1/+1
2007-12-30Added a key for targeting the nearest player character based on patches by ↵Philipp Sehmisch1-0/+1
Trinexx. Some mapping fixes at snake dungeon map.
2007-08-22Fixed an arithmetic exception in ItemShortcutContainer::draw.Bjørn Lindeijer1-1/+1
Changed default sitting key back to 's'. Fixed a problem with all equipment being interpreted as weapon sprite.
2007-08-21mantis id=118 - Added Item Shortcut Bar.Joshua Langley1-1/+11
2007-08-19v0.0 - keyboard config, sit fixed.Joshua Langley1-0/+1
2007-08-19v0.0.23 - src/keyboardconfig.cpp, src/keyboardconfig.h - minor cleanup.Joshua Langley1-14/+22
2007-07-25keyboard config - keyboard setup gui re-designed, fixed errors in keyboard ↵Joshua Langley1-8/+1
config. m_id:16
2007-07-24Fixed initialization order and added setup_keyboard.* and keyboardconfig.* toBjørn Lindeijer1-131/+132
the list of source files. Also set some missing Subversion properties.
2007-07-24keyboard configuration - mainly documentation fixes. Joshua Langley1-8/+10
http://mantis.themanaworld.org/view.php?id=16
2007-07-16(no commit message)Joshua Langley1-0/+129