Mercurial > vim
view src/proto/gui_x11.pro @ 34379:37b4c89ba420 v9.1.0116
patch 9.1.0116: win_split_ins may not check available room
Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 20:28:15 2024 +0100
patch 9.1.0116: win_split_ins may not check available room
Problem: win_split_ins has no check for E36 when moving an existing
window
Solution: check for room and fix the issues in f_win_splitmove()
(Sean Dewar)
win_split_ins has no check for E36 when moving an existing window,
allowing for layouts with many overlapping zero-sized windows to be
created (which may also cause drawing issues with tablines and such).
f_win_splitmove also has some bugs.
So check for room and fix the issues in f_win_splitmove. Handle failure
in the two relevant win_split_ins callers by restoring the original
layout, and factor the common logic into win_splitmove.
Don't check for room when opening an autocommand window, as it's a
temporary window that's rarely interacted with or drawn anyhow, and is
rather important for some autocommands.
Issues fixed in f_win_splitmove:
- Error if splitting is disallowed.
- Fix heap-use-after-frees if autocommands fired from switching to "targetwin"
close "wp" or "oldwin".
- Fix splitting the wrong window if autocommands fired from switching to
"targetwin" switch to a different window.
- Ensure -1 is returned for all errors.
Also handle allocation failure a bit earlier in make_snapshot (callers,
except win_splitmove, don't really care if a snapshot can't be made, so
just ignore the return value).
Note: Test_smoothscroll_in_zero_width_window failed after these changes with
E36, as it was using the previous behaviour to create a zero-width window.
I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is
reverted (and simplified it too).
related: #14042
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 20 Feb 2024 22:30:04 +0100 |
parents | f103da6ba95f |
children |
line wrap: on
line source
/* gui_x11.c */ void gui_x11_key_hit_cb(Widget w, XtPointer dud, XEvent *event, Boolean *dum); void gui_mch_prepare(int *argc, char **argv); int gui_mch_init_check(void); int gui_mch_init(void); void gui_mch_uninit(void); void gui_mch_new_colors(void); int gui_mch_open(void); void gui_init_tooltip_font(void); void gui_init_menu_font(void); void gui_mch_exit(int rc); int gui_mch_get_winpos(int *x, int *y); void gui_mch_set_winpos(int x, int y); void gui_mch_set_shellsize(int width, int height, int min_width, int min_height, int base_width, int base_height, int direction); void gui_mch_get_screen_dimensions(int *screen_w, int *screen_h); int gui_mch_init_font(char_u *font_name, int do_fontset); GuiFont gui_mch_get_font(char_u *name, int giveErrorIfMissing); char_u *gui_mch_get_fontname(GuiFont font, char_u *name); int gui_mch_adjust_charheight(void); void gui_mch_set_font(GuiFont font); void gui_mch_set_fontset(GuiFontset fontset); void gui_mch_free_font(GuiFont font); void gui_mch_free_fontset(GuiFontset fontset); GuiFontset gui_mch_get_fontset(char_u *name, int giveErrorIfMissing, int fixed_width); int fontset_height(XFontSet fs); guicolor_T gui_mch_get_color(char_u *name); guicolor_T gui_mch_get_rgb_color(int r, int g, int b); void gui_mch_set_fg_color(guicolor_T color); void gui_mch_set_bg_color(guicolor_T color); void gui_mch_set_sp_color(guicolor_T color); void gui_mch_draw_string(int row, int col, char_u *s, int len, int flags); int gui_mch_haskey(char_u *name); int gui_get_x11_windis(Window *win, Display **dis); void gui_mch_beep(void); void gui_mch_flash(int msec); void gui_mch_invert_rectangle(int r, int c, int nr, int nc); void gui_mch_iconify(void); void gui_mch_set_foreground(void); void gui_mch_draw_hollow_cursor(guicolor_T color); void gui_mch_draw_part_cursor(int w, int h, guicolor_T color); void gui_mch_update(void); int gui_mch_wait_for_chars(long wtime); void gui_mch_flush(void); void gui_mch_clear_block(int row1, int col1, int row2, int col2); void gui_mch_clear_all(void); void gui_mch_delete_lines(int row, int num_lines); void gui_mch_insert_lines(int row, int num_lines); void clip_mch_lose_selection(Clipboard_T *cbd); int clip_mch_own_selection(Clipboard_T *cbd); void clip_mch_request_selection(Clipboard_T *cbd); void clip_mch_set_selection(Clipboard_T *cbd); void gui_mch_menu_grey(vimmenu_T *menu, int grey); void gui_mch_menu_hidden(vimmenu_T *menu, int hidden); void gui_mch_draw_menubar(void); void gui_x11_menu_cb(Widget w, XtPointer client_data, XtPointer call_data); int gui_mch_is_blinking(void); int gui_mch_is_blink_off(void); void gui_mch_set_blinking(long waittime, long on, long off); void gui_mch_stop_blink(int may_call_gui_update_cursor); void gui_mch_start_blink(void); guicolor_T gui_mch_get_rgb(guicolor_T pixel); void gui_x11_callbacks(Widget textArea, Widget vimForm); void gui_mch_getmouse(int *x, int *y); void gui_mch_setmouse(int x, int y); XButtonPressedEvent *gui_x11_get_last_mouse_event(void); void gui_mch_drawsign(int row, int col, int typenr); void *gui_mch_register_sign(char_u *signfile); void gui_mch_destroy_sign(void *sign); void gui_mch_mousehide(int hide); void mch_set_mouse_shape(int shape); void gui_mch_menu_set_tip(vimmenu_T *menu); /* vim: set ft=c : */