← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/gui/sdlinput.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-10-07 10:26:14 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20131007102614-tg2zjdz8vmtl6n7i
Tags: 1.3.9.29-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/sdlinput.cpp
185
185
#endif
186
186
 
187
187
#ifdef ANDROID
 
188
#ifndef USE_SDL2
188
189
        case SDL_ACCELEROMETER:
189
190
            break;
190
191
#endif
 
192
#endif
191
193
 
192
194
        case SDL_MOUSEBUTTONDOWN:
193
195
            mMouseDown = true;
194
196
            mouseInput.setX(event.button.x);
195
197
            mouseInput.setY(event.button.y);
196
198
#ifdef ANDROID
 
199
#ifdef USE_SDL2
 
200
            mouseInput.setReal(event.button.x, event.button.y);
 
201
#else
197
202
            mouseInput.setReal(event.button.realx, event.button.realy);
198
203
#endif
 
204
#endif
199
205
            mouseInput.setButton(convertMouseButton(event.button.button));
200
206
 
201
207
#ifndef USE_SDL2
215
221
            mouseInput.setX(event.button.x);
216
222
            mouseInput.setY(event.button.y);
217
223
#ifdef ANDROID
 
224
#ifdef USE_SDL2
 
225
            mouseInput.setReal(event.button.x, event.button.y);
 
226
#else
218
227
            mouseInput.setReal(event.button.realx, event.button.realy);
219
228
#endif
 
229
#endif
220
230
            mouseInput.setButton(convertMouseButton(event.button.button));
221
231
            mouseInput.setType(gcn::MouseInput::RELEASED);
222
232
            mouseInput.setTimeStamp(SDL_GetTicks());
227
237
            mouseInput.setX(event.motion.x);
228
238
            mouseInput.setY(event.motion.y);
229
239
#ifdef ANDROID
 
240
#ifdef USE_SDL2
 
241
            mouseInput.setReal(event.motion.x, event.motion.y);
 
242
#else
230
243
            mouseInput.setReal(event.motion.realx, event.motion.realy);
231
244
#endif
 
245
#endif
232
246
            mouseInput.setButton(gcn::MouseInput::EMPTY);
233
247
            mouseInput.setType(gcn::MouseInput::MOVED);
234
248
            mouseInput.setTimeStamp(SDL_GetTicks());
355
369
          }
356
370
          break;
357
371
      case SDLK_ESCAPE:
 
372
#ifdef USE_SDL2
 
373
      case SDLK_AC_BACK:
 
374
#endif
358
375
          value = Key::ESCAPE;
359
376
          break;
360
377
      case SDLK_DELETE: