Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: Ancurio:2f86d9e3d06fbfc77223785f4ab4cc704c360a3b
Branches Tags
Ancurio:master
Ancurio:dancing_dragon
Ancurio:testing
Ancurio:ddg
Ancurio:integer_scaling
..
compare: Ancurio:2e82b8797223fc068e14e6b06850c3a1ded4ea1a
Branches Tags
Ancurio:master
Ancurio:dancing_dragon
Ancurio:testing
Ancurio:ddg
Ancurio:integer_scaling

No commits in common. "2f86d9e3d06fbfc77223785f4ab4cc704c360a3b" and "2e82b8797223fc068e14e6b06850c3a1ded4ea1a" have entirely different histories.
2f86d9e3d0 ... 2e82b87972

3 changed files with 4 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
binding-mri/graphics-binding.cpp
View file

@ -209,15 +209,6 @@ RB_METHOD(graphicsResizeWindow)
return Qnil; return Qnil;
} }
RB_METHOD(graphicsMaximizeWindow)
{
RB_UNUSED_PARAM;
shState->eThread().requestWindowMaximize();
return Qnil;
}
DEF_GRA_PROP_I(FrameRate) DEF_GRA_PROP_I(FrameRate)
DEF_GRA_PROP_I(FrameCount) DEF_GRA_PROP_I(FrameCount)
DEF_GRA_PROP_I(Brightness) DEF_GRA_PROP_I(Brightness)
@ -277,5 +268,4 @@ void graphicsBindingInit()
INIT_GRA_PROP_BIND( ShowCursor, "show_cursor" ); INIT_GRA_PROP_BIND( ShowCursor, "show_cursor" );
_rb_define_module_function(module, "resize_window", graphicsResizeWindow); _rb_define_module_function(module, "resize_window", graphicsResizeWindow);
_rb_define_module_function(module, "maximize_window", graphicsMaximizeWindow);
} }

20
src/eventthread.cpp
View file

@ -40,12 +40,12 @@
#include <string.h> #include <string.h>
typedef void (ALC_APIENTRY *_LPALCDEVICEPAUSESOFT) (ALCdevice *device); typedef void (ALC_APIENTRY *LPALCDEVICEPAUSESOFT) (ALCdevice *device);
typedef void (ALC_APIENTRY *_LPALCDEVICERESUMESOFT) (ALCdevice *device); typedef void (ALC_APIENTRY *LPALCDEVICERESUMESOFT) (ALCdevice *device);
#define AL_DEVICE_PAUSE_FUN \ #define AL_DEVICE_PAUSE_FUN \
AL_FUN(DevicePause, _LPALCDEVICEPAUSESOFT) \ AL_FUN(DevicePause, LPALCDEVICEPAUSESOFT) \
AL_FUN(DeviceResume, _LPALCDEVICERESUMESOFT) AL_FUN(DeviceResume, LPALCDEVICERESUMESOFT)
struct ALCFunctions struct ALCFunctions
{ {
@ -80,7 +80,6 @@ enum
{ {
REQUEST_SETFULLSCREEN = 0, REQUEST_SETFULLSCREEN = 0,
REQUEST_WINRESIZE, REQUEST_WINRESIZE,
REQUEST_WINMAXIMIZE,
REQUEST_MESSAGEBOX, REQUEST_MESSAGEBOX,
REQUEST_SETCURSORVISIBLE, REQUEST_SETCURSORVISIBLE,
@ -460,10 +459,6 @@ void EventThread::process(RGSSThreadData &rtData)
updateCursorState(cursorInWindow, gameScreen); updateCursorState(cursorInWindow, gameScreen);
break; break;
case REQUEST_WINMAXIMIZE :
SDL_MaximizeWindow(win);
break;
case UPDATE_FPS : case UPDATE_FPS :
if (rtData.config.printFPS) if (rtData.config.printFPS)
Debug() << "FPS:" << event.user.code; Debug() << "FPS:" << event.user.code;
@ -627,13 +622,6 @@ void EventThread::requestWindowResize(int width, int height, bool recenter)
SDL_PushEvent(&event); SDL_PushEvent(&event);
} }
void EventThread::requestWindowMaximize()
{
SDL_Event event;
event.type = usrIdStart + REQUEST_WINMAXIMIZE;
SDL_PushEvent(&event);
}
void EventThread::requestShowCursor(bool mode) void EventThread::requestShowCursor(bool mode)
{ {
SDL_Event event; SDL_Event event;

1
src/eventthread.h
View file

@ -89,7 +89,6 @@ public:
/* Called from RGSS thread */ /* Called from RGSS thread */
void requestFullscreenMode(bool mode); void requestFullscreenMode(bool mode);
void requestWindowResize(int width, int height, bool recenter = false); void requestWindowResize(int width, int height, bool recenter = false);
void requestWindowMaximize();
void requestShowCursor(bool mode); void requestShowCursor(bool mode);
void requestTerminate(); void requestTerminate();