devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-27 08:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Move some variables from int to guint in statusbar.c

Browse Source
This commit is contained in:
Michael Vetter
2026-02-20 11:34:26 +01:00
parent 1120170ef7
commit 8970b5e61b
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ui/statusbar.c
View File

@@ -71,7 +71,7 @@ typedef struct _status_bar_t
char* prompt; char* prompt;
char* fulljid; char* fulljid;
GHashTable* tabs; GHashTable* tabs;
int current_tab; guint current_tab;
} StatusBar; } StatusBar;
static GTimeZone* tz; static GTimeZone* tz;
@@ -82,11 +82,11 @@ void _get_range_bounds(int* start, int* end, gboolean is_static);
static int _status_bar_draw_time(int pos); static int _status_bar_draw_time(int pos);
static int _status_bar_draw_maintext(int pos); static int _status_bar_draw_maintext(int pos);
static int _status_bar_draw_bracket(gboolean current, int pos, const char* ch); static int _status_bar_draw_bracket(gboolean current, int pos, const char* ch);
static int _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end, gboolean is_static); static int _status_bar_draw_extended_tabs(int pos, gboolean prefix, guint start, guint end, gboolean is_static);
static int _status_bar_draw_tab(StatusBarTab* tab, int pos, int num, gboolean include_brackets); static int _status_bar_draw_tab(StatusBarTab* tab, guint pos, guint num, gboolean include_brackets);
static int _status_bar_draw_tabs(int pos); static int _status_bar_draw_tabs(int pos);
static void _destroy_tab(StatusBarTab* tab); static void _destroy_tab(StatusBarTab* tab);
static int _tabs_width(int start, int end); static int _tabs_width(guint start, guint end);
static unsigned int _count_digits(int number); static unsigned int _count_digits(int number);
static unsigned int _count_digits_in_range(int start, int end); static unsigned int _count_digits_in_range(int start, int end);
static char* _display_name(StatusBarTab* tab); static char* _display_name(StatusBarTab* tab);
@@ -161,7 +161,7 @@ status_bar_set_all_inactive(void)
} }
void void
status_bar_current(int i) status_bar_current(guint i)
{ {
if (i == 0) { if (i == 0) {
statusbar->current_tab = 10; statusbar->current_tab = 10;
@@ -288,7 +288,7 @@ status_bar_draw(void)
werase(statusbar_win); werase(statusbar_win);
wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT)); wbkgd(statusbar_win, theme_attrs(THEME_STATUS_TEXT));
gint max_tabs = prefs_get_statusbartabs(); guint max_tabs = prefs_get_statusbartabs();
int pos = 1; int pos = 1;
pos = _status_bar_draw_time(pos); pos = _status_bar_draw_time(pos);
@@ -365,9 +365,9 @@ _status_bar_draw_tabs(int pos)
static gboolean static gboolean
_has_new_msgs_beyond_range_on_side(gboolean left_side, int display_tabs_start, int display_tabs_end) _has_new_msgs_beyond_range_on_side(gboolean left_side, int display_tabs_start, int display_tabs_end)
{ {
gint max_tabs = prefs_get_statusbartabs(); guint max_tabs = prefs_get_statusbartabs();
int tabs_count = g_hash_table_size(statusbar->tabs); int tabs_count = g_hash_table_size(statusbar->tabs);
if (tabs_count <= max_tabs) { if ((guint)tabs_count <= max_tabs) {
return FALSE; return FALSE;
} }
@@ -385,9 +385,9 @@ _has_new_msgs_beyond_range_on_side(gboolean left_side, int display_tabs_start, i
} }
static int static int
_status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end, gboolean is_static) _status_bar_draw_extended_tabs(int pos, gboolean prefix, guint start, guint end, gboolean is_static)
{ {
gint max_tabs = prefs_get_statusbartabs(); guint max_tabs = prefs_get_statusbartabs();
if (max_tabs == 0) { if (max_tabs == 0) {
return pos; return pos;
} }
@@ -427,7 +427,7 @@ _status_bar_draw_extended_tabs(int pos, gboolean prefix, int start, int end, gbo
} }
static int static int
_status_bar_draw_tab(StatusBarTab* tab, int pos, int num, gboolean include_brackets) _status_bar_draw_tab(StatusBarTab* tab, guint pos, guint num, gboolean include_brackets)
{ {
gboolean is_current = num == statusbar->current_tab; gboolean is_current = num == statusbar->current_tab;
@@ -598,19 +598,19 @@ _destroy_tab(StatusBarTab* tab)
} }
static int static int
_tabs_width(int start, int end) _tabs_width(guint start, guint end)
{ {
gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER); gboolean show_number = prefs_get_boolean(PREF_STATUSBAR_SHOW_NUMBER);
gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME); gboolean show_name = prefs_get_boolean(PREF_STATUSBAR_SHOW_NAME);
gboolean show_read = prefs_get_boolean(PREF_STATUSBAR_SHOW_READ); gboolean show_read = prefs_get_boolean(PREF_STATUSBAR_SHOW_READ);
gint max_tabs = prefs_get_statusbartabs(); guint max_tabs = prefs_get_statusbartabs();
guint opened_tabs = g_hash_table_size(statusbar->tabs); guint opened_tabs = g_hash_table_size(statusbar->tabs);
int width = start < 2 ? 1 : 4; int width = start < 2 ? 1 : 4;
width += end > opened_tabs - 1 ? 0 : 3; width += end > opened_tabs - 1 ? 0 : 3;
if (show_name && show_number) { if (show_name && show_number) {
for (int i = start; i <= end; i++) { for (guint i = start; i <= end; i++) {
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i)); StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) { if (tab) {
gboolean is_current = i == statusbar->current_tab; gboolean is_current = i == statusbar->current_tab;
@@ -627,7 +627,7 @@ _tabs_width(int start, int end)
} }
if (show_name && !show_number) { if (show_name && !show_number) {
for (int i = start; i <= end; i++) { for (guint i = start; i <= end; i++) {
StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i)); StatusBarTab* tab = g_hash_table_lookup(statusbar->tabs, GINT_TO_POINTER(i));
if (tab) { if (tab) {
gboolean is_current = i == statusbar->current_tab; gboolean is_current = i == statusbar->current_tab;

2
src/ui/statusbar.h
View File

@@ -44,6 +44,6 @@ void status_bar_set_prompt(const char* const prompt);
void status_bar_clear_prompt(void); void status_bar_clear_prompt(void);
void status_bar_set_fulljid(const char* const fulljid); void status_bar_set_fulljid(const char* const fulljid);
void status_bar_clear_fulljid(void); void status_bar_clear_fulljid(void);
void status_bar_current(int i); void status_bar_current(guint i);
#endif #endif