--- SDL-1.2.5_agawa/src/video/qtopia/SDL_QWin.cc 2003-10-12 01:24:56.000000000 +0900 +++ SDL-1.2.5/src/video/qtopia/SDL_QWin.cc 2003-11-04 20:26:22.000000000 +0900 @@ -31,6 +31,9 @@ #include #include +extern int fb_hwrot; +static int mouse_button_mode=1; + screenRotationT screenRotation = SDL_QT_NO_ROTATION; SDL_QWin::SDL_QWin(const QSize& size) @@ -41,7 +44,8 @@ isSLA300InputFix_(0) { for (int i = 0; i < 5; i++) curAxis_[i] = 0; - setBackgroundMode(NoBackground); + setBackgroundColor( QColor::QColor(0,0,0) ); + setBackgroundMode( FixedColor ); } SDL_QWin::~SDL_QWin() { @@ -100,7 +104,7 @@ } #else QPoint realPos; - switch (qteRotation_) { +/* switch (qteRotation_) { case 0: realPos = pos; break; @@ -129,6 +133,8 @@ realPos.setX(realPos.x() - borderWidth); realPos.setY(realPos.y() - borderHeight); + fprintf(stderr, "setMousePos: realPos2(%d, %d)\n", realPos.x(), realPos.y()); + switch (rotation_) { case 0: my_mouse_pos = realPos; @@ -146,6 +152,12 @@ my_mouse_pos.setY(my_image->height() - realPos.x()); break; } +*/ + realPos = pos; + my_mouse_pos = realPos; + +// fprintf(stderr, "setMousePos: mymousePos(%d, %d)\n", (short)my_mouse_pos.x(), (short)my_mouse_pos.y()); + #endif } @@ -168,18 +180,14 @@ void SDL_QWin::mousePressEvent(QMouseEvent *e) { mouseMoveEvent(e); Qt::ButtonState button = e->button(); - SDL_PrivateMouseButton(SDL_PRESSED, - (button & Qt::LeftButton) ? 1 : - ((button & Qt::RightButton) ? 2 : 3), + SDL_PrivateMouseButton(SDL_PRESSED,mouse_button_mode, my_mouse_pos.x(), my_mouse_pos.y()); } void SDL_QWin::mouseReleaseEvent(QMouseEvent *e) { setMousePos(e->pos()); Qt::ButtonState button = e->button(); - SDL_PrivateMouseButton(SDL_RELEASED, - (button & Qt::LeftButton) ? 1 : - ((button & Qt::RightButton) ? 2 : 3), + SDL_PrivateMouseButton(SDL_RELEASED,mouse_button_mode, my_mouse_pos.x(), my_mouse_pos.y()); my_mouse_pos = QPoint(-1, -1); } @@ -528,9 +536,18 @@ case Qt::Key_F7: scancode = SDLK_F7; break; case Qt::Key_F8: scancode = SDLK_F8; break; case Qt::Key_F9: scancode = SDLK_F9; break; - case Qt::Key_F10: scancode = SDLK_F10; break; - case Qt::Key_F11: scancode = SDLK_F11; break; - case Qt::Key_F12: scancode = SDLK_F12; break; + case Qt::Key_F10: + scancode = SDLK_F10; + mouse_button_mode=1; + break; + case Qt::Key_F11: + scancode = SDLK_F11; + mouse_button_mode=3; + break; + case Qt::Key_F12: + scancode = SDLK_F12; + mouse_button_mode=2; + break; case Qt::Key_F13: scancode = SDLK_F13; break; case Qt::Key_F14: scancode = SDLK_F14; break; case Qt::Key_F15: scancode = SDLK_F15; break;