zhangyiss/indicators
1
0
Fork 0
mirror of https://github.com/p-ranav/indicators.git synced 2025-12-16 04:18:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66 from godbyk/bugfix/nested-namespace

Browse Source 
Elevate #includes from being nested in the namespace.
This commit is contained in:
Pranav
2020-06-17 08:35:52 -05:00
committed by GitHub
parent 51e3460ad0 3cef73d30d
commit d9a5219d09
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/indicators/terminal_size.hpp
View File

@@ -2,11 +2,12 @@
#pragma once #pragma once
#include <utility> #include <utility>
namespace indicators {
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <windows.h> #include <windows.h>
namespace indicators {
static inline std::pair<size_t, size_t> terminal_size() { static inline std::pair<size_t, size_t> terminal_size() {
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
int columns, rows; int columns, rows;
@@ -18,10 +19,15 @@ static inline std::pair<size_t, size_t> terminal_size() {
size_t terminal_width() { return terminal_size().second; } size_t terminal_width() { return terminal_size().second; }
} // namespace indicators
#else #else
#include <sys/ioctl.h> //ioctl() and TIOCGWINSZ #include <sys/ioctl.h> //ioctl() and TIOCGWINSZ
#include <unistd.h> // for STDOUT_FILENO #include <unistd.h> // for STDOUT_FILENO
namespace indicators {
static inline std::pair<size_t, size_t> terminal_size() { static inline std::pair<size_t, size_t> terminal_size() {
struct winsize size; struct winsize size;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &size); ioctl(STDOUT_FILENO, TIOCGWINSZ, &size);
@@ -29,6 +35,8 @@ static inline std::pair<size_t, size_t> terminal_size() {
} }
static inline size_t terminal_width() { return terminal_size().second; } static inline size_t terminal_width() { return terminal_size().second; }
} // namespace indicators
#endif #endif
} // namespace indicators