devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Revert "Apply coding style"

Browse Source 
This reverts commit 9b55f2dec0.

Sorting the includes creates some problems.
This commit is contained in:
Michael Vetter
2020-07-07 13:53:30 +02:00
parent 28fde3cd01
commit a4cadf78fa
214 changed files with 17576 additions and 19566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/ui/inputwin.c
View File

@@ -36,17 +36,17 @@
#define _XOPEN_SOURCE_EXTENDED
#include "config.h"
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <sys/select.h>
#include <stdlib.h>
#include <string.h>
#include <sys/select.h>
#include <sys/time.h>
#include <wchar.h>
#include <sys/time.h>
#include <errno.h>
#include <pthread.h>
#include <readline/history.h>
#include <readline/readline.h>
#include <readline/history.h>
#ifdef HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
@@ -54,26 +54,26 @@
#include <ncurses.h>
#endif
#include "command/cmd_ac.h"
#include "profanity.h"
#include "log.h"
#include "common.h"
#include "config/accounts.h"
#include "command/cmd_ac.h"
#include "config/files.h"
#include "config/accounts.h"
#include "config/preferences.h"
#include "config/theme.h"
#include "log.h"
#include "profanity.h"
#include "ui/inputwin.h"
#include "ui/ui.h"
#include "ui/screen.h"
#include "ui/statusbar.h"
#include "ui/ui.h"
#include "ui/inputwin.h"
#include "ui/window.h"
#include "ui/window_list.h"
#include "xmpp/chat_state.h"
#include "xmpp/xmpp.h"
#include "xmpp/muc.h"
#include "xmpp/roster_list.h"
#include "xmpp/xmpp.h"
#include "xmpp/chat_state.h"
static WINDOW* inp_win;
static WINDOW *inp_win;
static int pad_start = 0;
static struct timeval p_rl_timeout;
@@ -81,21 +81,21 @@ static struct timeval p_rl_timeout;
static gint inp_timeout = 0;
static gint no_input_count = 0;
static FILE* discard;
static FILE *discard;
static fd_set fds;
static int r;
static char* inp_line = NULL;
static char *inp_line = NULL;
static gboolean get_password = FALSE;
static void _inp_win_update_virtual(void);
static int _inp_edited(const wint_t ch);
static void _inp_win_handle_scroll(void);
static int _inp_offset_to_col(char* str, int offset);
static void _inp_write(char* line, int offset);
static int _inp_offset_to_col(char *str, int offset);
static void _inp_write(char *line, int offset);
static void _inp_rl_addfuncs(void);
static int _inp_rl_getc(FILE* stream);
static void _inp_rl_linehandler(char* line);
static int _inp_rl_getc(FILE *stream);
static void _inp_rl_linehandler(char *line);
static int _inp_rl_tab_handler(int count, int key);
static int _inp_rl_shift_tab_handler(int count, int key);
static int _inp_rl_win_clear_handler(int count, int key);
@@ -147,8 +147,7 @@ create_input_window(void)
rl_callback_handler_install(NULL, _inp_rl_linehandler);
inp_win = newpad(1, INP_WIN_MAX);
wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));
;
wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));;
keypad(inp_win, TRUE);
wmove(inp_win, 0, 0);
@@ -170,7 +169,7 @@ inp_readline(void)
pthread_mutex_lock(&lock);
if (r < 0) {
if (errno != EINTR) {
char* err_msg = strerror(errno);
char *err_msg = strerror(errno);
log_error("Readline failed: %s", err_msg);
}
return NULL;
@@ -179,7 +178,10 @@ inp_readline(void)
if (FD_ISSET(fileno(rl_instream), &fds)) {
rl_callback_read_char();
if (rl_line_buffer && rl_line_buffer[0] != '/' && rl_line_buffer[0] != '\0' && rl_line_buffer[0] != '\n') {
if (rl_line_buffer &&
rl_line_buffer[0] != '/' &&
rl_line_buffer[0] != '\0' &&
rl_line_buffer[0] != '\n') {
chat_state_activity();
}
@@ -196,7 +198,7 @@ inp_readline(void)
if (inp_line) {
if (!get_password && prefs_get_boolean(PREF_SLASH_GUARD)) {
if (strlen(inp_line) > 1) {
char* res = (char*)memchr(inp_line + 1, '/', 3);
char *res = (char*) memchr (inp_line+1, '/', 3);
if (res) {
cons_show("Your text contains a slash in the first 4 characters");
return NULL;
@@ -223,15 +225,14 @@ inp_win_resize(void)
}
}
wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));
;
wbkgd(inp_win, theme_attrs(THEME_INPUT_TEXT));;
_inp_win_update_virtual();
}
void
inp_nonblocking(gboolean reset)
{
if (!prefs_get_boolean(PREF_INPBLOCK_DYNAMIC)) {
if (! prefs_get_boolean(PREF_INPBLOCK_DYNAMIC)) {
inp_timeout = prefs_get_inpblock();
return;
}
@@ -268,7 +269,7 @@ inp_get_line(void)
wmove(inp_win, 0, 0);
_inp_win_update_virtual();
doupdate();
char* line = NULL;
char *line = NULL;
while (!line) {
line = inp_readline();
ui_update();
@@ -284,7 +285,7 @@ inp_get_password(void)
wmove(inp_win, 0, 0);
_inp_win_update_virtual();
doupdate();
char* password = NULL;
char *password = NULL;
get_password = TRUE;
while (!password) {
password = inp_readline();
@@ -306,11 +307,11 @@ _inp_win_update_virtual(void)
{
int wcols = getmaxx(stdscr);
int row = screen_inputwin_row();
pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols - 2);
pnoutrefresh(inp_win, 0, pad_start, row, 0, row, wcols-2);
}
static void
_inp_write(char* line, int offset)
_inp_write(char *line, int offset)
{
int col = _inp_offset_to_col(line, offset);
werase(inp_win);
@@ -345,7 +346,7 @@ _inp_edited(const wint_t ch)
}
// printable
char bytes[MB_CUR_MAX + 1];
char bytes[MB_CUR_MAX+1];
size_t utf_len = wcrtomb(bytes, ch, &mbstate);
if (utf_len == (size_t)-1) {
return 0;
@@ -357,7 +358,7 @@ _inp_edited(const wint_t ch)
}
static int
_inp_offset_to_col(char* str, int offset)
_inp_offset_to_col(char *str, int offset)
{
int i = 0;
int col = 0;
@@ -383,7 +384,7 @@ _inp_win_handle_scroll(void)
if (col == 0) {
pad_start = 0;
} else if (col >= pad_start + (wcols - 2)) {
} else if (col >= pad_start + (wcols -2)) {
pad_start = col - (wcols / 2);
if (pad_start < 0) {
pad_start = 0;
@@ -502,7 +503,7 @@ _inp_rl_startup_hook(void)
rl_variable_bind("disable-completion", "on");
// check for and load ~/.config/profanity/inputrc
gchar* inputrc = files_get_inputrc_file();
gchar *inputrc = files_get_inputrc_file();
if (inputrc) {
rl_read_init_file(inputrc);
g_free(inputrc);
@@ -512,7 +513,7 @@ _inp_rl_startup_hook(void)
}
static void
_inp_rl_linehandler(char* line)
_inp_rl_linehandler(char *line)
{
if (line && *line) {
if (!get_password) {
@@ -525,7 +526,7 @@ _inp_rl_linehandler(char* line)
static gboolean shift_tab = FALSE;
static int
_inp_rl_getc(FILE* stream)
_inp_rl_getc(FILE *stream)
{
int ch = rl_getc(stream);
@@ -544,7 +545,7 @@ _inp_rl_getc(FILE* stream)
shift_tab = FALSE;
if (_inp_edited(ch)) {
ProfWin* window = wins_get_current();
ProfWin *window = wins_get_current();
cmd_ac_reset(window);
}
return ch;
@@ -553,7 +554,7 @@ _inp_rl_getc(FILE* stream)
static int
_inp_rl_win_clear_handler(int count, int key)
{
ProfWin* win = wins_get_current();
ProfWin *win = wins_get_current();
win_clear(win);
return 0;
}
@@ -561,7 +562,7 @@ _inp_rl_win_clear_handler(int count, int key)
static int
_inp_rl_win_close_handler(int count, int key)
{
ProfWin* win = wins_get_current();
ProfWin *win = wins_get_current();
gchar* args = 0;
cmd_close(win, 0, &args);
return 0;
@@ -574,17 +575,17 @@ _inp_rl_tab_handler(int count, int key)
return 0;
}
ProfWin* current = wins_get_current();
ProfWin *current = wins_get_current();
if ((strncmp(rl_line_buffer, "/", 1) != 0) && (current->type == WIN_MUC)) {
char* result = muc_autocomplete(current, rl_line_buffer, FALSE);
char *result = muc_autocomplete(current, rl_line_buffer, FALSE);
if (result) {
rl_replace_line(result, 1);
rl_point = rl_end;
free(result);
}
} else if (strncmp(rl_line_buffer, "/", 1) == 0) {
ProfWin* window = wins_get_current();
char* result = cmd_ac_complete(window, rl_line_buffer, FALSE);
ProfWin *window = wins_get_current();
char *result = cmd_ac_complete(window, rl_line_buffer, FALSE);
if (result) {
rl_replace_line(result, 1);
rl_point = rl_end;
@@ -602,17 +603,17 @@ _inp_rl_shift_tab_handler(int count, int key)
return 0;
}
ProfWin* current = wins_get_current();
ProfWin *current = wins_get_current();
if ((strncmp(rl_line_buffer, "/", 1) != 0) && (current->type == WIN_MUC)) {
char* result = muc_autocomplete(current, rl_line_buffer, TRUE);
char *result = muc_autocomplete(current, rl_line_buffer, TRUE);
if (result) {
rl_replace_line(result, 1);
rl_point = rl_end;
free(result);
}
} else if (strncmp(rl_line_buffer, "/", 1) == 0) {
ProfWin* window = wins_get_current();
char* result = cmd_ac_complete(window, rl_line_buffer, TRUE);
ProfWin *window = wins_get_current();
char *result = cmd_ac_complete(window, rl_line_buffer, TRUE);
if (result) {
rl_replace_line(result, 1);
rl_point = rl_end;
@@ -626,7 +627,7 @@ _inp_rl_shift_tab_handler(int count, int key)
static void
_go_to_win(int i)
{
ProfWin* window = wins_get_by_num(i);
ProfWin *window = wins_get_by_num(i);
if (window) {
ui_focus_win(window);
}
@@ -775,7 +776,7 @@ _inp_rl_win_20_handler(int count, int key)
static int
_inp_rl_win_prev_handler(int count, int key)
{
ProfWin* window = wins_get_previous();
ProfWin *window = wins_get_previous();
if (window) {
ui_focus_win(window);
}
@@ -785,7 +786,7 @@ _inp_rl_win_prev_handler(int count, int key)
static int
_inp_rl_win_next_handler(int count, int key)
{
ProfWin* window = wins_get_next();
ProfWin *window = wins_get_next();
if (window) {
ui_focus_win(window);
}
@@ -795,7 +796,7 @@ _inp_rl_win_next_handler(int count, int key)
static int
_inp_rl_win_next_unread_handler(int count, int key)
{
ProfWin* window = wins_get_next_unread();
ProfWin *window = wins_get_next_unread();
if (window) {
ui_focus_win(window);
}
@@ -805,7 +806,7 @@ _inp_rl_win_next_unread_handler(int count, int key)
static int
_inp_rl_win_pageup_handler(int count, int key)
{
ProfWin* current = wins_get_current();
ProfWin *current = wins_get_current();
win_page_up(current);
return 0;
}
@@ -813,7 +814,7 @@ _inp_rl_win_pageup_handler(int count, int key)
static int
_inp_rl_win_pagedown_handler(int count, int key)
{
ProfWin* current = wins_get_current();
ProfWin *current = wins_get_current();
win_page_down(current);
return 0;
}
@@ -821,7 +822,7 @@ _inp_rl_win_pagedown_handler(int count, int key)
static int
_inp_rl_subwin_pageup_handler(int count, int key)
{
ProfWin* current = wins_get_current();
ProfWin *current = wins_get_current();
win_sub_page_up(current);
return 0;
}
@@ -829,7 +830,7 @@ _inp_rl_subwin_pageup_handler(int count, int key)
static int
_inp_rl_subwin_pagedown_handler(int count, int key)
{
ProfWin* current = wins_get_current();
ProfWin *current = wins_get_current();
win_sub_page_down(current);
return 0;
}