summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2011-04-13 20:25:26 +0200
committerSebastien Helleu <flashcode@flashtux.org>2011-04-13 20:25:26 +0200
commit7673a700b38581e5ccdb37cd18976728aebbabcf (patch)
tree05b7b000082b92fa0b35ce1117932b853d91dd28 /src/gui
parent7d7eeceb8920a57d4efe9e270c786804fc673d4f (diff)
downloadweechat-7673a700b38581e5ccdb37cd18976728aebbabcf.zip
core: use buffer pointer instead of window in input functions, add new function window_search_with_buffer in plugin API
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui-input.c664
-rw-r--r--src/gui/gui-input.h75
-rw-r--r--src/gui/gui-window.c36
-rw-r--r--src/gui/gui-window.h1
4 files changed, 424 insertions, 352 deletions
diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c
index 8662a8218..2a3326468 100644
--- a/src/gui/gui-input.c
+++ b/src/gui/gui-input.c
@@ -317,16 +317,16 @@ gui_input_clipboard_copy (const char *buffer, int size)
*/
void
-gui_input_clipboard_paste (struct t_gui_window *window)
+gui_input_clipboard_paste (struct t_gui_buffer *buffer)
{
- if (window->buffer->input && gui_input_clipboard)
+ if (buffer->input && gui_input_clipboard)
{
- gui_buffer_undo_snap (window->buffer);
- gui_input_insert_string (window->buffer,
+ gui_buffer_undo_snap (buffer);
+ gui_input_insert_string (buffer,
gui_input_clipboard, -1);
- gui_completion_stop (window->buffer->completion, 1);
+ gui_completion_stop (buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -335,11 +335,13 @@ gui_input_clipboard_paste (struct t_gui_window *window)
*/
void
-gui_input_return (struct t_gui_window *window)
+gui_input_return (struct t_gui_buffer *buffer)
{
+ struct t_gui_window *window;
char *command;
- if (window->buffer->input)
+ window = gui_window_search_with_buffer (buffer);
+ if (window && window->buffer->input)
{
if (window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
{
@@ -377,76 +379,76 @@ gui_input_return (struct t_gui_window *window)
*/
void
-gui_input_complete (struct t_gui_window *window)
+gui_input_complete (struct t_gui_buffer *buffer)
{
int i;
- if (!window->buffer->completion)
+ if (!buffer->completion)
return;
- if (window->buffer->completion->word_found)
+ if (buffer->completion->word_found)
{
/* replace word with new completed word into input buffer */
- if (window->buffer->completion->diff_size > 0)
+ if (buffer->completion->diff_size > 0)
{
- window->buffer->input_buffer_size +=
- window->buffer->completion->diff_size;
- window->buffer->input_buffer_length +=
- window->buffer->completion->diff_length;
- gui_input_optimize_size (window->buffer);
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
- for (i = window->buffer->input_buffer_size - 1;
- i >= window->buffer->completion->position_replace +
- (int)strlen (window->buffer->completion->word_found); i--)
+ buffer->input_buffer_size +=
+ buffer->completion->diff_size;
+ buffer->input_buffer_length +=
+ buffer->completion->diff_length;
+ gui_input_optimize_size (buffer);
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
+ for (i = buffer->input_buffer_size - 1;
+ i >= buffer->completion->position_replace +
+ (int)strlen (buffer->completion->word_found); i--)
{
- window->buffer->input_buffer[i] =
- window->buffer->input_buffer[i - window->buffer->completion->diff_size];
+ buffer->input_buffer[i] =
+ buffer->input_buffer[i - buffer->completion->diff_size];
}
}
else
{
- for (i = window->buffer->completion->position_replace +
- strlen (window->buffer->completion->word_found);
- i < window->buffer->input_buffer_size; i++)
+ for (i = buffer->completion->position_replace +
+ strlen (buffer->completion->word_found);
+ i < buffer->input_buffer_size; i++)
{
- window->buffer->input_buffer[i] =
- window->buffer->input_buffer[i - window->buffer->completion->diff_size];
+ buffer->input_buffer[i] =
+ buffer->input_buffer[i - buffer->completion->diff_size];
}
- window->buffer->input_buffer_size += window->buffer->completion->diff_size;
- window->buffer->input_buffer_length += window->buffer->completion->diff_length;
- gui_input_optimize_size (window->buffer);
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
+ buffer->input_buffer_size += buffer->completion->diff_size;
+ buffer->input_buffer_length += buffer->completion->diff_length;
+ gui_input_optimize_size (buffer);
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
}
-
- strncpy (window->buffer->input_buffer + window->buffer->completion->position_replace,
- window->buffer->completion->word_found,
- strlen (window->buffer->completion->word_found));
- window->buffer->input_buffer_pos =
- utf8_pos (window->buffer->input_buffer,
- window->buffer->completion->position_replace) +
- utf8_strlen (window->buffer->completion->word_found);
+
+ strncpy (buffer->input_buffer + buffer->completion->position_replace,
+ buffer->completion->word_found,
+ strlen (buffer->completion->word_found));
+ buffer->input_buffer_pos =
+ utf8_pos (buffer->input_buffer,
+ buffer->completion->position_replace) +
+ utf8_strlen (buffer->completion->word_found);
/*
* position is < 0 this means only one word was found to complete,
* so reinit to stop completion
*/
- if (window->buffer->completion->position >= 0)
- window->buffer->completion->position = utf8_real_pos (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
+ if (buffer->completion->position >= 0)
+ buffer->completion->position = utf8_real_pos (buffer->input_buffer,
+ buffer->input_buffer_pos);
/* add space if needed after completion */
- if (window->buffer->completion->add_space)
+ if (buffer->completion->add_space)
{
- if (window->buffer->input_buffer[utf8_real_pos (window->buffer->input_buffer,
- window->buffer->input_buffer_pos)] != ' ')
+ if (buffer->input_buffer[utf8_real_pos (buffer->input_buffer,
+ buffer->input_buffer_pos)] != ' ')
{
- gui_input_insert_string (window->buffer, " ",
- window->buffer->input_buffer_pos);
+ gui_input_insert_string (buffer, " ",
+ buffer->input_buffer_pos);
}
else
- window->buffer->input_buffer_pos++;
- if (window->buffer->completion->position >= 0)
- window->buffer->completion->position++;
+ buffer->input_buffer_pos++;
+ if (buffer->completion->position >= 0)
+ buffer->completion->position++;
}
}
}
@@ -456,20 +458,20 @@ gui_input_complete (struct t_gui_window *window)
*/
void
-gui_input_complete_next (struct t_gui_window *window)
+gui_input_complete_next (struct t_gui_buffer *buffer)
{
- if (window->buffer->input
- && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
+ if (buffer->input
+ && (buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
{
- gui_buffer_undo_snap (window->buffer);
- gui_completion_search (window->buffer->completion,
+ gui_buffer_undo_snap (buffer);
+ gui_completion_search (buffer->completion,
1,
- window->buffer->input_buffer,
- window->buffer->input_buffer_size,
- utf8_real_pos (window->buffer->input_buffer,
- window->buffer->input_buffer_pos));
- gui_input_complete (window);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer,
+ buffer->input_buffer_size,
+ utf8_real_pos (buffer->input_buffer,
+ buffer->input_buffer_pos));
+ gui_input_complete (buffer);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -478,20 +480,20 @@ gui_input_complete_next (struct t_gui_window *window)
*/
void
-gui_input_complete_previous (struct t_gui_window *window)
+gui_input_complete_previous (struct t_gui_buffer *buffer)
{
- if (window->buffer->input
- && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
+ if (buffer->input
+ && (buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
{
- gui_buffer_undo_snap (window->buffer);
- gui_completion_search (window->buffer->completion,
+ gui_buffer_undo_snap (buffer);
+ gui_completion_search (buffer->completion,
-1,
- window->buffer->input_buffer,
- window->buffer->input_buffer_size,
- utf8_real_pos (window->buffer->input_buffer,
- window->buffer->input_buffer_pos));
- gui_input_complete (window);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer,
+ buffer->input_buffer_size,
+ utf8_real_pos (buffer->input_buffer,
+ buffer->input_buffer_pos));
+ gui_input_complete (buffer);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -500,9 +502,12 @@ gui_input_complete_previous (struct t_gui_window *window)
*/
void
-gui_input_search_text (struct t_gui_window *window)
+gui_input_search_text (struct t_gui_buffer *buffer)
{
- if (window->buffer->type == GUI_BUFFER_TYPE_FORMATTED)
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window && (window->buffer->type == GUI_BUFFER_TYPE_FORMATTED))
{
/* toggle search */
if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
@@ -521,27 +526,27 @@ gui_input_search_text (struct t_gui_window *window)
*/
void
-gui_input_delete_previous_char (struct t_gui_window *window)
+gui_input_delete_previous_char (struct t_gui_buffer *buffer)
{
char *pos, *pos_last;
int char_size, size_to_move;
- if (window->buffer->input && (window->buffer->input_buffer_pos > 0))
+ if (buffer->input && (buffer->input_buffer_pos > 0))
{
- gui_buffer_undo_snap (window->buffer);
- pos = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
- pos_last = utf8_prev_char (window->buffer->input_buffer, pos);
+ gui_buffer_undo_snap (buffer);
+ pos = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
+ pos_last = utf8_prev_char (buffer->input_buffer, pos);
char_size = pos - pos_last;
size_to_move = strlen (pos);
memmove (pos_last, pos, size_to_move);
- window->buffer->input_buffer_size -= char_size;
- window->buffer->input_buffer_length--;
- window->buffer->input_buffer_pos--;
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer_size -= char_size;
+ buffer->input_buffer_length--;
+ buffer->input_buffer_pos--;
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -550,27 +555,27 @@ gui_input_delete_previous_char (struct t_gui_window *window)
*/
void
-gui_input_delete_next_char (struct t_gui_window *window)
+gui_input_delete_next_char (struct t_gui_buffer *buffer)
{
char *pos, *pos_next;
int char_size, size_to_move;
- if (window->buffer->input
- && (window->buffer->input_buffer_pos < window->buffer->input_buffer_length))
+ if (buffer->input
+ && (buffer->input_buffer_pos < buffer->input_buffer_length))
{
- gui_buffer_undo_snap (window->buffer);
- pos = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
+ gui_buffer_undo_snap (buffer);
+ pos = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
pos_next = utf8_next_char (pos);
char_size = pos_next - pos;
size_to_move = strlen (pos_next);
memmove (pos, pos_next, size_to_move);
- window->buffer->input_buffer_size -= char_size;
- window->buffer->input_buffer_length--;
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer_size -= char_size;
+ buffer->input_buffer_length--;
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -579,32 +584,32 @@ gui_input_delete_next_char (struct t_gui_window *window)
*/
void
-gui_input_delete_previous_word (struct t_gui_window *window)
+gui_input_delete_previous_word (struct t_gui_buffer *buffer)
{
int length_deleted, size_deleted;
char *start, *string;
- if (window->buffer->input && (window->buffer->input_buffer_pos > 0))
+ if (buffer->input && (buffer->input_buffer_pos > 0))
{
- gui_buffer_undo_snap (window->buffer);
- start = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos - 1);
+ gui_buffer_undo_snap (buffer);
+ start = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos - 1);
string = start;
while (string && (string[0] == ' '))
{
- string = utf8_prev_char (window->buffer->input_buffer, string);
+ string = utf8_prev_char (buffer->input_buffer, string);
}
if (string)
{
while (string && (string[0] != ' '))
{
- string = utf8_prev_char (window->buffer->input_buffer, string);
+ string = utf8_prev_char (buffer->input_buffer, string);
}
if (string)
{
while (string && (string[0] == ' '))
{
- string = utf8_prev_char (window->buffer->input_buffer, string);
+ string = utf8_prev_char (buffer->input_buffer, string);
}
}
}
@@ -612,7 +617,7 @@ gui_input_delete_previous_word (struct t_gui_window *window)
if (string)
string = utf8_next_char (utf8_next_char (string));
else
- string = window->buffer->input_buffer;
+ string = buffer->input_buffer;
size_deleted = utf8_next_char (start) - string;
length_deleted = utf8_strnlen (string, size_deleted);
@@ -621,13 +626,13 @@ gui_input_delete_previous_word (struct t_gui_window *window)
memmove (string, string + size_deleted, strlen (string + size_deleted));
- window->buffer->input_buffer_size -= size_deleted;
- window->buffer->input_buffer_length -= length_deleted;
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
- window->buffer->input_buffer_pos -= length_deleted;
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer_size -= size_deleted;
+ buffer->input_buffer_length -= length_deleted;
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
+ buffer->input_buffer_pos -= length_deleted;
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -636,16 +641,16 @@ gui_input_delete_previous_word (struct t_gui_window *window)
*/
void
-gui_input_delete_next_word (struct t_gui_window *window)
+gui_input_delete_next_word (struct t_gui_buffer *buffer)
{
int size_deleted, length_deleted;
char *start, *string;
- if (window->buffer->input)
+ if (buffer->input)
{
- gui_buffer_undo_snap (window->buffer);
- start = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
+ gui_buffer_undo_snap (buffer);
+ start = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
string = start;
length_deleted = 0;
while (string[0])
@@ -661,12 +666,12 @@ gui_input_delete_next_word (struct t_gui_window *window)
memmove (start, string, strlen (string));
- window->buffer->input_buffer_size -= size_deleted;
- window->buffer->input_buffer_length -= length_deleted;
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer_size -= size_deleted;
+ buffer->input_buffer_length -= length_deleted;
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -677,30 +682,30 @@ gui_input_delete_next_word (struct t_gui_window *window)
*/
void
-gui_input_delete_beginning_of_line (struct t_gui_window *window)
+gui_input_delete_beginning_of_line (struct t_gui_buffer *buffer)
{
int length_deleted, size_deleted;
char *start;
- if (window->buffer->input && (window->buffer->input_buffer_pos > 0))
+ if (buffer->input && (buffer->input_buffer_pos > 0))
{
- gui_buffer_undo_snap (window->buffer);
- start = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
- size_deleted = start - window->buffer->input_buffer;
- length_deleted = utf8_strnlen (window->buffer->input_buffer, size_deleted);
- gui_input_clipboard_copy (window->buffer->input_buffer,
- start - window->buffer->input_buffer);
+ gui_buffer_undo_snap (buffer);
+ start = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
+ size_deleted = start - buffer->input_buffer;
+ length_deleted = utf8_strnlen (buffer->input_buffer, size_deleted);
+ gui_input_clipboard_copy (buffer->input_buffer,
+ start - buffer->input_buffer);
- memmove (window->buffer->input_buffer, start, strlen (start));
+ memmove (buffer->input_buffer, start, strlen (start));
- window->buffer->input_buffer_size -= size_deleted;
- window->buffer->input_buffer_length -= length_deleted;
- window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0';
- window->buffer->input_buffer_pos = 0;
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer_size -= size_deleted;
+ buffer->input_buffer_length -= length_deleted;
+ buffer->input_buffer[buffer->input_buffer_size] = '\0';
+ buffer->input_buffer_pos = 0;
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -710,24 +715,24 @@ gui_input_delete_beginning_of_line (struct t_gui_window *window)
*/
void
-gui_input_delete_end_of_line (struct t_gui_window *window)
+gui_input_delete_end_of_line (struct t_gui_buffer *buffer)
{
char *start;
int size_deleted;
- if (window->buffer->input)
+ if (buffer->input)
{
- gui_buffer_undo_snap (window->buffer);
- start = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
+ gui_buffer_undo_snap (buffer);
+ start = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
size_deleted = strlen (start);
gui_input_clipboard_copy (start, size_deleted);
start[0] = '\0';
- window->buffer->input_buffer_size = strlen (window->buffer->input_buffer);
- window->buffer->input_buffer_length = utf8_strlen (window->buffer->input_buffer);
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ buffer->input_buffer_size = strlen (buffer->input_buffer);
+ buffer->input_buffer_length = utf8_strlen (buffer->input_buffer);
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -736,18 +741,18 @@ gui_input_delete_end_of_line (struct t_gui_window *window)
*/
void
-gui_input_delete_line (struct t_gui_window *window)
+gui_input_delete_line (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input)
{
- gui_buffer_undo_snap (window->buffer);
- window->buffer->input_buffer[0] = '\0';
- window->buffer->input_buffer_size = 0;
- window->buffer->input_buffer_length = 0;
- window->buffer->input_buffer_pos = 0;
- gui_input_optimize_size (window->buffer);
- gui_completion_stop (window->buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ gui_buffer_undo_snap (buffer);
+ buffer->input_buffer[0] = '\0';
+ buffer->input_buffer_size = 0;
+ buffer->input_buffer_length = 0;
+ buffer->input_buffer_pos = 0;
+ gui_input_optimize_size (buffer);
+ gui_completion_stop (buffer->completion, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -757,22 +762,22 @@ gui_input_delete_line (struct t_gui_window *window)
*/
void
-gui_input_transpose_chars (struct t_gui_window *window)
+gui_input_transpose_chars (struct t_gui_buffer *buffer)
{
char *start, *prev_char, saved_char[5];
int size_prev_char, size_start_char;
- if (window->buffer->input && (window->buffer->input_buffer_pos > 0)
- && (window->buffer->input_buffer_length > 1))
+ if (buffer->input && (buffer->input_buffer_pos > 0)
+ && (buffer->input_buffer_length > 1))
{
- gui_buffer_undo_snap (window->buffer);
+ gui_buffer_undo_snap (buffer);
- if (window->buffer->input_buffer_pos == window->buffer->input_buffer_length)
- window->buffer->input_buffer_pos--;
+ if (buffer->input_buffer_pos == buffer->input_buffer_length)
+ buffer->input_buffer_pos--;
- start = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
- prev_char = utf8_prev_char (window->buffer->input_buffer, start);
+ start = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
+ prev_char = utf8_prev_char (buffer->input_buffer, start);
size_prev_char = start - prev_char;
size_start_char = utf8_char_size (start);
@@ -780,11 +785,11 @@ gui_input_transpose_chars (struct t_gui_window *window)
memcpy (prev_char, start, size_start_char);
memcpy (prev_char + size_start_char, saved_char, size_prev_char);
- window->buffer->input_buffer_pos++;
+ buffer->input_buffer_pos++;
- gui_completion_stop (window->buffer->completion, 1);
+ gui_completion_stop (buffer->completion, 1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
}
}
@@ -793,15 +798,12 @@ gui_input_transpose_chars (struct t_gui_window *window)
*/
void
-gui_input_move_beginning_of_line (struct t_gui_window *window)
+gui_input_move_beginning_of_line (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input && (buffer->input_buffer_pos > 0))
{
- if (window->buffer->input_buffer_pos > 0)
- {
- window->buffer->input_buffer_pos = 0;
- gui_input_text_cursor_moved_signal ();
- }
+ buffer->input_buffer_pos = 0;
+ gui_input_text_cursor_moved_signal ();
}
}
@@ -810,15 +812,13 @@ gui_input_move_beginning_of_line (struct t_gui_window *window)
*/
void
-gui_input_move_end_of_line (struct t_gui_window *window)
+gui_input_move_end_of_line (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input
+ && (buffer->input_buffer_pos < buffer->input_buffer_length))
{
- if (window->buffer->input_buffer_pos < window->buffer->input_buffer_length)
- {
- window->buffer->input_buffer_pos = window->buffer->input_buffer_length;
- gui_input_text_cursor_moved_signal ();
- }
+ buffer->input_buffer_pos = buffer->input_buffer_length;
+ gui_input_text_cursor_moved_signal ();
}
}
@@ -827,15 +827,12 @@ gui_input_move_end_of_line (struct t_gui_window *window)
*/
void
-gui_input_move_previous_char (struct t_gui_window *window)
+gui_input_move_previous_char (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input && (buffer->input_buffer_pos > 0))
{
- if (window->buffer->input_buffer_pos > 0)
- {
- window->buffer->input_buffer_pos--;
- gui_input_text_cursor_moved_signal ();
- }
+ buffer->input_buffer_pos--;
+ gui_input_text_cursor_moved_signal ();
}
}
@@ -844,15 +841,13 @@ gui_input_move_previous_char (struct t_gui_window *window)
*/
void
-gui_input_move_next_char (struct t_gui_window *window)
+gui_input_move_next_char (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input
+ && (buffer->input_buffer_pos < buffer->input_buffer_length))
{
- if (window->buffer->input_buffer_pos < window->buffer->input_buffer_length)
- {
- window->buffer->input_buffer_pos++;
- gui_input_text_cursor_moved_signal ();
- }
+ buffer->input_buffer_pos++;
+ gui_input_text_cursor_moved_signal ();
}
}
@@ -862,38 +857,36 @@ gui_input_move_next_char (struct t_gui_window *window)
*/
void
-gui_input_move_previous_word (struct t_gui_window *window)
+gui_input_move_previous_word (struct t_gui_buffer *buffer)
{
char *pos;
- if (window->buffer->input)
+ if (buffer->input
+ && (buffer->input_buffer_pos > 0))
{
- if (window->buffer->input_buffer_pos > 0)
+ pos = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos - 1);
+ while (pos && (pos[0] == ' '))
+ {
+ pos = utf8_prev_char (buffer->input_buffer, pos);
+ }
+ if (pos)
{
- pos = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos - 1);
- while (pos && (pos[0] == ' '))
+ while (pos && (pos[0] != ' '))
{
- pos = utf8_prev_char (window->buffer->input_buffer, pos);
+ pos = utf8_prev_char (buffer->input_buffer, pos);
}
if (pos)
- {
- while (pos && (pos[0] != ' '))
- {
- pos = utf8_prev_char (window->buffer->input_buffer, pos);
- }
- if (pos)
- pos = utf8_next_char (pos);
- else
- pos = window->buffer->input_buffer;
- window->buffer->input_buffer_pos = utf8_pos (window->buffer->input_buffer,
- pos - window->buffer->input_buffer);
- }
+ pos = utf8_next_char (pos);
else
- window->buffer->input_buffer_pos = 0;
-
- gui_input_text_cursor_moved_signal ();
+ pos = buffer->input_buffer;
+ buffer->input_buffer_pos = utf8_pos (buffer->input_buffer,
+ pos - buffer->input_buffer);
}
+ else
+ buffer->input_buffer_pos = 0;
+
+ gui_input_text_cursor_moved_signal ();
}
}
@@ -903,44 +896,42 @@ gui_input_move_previous_word (struct t_gui_window *window)
*/
void
-gui_input_move_next_word (struct t_gui_window *window)
+gui_input_move_next_word (struct t_gui_buffer *buffer)
{
char *pos;
- if (window->buffer->input)
+ if (buffer->input
+ && (buffer->input_buffer_pos < buffer->input_buffer_length))
{
- if (window->buffer->input_buffer_pos < window->buffer->input_buffer_length)
+ pos = utf8_add_offset (buffer->input_buffer,
+ buffer->input_buffer_pos);
+ while (pos[0] && (pos[0] == ' '))
{
- pos = utf8_add_offset (window->buffer->input_buffer,
- window->buffer->input_buffer_pos);
- while (pos[0] && (pos[0] == ' '))
+ pos = utf8_next_char (pos);
+ }
+ if (pos[0])
+ {
+ while (pos[0] && (pos[0] != ' '))
{
pos = utf8_next_char (pos);
}
if (pos[0])
{
- while (pos[0] && (pos[0] != ' '))
- {
- pos = utf8_next_char (pos);
- }
- if (pos[0])
- {
- window->buffer->input_buffer_pos =
- utf8_pos (window->buffer->input_buffer,
- pos - window->buffer->input_buffer);
- }
- else
- window->buffer->input_buffer_pos = window->buffer->input_buffer_length;
+ buffer->input_buffer_pos =
+ utf8_pos (buffer->input_buffer,
+ pos - buffer->input_buffer);
}
else
- {
- window->buffer->input_buffer_pos =
- utf8_pos (window->buffer->input_buffer,
- utf8_prev_char (window->buffer->input_buffer, pos) - window->buffer->input_buffer);
- }
-
- gui_input_text_cursor_moved_signal ();
+ buffer->input_buffer_pos = buffer->input_buffer_length;
}
+ else
+ {
+ buffer->input_buffer_pos =
+ utf8_pos (buffer->input_buffer,
+ utf8_prev_char (buffer->input_buffer, pos) - buffer->input_buffer);
+ }
+
+ gui_input_text_cursor_moved_signal ();
}
}
@@ -1094,11 +1085,17 @@ gui_input_history_next (struct t_gui_window *window,
*/
void
-gui_input_history_local_previous (struct t_gui_window *window)
+gui_input_history_local_previous (struct t_gui_buffer *buffer)
{
- gui_input_history_previous (window,
- window->buffer->history,
- &(window->buffer->ptr_history));
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window)
+ {
+ gui_input_history_previous (window,
+ window->buffer->history,
+ &(window->buffer->ptr_history));
+ }
}
/*
@@ -1107,11 +1104,17 @@ gui_input_history_local_previous (struct t_gui_window *window)
*/
void
-gui_input_history_local_next (struct t_gui_window *window)
+gui_input_history_local_next (struct t_gui_buffer *buffer)
{
- gui_input_history_next (window,
- window->buffer->history,
- &(window->buffer->ptr_history));
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window)
+ {
+ gui_input_history_next (window,
+ window->buffer->history,
+ &(window->buffer->ptr_history));
+ }
}
/*
@@ -1120,11 +1123,17 @@ gui_input_history_local_next (struct t_gui_window *window)
*/
void
-gui_input_history_global_previous (struct t_gui_window *window)
+gui_input_history_global_previous (struct t_gui_buffer *buffer)
{
- gui_input_history_previous (window,
- history_global,
- &history_global_ptr);
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window)
+ {
+ gui_input_history_previous (window,
+ history_global,
+ &history_global_ptr);
+ }
}
/*
@@ -1133,21 +1142,31 @@ gui_input_history_global_previous (struct t_gui_window *window)
*/
void
-gui_input_history_global_next (struct t_gui_window *window)
+gui_input_history_global_next (struct t_gui_buffer *buffer)
{
- gui_input_history_next (window,
- history_global,
- &history_global_ptr);
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window)
+ {
+ gui_input_history_next (window,
+ history_global,
+ &history_global_ptr);
+ }
}
/*
- * gui_input_jump_smart: jump to buffer with activity (default key: alt-A)
+ * gui_input_jump_smart: jump to buffer with activity (default key: alt-a)
*/
void
-gui_input_jump_smart (struct t_gui_window *window)
+gui_input_jump_smart (struct t_gui_buffer *buffer)
{
- if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window
+ && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
{
if (gui_hotlist)
{
@@ -1175,9 +1194,13 @@ gui_input_jump_smart (struct t_gui_window *window)
*/
void
-gui_input_jump_last_buffer (struct t_gui_window *window)
+gui_input_jump_last_buffer (struct t_gui_buffer *buffer)
{
- if ((window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window
+ && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
&& last_gui_buffer)
{
gui_buffer_switch_by_number (window, last_gui_buffer->number);
@@ -1191,12 +1214,15 @@ gui_input_jump_last_buffer (struct t_gui_window *window)
*/
void
-gui_input_jump_previously_visited_buffer (struct t_gui_window *window)
+gui_input_jump_previously_visited_buffer (struct t_gui_buffer *buffer)
{
+ struct t_gui_window *window;
int index;
struct t_gui_buffer_visited *ptr_buffer_visited;
- if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
+ window = gui_window_search_with_buffer (buffer);
+ if (window
+ && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
{
index = gui_buffer_visited_get_index_previous ();
if (index >= 0)
@@ -1223,12 +1249,15 @@ gui_input_jump_previously_visited_buffer (struct t_gui_window *window)
*/
void
-gui_input_jump_next_visited_buffer (struct t_gui_window *window)
+gui_input_jump_next_visited_buffer (struct t_gui_buffer *buffer)
{
+ struct t_gui_window *window;
int index;
struct t_gui_buffer_visited *ptr_buffer_visited;
- if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
+ window = gui_window_search_with_buffer (buffer);
+ if (window
+ && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
{
index = gui_buffer_visited_get_index_next ();
if (index >= 0)
@@ -1252,10 +1281,10 @@ gui_input_jump_next_visited_buffer (struct t_gui_window *window)
*/
void
-gui_input_hotlist_clear (struct t_gui_window *window)
+gui_input_hotlist_clear (struct t_gui_buffer *buffer)
{
gui_hotlist_clear ();
- gui_hotlist_initial_buffer = window->buffer;
+ gui_hotlist_initial_buffer = buffer;
}
/*
@@ -1264,9 +1293,9 @@ gui_input_hotlist_clear (struct t_gui_window *window)
*/
void
-gui_input_grab_key (struct t_gui_window *window)
+gui_input_grab_key (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input)
gui_keyboard_grab_init (0);
}
@@ -1276,9 +1305,9 @@ gui_input_grab_key (struct t_gui_window *window)
*/
void
-gui_input_grab_key_command (struct t_gui_window *window)
+gui_input_grab_key_command (struct t_gui_buffer *buffer)
{
- if (window->buffer->input)
+ if (buffer->input)
gui_keyboard_grab_init (1);
}
@@ -1288,9 +1317,13 @@ gui_input_grab_key_command (struct t_gui_window *window)
*/
void
-gui_input_scroll_unread (struct t_gui_window *window)
+gui_input_scroll_unread (struct t_gui_buffer *buffer)
{
- if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
+ struct t_gui_window *window;
+
+ window = gui_window_search_with_buffer (buffer);
+ if (window
+ && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
{
if (CONFIG_STRING(config_look_read_marker) &&
CONFIG_STRING(config_look_read_marker)[0] &&
@@ -1339,26 +1372,30 @@ gui_input_set_unread ()
*/
void
-gui_input_set_unread_current (struct t_gui_window *window)
+gui_input_set_unread_current (struct t_gui_buffer *buffer)
{
- gui_buffer_set_unread (window->buffer);
+ gui_buffer_set_unread (buffer);
}
/*
* gui_input_switch_active_buffer: switch active buffer to next buffer
* (when many buffers are merged)
+ * (default key: ctrl-x)
*/
void
-gui_input_switch_active_buffer (struct t_gui_window *window)
+gui_input_switch_active_buffer (struct t_gui_buffer *buffer)
{
struct t_gui_buffer *ptr_buffer;
+ struct t_gui_window *window;
- ptr_buffer = gui_buffer_get_next_active_buffer (window->buffer);
+ ptr_buffer = gui_buffer_get_next_active_buffer (buffer);
if (ptr_buffer)
{
gui_buffer_set_active_buffer (ptr_buffer);
- gui_window_switch_to_buffer (window, ptr_buffer, 1);
+ window = gui_window_search_with_buffer (buffer);
+ if (window)
+ gui_window_switch_to_buffer (window, ptr_buffer, 1);
}
}
@@ -1369,15 +1406,18 @@ gui_input_switch_active_buffer (struct t_gui_window *window)
*/
void
-gui_input_switch_active_buffer_previous (struct t_gui_window *window)
+gui_input_switch_active_buffer_previous (struct t_gui_buffer *buffer)
{
struct t_gui_buffer *ptr_buffer;
+ struct t_gui_window *window;
- ptr_buffer = gui_buffer_get_previous_active_buffer (window->buffer);
+ ptr_buffer = gui_buffer_get_previous_active_buffer (buffer);
if (ptr_buffer)
{
gui_buffer_set_active_buffer (ptr_buffer);
- gui_window_switch_to_buffer (window, ptr_buffer, 1);
+ window = gui_window_search_with_buffer (buffer);
+ if (window)
+ gui_window_switch_to_buffer (window, ptr_buffer, 1);
}
}
@@ -1387,16 +1427,16 @@ gui_input_switch_active_buffer_previous (struct t_gui_window *window)
*/
void
-gui_input_insert (struct t_gui_window *window, const char *args)
+gui_input_insert (struct t_gui_buffer *buffer, const char *args)
{
char *args2;
if (args)
{
- gui_buffer_undo_snap (window->buffer);
+ gui_buffer_undo_snap (buffer);
args2 = string_convert_hex_chars (args);
- gui_input_insert_string (window->buffer, (args2) ? args2 : args, -1);
- gui_input_text_changed_modifier_and_signal (window->buffer, 1);
+ gui_input_insert_string (buffer, (args2) ? args2 : args, -1);
+ gui_input_text_changed_modifier_and_signal (buffer, 1);
if (args2)
free (args2);
}
@@ -1422,28 +1462,28 @@ gui_input_undo_use (struct t_gui_buffer *buffer, struct t_gui_input_undo *undo)
*/
void
-gui_input_undo (struct t_gui_window *window)
+gui_input_undo (struct t_gui_buffer *buffer)
{
- if (window->buffer->ptr_input_undo)
+ if (buffer->ptr_input_undo)
{
/*
* if we are doing undo and that undo pointer is to the end of list
* (for example first time undo is used), then save current input
* content in undo list
*/
- if ((window->buffer->ptr_input_undo == window->buffer->last_input_undo)
- && (window->buffer->ptr_input_undo)->data
- && (strcmp (window->buffer->input_buffer, (window->buffer->ptr_input_undo)->data) != 0))
+ if ((buffer->ptr_input_undo == buffer->last_input_undo)
+ && (buffer->ptr_input_undo)->data
+ && (strcmp (buffer->input_buffer, (buffer->ptr_input_undo)->data) != 0))
{
- gui_buffer_undo_snap_free (window->buffer);
- gui_buffer_undo_add (window->buffer);
+ gui_buffer_undo_snap_free (buffer);
+ gui_buffer_undo_add (buffer);
}
- if (window->buffer->ptr_input_undo
- && (window->buffer->ptr_input_undo)->prev_undo)
+ if (buffer->ptr_input_undo
+ && (buffer->ptr_input_undo)->prev_undo)
{
- window->buffer->ptr_input_undo = (window->buffer->ptr_input_undo)->prev_undo;
- gui_input_undo_use (window->buffer, window->buffer->ptr_input_undo);
+ buffer->ptr_input_undo = (buffer->ptr_input_undo)->prev_undo;
+ gui_input_undo_use (buffer, buffer->ptr_input_undo);
}
}
}
@@ -1453,12 +1493,12 @@ gui_input_undo (struct t_gui_window *window)
*/
void
-gui_input_redo (struct t_gui_window *window)
+gui_input_redo (struct t_gui_buffer *buffer)
{
- if (window->buffer->ptr_input_undo
- && (window->buffer->ptr_input_undo)->next_undo)
+ if (buffer->ptr_input_undo
+ && (buffer->ptr_input_undo)->next_undo)
{
- window->buffer->ptr_input_undo = (window->buffer->ptr_input_undo)->next_undo;
- gui_input_undo_use (window->buffer, window->buffer->ptr_input_undo);
+ buffer->ptr_input_undo = (buffer->ptr_input_undo)->next_undo;
+ gui_input_undo_use (buffer, buffer->ptr_input_undo);
}
}
diff --git a/src/gui/gui-input.h b/src/gui/gui-input.h
index 43f2866cf..557180154 100644
--- a/src/gui/gui-input.h
+++ b/src/gui/gui-input.h
@@ -21,7 +21,6 @@
#define __WEECHAT_GUI_INPUT_H 1
struct t_gui_buffer;
-struct t_gui_window;
/* input variables */
@@ -39,43 +38,43 @@ extern int gui_input_insert_string (struct t_gui_buffer *buffer,
const char *string, int pos);
extern void gui_input_move_to_buffer (struct t_gui_buffer *from_buffer,
struct t_gui_buffer *to_buffer);
-extern void gui_input_clipboard_paste (struct t_gui_window *window);
-extern void gui_input_return (struct t_gui_window *window);
-extern void gui_input_complete_next (struct t_gui_window *window);
-extern void gui_input_complete_previous (struct t_gui_window *window);
-extern void gui_input_search_text (struct t_gui_window *window);
-extern void gui_input_delete_previous_char (struct t_gui_window *window);
-extern void gui_input_delete_next_char (struct t_gui_window *window);
-extern void gui_input_delete_previous_word (struct t_gui_window *window);
-extern void gui_input_delete_next_word (struct t_gui_window *window);
-extern void gui_input_delete_beginning_of_line (struct t_gui_window *window);
-extern void gui_input_delete_end_of_line (struct t_gui_window *window);
-extern void gui_input_delete_line (struct t_gui_window *window);
-extern void gui_input_transpose_chars (struct t_gui_window *window);
-extern void gui_input_move_beginning_of_line (struct t_gui_window *window);
-extern void gui_input_move_end_of_line (struct t_gui_window *window);
-extern void gui_input_move_previous_char (struct t_gui_window *window);
-extern void gui_input_move_next_char (struct t_gui_window *window);
-extern void gui_input_move_previous_word (struct t_gui_window *window);
-extern void gui_input_move_next_word (struct t_gui_window *window);
-extern void gui_input_history_local_previous (struct t_gui_window *window);
-extern void gui_input_history_local_next (struct t_gui_window *window);
-extern void gui_input_history_global_previous (struct t_gui_window *window);
-extern void gui_input_history_global_next (struct t_gui_window *window);
-extern void gui_input_jump_smart (struct t_gui_window *window);
-extern void gui_input_jump_last_buffer (struct t_gui_window *window);
-extern void gui_input_jump_previously_visited_buffer (struct t_gui_window *window);
-extern void gui_input_jump_next_visited_buffer (struct t_gui_window *window);
-extern void gui_input_hotlist_clear (struct t_gui_window *window);
-extern void gui_input_grab_key (struct t_gui_window *window);
-extern void gui_input_grab_key_command (struct t_gui_window *window);
-extern void gui_input_scroll_unread (struct t_gui_window *window);
+extern void gui_input_clipboard_paste (struct t_gui_buffer *buffer);
+extern void gui_input_return (struct t_gui_buffer *buffer);
+extern void gui_input_complete_next (struct t_gui_buffer *buffer);
+extern void gui_input_complete_previous (struct t_gui_buffer *buffer);
+extern void gui_input_search_text (struct t_gui_buffer *buffer);
+extern void gui_input_delete_previous_char (struct t_gui_buffer *buffer);
+extern void gui_input_delete_next_char (struct t_gui_buffer *buffer);
+extern void gui_input_delete_previous_word (struct t_gui_buffer *buffer);
+extern void gui_input_delete_next_word (struct t_gui_buffer *buffer);
+extern void gui_input_delete_beginning_of_line (struct t_gui_buffer *buffer);
+extern void gui_input_delete_end_of_line (struct t_gui_buffer *buffer);
+extern void gui_input_delete_line (struct t_gui_buffer *buffer);
+extern void gui_input_transpose_chars (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_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);
+extern void gui_input_move_next_word (struct t_gui_buffer *buffer);
+extern void gui_input_history_local_previous (struct t_gui_buffer *buffer);
+extern void gui_input_history_local_next (struct t_gui_buffer *buffer);
+extern void gui_input_history_global_previous (struct t_gui_buffer *buffer);
+extern void gui_input_history_global_next (struct t_gui_buffer *buffer);
+extern void gui_input_jump_smart (struct t_gui_buffer *buffer);
+extern void gui_input_jump_last_buffer (struct t_gui_buffer *buffer);
+extern void gui_input_jump_previously_visited_buffer (struct t_gui_buffer *buffer);
+extern void gui_input_jump_next_visited_buffer (struct t_gui_buffer *buffer);
+extern void gui_input_hotlist_clear (struct t_gui_buffer *buffer);
+extern void gui_input_grab_key (struct t_gui_buffer *buffer);
+extern void gui_input_grab_key_command (struct t_gui_buffer *buffer);
+extern void gui_input_scroll_unread (struct t_gui_buffer *buffer);
extern void gui_input_set_unread ();
-extern void gui_input_set_unread_current (struct t_gui_window *window);
-extern void gui_input_switch_active_buffer (struct t_gui_window *window);
-extern void gui_input_switch_active_buffer_previous (struct t_gui_window *window);
-extern void gui_input_insert (struct t_gui_window *window, const char *args);
-extern void gui_input_undo (struct t_gui_window *window);
-extern void gui_input_redo (struct t_gui_window *window);
+extern void gui_input_set_unread_current (struct t_gui_buffer *buffer);
+extern void gui_input_switch_active_buffer (struct t_gui_buffer *buffer);
+extern void gui_input_switch_active_buffer_previous (struct t_gui_buffer *buffer);
+extern void gui_input_insert (struct t_gui_buffer *buffer, const char *args);
+extern void gui_input_undo (struct t_gui_buffer *buffer);
+extern void gui_input_redo (struct t_gui_buffer *buffer);
#endif /* __WEECHAT_GUI_INPUT_H */
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index 8048ecac5..7e9505e68 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -484,6 +484,38 @@ gui_window_valid (struct t_gui_window *window)
}
/*
+ * gui_window_search_with_buffer: search window displaying a buffer
+ * return NULL if no window is displaying given
+ * buffer
+ * If many windows are displaying this buffer,
+ * the first window in list is returned (or
+ * current window if it is displaying this
+ * buffer)
+ */
+
+struct t_gui_window *
+gui_window_search_with_buffer (struct t_gui_buffer *buffer)
+{
+ struct t_gui_window *ptr_window;
+
+ if (!buffer)
+ return NULL;
+
+ if (gui_current_window->buffer == buffer)
+ return gui_current_window;
+
+ for (ptr_window = gui_windows; ptr_window;
+ ptr_window = ptr_window->next_window)
+ {
+ if (ptr_window->buffer == buffer)
+ return ptr_window;
+ }
+
+ /* no window displaying buffer */
+ return NULL;
+}
+
+/*
* gui_window_get_integer: get a window property as integer
*/
@@ -1064,7 +1096,7 @@ gui_window_search_start (struct t_gui_window *window)
if (window->buffer->input_buffer && window->buffer->input_buffer[0])
window->buffer->text_search_input =
strdup (window->buffer->input_buffer);
- gui_input_delete_line (window);
+ gui_input_delete_line (window->buffer);
}
/*
@@ -1101,7 +1133,7 @@ gui_window_search_stop (struct t_gui_window *window)
{
window->buffer->text_search = GUI_TEXT_SEARCH_DISABLED;
window->buffer->text_search = 0;
- gui_input_delete_line (window);
+ gui_input_delete_line (window->buffer);
if (window->buffer->text_search_input)
{
gui_input_insert_string (window->buffer,
diff --git a/src/gui/gui-window.h b/src/gui/gui-window.h
index 1e7920d49..6aabcb57e 100644
--- a/src/gui/gui-window.h
+++ b/src/gui/gui-window.h
@@ -128,6 +128,7 @@ extern struct t_gui_window *gui_window_new (struct t_gui_window *parent_window,
int x, int y, int width, int height,
int width_pct, int height_pct);
extern int gui_window_valid (struct t_gui_window *window);
+extern struct t_gui_window *gui_window_search_with_buffer (struct t_gui_buffer *buffer);
extern int gui_window_get_integer (struct t_gui_window *window,
const char *property);
extern const char *gui_window_get_string (struct t_gui_window *window,