diff --git a/.clang-format b/.clang-format old mode 100644 new mode 100755 index 3e55846..751603a --- a/.clang-format +++ b/.clang-format @@ -10,6 +10,7 @@ AllowShortFunctionsOnASingleLine: None AllowShortIfStatementsOnASingleLine: 'false' AllowShortLoopsOnASingleLine: 'false' BreakBeforeBraces: Allman +ColumnLimit: 0 ConstructorInitializerAllOnOneLineOrOnePerLine: 'false' Cpp11BracedListStyle: 'false' IndentCaseLabels: 'false' @@ -31,4 +32,5 @@ Standard: Auto TabWidth: '4' UseTab: Never + ... diff --git a/include/xoverlay.h b/include/xoverlay.h index 365cf22..0357504 100644 --- a/include/xoverlay.h +++ b/include/xoverlay.h @@ -15,43 +15,43 @@ extern "C" #include #include -struct xoverlay_library -{ - Display *display; - Window window; - Colormap colormap; - GC gc; - XGCValues gcvalues; - XFontStruct font; - int screen; - - int width; - int height; - - struct + struct xoverlay_library { - int x; - int y; - } mouse; + Display *display; + Window window; + Colormap colormap; + GC gc; + XGCValues gcvalues; + XFontStruct font; + int screen; - char init; - char drawing; - char mapped; -}; + int width; + int height; -extern struct xoverlay_library xoverlay_library; + struct + { + int x; + int y; + } mouse; -int xoverlay_init(); + char init; + char drawing; + char mapped; + }; -void xoverlay_destroy(); + extern struct xoverlay_library xoverlay_library; -void xoverlay_show(); + int xoverlay_init(); -void xoverlay_hide(); + void xoverlay_destroy(); -void xoverlay_draw_begin(); + void xoverlay_show(); -void xoverlay_draw_end(); + void xoverlay_hide(); + + void xoverlay_draw_begin(); + + void xoverlay_draw_end(); #ifdef __cplusplus } diff --git a/src/drawglx.c b/src/drawglx.c index c6c495d..c792bc9 100644 --- a/src/drawglx.c +++ b/src/drawglx.c @@ -193,7 +193,8 @@ int xoverlay_glx_create_window() { return -1; } - if (!glXIsDirect(xoverlay_library.display, glx_state.context)); + if (!glXIsDirect(xoverlay_library.display, glx_state.context)) + ; glXMakeCurrent(xoverlay_library.display, xoverlay_library.window, glx_state.context); glewExperimental = GL_TRUE; @@ -207,7 +208,8 @@ int xoverlay_glx_create_window() (PFNGLXSWAPINTERVALEXTPROC) glXGetProcAddressARB( (const GLubyte *) "glXSwapIntervalEXT"); if (glXSwapIntervalEXT) - glXSwapIntervalEXT(xoverlay_library.display, xoverlay_library.window, 0); + glXSwapIntervalEXT(xoverlay_library.display, xoverlay_library.window, + 0); glXSwapBuffers(xoverlay_library.display, xoverlay_library.window); return 0;