diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/wee-command.c | 235 | ||||
| -rw-r--r-- | src/core/wee-config.c | 24 | ||||
| -rw-r--r-- | src/core/wee-config.h | 1 | ||||
| -rw-r--r-- | src/gui/gui-buffer.c | 660 | ||||
| -rw-r--r-- | src/gui/gui-buffer.h | 5 | ||||
| -rw-r--r-- | src/gui/gui-layout.c | 34 |
6 files changed, 678 insertions, 281 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index a1f0ed654..f9f5f9ab9 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -512,9 +512,9 @@ COMMAND_CALLBACK(buffer) { struct t_gui_buffer *ptr_buffer, *ptr_buffer2, *ptr_prev_buffer; struct t_gui_buffer *weechat_buffer; - long number, number1, number2; + long number, number1, number2, numbers[3]; char *error, *value, *pos, *str_number1, *pos_number2; - int i, target_buffer, error_main_buffer, num_buffers; + int i, error_main_buffer, num_buffers, count, prev_number; /* make C compiler happy */ (void) data; @@ -553,42 +553,24 @@ COMMAND_CALLBACK(buffer) { if (string_strcasecmp (argv[2], "-all") == 0) gui_buffer_clear_all (); - else if (string_strcasecmp (argv[2], "-merged") == 0) - { - for (ptr_buffer = gui_buffers; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - if ((ptr_buffer->number == buffer->number) - && (ptr_buffer->type == GUI_BUFFER_TYPE_FORMATTED)) - { - gui_buffer_clear (ptr_buffer); - } - } - } else { for (i = 2; i < argc; i++) { - error = NULL; - number = strtol (argv[i], &error, 10); - if (error && !error[0]) + ptr_buffer = (string_strcasecmp (argv[i], "-merged") == 0) ? + buffer : gui_buffer_search_by_number_or_name (argv[i]); + if (ptr_buffer) { - for (ptr_buffer = gui_buffers; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) + for (ptr_buffer2 = gui_buffers; ptr_buffer2; + ptr_buffer2 = ptr_buffer2->next_buffer) { - if ((ptr_buffer->number == number) - && (ptr_buffer->type == GUI_BUFFER_TYPE_FORMATTED)) + if ((ptr_buffer2->number == ptr_buffer->number) + && (ptr_buffer2->type == GUI_BUFFER_TYPE_FORMATTED)) { - gui_buffer_clear (ptr_buffer); + gui_buffer_clear (ptr_buffer2); } } } - else - { - ptr_buffer = gui_buffer_search_by_full_name (argv[i]); - if (ptr_buffer) - gui_buffer_clear (ptr_buffer); - } } } } @@ -605,28 +587,39 @@ COMMAND_CALLBACK(buffer) if (string_strcasecmp (argv[1], "move") == 0) { COMMAND_MIN_ARGS(3, "buffer move"); - error = NULL; - number = strtol (((argv[2][0] == '+') || (argv[2][0] == '-')) ? - argv[2] + 1 : argv[2], - &error, 10); - if (error && !error[0]) + if (strcmp (argv[2], "-") == 0) { - if (argv[2][0] == '+') - gui_buffer_move_to_number (buffer, - buffer->number + ((int) number)); - else if (argv[2][0] == '-') - gui_buffer_move_to_number (buffer, - buffer->number - ((int) number)); - else - gui_buffer_move_to_number (buffer, (int) number); + gui_buffer_move_to_number (buffer, 1); + } + else if (strcmp (argv[2], "+") == 0) + { + gui_buffer_move_to_number (buffer, last_gui_buffer->number + 1); } else { - /* invalid number */ - gui_chat_printf (NULL, - _("%sError: incorrect buffer number"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + error = NULL; + number = strtol (((argv[2][0] == '+') || (argv[2][0] == '-')) ? + argv[2] + 1 : argv[2], + &error, 10); + if (error && !error[0]) + { + if (argv[2][0] == '+') + gui_buffer_move_to_number (buffer, + buffer->number + ((int) number)); + else if (argv[2][0] == '-') + gui_buffer_move_to_number (buffer, + buffer->number - ((int) number)); + else + gui_buffer_move_to_number (buffer, (int) number); + } + else + { + /* invalid number */ + gui_chat_printf (NULL, + _("%sError: incorrect buffer number"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_OK; + } } return WEECHAT_RC_OK; @@ -640,33 +633,10 @@ COMMAND_CALLBACK(buffer) ptr_buffer = NULL; ptr_buffer2 = NULL; - /* first buffer for swap */ - number = strtol (argv[2], &error, 10); - if (error && !error[0]) - ptr_buffer = gui_buffer_search_by_number (number); - else - { - ptr_buffer = gui_buffer_search_by_full_name (argv[2]); - if (!ptr_buffer) - ptr_buffer = gui_buffer_search_by_partial_name (NULL, argv[2]); - } - - /* second buffer for swap */ - if (argc > 3) - { - number = strtol (argv[3], &error, 10); - if (error && !error[0]) - ptr_buffer2 = gui_buffer_search_by_number (number); - else - { - ptr_buffer2 = gui_buffer_search_by_full_name (argv[3]); - if (!ptr_buffer2) - ptr_buffer2 = gui_buffer_search_by_partial_name (NULL, argv[3]); - } - } - else - ptr_buffer2 = buffer; - + /* search buffers to swap */ + ptr_buffer = gui_buffer_search_by_number_or_name (argv[2]); + ptr_buffer2 = (argc > 3) ? + gui_buffer_search_by_number_or_name (argv[3]) : buffer; if (!ptr_buffer || !ptr_buffer2) { /* invalid buffer name/number */ @@ -676,7 +646,7 @@ COMMAND_CALLBACK(buffer) return WEECHAT_RC_OK; } - gui_buffer_swap (ptr_buffer, ptr_buffer2); + gui_buffer_swap (ptr_buffer->number, ptr_buffer2->number); return WEECHAT_RC_OK; } @@ -730,11 +700,49 @@ COMMAND_CALLBACK(buffer) } } } - gui_buffer_unmerge (buffer, (int) number); + gui_buffer_unmerge (buffer, (int)number); return WEECHAT_RC_OK; } + /* renumber buffers */ + if (string_strcasecmp (argv[1], "renumber") == 0) + { + if (CONFIG_BOOLEAN(config_look_buffer_auto_renumber)) + { + gui_chat_printf (NULL, + _("%sError: renumbering is allowed only if option " + "weechat.look.buffer_auto_renumber is off"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_OK; + } + for (i = 0; i < 3; i++) + { + if (argc >= i + 3) + { + error = NULL; + numbers[i] = strtol (argv[i + 2], &error, 10); + if (!error || error[0]) + { + /* invalid number */ + gui_chat_printf (NULL, + _("%sError: incorrect buffer number"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_OK; + } + } + else + numbers[i] = -1; + } + /* + * renumber the buffers; if we are renumbering all buffers (no numbers + * given), start at number 1 + */ + gui_buffer_renumber (numbers[0], numbers[1], + (argc == 2) ? 1 : numbers[2]); + return WEECHAT_RC_OK; + } + /* close buffer */ if (string_strcasecmp (argv[1], "close") == 0) { @@ -945,12 +953,35 @@ COMMAND_CALLBACK(buffer) number = strtol (argv[1] + 1, &error, 10); if (error && !error[0]) { - target_buffer = buffer->number - (int) number; - if (target_buffer < 1) - target_buffer = (last_gui_buffer) ? - last_gui_buffer->number + target_buffer : 1; - gui_buffer_switch_by_number (gui_current_window, - target_buffer); + if (number <= 0) + return WEECHAT_RC_OK; + count = 0; + prev_number = gui_current_window->buffer->number; + ptr_buffer = gui_current_window->buffer; + while (1) + { + ptr_buffer = ptr_buffer->prev_buffer; + if (!ptr_buffer) + ptr_buffer = last_gui_buffer; + + /* if we have looped on all buffers, exit the loop */ + if (ptr_buffer == gui_current_window->buffer) + break; + + if ((ptr_buffer->number != gui_current_window->buffer->number) + && (ptr_buffer->number != prev_number)) + { + /* increase count each time we discover a different number */ + count++; + if (count == number) + { + gui_buffer_switch_by_number (gui_current_window, + ptr_buffer->number); + break; + } + } + prev_number = ptr_buffer->number; + } } else { @@ -971,11 +1002,35 @@ COMMAND_CALLBACK(buffer) number = strtol (argv[1] + 1, &error, 10); if (error && !error[0]) { - target_buffer = buffer->number + (int) number; - if (last_gui_buffer && target_buffer > last_gui_buffer->number) - target_buffer -= last_gui_buffer->number; - gui_buffer_switch_by_number (gui_current_window, - target_buffer); + if (number <= 0) + return WEECHAT_RC_OK; + count = 0; + prev_number = gui_current_window->buffer->number; + ptr_buffer = gui_current_window->buffer; + while (1) + { + ptr_buffer = ptr_buffer->next_buffer; + if (!ptr_buffer) + ptr_buffer = gui_buffers; + + /* if we have looped on all buffers, exit the loop */ + if (ptr_buffer == gui_current_window->buffer) + break; + + if ((ptr_buffer->number != gui_current_window->buffer->number) + && (ptr_buffer->number != prev_number)) + { + /* increase count each time we discover a different number */ + count++; + if (count == number) + { + gui_buffer_switch_by_number (gui_current_window, + ptr_buffer->number); + break; + } + } + prev_number = ptr_buffer->number; + } } else { @@ -6213,6 +6268,7 @@ command_init () " || move|merge <number>" " || swap <number1>|<name1> [<number2>|<name2>]" " || unmerge [<number>|-all]" + " || renumber [<number1> [<number2> [<start>]]]" " || close [<n1>[-<n2>]|<name>]" " || notify <level>" " || localvar" @@ -6234,6 +6290,8 @@ command_init () "buffers)\n" " unmerge: unmerge buffer from other buffers which have " "same number\n" + "renumber: renumber a range of buffers (works only if " + "option weechat.look.buffer_auto_renumber is off)\n" " close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this " "level determines whether buffer will be added to " @@ -6273,11 +6331,14 @@ command_init () " /buffer #weechat\n" " jump to next buffer:\n" " /buffer +1"), - "clear -merged|-all|%(buffers_numbers)|%(buffers_plugins_names)" + "clear -merged|-all|%(buffers_numbers)|" + "%(buffers_plugins_names)" " || move %(buffers_numbers)" " || swap %(buffers_numbers)" " || merge %(buffers_numbers)" " || unmerge %(buffers_numbers)|-all" + " || renumber %(buffers_numbers) %(buffers_numbers) " + "%(buffers_numbers)" " || close %(buffers_plugins_names)" " || list" " || notify reset|none|highlight|message|all" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index bbf7704c4..9b3888ccf 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -84,6 +84,7 @@ struct t_config_option *config_look_bar_more_left; struct t_config_option *config_look_bar_more_right; struct t_config_option *config_look_bar_more_up; struct t_config_option *config_look_bar_more_down; +struct t_config_option *config_look_buffer_auto_renumber; struct t_config_option *config_look_buffer_notify_default; struct t_config_option *config_look_buffer_search_case_sensitive; struct t_config_option *config_look_buffer_search_force_default; @@ -384,6 +385,21 @@ config_change_mouse (void *data, struct t_config_option *option) } /* + * Callback for changes on option "weechat.look.buffer_auto_renumber". + */ + +void +config_change_buffer_auto_renumber (void *data, struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + if (gui_buffers && CONFIG_BOOLEAN(config_look_buffer_auto_renumber)) + gui_buffer_renumber (-1, -1, 1); +} + +/* * Callback for changes on option "weechat.look.buffer_notify_default". */ @@ -1974,6 +1990,14 @@ config_weechat_init_options () N_("string displayed when bar can be scrolled down " "(for bars with filling different from \"horizontal\")"), NULL, 0, 0, "++", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_buffer_auto_renumber = config_file_new_option ( + weechat_config_file, ptr_section, + "buffer_auto_renumber", "boolean", + N_("automatically renumber buffers to have only consecutive numbers " + "and start with number 1; if disabled, gaps between buffer numbers " + "are allowed and the first buffer can have a number > 1"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + &config_change_buffer_auto_renumber, NULL, NULL, NULL); config_look_buffer_notify_default = config_file_new_option ( weechat_config_file, ptr_section, "buffer_notify_default", "integer", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 9fe7eb2e2..a5f1df7be 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -108,6 +108,7 @@ extern struct t_config_option *config_look_bar_more_left; extern struct t_config_option *config_look_bar_more_right; extern struct t_config_option *config_look_bar_more_up; extern struct t_config_option *config_look_bar_more_down; +extern struct t_config_option *config_look_buffer_auto_renumber; extern struct t_config_option *config_look_buffer_notify_default; extern struct t_config_option *config_look_buffer_search_case_sensitive; extern struct t_config_option *config_look_buffer_search_force_default; diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index daa461ac0..63d019806 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -346,37 +346,76 @@ gui_buffer_find_pos (struct t_gui_buffer *buffer) } /* + * Shifts number of buffers (number + 1) until we find a gap (if auto renumber + * is OFF), or until last buffer. + */ + +void +gui_buffer_shift_numbers (struct t_gui_buffer *buffer) +{ + struct t_gui_buffer *ptr_buffer; + + for (ptr_buffer = buffer; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) + { + if (ptr_buffer->prev_buffer + && (ptr_buffer->number > ptr_buffer->prev_buffer->number)) + { + break; + } + ptr_buffer->number++; + } +} + +/* * Inserts a buffer in good position in list of buffers (keeping sort on * number). */ void -gui_buffer_insert (struct t_gui_buffer *buffer, int automatic_merge) +gui_buffer_insert (struct t_gui_buffer *buffer) { - struct t_gui_buffer *pos, *ptr_buffer; + struct t_gui_buffer *pos_buffer; - pos = gui_buffer_find_pos (buffer); - if (pos) + pos_buffer = gui_buffer_find_pos (buffer); + if (pos_buffer) { /* add buffer into the list (before position found) */ - buffer->number = pos->number; - buffer->prev_buffer = pos->prev_buffer; - buffer->next_buffer = pos; - if (pos->prev_buffer) - (pos->prev_buffer)->next_buffer = buffer; + if (!CONFIG_BOOLEAN(config_look_buffer_auto_renumber) + && (buffer->layout_number > 0) + && (buffer->layout_number < pos_buffer->number) + && (!pos_buffer->prev_buffer + || (buffer->layout_number > pos_buffer->prev_buffer->number))) + { + buffer->number = buffer->layout_number; + } else - gui_buffers = buffer; - pos->prev_buffer = buffer; - for (ptr_buffer = pos; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) { - ptr_buffer->number++; + buffer->number = pos_buffer->number; } + buffer->prev_buffer = pos_buffer->prev_buffer; + buffer->next_buffer = pos_buffer; + if (pos_buffer->prev_buffer) + (pos_buffer->prev_buffer)->next_buffer = buffer; + else + gui_buffers = buffer; + pos_buffer->prev_buffer = buffer; + if (buffer->number == pos_buffer->number) + gui_buffer_shift_numbers (pos_buffer); } else { /* add buffer to the end */ - buffer->number = (last_gui_buffer) ? last_gui_buffer->number + 1 : 1; + if (!CONFIG_BOOLEAN(config_look_buffer_auto_renumber) + && (buffer->layout_number > 0) + && (!last_gui_buffer + || (buffer->layout_number > last_gui_buffer->number))) + { + buffer->number = buffer->layout_number; + } + else + { + buffer->number = (last_gui_buffer) ? last_gui_buffer->number + 1 : 1; + } buffer->prev_buffer = last_gui_buffer; buffer->next_buffer = NULL; if (gui_buffers) @@ -387,7 +426,7 @@ gui_buffer_insert (struct t_gui_buffer *buffer, int automatic_merge) } /* merge buffer with previous or next, if they have layout number */ - if (automatic_merge && (buffer->layout_number >= 1)) + if (buffer->layout_number > 0) { if (buffer->prev_buffer && (buffer->layout_number == (buffer->prev_buffer)->layout_number)) @@ -397,7 +436,7 @@ gui_buffer_insert (struct t_gui_buffer *buffer, int automatic_merge) else if ((buffer->next_buffer) && (buffer->layout_number == (buffer->next_buffer)->layout_number)) { - gui_buffer_merge (buffer, buffer->next_buffer); + gui_buffer_merge (buffer->next_buffer, buffer); } } } @@ -577,7 +616,7 @@ gui_buffer_new (struct t_weechat_plugin *plugin, /* add buffer to buffers list */ first_buffer_creation = (gui_buffers == NULL); - gui_buffer_insert (new_buffer, 1); + gui_buffer_insert (new_buffer); /* set notify level */ new_buffer->notify = gui_buffer_notify_get (new_buffer); @@ -1986,6 +2025,32 @@ gui_buffer_search_by_number (int number) } /* + * Searches for a buffer by number, full name or partial name. + */ + +struct t_gui_buffer * +gui_buffer_search_by_number_or_name (const char *string) +{ + struct t_gui_buffer *ptr_buffer; + long number; + char *error; + + ptr_buffer = NULL; + + number = strtol (string, &error, 10); + if (error && !error[0]) + ptr_buffer = gui_buffer_search_by_number (number); + else + { + ptr_buffer = gui_buffer_search_by_full_name (string); + if (!ptr_buffer) + ptr_buffer = gui_buffer_search_by_partial_name (NULL, string); + } + + return ptr_buffer; +} + +/* * Searches for a buffer by layout number. */ @@ -2010,6 +2075,62 @@ gui_buffer_search_by_layout_number (int layout_number, } /* + * Searches a range of buffer between "number1" and "number2" (both are + * included in the range). + * + * Arguments "ptr_first_buffer" and "ptr_last_buffer" must NOT be NULL. + * They are set with the first buffer with number >= number1 and the last + * buffer with number <= number2. + * + * If "different_numbers" is not NULL, it is set with the number of + * "different numbers" from number1 to number2 (including these numbers). + * + * Note: first/last buffers returned may have different number than + * number1/number2. + * For example with buffers: 1 2 5 7 10, if number1 == 3 and number2 == 8, + * the function will return: + * first: pointer to buffer 5 (first merged buffer in case of merged buffers) + * last : pointer to buffer 7 (last merged buffer in case of merged buffers) + */ + +void +gui_buffer_search_range (int number1, int number2, + struct t_gui_buffer **ptr_first_buffer, + struct t_gui_buffer **ptr_last_buffer, + int *different_numbers) +{ + struct t_gui_buffer *ptr_buffer; + int prev_number; + + *ptr_first_buffer = NULL; + *ptr_last_buffer = NULL; + if (different_numbers) + *different_numbers = 0; + + if ((number1 < 1) || (number2 < 1) || (number1 > number2)) + return; + + prev_number = -1; + for (ptr_buffer = gui_buffers; + ptr_buffer && (ptr_buffer->number <= number2); + ptr_buffer = ptr_buffer->next_buffer) + { + if (!*ptr_first_buffer && (ptr_buffer->number >= number1)) + *ptr_first_buffer = ptr_buffer; + + *ptr_last_buffer = ptr_buffer; + + /* count the number of different numbers between number1 & 2 */ + if (different_numbers && *ptr_first_buffer + && (ptr_buffer->number != prev_number)) + { + (*different_numbers)++; + } + prev_number = ptr_buffer->number; + } +} + +/* * Returns number of merged buffers (buffers with same number). */ @@ -2143,7 +2264,7 @@ gui_buffer_close (struct t_gui_buffer *buffer) if (gui_buffer_count_merged_buffers (buffer->number) > 1) { ptr_back_to_buffer = gui_buffer_get_next_active_buffer (buffer); - gui_buffer_unmerge (buffer, -1); + gui_buffer_unmerge (buffer, last_gui_buffer->number + 1); } if (!weechat_quit) @@ -2211,11 +2332,14 @@ gui_buffer_close (struct t_gui_buffer *buffer) gui_buffer_visited_remove_by_buffer (buffer); - /* decrease buffer number for all next buffers */ - for (ptr_buffer = buffer->next_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) + /* compute "number - 1" on next buffers if auto renumber is ON */ + if (CONFIG_BOOLEAN(config_look_buffer_auto_renumber)) { - ptr_buffer->number--; + for (ptr_buffer = buffer->next_buffer; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + ptr_buffer->number--; + } } /* free all lines */ @@ -2421,6 +2545,114 @@ gui_buffer_get_previous_active_buffer (struct t_gui_buffer *buffer) } /* + * Renumbers buffers with consecutive numbers between the range + * number1 -> number2, sarting with new number "start_number". + * + * If number1 < 1, then renumber starts at first buffer in list (with lowest + * number). + * If number2 < 1, then renumber ends at last buffer in list (with highest + * number). + * If start_number is < 1, then the numbers will start with the first number + * seen in range number1-number2. + * + * Note: the start_number must be strictly greater than the buffer before + * "number1". + * + * Examples (^^^ == the buffers affected/renumbered): + * + * renumber(4, 10, 4): 1 2 6 8 10 15 + * --> 1 2 4 5 6 15 + * ^^^^^^^^ + * + * renumber(4, 10, -1): 1 2 6 8 10 15 + * --> 1 2 6 7 8 15 + * ^^^^^^^^ + * + * renumber(3, -1, 10): 1 2 6 8 10 15 + * --> 1 2 10 11 12 13 + * ^^^^^^^^^^^^^^ + * + * renumber(-1, -1, -1): 1 2 6 8 10 15 + * --> 1 2 3 4 5 6 + * ^^^^^^^^^^^^^^^^^^ + * + * renumber(-1, -1, 5): 1 2 6 8 10 15 + * --> 5 6 7 8 9 10 + * ^^^^^^^^^^^^^^^^^^ + */ + +void +gui_buffer_renumber (int number1, int number2, int start_number) +{ + struct t_gui_buffer *ptr_buffer, *ptr_buffer2, *ptr_buffer_moved; + struct t_gui_buffer *ptr_first_buffer, *ptr_last_buffer; + int different_numbers, current_number, number; + + /* if numbers are >= 1, from_number must be <= to_number */ + if ((number1 >= 1) && (number2 >= 1) && (number1 > number2)) + return; + + /* replace negative buffer numbers */ + if (number1 < 1) + number1 = gui_buffers->number; + if (number2 < 1) + number2 = last_gui_buffer->number; + + /* search for first and last buffers affected by renumbering */ + gui_buffer_search_range (number1, number2, + &ptr_first_buffer, &ptr_last_buffer, + &different_numbers); + if (!ptr_first_buffer || !ptr_last_buffer) + return; + + if (start_number < 1) + start_number = ptr_first_buffer->number; + + /* the start number must be greater than buffer before first buffer */ + if (ptr_first_buffer->prev_buffer + && (start_number <= ptr_first_buffer->prev_buffer->number)) + { + return; + } + + /* + * start_number + different_numbers must be lower than buffer after + * last buffer + */ + if (ptr_last_buffer->next_buffer + && (start_number + different_numbers - 1 >= ptr_last_buffer->next_buffer->number)) + { + return; + } + + /* let's go for the renumbering! */ + current_number = start_number; + ptr_buffer = ptr_first_buffer; + while (ptr_buffer) + { + number = ptr_buffer->number; + ptr_buffer_moved = (number != current_number) ? ptr_buffer : NULL; + ptr_buffer2 = ptr_buffer; + while (ptr_buffer && (ptr_buffer->number == number)) + { + ptr_buffer->number = current_number; + ptr_buffer2 = ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer; + } + if (ptr_buffer_moved) + { + hook_signal_send ("buffer_moved", + WEECHAT_HOOK_SIGNAL_POINTER, ptr_buffer_moved); + } + ptr_buffer = ptr_buffer2; + if (ptr_buffer == ptr_last_buffer) + break; + ptr_buffer = ptr_buffer->next_buffer; + current_number++; + } +} + +/* * Moves a buffer to another number. */ @@ -2429,9 +2661,12 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number) { struct t_gui_buffer *ptr_first_buffer, *ptr_last_buffer, *ptr_buffer; struct t_gui_buffer *ptr_buffer_pos; + int auto_renumber; - /* if only one buffer then return */ - if (gui_buffers == last_gui_buffer) + auto_renumber = CONFIG_BOOLEAN(config_look_buffer_auto_renumber); + + /* nothing to do if auto renumber is ON and that there is only one buffer */ + if (auto_renumber && (gui_buffers == last_gui_buffer)) return; if (number < 1) @@ -2441,111 +2676,95 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number) if (number == buffer->number) return; - ptr_first_buffer = NULL; - ptr_last_buffer = NULL; - for (ptr_buffer = gui_buffers; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - if (ptr_buffer->number == buffer->number) - { - if (!ptr_first_buffer) - ptr_first_buffer = ptr_buffer; - ptr_last_buffer = ptr_buffer; - } - } - - /* error when looking for buffers */ + /* search for first and last buffer to move */ + gui_buffer_search_range (buffer->number, buffer->number, + &ptr_first_buffer, + &ptr_last_buffer, + NULL); if (!ptr_first_buffer || !ptr_last_buffer) return; - /* if group of buffers found is all buffers, then we can't move buffers! */ - if ((ptr_first_buffer == gui_buffers) && (ptr_last_buffer == last_gui_buffer)) + /* + * if group of buffers found is all buffers, then we can't move buffers! + * (allowed only if auto renumber is OFF) + */ + if (auto_renumber + && (ptr_first_buffer == gui_buffers) + && (ptr_last_buffer == last_gui_buffer)) + { return; + } /* remove buffer(s) from list */ - if (ptr_first_buffer == gui_buffers) - { - gui_buffers = ptr_last_buffer->next_buffer; - gui_buffers->prev_buffer = NULL; - } - else if (ptr_last_buffer == last_gui_buffer) - { - last_gui_buffer = ptr_first_buffer->prev_buffer; - last_gui_buffer->next_buffer = NULL; - } if (ptr_first_buffer->prev_buffer) (ptr_first_buffer->prev_buffer)->next_buffer = ptr_last_buffer->next_buffer; if (ptr_last_buffer->next_buffer) (ptr_last_buffer->next_buffer)->prev_buffer = ptr_first_buffer->prev_buffer; + if (gui_buffers == ptr_first_buffer) + gui_buffers = ptr_last_buffer->next_buffer; + if (last_gui_buffer == ptr_last_buffer) + last_gui_buffer = ptr_first_buffer->prev_buffer; - /* compute "number - 1" for all buffers after buffer(s) */ - for (ptr_buffer = ptr_last_buffer->next_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) + /* compute "number - 1" on next buffers if auto renumber is ON */ + if (auto_renumber) { - ptr_buffer->number--; + for (ptr_buffer = ptr_last_buffer->next_buffer; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + ptr_buffer->number--; + } } - if (number == 1) + /* search for new position in the list */ + for (ptr_buffer_pos = gui_buffers; ptr_buffer_pos; + ptr_buffer_pos = ptr_buffer_pos->next_buffer) { + if (ptr_buffer_pos->number >= number) + break; + } + + if (ptr_buffer_pos) + { + /* insert before buffer found */ for (ptr_buffer = ptr_first_buffer; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) { - ptr_buffer->number = 1; + ptr_buffer->number = number; if (ptr_buffer == ptr_last_buffer) break; } - gui_buffers->prev_buffer = ptr_last_buffer; - ptr_first_buffer->prev_buffer = NULL; - ptr_last_buffer->next_buffer = gui_buffers; - gui_buffers = ptr_first_buffer; + ptr_first_buffer->prev_buffer = ptr_buffer_pos->prev_buffer; + if (!ptr_first_buffer->prev_buffer) + gui_buffers = ptr_first_buffer; + ptr_last_buffer->next_buffer = ptr_buffer_pos; + if (!ptr_last_buffer->next_buffer) + last_gui_buffer = ptr_last_buffer; + if (ptr_buffer_pos->prev_buffer) + (ptr_buffer_pos->prev_buffer)->next_buffer = ptr_first_buffer; + ptr_buffer_pos->prev_buffer = ptr_last_buffer; + + /* compute "number + 1" on next buffers */ + if (ptr_last_buffer->next_buffer + && (ptr_last_buffer->next_buffer->number == number)) + { + gui_buffer_shift_numbers (ptr_last_buffer->next_buffer); + } } else { - /* search for new position in the list */ - for (ptr_buffer_pos = gui_buffers; ptr_buffer_pos; - ptr_buffer_pos = ptr_buffer_pos->next_buffer) + /* number not found (too big)? => add to the end */ + for (ptr_buffer = ptr_first_buffer; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) { - if (ptr_buffer_pos->number >= number) + ptr_buffer->number = (auto_renumber) ? + last_gui_buffer->number + 1 : number; + if (ptr_buffer == ptr_last_buffer) break; } - if (ptr_buffer_pos) - { - /* insert before buffer found */ - for (ptr_buffer = ptr_first_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - ptr_buffer->number = ptr_buffer_pos->number; - if (ptr_buffer == ptr_last_buffer) - break; - } - ptr_first_buffer->prev_buffer = ptr_buffer_pos->prev_buffer; - ptr_last_buffer->next_buffer = ptr_buffer_pos; - if (ptr_buffer_pos->prev_buffer) - (ptr_buffer_pos->prev_buffer)->next_buffer = ptr_first_buffer; - ptr_buffer_pos->prev_buffer = ptr_last_buffer; - } - else - { - /* number not found (too big)? => add to end */ - for (ptr_buffer = ptr_first_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - ptr_buffer->number = last_gui_buffer->number + 1; - if (ptr_buffer == ptr_last_buffer) - break; - } - ptr_first_buffer->prev_buffer = last_gui_buffer; - ptr_last_buffer->next_buffer = NULL; - last_gui_buffer->next_buffer = ptr_first_buffer; - last_gui_buffer = ptr_last_buffer; - } - } - - /* compute "number + 1" for all buffers after buffer(s) */ - for (ptr_buffer = ptr_last_buffer->next_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - ptr_buffer->number++; + ptr_first_buffer->prev_buffer = last_gui_buffer; + ptr_last_buffer->next_buffer = NULL; + last_gui_buffer->next_buffer = ptr_first_buffer; + last_gui_buffer = ptr_last_buffer; } hook_signal_send ("buffer_moved", @@ -2553,58 +2772,123 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number) } /* - * Swaps two buffers. + * Swaps two buffers (or merged buffers). */ void -gui_buffer_swap (struct t_gui_buffer *buffer1, struct t_gui_buffer *buffer2) +gui_buffer_swap (int number1, int number2) { - struct t_gui_buffer *ptr_buffer1, *ptr_buffer2; - int number1, number2; + struct t_gui_buffer *ptr_buffer, *ptr_first_buffer[2], *ptr_last_buffer[2]; + int number; - if (!buffer1 || !buffer2) + /* swap buffer with itself? nothing to do! */ + if (number1 == number2) return; - /* store pointers and numbers, with number1 < number2 */ - ptr_buffer1 = (buffer1->number < buffer2->number) ? buffer1 : buffer2; - ptr_buffer2 = (buffer1->number < buffer2->number) ? buffer2 : buffer1; - number1 = ptr_buffer1->number; - number2 = ptr_buffer2->number; + /* ensure we have number1 < number2: if not, exchange numbers */ + if (number1 > number2) + { + number = number1; + number1 = number2; + number2 = number; + } - /* swap buffer with itself? nothing to do! */ - if (number1 == number2) + /* search for first and last buffers, for each number */ + gui_buffer_search_range (number1, number1, + &ptr_first_buffer[0], + &ptr_last_buffer[0], + NULL); + if (!ptr_first_buffer[0] || !ptr_last_buffer[0]) + return; + gui_buffer_search_range (number2, number2, + &ptr_first_buffer[1], + &ptr_last_buffer[1], + NULL); + if (!ptr_first_buffer[1] || !ptr_last_buffer[1]) return; - /* move number2 before number1 */ - gui_buffer_move_to_number (ptr_buffer2, number1); + /* first set gui_buffers/last_gui_buffers if they are affected by the swap */ + if (gui_buffers == ptr_first_buffer[0]) + gui_buffers = ptr_first_buffer[1]; + if (last_gui_buffer == ptr_last_buffer[1]) + last_gui_buffer = ptr_last_buffer[0]; + + /* swap the pointer outside elements in the linked list */ + if (ptr_first_buffer[0]->prev_buffer) + (ptr_first_buffer[0]->prev_buffer)->next_buffer = ptr_first_buffer[1]; + if (ptr_last_buffer[1]->next_buffer) + (ptr_last_buffer[1]->next_buffer)->prev_buffer = ptr_last_buffer[0]; + if (ptr_last_buffer[0]->next_buffer == ptr_first_buffer[1]) + { + /* special case: adjacent buffers */ + ptr_first_buffer[1]->prev_buffer = ptr_first_buffer[0]->prev_buffer; + ptr_first_buffer[0]->prev_buffer = ptr_last_buffer[1]; + ptr_last_buffer[0]->next_buffer = ptr_last_buffer[1]->next_buffer; + ptr_last_buffer[1]->next_buffer = ptr_first_buffer[0]; + } + else + { + if (ptr_first_buffer[1]->prev_buffer) + (ptr_first_buffer[1]->prev_buffer)->next_buffer = ptr_first_buffer[0]; + if (ptr_last_buffer[0]->next_buffer) + (ptr_last_buffer[0]->next_buffer)->prev_buffer = ptr_last_buffer[1]; + /* swap first[0]->prev <-> first[1]->prev */ + ptr_buffer = ptr_first_buffer[0]->prev_buffer; + ptr_first_buffer[0]->prev_buffer = ptr_first_buffer[1]->prev_buffer; + ptr_first_buffer[1]->prev_buffer = ptr_buffer; + /* swap last[0]->next <-> last[1]->next */ + ptr_buffer = ptr_last_buffer[0]->next_buffer; + ptr_last_buffer[0]->next_buffer = ptr_last_buffer[1]->next_buffer; + ptr_last_buffer[1]->next_buffer = ptr_buffer; + } + + /* swap the numbers inside buffers */ + for (ptr_buffer = ptr_first_buffer[0]; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + ptr_buffer->number = number2; + if (ptr_buffer == ptr_last_buffer[0]) + break; + } + for (ptr_buffer = ptr_first_buffer[1]; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + ptr_buffer->number = number1; + if (ptr_buffer == ptr_last_buffer[1]) + break; + } - /* move number1 before number2 */ - if (number2 > number1 + 1) - gui_buffer_move_to_number (ptr_buffer1, number2); + /* send signals */ + hook_signal_send ("buffer_moved", + WEECHAT_HOOK_SIGNAL_POINTER, ptr_first_buffer[0]); + hook_signal_send ("buffer_moved", + WEECHAT_HOOK_SIGNAL_POINTER, ptr_first_buffer[1]); } /* - * Merges a buffer to another buffer. + * Merges a buffer into another buffer. */ void gui_buffer_merge (struct t_gui_buffer *buffer, struct t_gui_buffer *target_buffer) { - struct t_gui_buffer *ptr_buffer; - int target_number; + struct t_gui_buffer *ptr_buffer, *ptr_first_buffer[2], *ptr_last_buffer[2]; - /* if only one buffer then return */ - if (gui_buffers == last_gui_buffer) - return; - - if ((buffer == target_buffer) || (buffer->number == target_buffer->number)) + /* + * nothing to do if: + * - there is only one buffer + * - buffer and target are the same + * - numbers of buffers are the same (already merged) + */ + if ((gui_buffers == last_gui_buffer) + || (buffer == target_buffer) + || (buffer->number == target_buffer->number)) + { return; + } - if (gui_buffer_count_merged_buffers (buffer->number) > 1) - gui_buffer_unmerge (buffer, -1); - - /* check if current buffer and target buffers are type "formatted" */ + /* check if current buffer and target buffers have "formatted" content */ if ((buffer->type != GUI_BUFFER_TYPE_FORMATTED) || (target_buffer->type != GUI_BUFFER_TYPE_FORMATTED)) { @@ -2615,28 +2899,66 @@ gui_buffer_merge (struct t_gui_buffer *buffer, return; } - /* move buffer immediately after number we want to merge to */ - target_number = (buffer->number < target_buffer->number) ? - target_buffer->number : target_buffer->number + 1; - if (buffer->number != target_number) - gui_buffer_move_to_number (buffer, target_number); + /* search for first and last buffer to merge */ + gui_buffer_search_range (buffer->number, buffer->number, + &ptr_first_buffer[0], + &ptr_last_buffer[0], + NULL); + if (!ptr_first_buffer[0] || !ptr_last_buffer[0]) + return; - /* change number */ - buffer->number--; + /* search for first and last target buffer */ + gui_buffer_search_range (target_buffer->number, target_buffer->number, + &ptr_first_buffer[1], + &ptr_last_buffer[1], + NULL); + if (!ptr_first_buffer[1] || !ptr_last_buffer[1]) + return; - /* mix lines */ - gui_line_mix_buffers (buffer); + /* remove buffer(s) to merge from list */ + if (ptr_first_buffer[0]->prev_buffer) + (ptr_first_buffer[0]->prev_buffer)->next_buffer = ptr_last_buffer[0]->next_buffer; + if (ptr_last_buffer[0]->next_buffer) + (ptr_last_buffer[0]->next_buffer)->prev_buffer = ptr_first_buffer[0]->prev_buffer; + if (gui_buffers == ptr_first_buffer[0]) + gui_buffers = ptr_last_buffer[0]->next_buffer; + if (last_gui_buffer == ptr_last_buffer[0]) + last_gui_buffer = ptr_first_buffer[0]->prev_buffer; - /* set buffer as active in merged buffers group */ - gui_buffer_set_active_buffer (buffer); + /* compute "number - 1" on next buffers if auto renumber is ON */ + if (CONFIG_BOOLEAN(config_look_buffer_auto_renumber)) + { + for (ptr_buffer = ptr_last_buffer[0]->next_buffer; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + ptr_buffer->number--; + } + } - /* compute "number - 1" for next buffers */ - for (ptr_buffer = buffer->next_buffer; ptr_buffer; + /* insert new merged buffers after target buffer */ + if (ptr_last_buffer[1] == last_gui_buffer) + last_gui_buffer = ptr_last_buffer[0]; + if (ptr_last_buffer[1]->next_buffer) + (ptr_last_buffer[1]->next_buffer)->prev_buffer = ptr_last_buffer[0]; + ptr_last_buffer[0]->next_buffer = ptr_last_buffer[1]->next_buffer; + ptr_last_buffer[1]->next_buffer = ptr_first_buffer[0]; + ptr_first_buffer[0]->prev_buffer = ptr_last_buffer[1]; + + /* change number in new merged buffer(s) */ + for (ptr_buffer = ptr_first_buffer[0]; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer) { - ptr_buffer->number--; + ptr_buffer->number = target_buffer->number; + if (ptr_buffer == ptr_last_buffer[0]) + break; } + /* mix lines */ + gui_line_mix_buffers (buffer); + + /* set buffer as active in merged buffers group */ + gui_buffer_set_active_buffer (buffer); + gui_buffer_compute_num_displayed (); gui_window_ask_refresh (1); @@ -2658,18 +2980,17 @@ gui_buffer_unmerge (struct t_gui_buffer *buffer, int number) int num_merged; struct t_gui_buffer *ptr_buffer, *ptr_new_active_buffer; - /* if only one buffer then return */ + /* nothing to do if there is only one buffer */ if (gui_buffers == last_gui_buffer) return; - ptr_new_active_buffer = NULL; - + /* nothing to do if buffer is not merged with at least one buffer */ num_merged = gui_buffer_count_merged_buffers (buffer->number); - - /* can't unmerge if buffer is not merged to at least one buffer */ if (num_merged < 2) return; + ptr_new_active_buffer = NULL; + /* by default, we move buffer to buffer->number + 1 */ if ((number < 1) || (number == buffer->number)) { @@ -2677,8 +2998,12 @@ gui_buffer_unmerge (struct t_gui_buffer *buffer, int number) } else { - if (number > last_gui_buffer->number + 1) + /* if auto renumber is ON, max number is last buffer + 1 */ + if (CONFIG_BOOLEAN(config_look_buffer_auto_renumber) + && (number > last_gui_buffer->number + 1)) + { number = last_gui_buffer->number + 1; + } } if (num_merged == 2) @@ -2746,10 +3071,12 @@ gui_buffer_unmerge (struct t_gui_buffer *buffer, int number) } buffer->active = 1; buffer->number = number; - for (ptr_buffer = buffer->next_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) + + /* compute "number + 1" on next buffers */ + if (buffer->next_buffer + && (buffer->next_buffer->number == number)) { - ptr_buffer->number++; + gui_buffer_shift_numbers (buffer->next_buffer); } gui_buffer_compute_num_displayed (); @@ -2773,21 +3100,24 @@ gui_buffer_unmerge (struct t_gui_buffer *buffer, int number) void gui_buffer_unmerge_all () { + struct t_gui_buffer *ptr_buffer, *ptr_next_buffer; int number; - struct t_gui_buffer *ptr_buffer; - number = 1; - while (number <= last_gui_buffer->number) + ptr_buffer = gui_buffers; + while (ptr_buffer) { + number = ptr_buffer->number; while (gui_buffer_count_merged_buffers (number) > 1) { - ptr_buffer = gui_buffer_search_by_number (number); - if (ptr_buffer) - gui_buffer_unmerge (ptr_buffer, -1); - else - break; + ptr_next_buffer = ptr_buffer->next_buffer; + gui_buffer_unmerge (ptr_buffer, -1); + ptr_buffer = ptr_next_buffer; + } + /* go to the next number */ + while (ptr_buffer && (ptr_buffer->number == number)) + { + ptr_buffer = ptr_buffer->next_buffer; } - number++; } } @@ -2808,7 +3138,7 @@ gui_buffer_sort_by_layout_number () while (ptr_buffer) { ptr_next_buffer = ptr_buffer->next_buffer; - gui_buffer_insert (ptr_buffer, 0); + gui_buffer_insert (ptr_buffer); ptr_buffer = ptr_next_buffer; } } diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index f9de9c4b1..a3c2a1ce9 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -275,6 +275,7 @@ extern struct t_gui_buffer *gui_buffer_search_by_full_name (const char *full_nam extern struct t_gui_buffer *gui_buffer_search_by_partial_name (const char *plugin, const char *name); extern struct t_gui_buffer *gui_buffer_search_by_number (int number); +extern struct t_gui_buffer *gui_buffer_search_by_number_or_name (const char *string); extern struct t_gui_buffer *gui_buffer_search_by_layout_number (int layout_number, int layout_number_merge_order); extern int gui_buffer_count_merged_buffers (int number); @@ -287,9 +288,9 @@ extern void gui_buffer_switch_by_number (struct t_gui_window *window, extern void gui_buffer_set_active_buffer (struct t_gui_buffer *buffer); extern struct t_gui_buffer *gui_buffer_get_next_active_buffer (struct t_gui_buffer *buffer); extern struct t_gui_buffer *gui_buffer_get_previous_active_buffer (struct t_gui_buffer *buffer); +extern void gui_buffer_renumber (int number1, int number2, int start_number); extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number); -extern void gui_buffer_swap (struct t_gui_buffer *buffer1, - struct t_gui_buffer *buffer2); +extern void gui_buffer_swap (int number1, int number2); extern void gui_buffer_merge (struct t_gui_buffer *buffer, struct t_gui_buffer *target_buffer); extern void gui_buffer_unmerge (struct t_gui_buffer *buffer, int number); diff --git a/src/gui/gui-layout.c b/src/gui/gui-layout.c index 42a143bf0..672af41e7 100644 --- a/src/gui/gui-layout.c +++ b/src/gui/gui-layout.c @@ -342,8 +342,7 @@ gui_layout_buffer_save (struct t_gui_layout *layout) void gui_layout_buffer_apply (struct t_gui_layout *layout) { - struct t_gui_buffer *ptr_buffer, *ptr_next_buffer; - int number, count_merged; + struct t_gui_buffer *ptr_buffer; if (!layout) return; @@ -357,35 +356,16 @@ gui_layout_buffer_apply (struct t_gui_layout *layout) /* sort buffers by layout number (without merge) */ gui_buffer_sort_by_layout_number (); - /* merge buffers */ - ptr_buffer = gui_buffers->next_buffer; - while (ptr_buffer) - { - ptr_next_buffer = ptr_buffer->next_buffer; - - if ((ptr_buffer->layout_number >= 1) - && (ptr_buffer->layout_number == (ptr_buffer->prev_buffer)->layout_number)) - { - gui_buffer_merge (ptr_buffer, ptr_buffer->prev_buffer); - } - - ptr_buffer = ptr_next_buffer; - } - /* set appropriate active buffers */ - number = 1; - while (number <= last_gui_buffer->number) + for (ptr_buffer = gui_buffers; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) { - count_merged = gui_buffer_count_merged_buffers (number); - if (count_merged > 1) + if ((gui_buffer_count_merged_buffers (ptr_buffer->number) > 1) + && (ptr_buffer->layout_number == ptr_buffer->number) + && (ptr_buffer->layout_number_merge_order == 0)) { - ptr_buffer = gui_buffer_search_by_layout_number (number, 0); - if (ptr_buffer && !ptr_buffer->active) - { - gui_buffer_set_active_buffer (ptr_buffer); - } + gui_buffer_set_active_buffer (ptr_buffer); } - number++; } } |