pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

core: fix code style (issue #1503)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-03-26 16:41:03 +02:00
parent a508640fa0
commit ec671fe447
3 changed files with 71 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-utf8.c
+8 -7
View File
@@ -279,16 +279,16 @@ utf8_next_char (const char *string)
const char *
utf8_beginning_of_line (const char *string_start, const char *string)
{
if (string && string[0] == '\n')
string = (char *)utf8_prev_char (string_start, string);
if (string && (string[0] == '\n'))
string = utf8_prev_char (string_start, string);
while (string && string[0] != '\n')
while (string && (string[0] != '\n'))
{
string = (char *)utf8_prev_char (string_start, string);
string = utf8_prev_char (string_start, string);
}
if (string)
return (char *)utf8_next_char (string);
return utf8_next_char (string);
return string_start;
}
@@ -305,10 +305,11 @@ utf8_end_of_line (const char *string)
if (!string)
return NULL;
while (string[0] && string[0] != '\n')
while (string[0] && (string[0] != '\n'))
{
string = (char *)utf8_next_char (string);
string = utf8_next_char (string);
}
return string;
}
src/gui/gui-input.c
+61 -55
View File
@@ -932,7 +932,8 @@ gui_input_delete_beginning_of_line (struct t_gui_buffer *buffer)
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
beginning_of_line = (char *)utf8_beginning_of_line (buffer->input_buffer, start);
beginning_of_line = (char *)utf8_beginning_of_line (buffer->input_buffer,
start);
if (beginning_of_line == start)
{
beginning_of_line = (char *)utf8_prev_char (buffer->input_buffer,
@@ -947,14 +948,14 @@ gui_input_delete_beginning_of_line (struct t_gui_buffer *buffer)
memmove (beginning_of_line, start, strlen (start));
if (gui_input_optimize_size (
buffer,
buffer->input_buffer_size - size_deleted,
buffer->input_buffer_length - length_deleted))
if (gui_input_optimize_size (buffer,
buffer->input_buffer_size - size_deleted,
buffer->input_buffer_length - length_deleted))
{
buffer->input_buffer[buffer->input_buffer_size] = '\0';
buffer->input_buffer_pos = utf8_pos (buffer->input_buffer,
beginning_of_line - buffer->input_buffer);
buffer->input_buffer_pos = utf8_pos (
buffer->input_buffer,
beginning_of_line - buffer->input_buffer);
}
gui_input_text_changed_modifier_and_signal (buffer,
1, /* save undo */
@@ -980,7 +981,7 @@ gui_input_delete_end_of_line (struct t_gui_buffer *buffer)
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
if (start[0] && start[0] == '\n')
if (start[0] && (start[0] == '\n'))
end_of_line = (char *)utf8_next_char (start);
else
end_of_line = start;
@@ -992,10 +993,9 @@ gui_input_delete_end_of_line (struct t_gui_buffer *buffer)
memmove (start, end_of_line, strlen (end_of_line));
if (gui_input_optimize_size (
buffer,
buffer->input_buffer_size - size_deleted,
buffer->input_buffer_length - length_deleted))
if (gui_input_optimize_size (buffer,
buffer->input_buffer_size - size_deleted,
buffer->input_buffer_length - length_deleted))
{
buffer->input_buffer[buffer->input_buffer_size] = '\0';
buffer->input_buffer_pos = utf8_pos (buffer->input_buffer,
@@ -1087,7 +1087,8 @@ gui_input_delete_line (struct t_gui_buffer *buffer)
start = (char *)utf8_add_offset (buffer->input_buffer,
buffer->input_buffer_pos);
beginning_of_line = (char *)utf8_beginning_of_line (buffer->input_buffer, start);
beginning_of_line = (char *)utf8_beginning_of_line (buffer->input_buffer,
start);
end_of_line = (char *)utf8_end_of_line (start);
size_deleted = end_of_line - beginning_of_line;
@@ -1095,14 +1096,14 @@ gui_input_delete_line (struct t_gui_buffer *buffer)
memmove (beginning_of_line, end_of_line, strlen (end_of_line));
if (gui_input_optimize_size (
buffer,
buffer->input_buffer_size - size_deleted,
buffer->input_buffer_length - length_deleted))
if (gui_input_optimize_size (buffer,
buffer->input_buffer_size - size_deleted,
buffer->input_buffer_length - length_deleted))
{
buffer->input_buffer[buffer->input_buffer_size] = '\0';
buffer->input_buffer_pos = utf8_pos (buffer->input_buffer,
beginning_of_line - buffer->input_buffer);
buffer->input_buffer_pos = utf8_pos (
buffer->input_buffer,
beginning_of_line - buffer->input_buffer);
}
gui_input_text_changed_modifier_and_signal (buffer,
@@ -1170,37 +1171,6 @@ gui_input_transpose_chars (struct t_gui_buffer *buffer)
1); /* stop completion */
}
/*
* Moves cursor to beginning of input (default key: shift-home).
*/
void
gui_input_move_beginning_of_input (struct t_gui_buffer *buffer)
{
if (!buffer->input || (buffer->input_buffer_pos <= 0))
return;
buffer->input_buffer_pos = 0;
gui_input_text_cursor_moved_signal (buffer);
}
/*
* Moves cursor to end of input (default key: shift-end).
*/
void
gui_input_move_end_of_input (struct t_gui_buffer *buffer)
{
if (!buffer->input
|| (buffer->input_buffer_pos >= buffer->input_buffer_length))
{
return;
}
buffer->input_buffer_pos = buffer->input_buffer_length;
gui_input_text_cursor_moved_signal (buffer);
}
/*
* Moves cursor to beginning of line (default key: home).
*
@@ -1258,16 +1228,48 @@ gui_input_move_end_of_line (struct t_gui_buffer *buffer)
pos = (char *)utf8_end_of_line (pos);
if (pos[0])
{
buffer->input_buffer_pos =
utf8_pos (buffer->input_buffer,
pos - buffer->input_buffer);
buffer->input_buffer_pos = utf8_pos (buffer->input_buffer,
pos - buffer->input_buffer);
}
else
{
buffer->input_buffer_pos = buffer->input_buffer_length;
}
gui_input_text_cursor_moved_signal (buffer);
}
/*
* Moves cursor to beginning of input (default key: shift-home).
*/
void
gui_input_move_beginning_of_input (struct t_gui_buffer *buffer)
{
if (!buffer->input || (buffer->input_buffer_pos <= 0))
return;
buffer->input_buffer_pos = 0;
gui_input_text_cursor_moved_signal (buffer);
}
/*
* Moves cursor to end of input (default key: shift-end).
*/
void
gui_input_move_end_of_input (struct t_gui_buffer *buffer)
{
if (!buffer->input
|| (buffer->input_buffer_pos >= buffer->input_buffer_length))
{
return;
}
buffer->input_buffer_pos = buffer->input_buffer_length;
gui_input_text_cursor_moved_signal (buffer);
}
/*
* Moves cursor to previous char (default key: left).
*/
@@ -1406,7 +1408,9 @@ gui_input_move_previous_line (struct t_gui_buffer *buffer)
pos = (char *)utf8_prev_char (buffer->input_buffer, pos);
pos = (char *)utf8_beginning_of_line (buffer->input_buffer, pos);
for (i = 0; pos[0] && pos[0] != '\n' && i < length_from_beginning; i++)
for (i = 0;
pos[0] && (pos[0] != '\n') && (i < length_from_beginning);
i++)
{
pos = (char *)utf8_next_char (pos);
}
@@ -1447,7 +1451,9 @@ gui_input_move_next_line (struct t_gui_buffer *buffer)
{
pos = (char *)utf8_next_char (pos);
for (i = 0; pos[0] && pos[0] != '\n' && i < length_from_beginning; i++)
for (i = 0;
pos[0] && (pos[0] != '\n') && (i < length_from_beginning);
i++)
{
pos = (char *)utf8_next_char (pos);
}
src/gui/gui-input.h
+2 -2
View File
@@ -63,10 +63,10 @@ extern void gui_input_delete_end_of_input (struct t_gui_buffer *buffer);
extern void gui_input_delete_line (struct t_gui_buffer *buffer);
extern void gui_input_delete_input (struct t_gui_buffer *buffer);
extern void gui_input_transpose_chars (struct t_gui_buffer *buffer);
extern void gui_input_move_beginning_of_input (struct t_gui_buffer *buffer);
extern void gui_input_move_end_of_input (struct t_gui_buffer *buffer);
extern void gui_input_move_beginning_of_line (struct t_gui_buffer *buffer);
extern void gui_input_move_end_of_line (struct t_gui_buffer *buffer);
extern void gui_input_move_beginning_of_input (struct t_gui_buffer *buffer);
extern void gui_input_move_end_of_input (struct t_gui_buffer *buffer);
extern void gui_input_move_previous_char (struct t_gui_buffer *buffer);
extern void gui_input_move_next_char (struct t_gui_buffer *buffer);
extern void gui_input_move_previous_word (struct t_gui_buffer *buffer);