]>
Commit | Line | Data |
---|---|---|
d8bcfa9f AF |
1 | Index: runtime/menu.vim |
2 | =================================================================== | |
3 | RCS file: /cvsroot/vim/vim/runtime/menu.vim,v | |
4 | retrieving revision 1.76 | |
5 | diff -u -3 -p -r1.76 menu.vim | |
6 | --- runtime/menu.vim 19 Nov 2002 23:53:46 -0000 1.76 | |
7 | +++ runtime/menu.vim 6 Feb 2003 17:52:16 -0000 | |
8 | @@ -695,6 +695,7 @@ func! s:BMMunge(fname, bnum) | |
9 | endif | |
10 | let name = name2 . "\t" . <SID>BMTruncName(fnamemodify(name,':h')) | |
11 | let name = escape(name, "\\. \t|") | |
12 | + let name = substitute(name, "&", "&&", "g") | |
13 | let name = substitute(name, "\n", "^@", "g") | |
14 | return name | |
15 | endfunc | |
16 | Index: runtime/doc/gui.txt | |
17 | =================================================================== | |
18 | RCS file: /cvsroot/vim/vim/runtime/doc/gui.txt,v | |
19 | retrieving revision 1.58 | |
20 | diff -u -3 -p -r1.58 gui.txt | |
21 | --- runtime/doc/gui.txt 13 May 2002 15:35:02 -0000 1.58 | |
22 | +++ runtime/doc/gui.txt 6 Feb 2003 17:52:17 -0000 | |
23 | @@ -493,7 +493,8 @@ which when selected, performs the operat | |
24 | Special characters in a menu name: | |
25 | ||
26 | & The next character is the shortcut key. Make sure each | |
27 | - shortcut key is only used once in a (sub)menu. | |
28 | + shortcut key is only used once in a (sub)menu. If you want to | |
29 | + insert a literal "&" in the menu name use "&&". | |
30 | <Tab> Separates the menu name from right-aligned text. This can be | |
31 | used to show the equivalent typed command. The text "<Tab>" | |
32 | can be used here for convenience. If you are using a real | |
33 | @@ -576,7 +577,8 @@ When no or zero priority is given, 500 i | |
34 | The priority for the PopUp menu is not used. | |
35 | ||
36 | The Help menu will be placed on the far right side of the menu bar on systems | |
37 | -which support this (Motif and GTK+). | |
38 | +which support this (Motif and GTK+). For GTK+ 2, this is not done anymore | |
39 | +because right-aligning the Help menu is now discouraged UI design. | |
40 | ||
41 | You can use a priority higher than 9999, to make it go after the Help menu, | |
42 | but that is non-standard and is discouraged. The highest possible priority is | |
43 | @@ -644,8 +646,10 @@ level. Vim interprets the items in this | |
44 | toolbar button image. Note that the exact filename is OS-specific: For | |
45 | example, under Win32 the command > | |
46 | :amenu ToolBar.Hello :echo "hello"<CR> | |
47 | -< would find the file 'hello.bmp'. Under GTK+/X11 it is 'Hello.xpm'. | |
48 | - For MS-Windows the bitmap is scaled to fit the button. | |
49 | +< would find the file 'hello.bmp'. Under GTK+/X11 it is 'Hello.xpm'. With | |
50 | + GTK+ 2 the files 'Hello.png', 'Hello.xpm' and 'Hello.bmp' are checked for | |
51 | + existence, and the first one found would be used. | |
52 | + For MS-Windows and GTK+ 2 the bitmap is scaled to fit the button. | |
53 | For others the size of the default pixmaps used is 20 by 20 pixels. | |
54 | For MS-Windows the bitmap should have 16 colors with the standard pallete. | |
55 | The light grey pixels will be changed to the Window frame color and the | |
56 | @@ -826,8 +830,10 @@ The tip is defined like this: > | |
57 | And delete it with: > | |
58 | :tunmenu MyMenu.Hello | |
59 | ||
60 | -When using the GTK GUI, and Vim has already opened the GUI window, the tooltip | |
61 | -must be defined before the ToolBar menu. Otherwise it won't show up. | |
62 | +When using the GTK+ 1.2 GUI, and Vim has already opened the GUI window, the | |
63 | +tooltip must be defined before the ToolBar menu. Otherwise it won't show up. | |
64 | +In the GTK+ 2 port the tooltip is now updated on the fly, so this is no longer | |
65 | +necessary. | |
66 | ||
67 | Tooltips are currently only supported for the X11 and Win32 GUI. However, they | |
68 | should appear for the other gui platforms in the not too distant future. | |
69 | Index: runtime/doc/gui_x11.txt | |
70 | =================================================================== | |
71 | RCS file: /cvsroot/vim/vim/runtime/doc/gui_x11.txt,v | |
72 | retrieving revision 1.57 | |
73 | diff -u -3 -p -r1.57 gui_x11.txt | |
74 | --- runtime/doc/gui_x11.txt 25 Mar 2002 17:00:32 -0000 1.57 | |
75 | +++ runtime/doc/gui_x11.txt 6 Feb 2003 17:52:17 -0000 | |
76 | @@ -315,14 +315,15 @@ internally. Look in the GTK documentati | |
77 | --sync | |
78 | --gdk-debug | |
79 | --gdk-no-debug | |
80 | - --no-xshm | |
81 | - --xim-preedit | |
82 | - --xim-status | |
83 | + --no-xshm (not in GTK+ 2) | |
84 | + --xim-preedit (not in GTK+ 2) | |
85 | + --xim-status (not in GTK+ 2) | |
86 | --gtk-debug | |
87 | --gtk-no-debug | |
88 | --g-fatal-warnings | |
89 | --gtk-module | |
90 | --display (GTK+ counterpart of -display; works the same way.) | |
91 | + --screen (The screen number; for GTK+ 2.2 multihead support.) | |
92 | ||
93 | As for colors, vim's color settings (for syntax highlighting) is still | |
94 | done the traditional vim way. See |:highlight| for more help. | |
95 | @@ -365,7 +366,8 @@ application to spawn the Vim correctly. | |
96 | http://www.gtk.org/api/ | |
97 | ||
98 | Note that this feature requires the latest GTK version. GTK 1.2.10 still has | |
99 | -a small problem. | |
100 | +a small problem. The socket feature has not yet been tested with GTK+ 2 -- | |
101 | +feel free to volunteer. | |
102 | ||
103 | ============================================================================== | |
104 | 6. GNOME version *gui-gnome* *Gnome* *GNOME* | |
105 | @@ -373,17 +375,31 @@ a small problem. | |
106 | The Gnome GUI works just like the GTK version. It only looks a bit different. | |
107 | See |GTK| above for how it works. | |
108 | ||
109 | +On the other hand, the GNOME 2 GUI looks barely different from the GTK+ 2 | |
110 | +version but implements an important feature that is not available in plain | |
111 | +GTK+ 2: Interaction with the session manager. | |
112 | + | |
113 | +On logout, Vim will show the usual exit confirmation dialog if any buffers are | |
114 | +still modified. Clicking [Cancel] will stop the logout process. Otherwise | |
115 | +the current session is stored to disk by using the |:mksession| command, and | |
116 | +restored the next time you log in. | |
117 | + | |
118 | +Note that the Session.vim file is written to a separate sub-directory of | |
119 | +$HOME/.gnome2 (the exact filename is based on a per-save unique key). Your | |
120 | +own session files will not be touched at all. | |
121 | + | |
122 | These are the different looks: | |
123 | -- Uses GNOME dialogs. | |
124 | +- Uses GNOME dialogs (GNOME 1 only). The GNOME 2 GUI uses the same nice | |
125 | + dialogs as the GTK+ 2 version. | |
126 | - Uses the GNOME dock, so that the toolbar and menubar can be moved to | |
127 | different locations other than the top (e.g., the toolbar can be placed on | |
128 | - the left, right, top, or bottom). The positioning of the menubar and | |
129 | - toolbar isn't saved right now; I think that's for GNOME session management | |
130 | - which isn't supported (yet). | |
131 | + the left, right, top, or bottom). The placement of the menubar and | |
132 | + toolbar is only saved in the GNOME 2 version. | |
133 | - That means the menubar and toolbar handles are back! Yeah! And the | |
134 | resizing grid still works too. | |
135 | ||
136 | Gnome is automatically compiled with if it was found by configure. | |
137 | +(FIXME: Is this still true? Use --enable-gnome-check to force it to.) | |
138 | ||
139 | ============================================================================== | |
140 | 7. Compiling *gui-x11-compiling* | |
141 | @@ -399,6 +415,12 @@ you can already successful compile, buil | |
142 | reason for this is because the compiler flags (CFLAGS) and link flags | |
143 | (LDFLAGS) are obtained through the 'gtk-config' shell script. | |
144 | ||
145 | +If you want to build with GTK+ 2 support pass the --enable-gtk2-check argument | |
146 | +to ./configure. Optionally, support for GNOME 2 will be compiled if the | |
147 | +--enable-gnome-check option is also given. Note that the support for GTK+ 2 | |
148 | +is still experimental. However, many people have reported that it works just | |
149 | +fine for them. | |
150 | + | |
151 | Otherwise, if you are using Motif or Athena, when you have the Motif or Athena | |
152 | files in a directory where configure doesn't look, edit the Makefile to enter | |
153 | the names of the directories. Search for "GUI_INC_LOC" for an example to set | |
154 | @@ -411,8 +433,15 @@ if using v1.0.6. For instance, there ar | |
155 | Using a version from GTK+'s CVS tree may or may not work, and is therefore not | |
156 | supported and not recommended. | |
157 | ||
158 | +For the experimental GTK+ 2 GUI, using the latest release in the GTK+ 2.0 or | |
159 | +GTK+ 2.2 series is recommended. CVS HEAD seems to work fine most of time as | |
160 | +well. | |
161 | + | |
162 | Lastly, although GTK+ has supposedly been ported to the Win32 platform, this | |
163 | -has not been tested with Vim and is also unsupported. | |
164 | +has not been tested with Vim and is also unsupported. Also, it's unlikely to | |
165 | +even compile since GTK+ GUI uses parts of the generic X11 code. This might | |
166 | +change in distant future; particularly because getting rid of the X11 centric | |
167 | +code parts is also required for GTK+ framebuffer support. | |
168 | ||
169 | *gui-x11-motif* | |
170 | For Motif, you need at least Motif version 1.2 and/or X11R5. Motif 2.0 and | |
171 | Index: runtime/doc/mbyte.txt | |
172 | =================================================================== | |
173 | RCS file: /cvsroot/vim/vim/runtime/doc/mbyte.txt,v | |
174 | retrieving revision 1.7 | |
175 | diff -u -3 -p -r1.7 mbyte.txt | |
176 | --- runtime/doc/mbyte.txt 25 Mar 2002 17:00:33 -0000 1.7 | |
177 | +++ runtime/doc/mbyte.txt 6 Feb 2003 17:52:18 -0000 | |
178 | @@ -105,6 +105,12 @@ is the difficult part. It depends on th | |
179 | a few other things. See the chapters on fonts: |mbyte-fonts-X11| for | |
180 | X-Windows and |mbyte-fonts-MSwin| for MS-Windows. | |
181 | ||
182 | +For GTK+ 2, you can skip the rest of this section. The options 'guifontset' | |
183 | +and 'guifontwide' do no longer exist. You only need to set 'guifont' and | |
184 | +everything should "just work". If your system comes with Xft2 and fontconfig | |
185 | +and the current font does not contain a certain glyph, a different font will | |
186 | +be used automatically if available. | |
187 | + | |
188 | For X11 you can set the 'guifontset' option to a list of fonts that together | |
189 | cover the characters that are used. Example for Korean: > | |
190 | ||
191 | @@ -493,6 +499,11 @@ For Vim you may need to set 'encoding' t | |
192 | Unfortunately, using fonts in X11 is complicated. The name of a single-byte | |
193 | font is a long string. For multi-byte fonts we need several of these... | |
194 | ||
195 | +Note: Most of this is no longer relevant for GTK+ 2. Selecting a font via | |
196 | +its XLFD is not supported anymore; see |'guifont'| for an example of how to | |
197 | +set the font. Do yourself a favour and ignore the |XLFD| and |fontset| | |
198 | +sections below. | |
199 | + | |
200 | First of all, Vim only accepts fixed-width fonts for displaying text. You | |
201 | cannot use proportionally spaced fonts. This excludes many of the available | |
202 | (and nicer looking) fonts. However, for menus and tooltips any font can be | |
203 | @@ -991,7 +1002,7 @@ The length of the two items together mus | |
204 | ||
205 | It's possible to have more than one character in the first column. This works | |
206 | like a dead key. Example: > | |
207 |