diff options
author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-12-15 21:20:27 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-12-15 21:20:27 +0100 |
commit | e78ed334abc80578346dbef8a8b995c99dcfee7b (patch) | |
tree | 309c015c208ca2a57906df53741750ba90d48ad4 /src | |
parent | 580bf0a92367c08d10344784843b77cf7fb73d13 (diff) | |
parent | ed5b9c52d7e469f0966c19ad9876b70aa8ac3737 (diff) | |
download | mana-client-e78ed334abc80578346dbef8a8b995c99dcfee7b.tar.gz mana-client-e78ed334abc80578346dbef8a8b995c99dcfee7b.tar.bz2 mana-client-e78ed334abc80578346dbef8a8b995c99dcfee7b.tar.xz mana-client-e78ed334abc80578346dbef8a8b995c99dcfee7b.zip |
Merge branch '0.5'
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 528 | ||||
-rw-r--r-- | src/game.cpp | 3 | ||||
-rw-r--r-- | src/gui/npcdialog.cpp | 5 | ||||
-rw-r--r-- | src/gui/npcdialog.h | 2 |
4 files changed, 9 insertions, 529 deletions
diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index aecca587..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,528 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects - -bin_PROGRAMS = mana - -mana_CXXFLAGS = -DPKG_DATADIR=\""$(pkgdatadir)/"\" \ - -DLOCALEDIR=\""$(localedir)"\" \ - -Wall - -mana_SOURCES = gui/widgets/avatarlistbox.cpp \ - gui/widgets/avatarlistbox.h \ - gui/widgets/browserbox.cpp \ - gui/widgets/browserbox.h \ - gui/widgets/button.cpp \ - gui/widgets/button.h \ - gui/widgets/channeltab.cpp \ - gui/widgets/channeltab.h \ - gui/widgets/chattab.cpp \ - gui/widgets/chattab.h \ - gui/widgets/checkbox.cpp \ - gui/widgets/checkbox.h \ - gui/widgets/container.cpp \ - gui/widgets/container.h \ - gui/widgets/desktop.cpp \ - gui/widgets/desktop.h \ - gui/widgets/dropdown.cpp \ - gui/widgets/dropdown.h \ - gui/widgets/emoteshortcutcontainer.cpp \ - gui/widgets/emoteshortcutcontainer.h \ - gui/widgets/flowcontainer.cpp \ - gui/widgets/flowcontainer.h \ - gui/widgets/icon.cpp \ - gui/widgets/icon.h \ - gui/widgets/inttextfield.cpp \ - gui/widgets/inttextfield.h \ - gui/widgets/itemcontainer.cpp \ - gui/widgets/itemcontainer.h \ - gui/widgets/itemlinkhandler.cpp \ - gui/widgets/itemlinkhandler.h \ - gui/widgets/itemshortcutcontainer.cpp \ - gui/widgets/itemshortcutcontainer.h \ - gui/widgets/label.cpp \ - gui/widgets/label.h \ - gui/widgets/layout.cpp \ - gui/widgets/layout.h \ - gui/widgets/layouthelper.cpp \ - gui/widgets/layouthelper.h \ - gui/widgets/linkhandler.h \ - gui/widgets/listbox.cpp \ - gui/widgets/listbox.h \ - gui/widgets/passwordfield.cpp \ - gui/widgets/passwordfield.h \ - gui/widgets/playerbox.cpp \ - gui/widgets/playerbox.h \ - gui/widgets/popup.cpp \ - gui/widgets/popup.h \ - gui/widgets/progressbar.cpp \ - gui/widgets/progressbar.h \ - gui/widgets/progressindicator.cpp \ - gui/widgets/progressindicator.h \ - gui/widgets/radiobutton.cpp \ - gui/widgets/radiobutton.h \ - gui/widgets/resizegrip.cpp \ - gui/widgets/resizegrip.h \ - gui/widgets/scrollarea.cpp \ - gui/widgets/scrollarea.h \ - gui/widgets/setuptab.cpp \ - gui/widgets/setuptab.h \ - gui/widgets/shopitems.cpp \ - gui/widgets/shopitems.h \ - gui/widgets/shoplistbox.cpp \ - gui/widgets/shoplistbox.h \ - gui/widgets/shortcutcontainer.cpp \ - gui/widgets/shortcutcontainer.h \ - gui/widgets/slider.cpp \ - gui/widgets/slider.h \ - gui/widgets/tab.cpp \ - gui/widgets/tab.h \ - gui/widgets/tabbedarea.cpp \ - gui/widgets/tabbedarea.h \ - gui/widgets/table.cpp \ - gui/widgets/table.h \ - gui/widgets/tablemodel.cpp \ - gui/widgets/tablemodel.h \ - gui/widgets/textbox.cpp \ - gui/widgets/textbox.h \ - gui/widgets/textfield.cpp \ - gui/widgets/textfield.h \ - gui/widgets/textpreview.cpp \ - gui/widgets/textpreview.h \ - gui/widgets/vertcontainer.cpp \ - gui/widgets/vertcontainer.h \ - gui/widgets/whispertab.cpp \ - gui/widgets/whispertab.h \ - gui/widgets/window.cpp \ - gui/widgets/window.h \ - gui/widgets/windowcontainer.cpp \ - gui/widgets/windowcontainer.h \ - gui/beingpopup.cpp \ - gui/beingpopup.h \ - gui/buy.cpp \ - gui/buy.h \ - gui/buysell.cpp \ - gui/buysell.h \ - gui/changeemaildialog.cpp \ - gui/changeemaildialog.h \ - gui/changepassworddialog.cpp \ - gui/changepassworddialog.h \ - gui/charselectdialog.cpp \ - gui/charselectdialog.h \ - gui/charcreatedialog.cpp \ - gui/charcreatedialog.h \ - gui/chat.cpp \ - gui/chat.h \ - gui/confirmdialog.cpp \ - gui/confirmdialog.h \ - gui/connectiondialog.cpp \ - gui/connectiondialog.h \ - gui/debugwindow.cpp \ - gui/debugwindow.h \ - gui/emotepopup.cpp \ - gui/emotepopup.h \ - gui/equipmentwindow.cpp \ - gui/equipmentwindow.h \ - gui/focushandler.cpp \ - gui/focushandler.h \ - gui/gui.cpp \ - gui/gui.h \ - gui/help.cpp \ - gui/help.h \ - gui/inventorywindow.cpp \ - gui/inventorywindow.h \ - gui/itemamount.cpp \ - gui/itemamount.h \ - gui/itempopup.cpp \ - gui/itempopup.h \ - gui/login.cpp \ - gui/login.h \ - gui/minimap.cpp \ - gui/minimap.h \ - gui/ministatus.cpp \ - gui/ministatus.h \ - gui/npcdialog.cpp \ - gui/npcdialog.h \ - gui/npcpostdialog.cpp \ - gui/npcpostdialog.h \ - gui/okdialog.cpp \ - gui/okdialog.h \ - gui/outfitwindow.cpp \ - gui/outfitwindow.h \ - gui/palette.cpp \ - gui/palette.h \ - gui/popupmenu.cpp \ - gui/popupmenu.h \ - gui/quitdialog.cpp \ - gui/quitdialog.h \ - gui/recorder.cpp \ - gui/recorder.h \ - gui/register.cpp \ - gui/register.h \ - gui/sdlinput.cpp \ - gui/sdlinput.h \ - gui/sell.cpp \ - gui/sell.h \ - gui/serverdialog.cpp \ - gui/serverdialog.h \ - gui/setup.cpp \ - gui/setup.h \ - gui/setup_audio.cpp \ - gui/setup_audio.h \ - gui/setup_colors.cpp \ - gui/setup_colors.h \ - gui/setup_joystick.cpp \ - gui/setup_joystick.h \ - gui/setup_keyboard.cpp \ - gui/setup_keyboard.h \ - gui/setup_players.cpp \ - gui/setup_players.h \ - gui/setup_video.cpp \ - gui/setup_video.h \ - gui/shortcutwindow.cpp \ - gui/shortcutwindow.h \ - gui/skilldialog.cpp \ - gui/skilldialog.h \ - gui/socialwindow.cpp \ - gui/socialwindow.h \ - gui/speechbubble.cpp \ - gui/speechbubble.h \ - gui/specialswindow.cpp \ - gui/specialswindow.h \ - gui/statuswindow.cpp \ - gui/statuswindow.h \ - gui/textdialog.cpp \ - gui/textdialog.h \ - gui/textpopup.cpp \ - gui/textpopup.h \ - gui/trade.cpp \ - gui/trade.h \ - gui/truetypefont.cpp \ - gui/truetypefont.h \ - gui/unregisterdialog.cpp \ - gui/unregisterdialog.h \ - gui/updatewindow.cpp \ - gui/updatewindow.h \ - gui/viewport.cpp \ - gui/viewport.h \ - gui/windowmenu.cpp \ - gui/windowmenu.h \ - gui/worldselectdialog.cpp \ - gui/worldselectdialog.h \ - net/adminhandler.h \ - net/charhandler.cpp \ - net/charhandler.h \ - net/chathandler.h \ - net/download.cpp \ - net/download.h \ - net/gamehandler.h \ - net/generalhandler.h \ - net/guildhandler.h \ - net/inventoryhandler.h \ - net/logindata.h \ - net/loginhandler.h \ - net/messagehandler.h \ - net/messagein.cpp \ - net/messagein.h \ - net/messageout.cpp \ - net/messageout.h \ - net/net.cpp \ - net/net.h \ - net/npchandler.h \ - net/partyhandler.h \ - net/playerhandler.h \ - net/serverinfo.h \ - net/specialhandler.h \ - net/tradehandler.h \ - net/worldinfo.h \ - resources/action.cpp \ - resources/action.h \ - resources/ambientlayer.cpp \ - resources/ambientlayer.h \ - resources/ambientoverlay.cpp \ - resources/ambientoverlay.h \ - resources/animation.cpp \ - resources/animation.h \ - resources/beinginfo.cpp \ - resources/beinginfo.h \ - resources/colordb.cpp \ - resources/colordb.h \ - resources/dye.cpp \ - resources/dye.h \ - resources/emotedb.cpp \ - resources/emotedb.h \ - resources/image.cpp \ - resources/image.h \ - resources/imageloader.cpp \ - resources/imageloader.h \ - resources/imageset.h \ - resources/imageset.cpp \ - resources/imagewriter.cpp \ - resources/imagewriter.h \ - resources/itemdb.cpp \ - resources/itemdb.h \ - resources/iteminfo.h \ - resources/iteminfo.cpp \ - resources/mapreader.cpp \ - resources/mapreader.h \ - resources/monsterdb.cpp \ - resources/monsterdb.h \ - resources/music.cpp \ - resources/music.h \ - resources/npcdb.cpp \ - resources/npcdb.h \ - resources/resource.cpp \ - resources/resource.h \ - resources/resourcemanager.cpp \ - resources/resourcemanager.h \ - resources/soundeffect.h \ - resources/soundeffect.cpp \ - resources/specialdb.h \ - resources/specialdb.cpp \ - resources/spritedef.h \ - resources/spritedef.cpp \ - resources/theme.cpp \ - resources/theme.h \ - resources/userpalette.cpp \ - resources/userpalette.h \ - resources/wallpaper.cpp \ - resources/wallpaper.h \ - utils/base64.cpp \ - utils/base64.h \ - utils/copynpaste.cpp \ - utils/copynpaste.h \ - utils/dtor.h \ - utils/gettext.h \ - utils/mathutils.h \ - utils/mkdir.cpp \ - utils/mkdir.h \ - utils/sha256.cpp \ - utils/sha256.h \ - utils/specialfolder.cpp \ - utils/specialfolder.h \ - utils/stringutils.cpp \ - utils/stringutils.h \ - utils/mutex.h \ - utils/xml.cpp \ - utils/xml.h \ - utils/zlib.cpp \ - utils/zlib.h \ - actor.cpp \ - actor.h \ - actorsprite.cpp \ - actorsprite.h \ - actorspritelistener.h \ - actorspritemanager.cpp \ - actorspritemanager.h \ - animatedsprite.cpp \ - animatedsprite.h \ - animationparticle.cpp \ - animationparticle.h \ - avatar.cpp \ - avatar.h \ - being.cpp \ - being.h \ - chatlog.cpp \ - chatlog.h \ - client.cpp \ - client.h \ - channel.cpp \ - channel.h \ - channelmanager.cpp \ - channelmanager.h \ - commandhandler.cpp \ - commandhandler.h \ - compoundsprite.cpp \ - compoundsprite.h \ - configlistener.h \ - configuration.cpp \ - configuration.h \ - defaults.cpp \ - defaults.h \ - effectmanager.cpp \ - effectmanager.h \ - emoteshortcut.cpp \ - emoteshortcut.h \ - equipment.h \ - event.cpp \ - event.h \ - flooritem.cpp \ - flooritem.h \ - game.cpp \ - game.h \ - graphics.cpp \ - graphics.h \ - guichanfwd.h \ - guild.cpp \ - guild.h \ - imageparticle.cpp \ - imageparticle.h \ - imagesprite.cpp \ - imagesprite.h \ - inventory.cpp \ - inventory.h \ - item.cpp \ - item.h \ - itemshortcut.cpp \ - itemshortcut.h \ - joystick.cpp \ - joystick.h \ - keyboardconfig.cpp \ - keyboardconfig.h \ - listener.cpp \ - listener.h \ - localplayer.cpp \ - localplayer.h \ - log.cpp \ - log.h \ - main.cpp \ - main.h \ - map.cpp\ - map.h \ - openglgraphics.cpp\ - openglgraphics.h \ - particle.cpp \ - particle.h \ - particlecontainer.cpp \ - particlecontainer.h \ - particleemitter.cpp \ - particleemitter.h \ - particleemitterprop.h \ - party.cpp \ - party.h \ - playerinfo.cpp \ - playerinfo.h \ - playerrelations.cpp \ - playerrelations.h \ - position.cpp \ - position.h \ - properties.h \ - rotationalparticle.cpp \ - rotationalparticle.h \ - shopitem.cpp \ - shopitem.h \ - simpleanimation.cpp \ - simpleanimation.h \ - sound.cpp \ - sound.h \ - sprite.h \ - statuseffect.cpp \ - statuseffect.h \ - text.cpp \ - text.h \ - textmanager.cpp \ - textmanager.h \ - textparticle.cpp \ - textparticle.h \ - textrenderer.h \ - tileset.h \ - units.cpp \ - units.h \ - variabledata.h \ - vector.cpp \ - vector.h \ - winver.h - -mana_SOURCES += \ - net/manaserv/adminhandler.cpp \ - net/manaserv/adminhandler.h \ - net/manaserv/attributes.cpp \ - net/manaserv/attributes.h \ - net/manaserv/beinghandler.cpp \ - net/manaserv/beinghandler.h \ - net/manaserv/buysellhandler.cpp \ - net/manaserv/buysellhandler.h \ - net/manaserv/charhandler.cpp \ - net/manaserv/charhandler.h \ - net/manaserv/chathandler.cpp \ - net/manaserv/chathandler.h \ - net/manaserv/connection.cpp \ - net/manaserv/connection.h \ - net/manaserv/defines.h \ - net/manaserv/effecthandler.cpp \ - net/manaserv/effecthandler.h \ - net/manaserv/gamehandler.cpp \ - net/manaserv/gamehandler.h \ - net/manaserv/generalhandler.cpp \ - net/manaserv/generalhandler.h \ - net/manaserv/guildhandler.cpp \ - net/manaserv/guildhandler.h \ - net/manaserv/internal.cpp \ - net/manaserv/internal.h \ - net/manaserv/inventoryhandler.cpp \ - net/manaserv/inventoryhandler.h \ - net/manaserv/itemhandler.h \ - net/manaserv/itemhandler.cpp \ - net/manaserv/loginhandler.cpp \ - net/manaserv/loginhandler.h \ - net/manaserv/messagehandler.cpp \ - net/manaserv/messagehandler.h \ - net/manaserv/messagein.cpp \ - net/manaserv/messagein.h \ - net/manaserv/messageout.cpp \ - net/manaserv/messageout.h \ - net/manaserv/network.cpp \ - net/manaserv/network.h \ - net/manaserv/npchandler.cpp \ - net/manaserv/npchandler.h \ - net/manaserv/partyhandler.cpp \ - net/manaserv/partyhandler.h \ - net/manaserv/playerhandler.cpp \ - net/manaserv/playerhandler.h \ - net/manaserv/protocol.h \ - net/manaserv/specialhandler.cpp \ - net/manaserv/specialhandler.h \ - net/manaserv/tradehandler.cpp \ - net/manaserv/tradehandler.h - -mana_SOURCES += \ - net/tmwa/gui/guildtab.cpp \ - net/tmwa/gui/guildtab.h \ - net/tmwa/gui/partytab.cpp \ - net/tmwa/gui/partytab.h \ - net/tmwa/adminhandler.cpp \ - net/tmwa/adminhandler.h \ - net/tmwa/beinghandler.cpp \ - net/tmwa/beinghandler.h \ - net/tmwa/buysellhandler.cpp \ - net/tmwa/buysellhandler.h \ - net/tmwa/charserverhandler.cpp \ - net/tmwa/charserverhandler.h \ - net/tmwa/chathandler.cpp \ - net/tmwa/chathandler.h \ - net/tmwa/gamehandler.cpp \ - net/tmwa/gamehandler.h \ - net/tmwa/generalhandler.cpp \ - net/tmwa/generalhandler.h \ - net/tmwa/guildhandler.cpp \ - net/tmwa/guildhandler.h \ - net/tmwa/inventoryhandler.cpp \ - net/tmwa/inventoryhandler.h \ - net/tmwa/itemhandler.cpp \ - net/tmwa/itemhandler.h \ - net/tmwa/loginhandler.cpp \ - net/tmwa/loginhandler.h \ - net/tmwa/messagehandler.cpp \ - net/tmwa/messagehandler.h \ - net/tmwa/messagein.cpp \ - net/tmwa/messagein.h \ - net/tmwa/messageout.cpp \ - net/tmwa/messageout.h \ - net/tmwa/network.cpp \ - net/tmwa/network.h \ - net/tmwa/npchandler.cpp \ - net/tmwa/npchandler.h \ - net/tmwa/partyhandler.cpp \ - net/tmwa/partyhandler.h \ - net/tmwa/playerhandler.cpp \ - net/tmwa/playerhandler.h \ - net/tmwa/protocol.h \ - net/tmwa/specialhandler.cpp \ - net/tmwa/specialhandler.h \ - net/tmwa/token.h \ - net/tmwa/tradehandler.cpp \ - net/tmwa/tradehandler.h - -EXTRA_DIST = CMakeLists.txt \ - winver.h.in - -# set the include path found by configure -INCLUDES = $(all_includes) diff --git a/src/game.cpp b/src/game.cpp index 1eb66572..92005dba 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -448,7 +448,8 @@ void Game::handleInput() && !gui->getFocusHandler()->getModalFocused()) { NpcDialog *dialog = NpcDialog::getActive(); - if (keyboard.isKeyActive(keyboard.KEY_OK)) + if (keyboard.isKeyActive(keyboard.KEY_OK) + && (!dialog || !dialog->isTextInputFocused())) { // Close the Browser if opened if (helpWindow->isVisible()) diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 1a5186ff..590001b0 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -315,6 +315,11 @@ void NpcDialog::textRequest(const std::string &defaultText) buildLayout(); } +bool NpcDialog::isTextInputFocused() const +{ + return mTextField->isFocused(); +} + bool NpcDialog::isInputFocused() const { return mTextField->isFocused() || mIntField->isFocused(); diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index 1906d725..d0131d0e 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -125,6 +125,8 @@ class NpcDialog : public Window, public gcn::ActionListener, bool isInputFocused() const; + bool isTextInputFocused() const; + static bool isAnyInputFocused(); /** |