Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into luajit
Browse files Browse the repository at this point in the history
  • Loading branch information
MCJack123 committed Jan 26, 2023
2 parents f0d6ec6 + f38633e commit 519e4ac
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/termsupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,7 @@ std::string termGetEvent(lua_State *L) {
lua_pushinteger(L, y);
if (e.motion.windowID != computer->term->id && config.monitorsUseMouseEvents) lua_pushstring(L, side.c_str());
return e.motion.state ? "mouse_drag" : "mouse_move";
#if SDL_VERSION_ATLEAST(2, 0, 12)
} else if ((e.type == SDL_FINGERDOWN || e.type == SDL_FINGERUP || e.type == SDL_FINGERMOTION) && (computer->config->isColor || computer->isDebugger) && (e.tfinger.windowID == computer->term->id || config.monitorsUseMouseEvents)) {
SDLTerminal * term = dynamic_cast<SDLTerminal*>(computer->term);
if (term == NULL) return "";
Expand Down Expand Up @@ -897,6 +898,7 @@ std::string termGetEvent(lua_State *L) {
case SDL_FINGERUP: return "_CCPC_finger_up";
case SDL_FINGERMOTION: return "_CCPC_finger_drag";
}
#endif
} else if (e.type == SDL_DROPFILE) {
if (config.dropFilePath) {
// Simply paste the file path
Expand Down

0 comments on commit 519e4ac

Please sign in to comment.