Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,9 @@ Before you can start, you need a GitHub account, here are a few suggestions:
- All significant new classes, methods and functions have Doxygen-style
documentation in source comments.
- Consistent code styling is enforced with `make style` in the top-level
directory. This requires [Artistic Style](http://astyle.sourceforge.net) (we
specifically use version 2.05.1). See also the file `config/glvis.astylerc`.
directory. This requires [Artistic Style](http://astyle.sourceforge.net)
version 2.05.1 and MFEM's style configuration file, typically located in
`../mfem/config/mfem.astylerc`.
- Use `glvis::out` and `glvis::err` instead of `std::cout` and `std::cerr` in
internal library code. (You can use `std` in examples and miniapps.)
- When manually resolving conflicts during a merge, make sure to mention the
Expand Down
14 changes: 6 additions & 8 deletions lib/sdl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ bool SdlWindow::createWindow(const char* title, int x, int y, int w, int h,
if (err == GLEW_ERROR_NO_GLX_DISPLAY)
{
cerr << "GLEW: No GLX display found. If you are using Wayland this can "
"be ignored." << endl;
<< "be ignored." << endl;
err = GLEW_OK;
}
#endif
Expand Down Expand Up @@ -440,13 +440,11 @@ void SdlWindow::mainIter()
{
// Wait for next wakeup event from main event thread
unique_lock<mutex> event_lock{event_mutex};
events_available.wait(
event_lock,
[this]()
{
// Sleep until events from WM or glvis_command can be handled
return !waiting_events.empty() || call_idle_func;
});
events_available.wait(event_lock, [this]()
{
// Sleep until events from WM or glvis_command can be handled
return !waiting_events.empty() || call_idle_func;
});
}
}
if (wnd_state == RenderState::ExposePending)
Expand Down
4 changes: 2 additions & 2 deletions lib/threads.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ GLVisCommand::GLVisCommand(
{
vs = _vs;
keep_attr = _keep_attr;
thread_wnd = GetAppWindow(); // should be set in this thread by a call to
// InitVisualization()
// should be set in this thread by a call to InitVisualization()
thread_wnd = GetAppWindow();

num_waiting = 0;
terminating = false;
Expand Down