Skip to content

Commit c0abe64

Browse files
igagisigagis
committed
rename window_params -> window_parameters
1 parent 5cedf58 commit c0abe64

10 files changed

Lines changed: 46 additions & 43 deletions

File tree

‎examples/basic/src/main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class Application : public ruisapp::application{
88
public:
99
Application() :
10-
ruisapp::App(ruisapp::window_params(r4::vector2<unsigned>(800, 600)))
10+
ruisapp::App(ruisapp::window_parameters(r4::vector2<unsigned>(800, 600)))
1111
{
1212
ruis::Morda::inst().init_standard_widgets(*this->get_res_file());
1313

‎src/ruisapp/application.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@ class application : public utki::intrusive_singleton<application>
187187
/**
188188
* @brief Application constructor.
189189
* @param name - name of the application.
190-
* @param requested_window_params - requested window parameters.
190+
* @param window_params - requested window parameters.
191191
*/
192192
application(
193193
std::string name, //
194-
const window_params& requested_window_params
194+
const window_parameters& window_params
195195
);
196196

197197
public:

‎src/ruisapp/glue/android/glue.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ struct window_wrapper : public utki::destructable {
184184

185185
nitki::queue ui_queue;
186186

187-
window_wrapper(const window_params& wp)
187+
window_wrapper(const window_parameters& wp)
188188
{
189189
this->display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
190190
if (this->display == EGL_NO_DISPLAY) {
@@ -234,9 +234,9 @@ struct window_wrapper : public utki::destructable {
234234
EGL_RED_SIZE,
235235
8,
236236
EGL_DEPTH_SIZE,
237-
wp.buffers.get(window_params::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
237+
wp.buffers.get(window_parameters::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
238238
EGL_STENCIL_SIZE,
239-
wp.buffers.get(window_params::buffer::stencil) ? utki::byte_bits : 0,
239+
wp.buffers.get(window_parameters::buffer::stencil) ? utki::byte_bits : 0,
240240
EGL_NONE
241241
};
242242

@@ -1126,7 +1126,7 @@ ruisapp::application::directories get_application_directories(std::string_view a
11261126

11271127
ruisapp::application::application(
11281128
std::string name, //
1129-
const window_params& wp
1129+
const window_parameters& wp
11301130
) :
11311131
name(name),
11321132
window_pimpl(std::make_unique<window_wrapper>(wp)),

‎src/ruisapp/glue/ios/glue.mm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ @interface ViewController : GLKViewController{
8383
@end
8484

8585
namespace{
86-
window_params windowParams;
86+
window_parameters windowParams;
8787

8888
struct WindowWrapper : public utki::destructable{
8989
UIWindow *window;
9090

91-
WindowWrapper(const window_params& wp){
91+
WindowWrapper(const window_parameters& wp){
9292
windowParams = wp;
9393

9494
this->window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
@@ -128,7 +128,7 @@ @implementation ViewController
128128
- (void)viewDidLoad{
129129
[super viewDidLoad];
130130

131-
// TODO: init requested context version from window_params
131+
// TODO: init requested context version from window_parameters
132132
self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
133133
if (self.context == nil) {
134134
self.context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
@@ -144,13 +144,13 @@ - (void)viewDidLoad{
144144
view.drawableColorFormat = GLKViewDrawableColorFormatRGBA8888;
145145

146146
{
147-
const window_params& wp = windowParams;
148-
if(wp.buffers.get(window_params::buffer::depth)){
147+
const window_parameters& wp = windowParams;
148+
if(wp.buffers.get(window_parameters::buffer::depth)){
149149
view.drawableDepthFormat = GLKViewDrawableDepthFormat16;
150150
}else{
151151
view.drawableDepthFormat = GLKViewDrawableDepthFormatNone;
152152
}
153-
if(wp.buffers.get(window_params::buffer::stencil)){
153+
if(wp.buffers.get(window_parameters::buffer::stencil)){
154154
view.drawableStencilFormat = GLKViewDrawableStencilFormat8;
155155
}else{
156156
view.drawableStencilFormat = GLKViewDrawableStencilFormatNone;
@@ -326,7 +326,7 @@ - (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
326326

327327
application::application(
328328
std::string name,
329-
const window_params& wp
329+
const window_parameters& wp
330330
) :
331331
name(name),
332332
window_pimpl(std::make_unique<WindowWrapper>(wp)),

‎src/ruisapp/glue/linux/glue_wayland.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ struct window_wrapper : public utki::destructable {
19601960
};
19611961

19621962
toplevel_wrapper(
1963-
const ruisapp::window_params& wp,
1963+
const ruisapp::window_parameters& wp,
19641964
surface_wrapper& surface, //
19651965
xdg_surface_wrapper& xdg_surface
19661966
) :
@@ -2037,7 +2037,7 @@ struct window_wrapper : public utki::destructable {
20372037
egl_context_wrapper(
20382038
const display_wrapper& display,
20392039
const egl_window_wrapper& egl_window,
2040-
const window_params& wp
2040+
const window_parameters& wp
20412041
) :
20422042
egl_display(eglGetDisplay(display.disp))
20432043
{
@@ -2079,9 +2079,9 @@ struct window_wrapper : public utki::destructable {
20792079
EGL_RED_SIZE,
20802080
8,
20812081
EGL_DEPTH_SIZE,
2082-
wp.buffers.get(window_params::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
2082+
wp.buffers.get(window_parameters::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
20832083
EGL_STENCIL_SIZE,
2084-
wp.buffers.get(window_params::buffer::stencil) ? utki::byte_bits : 0,
2084+
wp.buffers.get(window_parameters::buffer::stencil) ? utki::byte_bits : 0,
20852085
EGL_NONE
20862086
};
20872087

@@ -2182,7 +2182,7 @@ struct window_wrapper : public utki::destructable {
21822182
}
21832183
} egl_context;
21842184

2185-
window_wrapper(const window_params& wp) :
2185+
window_wrapper(const window_parameters& wp) :
21862186
waitable(this->display),
21872187
registry(this->display),
21882188
compositor(this->registry),
@@ -2295,7 +2295,7 @@ window_wrapper& get_impl(application& app)
22952295

22962296
} // namespace
22972297

2298-
application::application(std::string name, const window_params& wp) :
2298+
application::application(std::string name, const window_parameters& wp) :
22992299
name(std::move(name)),
23002300
window_pimpl(std::make_unique<window_wrapper>(wp)),
23012301
gui(utki::make_shared<ruis::context>(

‎src/ruisapp/glue/linux/glue_xorg.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ struct window_wrapper : public utki::destructable {
217217

218218
std::atomic_bool quit_flag = false;
219219

220-
window_wrapper(const window_params& wp)
220+
window_wrapper(const window_parameters& wp)
221221
{
222222
// set scale factor
223223
{
@@ -293,11 +293,11 @@ struct window_wrapper : public utki::destructable {
293293
visual_attribs.push_back(GLX_ALPHA_SIZE);
294294
visual_attribs.push_back(utki::byte_bits);
295295

296-
if (wp.buffers.get(window_params::buffer::depth)) {
296+
if (wp.buffers.get(window_parameters::buffer::depth)) {
297297
visual_attribs.push_back(GLX_DEPTH_SIZE);
298298
visual_attribs.push_back(utki::byte_bits * 3); // 24 bits per pixel for depth buffer
299299
}
300-
if (wp.buffers.get(window_params::buffer::stencil)) {
300+
if (wp.buffers.get(window_parameters::buffer::stencil)) {
301301
visual_attribs.push_back(GLX_STENCIL_SIZE);
302302
visual_attribs.push_back(utki::byte_bits);
303303
}
@@ -409,9 +409,9 @@ struct window_wrapper : public utki::destructable {
409409
EGL_RED_SIZE,
410410
8,
411411
EGL_DEPTH_SIZE,
412-
wp.buffers.get(window_params::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
412+
wp.buffers.get(window_parameters::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
413413
EGL_STENCIL_SIZE,
414-
wp.buffers.get(window_params::buffer::stencil) ? utki::byte_bits : 0,
414+
wp.buffers.get(window_parameters::buffer::stencil) ? utki::byte_bits : 0,
415415
EGL_NONE
416416
};
417417

@@ -920,7 +920,7 @@ window_wrapper& get_impl(application& app)
920920

921921
application::application(
922922
std::string name, //
923-
const window_params& wp
923+
const window_parameters& wp
924924
) :
925925
name(std::move(name)),
926926
window_pimpl(std::make_unique<window_wrapper>(wp)),

‎src/ruisapp/glue/macosx/glue.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ -(void)initStuff;
7373

7474
bool mouseCursorIsCurrentlyVisible = true;
7575

76-
WindowWrapper(const window_params& wp);
76+
WindowWrapper(const window_parameters& wp);
7777

7878
~WindowWrapper()noexcept;
7979
};
@@ -615,7 +615,7 @@ -(CocoaView*)view{return self->v;}
615615
@end
616616

617617
namespace{
618-
WindowWrapper::WindowWrapper(const window_params& wp){
618+
WindowWrapper::WindowWrapper(const window_parameters& wp){
619619
LOG([&](auto&o){o << "WindowWrapper::WindowWrapper(): enter" << std::endl;})
620620
this->applicationObjectId = [NSApplication sharedApplication];
621621

@@ -648,10 +648,10 @@ -(CocoaView*)view{return self->v;}
648648
std::vector<NSOpenGLPixelFormatAttribute> attributes;
649649
attributes.push_back(NSOpenGLPFAAccelerated);
650650
attributes.push_back(NSOpenGLPFAColorSize); attributes.push_back(24);
651-
if(wp.buffers.get(window_params::buffer::depth)){
651+
if(wp.buffers.get(window_parameters::buffer::depth)){
652652
attributes.push_back(NSOpenGLPFADepthSize); attributes.push_back(16);
653653
}
654-
if(wp.buffers.get(window_params::buffer::stencil)){
654+
if(wp.buffers.get(window_parameters::buffer::stencil)){
655655
attributes.push_back(NSOpenGLPFAStencilSize); attributes.push_back(8);
656656
}
657657
attributes.push_back(NSOpenGLPFADoubleBuffer);
@@ -809,7 +809,7 @@ int main(int argc, const char** argv){
809809

810810
application::application(
811811
std::string name,
812-
const window_params& wp
812+
const window_parameters& wp
813813
) :
814814
name(name),
815815
window_pimpl(std::make_unique<WindowWrapper>(wp)),

‎src/ruisapp/glue/sdl/glue.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ class window_wrapper : public utki::destructable
480480
}
481481
#endif
482482

483-
sdl_window_wrapper(const window_params& wp) :
483+
sdl_window_wrapper(const window_parameters& wp) :
484484
scale_factor(get_display_scaling_factor()),
485485
window([&]() {
486486
#ifdef RUISAPP_RENDER_OPENGL
@@ -612,7 +612,7 @@ class window_wrapper : public utki::destructable
612612

613613
std::atomic_bool quit_flag = false;
614614

615-
window_wrapper(const window_params& wp) :
615+
window_wrapper(const window_parameters& wp) :
616616
window(wp),
617617
gl_context(this->window),
618618
user_event_type([]() {
@@ -700,7 +700,7 @@ ruis::mouse_button button_number_to_enum(Uint8 number)
700700
}
701701
} // namespace
702702

703-
application::application(std::string name, const window_params& wp) :
703+
application::application(std::string name, const window_parameters& wp) :
704704
name(std::move(name)),
705705
window_pimpl(std::make_unique<window_wrapper>(wp)),
706706
gui(utki::make_shared<ruis::context>(

‎src/ruisapp/glue/windows/glue.cxx‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct window_wrapper : public utki::destructable {
7272

7373
bool mouseCursorIsCurrentlyVisible = true;
7474

75-
window_wrapper(const window_params& wp);
75+
window_wrapper(const window_parameters& wp);
7676

7777
window_wrapper(const window_wrapper&) = delete;
7878
window_wrapper& operator=(const window_wrapper&) = delete;
@@ -708,7 +708,7 @@ ruisapp::application::directories get_application_directories(std::string_view a
708708

709709
application::application(
710710
std::string name, //
711-
const window_params& wp
711+
const window_parameters& wp
712712
) :
713713
name(std::move(name)),
714714
window_pimpl(std::make_unique<window_wrapper>(wp)),
@@ -928,7 +928,7 @@ void application::swap_frame_buffers()
928928
}
929929

930930
namespace {
931-
window_wrapper::window_wrapper(const window_params& wp)
931+
window_wrapper::window_wrapper(const window_parameters& wp)
932932
{
933933
{
934934
WNDCLASS wc;
@@ -1025,8 +1025,9 @@ window_wrapper::window_wrapper(const window_params& wp)
10251025
BYTE(0),
10261026
BYTE(0),
10271027
BYTE(0), // accumulation bits ignored
1028-
wp.buffers.get(window_params::buffer::depth) ? BYTE(utki::byte_bits * 2) : BYTE(0), // 16 bit depth buffer
1029-
wp.buffers.get(window_params::buffer::stencil) ? BYTE(utki::byte_bits) : BYTE(0),
1028+
wp.buffers.get(window_parameters::buffer::depth) ? BYTE(utki::byte_bits * 2)
1029+
: BYTE(0), // 16 bit depth buffer
1030+
wp.buffers.get(window_parameters::buffer::stencil) ? BYTE(utki::byte_bits) : BYTE(0),
10301031
BYTE(0), // no auxiliary buffer
10311032
BYTE(PFD_MAIN_PLANE), // main drawing layer
10321033
BYTE(0), // reserved
@@ -1134,9 +1135,9 @@ window_wrapper::window_wrapper(const window_params& wp)
11341135
EGL_BLUE_SIZE,
11351136
8,
11361137
EGL_DEPTH_SIZE,
1137-
wp.buffers.get(window_params::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
1138+
wp.buffers.get(window_parameters::buffer::depth) ? int(utki::byte_bits * sizeof(uint16_t)) : 0,
11381139
EGL_STENCIL_SIZE,
1139-
wp.buffers.get(window_params::buffer::stencil) ? utki::byte_bits : 0,
1140+
wp.buffers.get(window_parameters::buffer::stencil) ? utki::byte_bits : 0,
11401141
EGL_NONE
11411142
};
11421143

‎src/ruisapp/window.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ enum class orientation {
4343
/**
4444
* @brief Stay always in portrait orientation.
4545
*/
46-
portrait
46+
portrait,
47+
48+
enum_size
4749
};
4850

4951
/**
@@ -60,7 +62,7 @@ enum class buffer {
6062
/**
6163
* @brief Desired window parameters.
6264
*/
63-
struct window_params {
65+
struct window_parameters {
6466
constexpr const static auto default_window_width = 300;
6567
constexpr const static auto default_window_height = 150;
6668

0 commit comments

Comments
 (0)