1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
To: vim-dev@vim.org
Subject: Patch 7.2.099
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.099
Problem: Changing GUI options causes an unnecessary redraw when the GUI
isn't active.
Solution: Avoid the redraw. (Lech Lorens)
Files: src/option.c
*** ../vim-7.2.098/src/option.c Wed Dec 24 12:53:33 2008
--- src/option.c Wed Feb 4 16:59:56 2009
***************
*** 5407,5412 ****
--- 5407,5416 ----
int did_chartab = FALSE;
char_u **gvarp;
long_u free_oldval = (options[opt_idx].flags & P_ALLOCED);
+ #ifdef FEAT_GUI
+ /* set when changing an option that only requires a redraw in the GUI */
+ int redraw_gui_only = FALSE;
+ #endif
/* Get the global option to compare with, otherwise we would have to check
* two values for all local options. */
***************
*** 6055,6060 ****
--- 6059,6065 ----
errmsg = (char_u *)N_("E596: Invalid font(s)");
}
}
+ redraw_gui_only = TRUE;
}
# ifdef FEAT_XFONTSET
else if (varp == &p_guifontset)
***************
*** 6063,6068 ****
--- 6068,6074 ----
errmsg = (char_u *)N_("E597: can't select fontset");
else if (gui.in_use && gui_init_font(p_guifontset, TRUE) != OK)
errmsg = (char_u *)N_("E598: Invalid fontset");
+ redraw_gui_only = TRUE;
}
# endif
# ifdef FEAT_MBYTE
***************
*** 6072,6077 ****
--- 6078,6084 ----
errmsg = (char_u *)N_("E533: can't select wide font");
else if (gui_get_wide_font() == FAIL)
errmsg = (char_u *)N_("E534: Invalid wide font");
+ redraw_gui_only = TRUE;
}
# endif
#endif
***************
*** 6133,6145 ****
--- 6140,6163 ----
#ifdef FEAT_GUI
/* 'guioptions' */
else if (varp == &p_go)
+ {
gui_init_which_components(oldval);
+ redraw_gui_only = TRUE;
+ }
#endif
#if defined(FEAT_GUI_TABLINE)
/* 'guitablabel' */
else if (varp == &p_gtl)
+ {
redraw_tabline = TRUE;
+ redraw_gui_only = TRUE;
+ }
+ /* 'guitabtooltip' */
+ else if (varp == &p_gtt)
+ {
+ redraw_gui_only = TRUE;
+ }
#endif
#if defined(FEAT_MOUSE_TTY) && (defined(UNIX) || defined(VMS))
***************
*** 6717,6723 ****
if (curwin->w_curswant != MAXCOL)
curwin->w_set_curswant = TRUE; /* in case 'showbreak' changed */
! check_redraw(options[opt_idx].flags);
return errmsg;
}
--- 6735,6745 ----
if (curwin->w_curswant != MAXCOL)
curwin->w_set_curswant = TRUE; /* in case 'showbreak' changed */
! #ifdef FEAT_GUI
! /* check redraw when it's not a GUI option or the GUI is active. */
! if (!redraw_gui_only || gui.in_use)
! #endif
! check_redraw(options[opt_idx].flags);
return errmsg;
}
*** ../vim-7.2.098/src/version.c Wed Feb 4 16:25:53 2009
--- src/version.c Wed Feb 4 17:24:11 2009
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 99,
/**/
--
I started out with nothing, and I still have most of it.
-- Michael Davis -- "Tonight Show"
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
