Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-06-10 11:12:21 +00:00
Code Issues Releases Activity

Apply clang-format.

Browse Source
This commit is contained in:
Brenden Matthews 2021-01-23 18:19:04 -06:00
parent 36d685eb88
commit 283129e283
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
17 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common.cc
View File

@ -772,7 +772,7 @@ void print_github(struct text_object *obj, char *p, unsigned int p_max_size) {
curl_easy_setopt(curl, CURLOPT_URL, github_url);
#if defined(CURLOPT_ACCEPT_ENCODING)
curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "gzip");
#else /* defined(CURLOPT_ACCEPT_ENCODING) */
#else /* defined(CURLOPT_ACCEPT_ENCODING) */
curl_easy_setopt(curl, CURLOPT_ENCODING, "gzip");
#endif /* defined(CURLOPT_ACCEPT_ENCODING) */
curl_easy_setopt(curl, CURLOPT_USERAGENT, user_agent);

5
src/conky.cc
View File

@ -1457,7 +1457,7 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied) {
if (current->last_colour != 0 || current->first_colour != 0) {
#ifdef BUILD_HSV_GRADIENT
tmpcolour = do_hsv_gradient(w - 1, current->last_colour,
current->first_colour);
current->first_colour);
#else
tmpcolour = do_gradient(w - 1, current->last_colour,
current->first_colour);
@ -2197,8 +2197,7 @@ void main_loop() {
if (own_window.get(*state)) {
/* if an ordinary window with decorations */
if ((own_window_type.get(*state) == TYPE_NORMAL) &&
!TEST_HINT(own_window_hints.get(*state),
HINT_UNDECORATED)) {
!TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)) {
/* allow conky to hold input focus. */
break;
}

4
src/data-source.hh
View File

@ -101,7 +101,7 @@ template <typename T>
class register_data_source {
template <typename... Args>
static int factory(lua::state *l, const std::string &name,
const Args &... args) {
const Args &...args) {
T *t = static_cast<T *>(l->newuserdata(sizeof(T)));
l->insert(1);
new (t) T(l, name, args...);
@ -113,7 +113,7 @@ class register_data_source {
public:
template <typename... Args>
explicit register_data_source(const std::string &name, Args &&... args) {
explicit register_data_source(const std::string &name, Args &&...args) {
priv::do_register_data_source(
name,
std::bind(&factory<Args...>, std::placeholders::_1, name, args...));

2
src/fs.cc
View File

@ -167,7 +167,7 @@ void get_fs_type(const char *path, char *result) {
return;
#elif defined(__sun)
assert(0); /* not used - see update_fs_stat() */
#else /* HAVE_STRUCT_STATFS_F_FSTYPENAME */
#else /* HAVE_STRUCT_STATFS_F_FSTYPENAME */
struct mntent *me;
FILE *mtab = setmntent("/proc/mounts", "r");

35
src/hsv_gradient.cc
View File

@ -26,8 +26,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "conky.h"
#include "colours.h"
#include "conky.h"
#include "logging.h"
#ifdef BUILD_X11
#include "x11.h"
@ -52,7 +52,7 @@ long to_decimal_scale(long value, long max_value) {
} else if (value > 0) {
return (value * CONST_SCALE + max_value - 1) / max_value;
}
return -((abs(value) * CONST_SCALE + max_value - 1) / max_value);
return -((abs(value) * CONST_SCALE + max_value - 1) / max_value);
}
long from_decimal_scale(long value, long max_value) {
@ -64,7 +64,7 @@ long from_decimal_scale(long value, long max_value) {
return -((abs(value) * max_value + CONST_SCALE_HALF) / CONST_SCALE);
}
void scaled_rgb_to_scaled_hsv(long * const rgb, long *hsv) {
void scaled_rgb_to_scaled_hsv(long *const rgb, long *hsv) {
long val = rgb[0] > rgb[1] ? MAX(rgb[0], rgb[2]) : MAX(rgb[1], rgb[2]);
long cmin = rgb[0] < rgb[1] ? MIN(rgb[0], rgb[2]) : MIN(rgb[1], rgb[2]);
long delta = val - cmin;
@ -107,9 +107,10 @@ void scaled_hsv_to_scaled_rgb(long *const hsv, long *rgb) {
long c = (hsv[2] * hsv[1] + CONST_SCALE_HALF) / CONST_SCALE;
long hue = hsv[0] % CONST_SCALE360;
long x = (c *
(CONST_SCALE - abs(((hue + 30L) / 60L) % CONST_SCALE2 - CONST_SCALE))
+ CONST_SCALE_HALF) / CONST_SCALE;
long x = (c * (CONST_SCALE -
abs(((hue + 30L) / 60L) % CONST_SCALE2 - CONST_SCALE)) +
CONST_SCALE_HALF) /
CONST_SCALE;
long m = hsv[2] - c;
rgb[0] = m;
@ -137,11 +138,10 @@ void scaled_hsv_to_scaled_rgb(long *const hsv, long *rgb) {
}
}
/* this function returns the next colour between two colours in hsv space for a gradient */
unsigned long *do_hsv_gradient(int width,
unsigned long first_colour,
unsigned long last_colour) {
/* this function returns the next colour between two colours in hsv space for a
* gradient */
unsigned long *do_hsv_gradient(int width, unsigned long first_colour,
unsigned long last_colour) {
long rgb1[3], rgb2[3], rgb3[3];
long hsv1[3], hsv2[3];
long hueDiff, satDiff, valDiff;
@ -154,11 +154,15 @@ unsigned long *do_hsv_gradient(int width,
if (colour_depth == 0) { set_up_gradient(); }
rgb1[0] = to_decimal_scale((first_colour & redmask) >> redshift, redmask >> redshift);
rgb1[1] = to_decimal_scale((first_colour & greenmask) >> greenshift, greenmask >> greenshift);
rgb1[0] = to_decimal_scale((first_colour & redmask) >> redshift,
redmask >> redshift);
rgb1[1] = to_decimal_scale((first_colour & greenmask) >> greenshift,
greenmask >> greenshift);
rgb1[2] = to_decimal_scale(first_colour & bluemask, bluemask);
rgb2[0] = to_decimal_scale((last_colour & redmask) >> redshift, redmask >> redshift);
rgb2[1] = to_decimal_scale((last_colour & greenmask) >> greenshift, greenmask >> greenshift);
rgb2[0] = to_decimal_scale((last_colour & redmask) >> redshift,
redmask >> redshift);
rgb2[1] = to_decimal_scale((last_colour & greenmask) >> greenshift,
greenmask >> greenshift);
rgb2[2] = to_decimal_scale(last_colour & bluemask, bluemask);
scaled_rgb_to_scaled_hsv(rgb1, hsv1);
@ -205,7 +209,6 @@ unsigned long *do_hsv_gradient(int width,
long blue3 = from_decimal_scale(rgb3[2], bluemask);
colours[i] = (red3 << redshift) | (green3 << greenshift) | blue3;
}
return colours;
}

2
src/hsv_gradient.h
View File

@ -33,7 +33,7 @@ unsigned long *do_hsv_gradient(int, unsigned long, unsigned long);
long to_decimal_scale(long value, long max_value);
long from_decimal_scale(long value, long max_value);
void scaled_rgb_to_scaled_hsv(long * const rgb, long *hsv);
void scaled_rgb_to_scaled_hsv(long *const rgb, long *hsv);
void scaled_hsv_to_scaled_rgb(long *const hsv, long *rgb);
#endif /* _COLOURS_H */

10
src/libmpdclient.cc
View File

@ -115,7 +115,7 @@ static int do_connect_fail(mpd_Connection *connection,
return (connect(connection->sock, serv_addr, addrlen) == SOCKET_ERROR &&
WSAGetLastError() != WSAEWOULDBLOCK);
}
#else /* !WIN32 (sane operating systems) */
#else /* !WIN32 (sane operating systems) */
static int do_connect_fail(mpd_Connection *connection,
const struct sockaddr *serv_addr, int addrlen) {
int flags = fcntl(connection->sock, F_GETFL, 0);
@ -247,7 +247,7 @@ static int mpd_connect(mpd_Connection *connection, const char *host, int port,
connection->error = MPD_ERROR_UNKHOST;
return -1;
}
#else /* HAVE_GETHOSTBYNAME_R */
#else /* HAVE_GETHOSTBYNAME_R */
if (!(he_res = gethostbyname(host))) {
snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
"host \"%s\" not found", host);
@ -424,8 +424,7 @@ mpd_Connection *mpd_newConnection(const char *host, int port, float timeout) {
connection->buflen += readed;
connection->buffer[connection->buflen] = '\0';
} else if (err < 0) {
if
SELECT_ERRNO_IGNORE { continue; }
if SELECT_ERRNO_IGNORE { continue; }
snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
"problems connecting to \"%s\" on port %i", host, port);
connection->error = MPD_ERROR_CONNPORT;
@ -497,8 +496,7 @@ static void mpd_executeCommand(mpd_Connection *connection,
if (ret != 1 && !SELECT_ERRNO_IGNORE) { break; }
ret = send(connection->sock, commandPtr, commandLen, MSG_DONTWAIT);
if (ret <= 0) {
if
SENDRECV_ERRNO_IGNORE { continue; }
if SENDRECV_ERRNO_IGNORE { continue; }
snprintf(connection->errorStr, MPD_ERRORSTR_MAX_LENGTH,
"problems giving command \"%s\"", command);
connection->error = MPD_ERROR_SENDING;

2
src/linux.cc
View File

@ -3079,5 +3079,5 @@ void get_top_info(void) {
calc_cpu_each(total); /* and then the percentage for each task */
#ifdef BUILD_IOSTATS
calc_io_each(); /* percentage of I/O for each task */
#endif /* BUILD_IOSTATS */
#endif /* BUILD_IOSTATS */
}

8
src/logging.h
View File

@ -65,7 +65,7 @@ void clean_up(void *memtofree1, void *memtofree2);
void clean_up_without_threads(void *memtofree1, void *memtofree2);
template <typename... Args>
inline void gettextize_format(const char *format, Args &&... args) {
inline void gettextize_format(const char *format, Args &&...args) {
fprintf(stderr, _(format), args...);
}
@ -74,7 +74,7 @@ inline void gettextize_format(const char *format, Args &&... args) {
inline void gettextize_format(const char *format) { fputs(_(format), stderr); }
template <typename... Args>
void NORM_ERR(const char *format, Args &&... args) {
void NORM_ERR(const char *format, Args &&...args) {
fprintf(stderr, PACKAGE_NAME ": ");
gettextize_format(format, args...);
fputs("\n", stderr);
@ -83,7 +83,7 @@ void NORM_ERR(const char *format, Args &&... args) {
/* critical error */
template <typename... Args>
inline void CRIT_ERR(void *memtofree1, void *memtofree2, const char *format,
Args &&... args) {
Args &&...args) {
NORM_ERR(format, args...);
clean_up(memtofree1, memtofree2);
exit(EXIT_FAILURE);
@ -91,7 +91,7 @@ inline void CRIT_ERR(void *memtofree1, void *memtofree2, const char *format,
template <typename... Args>
inline void THREAD_CRIT_ERR(void *memtofree1, void *memtofree2,
const char *format, Args &&... args) {
const char *format, Args &&...args) {
NORM_ERR(format, args...);
clean_up_without_threads(memtofree1, memtofree2);
return;

4
src/luamm.hh
View File

@ -312,7 +312,7 @@ class state : private std::mutex {
// allocate a new lua userdata of appropriate size, and create a object in it
// pushes the userdata on stack and returns the pointer
template <typename T, typename... Args>
T *createuserdata(Args &&... args);
T *createuserdata(Args &&...args);
using std::mutex::lock;
using std::mutex::try_lock;
@ -365,7 +365,7 @@ class stack_sentry {
};
template <typename T, typename... Args>
T *state::createuserdata(Args &&... args) {
T *state::createuserdata(Args &&...args) {
stack_sentry s(*this);
void *t = newuserdata(sizeof(T));

4
src/net_stat.cc
View File

@ -121,7 +121,7 @@ void parse_net_stat_arg(struct text_object *obj, const char *arg,
#ifdef BUILD_IPV6
bool shownetmask = false;
bool showscope = false;
#endif /* BUILD_IPV6 */
#endif /* BUILD_IPV6 */
char nextarg[21]; // longest arg possible is a devname (max 20 chars)
int i = 0;
struct net_stat *netstat = nullptr;
@ -169,7 +169,7 @@ void parse_net_stat_arg(struct text_object *obj, const char *arg,
netstat = get_net_stat(nextarg, obj, free_at_crash);
#ifdef BUILD_IPV6
}
#endif /* BUILD_IPV6 */
#endif /* BUILD_IPV6 */
i += strlen(nextarg); // skip this arg
while (
!((isspace(static_cast<unsigned char>(arg[i])) != 0) || arg[i] == 0)) {

2
src/scroll.cc
View File

@ -52,7 +52,7 @@ inline int scroll_character_length(char c) {
return len;
}
#else /* BUILD_X11 */
#else /* BUILD_X11 */
(void)c;
#endif /* BUILD_X11 */

4
src/specials.cc
View File

@ -419,7 +419,7 @@ void new_gauge(struct text_object *obj, char *p, unsigned int p_max_size,
if (out_to_stdout.get(*state)) {
new_gauge_in_shell(obj, p, p_max_size, usage);
}
#else /* BUILD_X11 */
#else /* BUILD_X11 */
new_gauge_in_shell(obj, p, p_max_size, usage);
#endif /* BUILD_X11 */
}
@ -729,7 +729,7 @@ void new_bar(struct text_object *obj, char *p, unsigned int p_max_size,
if (out_to_stdout.get(*state)) {
new_bar_in_shell(obj, p, p_max_size, usage);
}
#else /* BUILD_X11 */
#else /* BUILD_X11 */
new_bar_in_shell(obj, p, p_max_size, usage);
#endif /* BUILD_X11 */
}

4
src/top.cc
View File

@ -587,7 +587,7 @@ int parse_top_args(const char *s, const char *arg, struct text_object *obj) {
} else {
#ifdef BUILD_IOSTATS
NORM_ERR("Must be top, top_mem, top_time or top_io");
#else /* BUILD_IOSTATS */
#else /* BUILD_IOSTATS */
NORM_ERR("Must be top, top_mem or top_time");
#endif /* BUILD_IOSTATS */
free_and_zero(obj->data.opaque);
@ -629,7 +629,7 @@ int parse_top_args(const char *s, const char *arg, struct text_object *obj) {
NORM_ERR(
"must be one of: name, cpu, pid, mem, time, mem_res, mem_vsize, "
"io_read, io_write, io_perc");
#else /* BUILD_IOSTATS */
#else /* BUILD_IOSTATS */
NORM_ERR("must be one of: name, cpu, pid, mem, time, mem_res, mem_vsize");
#endif /* BUILD_IOSTATS */
free_and_zero(td->s);

8
src/update-cb.hh
View File

@ -42,7 +42,7 @@ template <typename Callback>
class callback_handle;
void run_all_callbacks();
template <typename Callback, typename... Params>
callback_handle<Callback> register_cb(uint32_t period, Params &&... params);
callback_handle<Callback> register_cb(uint32_t period, Params &&...params);
namespace priv {
class callback_base {
@ -88,7 +88,7 @@ class callback_base {
template <typename Callback, typename... Params>
friend callback_handle<Callback> conky::register_cb(uint32_t period,
Params &&... params);
Params &&...params);
friend void conky::run_all_callbacks();
@ -140,11 +140,11 @@ class callback_handle : private std::shared_ptr<Callback> {
friend void conky::run_all_callbacks();
template <typename Callback_, typename... Params>
friend callback_handle<Callback_> register_cb(uint32_t period,
Params &&... params);
Params &&...params);
};
template <typename Callback, typename... Params>
callback_handle<Callback> register_cb(uint32_t period, Params &&... params) {
callback_handle<Callback> register_cb(uint32_t period, Params &&...params) {
return std::dynamic_pointer_cast<Callback>(
priv::callback_base::do_register_cb(priv::callback_base::handle(
new Callback(period, std::forward<Params>(params)...))));

4
tests/catch2/catch.hpp
View File

@ -5649,7 +5649,7 @@ bool isDebuggerActive();
// raise() called from it, i.e. one stack frame below.
#if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
#define CATCH_TRAP() asm volatile("int $3") /* NOLINT */
#else // Fall back to the generic way.
#else // Fall back to the generic way.
#include <signal.h>
#define CATCH_TRAP() raise(SIGTRAP)
@ -6610,7 +6610,7 @@ class TokenStream {
return m_tokenBuffer.front();
}
auto operator-> () const -> Token const* {
auto operator->() const -> Token const* {
assert(!m_tokenBuffer.empty());
return &m_tokenBuffer.front();
}

4
tests/test-hsv.cc
View File

@ -28,11 +28,10 @@
#include "catch2/catch.hpp"
#include <hsv_gradient.h>
#include <conky.h>
#include <hsv_gradient.h>
#include <lua-config.hh>
int testColor(long *rgb, int scale) {
long hsv[3];
long rgb1[3];
@ -69,6 +68,5 @@ TEST_CASE("hsv gradient tests") {
}
}
REQUIRE(failedCount == 0);
}
}