Support for resizeable windows with adaptive UI. #23161
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,6 +49,9 @@ std::array<RGBQUAD, color_loader<RGBQUAD>::COLOR_NAMES_COUNT> windowsPalette; | |
| unsigned char *dcbits; //the bits of the screen image, for direct access | ||
| bool CursorVisible = true; // Showcursor is a somewhat weird function | ||
|
|
||
| static int TERMINAL_WIDTH; | ||
| static int TERMINAL_HEIGHT; | ||
|
|
||
| //*********************************** | ||
| //Non-curses, Window functions * | ||
| //*********************************** | ||
|
|
@@ -87,7 +90,7 @@ bool WinCreate() | |
| return false; | ||
|
|
||
| // Adjust window size | ||
| uint32_t WndStyle = WS_CAPTION | WS_MINIMIZEBOX | WS_SIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU | WS_VISIBLE; // Basic window, show on creation | ||
| RECT WndRect; | ||
| WndRect.left = WndRect.top = 0; | ||
| WndRect.right = WindowWidth; | ||
|
|
@@ -108,7 +111,7 @@ bool WinCreate() | |
| 0, 0, WindowINST, NULL); | ||
| if (WindowHandle == 0) | ||
| return false; | ||
| return true; | ||
| }; | ||
|
|
||
|
|
@@ -126,6 +129,36 @@ void WinDestroy() | |
| } | ||
| }; | ||
|
|
||
| // creates a backbuffer to prevent flickering | ||
| void create_backbuffer() | ||
| { | ||
| if( WindowDC != NULL ) { | ||
| if( ReleaseDC(WindowHandle, WindowDC) == 0 ) { | ||
| WindowDC = 0; | ||
|
There was a problem hiding this comment. Setting this to 0 (why not |
||
| } | ||
| } | ||
| if( backbuffer != NULL ) { | ||
| if( ReleaseDC(WindowHandle, backbuffer) == 0 ) { | ||
| backbuffer = 0; | ||
| } | ||
| } | ||
| WindowDC = GetDC(WindowHandle); | ||
| backbuffer = CreateCompatibleDC(WindowDC); | ||
|
|
||
| BITMAPINFO bmi = BITMAPINFO(); | ||
| bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); | ||
| bmi.bmiHeader.biWidth = WindowWidth; | ||
| bmi.bmiHeader.biHeight = -WindowHeight; | ||
| bmi.bmiHeader.biPlanes = 1; | ||
| bmi.bmiHeader.biBitCount = 8; | ||
| bmi.bmiHeader.biCompression = BI_RGB; // Raw RGB | ||
| bmi.bmiHeader.biSizeImage = WindowWidth * WindowHeight * 1; | ||
| bmi.bmiHeader.biClrUsed = color_loader<RGBQUAD>::COLOR_NAMES_COUNT; // Colors in the palette | ||
| bmi.bmiHeader.biClrImportant = color_loader<RGBQUAD>::COLOR_NAMES_COUNT; // Colors in the palette | ||
| backbit = CreateDIBSection(0, &bmi, DIB_RGB_COLORS, (void**)&dcbits, NULL, 0); | ||
| DeleteObject(SelectObject(backbuffer, backbit));//load the buffer into DC | ||
| } | ||
|
|
||
| // Copied from sdlcurses.cpp | ||
| #define ALT_BUFFER_SIZE 8 | ||
| static char alt_buffer[ALT_BUFFER_SIZE] = {}; | ||
|
|
@@ -251,6 +284,26 @@ LRESULT CALLBACK ProcessMessages(HWND__ *hWnd,unsigned int Msg, | |
| lastchar = code; | ||
| } | ||
| return 0; | ||
|
|
||
| case WM_SIZE: | ||
| case WM_SIZING: | ||
| RECT WndRect; | ||
| if( GetClientRect( WindowHandle, &WndRect ) ) { | ||
| TERMINAL_WIDTH = WndRect.right / fontwidth; | ||
| TERMINAL_HEIGHT = WndRect.bottom / fontheight; | ||
| WindowWidth = TERMINAL_WIDTH * fontwidth; | ||
| WindowHeight = TERMINAL_HEIGHT * fontheight; | ||
| catacurses::resizeterm(); | ||
| create_backbuffer(); | ||
| SetBkMode(backbuffer, TRANSPARENT);//Transparent font backgrounds | ||
| SelectObject(backbuffer, font);//Load our font into the DC | ||
| color_loader<RGBQUAD>().load( windowsPalette ); | ||
| if( SetDIBColorTable(backbuffer, 0, windowsPalette.size(), windowsPalette.data() ) == 0 ) { | ||
| throw std::runtime_error( "SetDIBColorTable failed" ); | ||
|
There was a problem hiding this comment. This is throwing from a callback function that is called from non-C++ code. And the exception will leave the C++ code and that basically invokes Undefined Behaviour. Btw. the call to There was a problem hiding this comment. I was winging it with wincurse.cpp, honestly. Reading M$ Windows API references is like sticking a red hot poker in my eyes. I didn't really expect to get this platform to work at all. |
||
| } | ||
| catacurses::refresh(); | ||
| } | ||
| return 0; | ||
|
|
||
| case WM_SYSCHAR: | ||
| add_alt_code((char)wParam); | ||
|
|
@@ -458,6 +511,14 @@ int projected_window_height(int) | |
| return get_option<int>( "TERMINAL_Y" ) * fontheight; | ||
| } | ||
|
|
||
| int get_terminal_width() { | ||
| return TERMINAL_WIDTH; | ||
| } | ||
|
|
||
| int get_terminal_height() { | ||
| return TERMINAL_HEIGHT; | ||
| } | ||
|
|
||
| //*********************************** | ||
| //Pseudo-Curses Functions * | ||
| //*********************************** | ||
|
|
@@ -474,28 +535,16 @@ void catacurses::init_interface() | |
| ::fontheight = fl.fontheight; | ||
| halfwidth=fontwidth / 2; | ||
| halfheight=fontheight / 2; | ||
| TERMINAL_WIDTH = get_option<int>( "TERMINAL_X" ); | ||
| TERMINAL_HEIGHT = get_option<int>( "TERMINAL_Y" ); | ||
| WindowWidth = TERMINAL_WIDTH * fontwidth; | ||
| WindowHeight = TERMINAL_HEIGHT * fontheight; | ||
|
|
||
| WinCreate(); //Create the actual window, register it, etc | ||
| timeBeginPeriod(1); // Set Sleep resolution to 1ms | ||
| CheckMessages(); //Let the message queue handle setting up the window | ||
|
|
||
| create_backbuffer(); | ||
|
|
||
| // Load private fonts | ||
| if (SetCurrentDirectoryW(L"data\\font")){ | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fact that so much pure output code now depends on "game.h" and
class gameworries me. This is not a good design.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree. I only pulled this header to access game::init_ui. Perhaps there's a better location for it? The game class seems far too involved in handling output in general, in my opinion. Of course, it's also a behemoth that I'm sure no one really wants to suffer through refactoring.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could also extend our available toolkit with signals. A signal would be an excellent way to handle this situation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How so? This is a dependency issue, the primary uses of signals are IPC and asynchronicity, we arent dealing with either of those here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When it comes down to it, we are dealing with an asynchronous event. Window resizing is an external event generated by the platform window manager, and a signal and slot approach let's us handle it with ease. It also let's us work around the tight coupling issue and avoid adding in another header just to run a single function.
Edit: I can use this approach to tackle the issues with overlay UI resizing and screen redraws, as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just because there is asynchronous behavior happening somewhere doesn't mean it's suitable to use an asynchronous solution for this particular problem.
In this particular case you are avoiding moving logic out of the game module (which we are in dire need of) and creating a new header by adding a new header and replacing a simple method call with indirection through the OS.
If you want to add support for handling external signals, cool, do that.
Even if we have signal support it is not ok to do communication between different parts of the program with signals.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the merge blocker on this the ui code being moved out of game? As far as I can tell, that requires changing the ownership of the windows, which affects all of the ui code using g->w_whatever, as well as requiring some serious changes to game itself.
That'd turn a small feature PR into a massive refactor PR, wouldn't it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, the problem is just the new inclusion of game.h, you can just add a function that accepts no arguments and unconditionally invokes the g->init_ui(), and a later cleanup can move more code into that module.
I probably would have done it for you if I had time at the moment.