Mercurial > vim
comparison src/gui.h @ 18753:6e3dc2d630c2 v8.1.2366
patch 8.1.2366: using old C style comments
Commit: https://github.com/vim/vim/commit/9bf703d46a79fbffeb829246ea5ce385bddc4166
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 30 19:44:38 2019 +0100
patch 8.1.2366: using old C style comments
Problem: Using old C style comments.
Solution: Use // comments where appropriate.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 30 Nov 2019 19:45:03 +0100 |
parents | 00cd8830bab9 |
children | 22f0dda71638 |
comparison
equal
deleted
inserted
replaced
18752:9ec3c9cb4533 | 18753:6e3dc2d630c2 |
---|---|
15 # include <X11/Intrinsic.h> | 15 # include <X11/Intrinsic.h> |
16 # include <X11/StringDefs.h> | 16 # include <X11/StringDefs.h> |
17 #endif | 17 #endif |
18 | 18 |
19 #ifdef FEAT_GUI_GTK | 19 #ifdef FEAT_GUI_GTK |
20 # ifdef VMS /* undef MIN and MAX because Intrinsic.h redefines them anyway */ | 20 # ifdef VMS // undef MIN and MAX because Intrinsic.h redefines them anyway |
21 # ifdef MAX | 21 # ifdef MAX |
22 # undef MAX | 22 # undef MAX |
23 # endif | 23 # endif |
24 # ifdef MIN | 24 # ifdef MIN |
25 # undef MIN | 25 # undef MIN |
111 + gui.border_offset) | 111 + gui.border_offset) |
112 # define FILL_Y(row) ((row) * gui.char_height + gui.border_offset) | 112 # define FILL_Y(row) ((row) * gui.char_height + gui.border_offset) |
113 # define Y_2_ROW(y) (((y) - gui.border_offset) / gui.char_height) | 113 # define Y_2_ROW(y) (((y) - gui.border_offset) / gui.char_height) |
114 #endif | 114 #endif |
115 | 115 |
116 /* Indices for arrays of scrollbars */ | 116 // Indices for arrays of scrollbars |
117 #define SBAR_NONE -1 | 117 #define SBAR_NONE -1 |
118 #define SBAR_LEFT 0 | 118 #define SBAR_LEFT 0 |
119 #define SBAR_RIGHT 1 | 119 #define SBAR_RIGHT 1 |
120 #define SBAR_BOTTOM 2 | 120 #define SBAR_BOTTOM 2 |
121 | 121 |
122 /* Orientations for scrollbars */ | 122 // Orientations for scrollbars |
123 #define SBAR_VERT 0 | 123 #define SBAR_VERT 0 |
124 #define SBAR_HORIZ 1 | 124 #define SBAR_HORIZ 1 |
125 | 125 |
126 /* Default size of scrollbar */ | 126 // Default size of scrollbar |
127 #define SB_DEFAULT_WIDTH 16 | 127 #define SB_DEFAULT_WIDTH 16 |
128 | 128 |
129 /* Default height of the menu bar */ | 129 // Default height of the menu bar |
130 #define MENU_DEFAULT_HEIGHT 1 /* figure it out at runtime */ | 130 #define MENU_DEFAULT_HEIGHT 1 // figure it out at runtime |
131 | 131 |
132 /* Flags for gui_mch_outstr_nowrap() */ | 132 // Flags for gui_mch_outstr_nowrap() |
133 #define GUI_MON_WRAP_CURSOR 0x01 /* wrap cursor at end of line */ | 133 #define GUI_MON_WRAP_CURSOR 0x01 // wrap cursor at end of line |
134 #define GUI_MON_INVERT 0x02 /* invert the characters */ | 134 #define GUI_MON_INVERT 0x02 // invert the characters |
135 #define GUI_MON_IS_CURSOR 0x04 /* drawing cursor */ | 135 #define GUI_MON_IS_CURSOR 0x04 // drawing cursor |
136 #define GUI_MON_TRS_CURSOR 0x08 /* drawing transparent cursor */ | 136 #define GUI_MON_TRS_CURSOR 0x08 // drawing transparent cursor |
137 #define GUI_MON_NOCLEAR 0x10 /* don't clear selection */ | 137 #define GUI_MON_NOCLEAR 0x10 // don't clear selection |
138 | 138 |
139 /* Flags for gui_mch_draw_string() */ | 139 // Flags for gui_mch_draw_string() |
140 #define DRAW_TRANSP 0x01 /* draw with transparent bg */ | 140 #define DRAW_TRANSP 0x01 // draw with transparent bg |
141 #define DRAW_BOLD 0x02 /* draw bold text */ | 141 #define DRAW_BOLD 0x02 // draw bold text |
142 #define DRAW_UNDERL 0x04 /* draw underline text */ | 142 #define DRAW_UNDERL 0x04 // draw underline text |
143 #define DRAW_UNDERC 0x08 /* draw undercurl text */ | 143 #define DRAW_UNDERC 0x08 // draw undercurl text |
144 #if defined(FEAT_GUI_GTK) | 144 #if defined(FEAT_GUI_GTK) |
145 # define DRAW_ITALIC 0x10 /* draw italic text */ | 145 # define DRAW_ITALIC 0x10 // draw italic text |
146 #endif | 146 #endif |
147 #define DRAW_CURSOR 0x20 /* drawing block cursor (win32) */ | 147 #define DRAW_CURSOR 0x20 // drawing block cursor (win32) |
148 #define DRAW_STRIKE 0x40 /* strikethrough */ | 148 #define DRAW_STRIKE 0x40 // strikethrough |
149 | 149 |
150 /* For our own tearoff menu item */ | 150 // For our own tearoff menu item |
151 #define TEAR_STRING "-->Detach" | 151 #define TEAR_STRING "-->Detach" |
152 #define TEAR_LEN (9) /* length of above string */ | 152 #define TEAR_LEN (9) // length of above string |
153 | 153 |
154 /* for the toolbar */ | 154 // for the toolbar |
155 #define TOOLBAR_BUTTON_HEIGHT 18 | 155 #define TOOLBAR_BUTTON_HEIGHT 18 |
156 #define TOOLBAR_BUTTON_WIDTH 18 | 156 #define TOOLBAR_BUTTON_WIDTH 18 |
157 #define TOOLBAR_BORDER_HEIGHT 12 /* room above+below buttons for MSWindows */ | 157 #define TOOLBAR_BORDER_HEIGHT 12 // room above+below buttons for MSWindows |
158 | 158 |
159 #ifdef FEAT_GUI_MSWIN | 159 #ifdef FEAT_GUI_MSWIN |
160 # define TABLINE_HEIGHT 22 | 160 # define TABLINE_HEIGHT 22 |
161 #endif | 161 #endif |
162 #ifdef FEAT_GUI_MOTIF | 162 #ifdef FEAT_GUI_MOTIF |
163 # define TABLINE_HEIGHT 30 | 163 # define TABLINE_HEIGHT 30 |
164 #endif | 164 #endif |
165 | 165 |
166 #if defined(NO_CONSOLE) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) | 166 #if defined(NO_CONSOLE) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) |
167 # define NO_CONSOLE_INPUT /* use no_console_input() to check if there | 167 # define NO_CONSOLE_INPUT // use no_console_input() to check if there |
168 is no console input possible */ | 168 // is no console input possible |
169 #endif | 169 #endif |
170 | 170 |
171 typedef struct GuiScrollbar | 171 typedef struct GuiScrollbar |
172 { | 172 { |
173 long ident; /* Unique identifier for each scrollbar */ | 173 long ident; // Unique identifier for each scrollbar |
174 win_T *wp; /* Scrollbar's window, NULL for bottom */ | 174 win_T *wp; // Scrollbar's window, NULL for bottom |
175 int type; /* one of SBAR_{LEFT,RIGHT,BOTTOM} */ | 175 int type; // one of SBAR_{LEFT,RIGHT,BOTTOM} |
176 long value; /* Represents top line number visible */ | 176 long value; // Represents top line number visible |
177 #ifdef FEAT_GUI_ATHENA | 177 #ifdef FEAT_GUI_ATHENA |
178 int pixval; /* pixel count of value */ | 178 int pixval; // pixel count of value |
179 #endif | 179 #endif |
180 long size; /* Size of scrollbar thumb */ | 180 long size; // Size of scrollbar thumb |
181 long max; /* Number of lines in buffer */ | 181 long max; // Number of lines in buffer |
182 | 182 |
183 /* Values measured in characters: */ | 183 // Values measured in characters: |
184 int top; /* Top of scroll bar (chars from row 0) */ | 184 int top; // Top of scroll bar (chars from row 0) |
185 int height; /* Current height of scroll bar in rows */ | 185 int height; // Current height of scroll bar in rows |
186 int width; /* Current width of scroll bar in cols */ | 186 int width; // Current width of scroll bar in cols |
187 int status_height; /* Height of status line */ | 187 int status_height; // Height of status line |
188 #ifdef FEAT_GUI_X11 | 188 #ifdef FEAT_GUI_X11 |
189 Widget id; /* Id of real scroll bar */ | 189 Widget id; // Id of real scroll bar |
190 #endif | 190 #endif |
191 #ifdef FEAT_GUI_GTK | 191 #ifdef FEAT_GUI_GTK |
192 GtkWidget *id; /* Id of real scroll bar */ | 192 GtkWidget *id; // Id of real scroll bar |
193 unsigned long handler_id; /* Id of "value_changed" signal handler */ | 193 unsigned long handler_id; // Id of "value_changed" signal handler |
194 #endif | 194 #endif |
195 | 195 |
196 #ifdef FEAT_GUI_MSWIN | 196 #ifdef FEAT_GUI_MSWIN |
197 HWND id; /* Id of real scroll bar */ | 197 HWND id; // Id of real scroll bar |
198 int scroll_shift; /* The scrollbar stuff can handle only up to | 198 int scroll_shift; // The scrollbar stuff can handle only up to |
199 32767 lines. When the file is longer, | 199 // 32767 lines. When the file is longer, |
200 scroll_shift is set to the number of shifts | 200 // scroll_shift is set to the number of shifts |
201 to reduce the count. */ | 201 // to reduce the count. |
202 #endif | 202 #endif |
203 #ifdef FEAT_GUI_MAC | 203 #ifdef FEAT_GUI_MAC |
204 ControlHandle id; /* A handle to the scrollbar */ | 204 ControlHandle id; // A handle to the scrollbar |
205 #endif | 205 #endif |
206 #ifdef FEAT_GUI_PHOTON | 206 #ifdef FEAT_GUI_PHOTON |
207 PtWidget_t *id; | 207 PtWidget_t *id; |
208 #endif | 208 #endif |
209 } scrollbar_T; | 209 } scrollbar_T; |
210 | 210 |
211 typedef long guicolor_T; /* handle for a GUI color; for X11 this should | 211 typedef long guicolor_T; // handle for a GUI color; for X11 this should |
212 be "Pixel", but that's an unsigned and we | 212 // be "Pixel", but that's an unsigned and we |
213 need a signed value */ | 213 // need a signed value |
214 #define INVALCOLOR (guicolor_T)-11111 /* number for invalid color; on 32 bit | 214 #define INVALCOLOR (guicolor_T)-11111 // number for invalid color; on 32 bit |
215 displays there is a tiny chance this is an | 215 // displays there is a tiny chance this is an |
216 actual color */ | 216 // actual color |
217 #define CTERMCOLOR (guicolor_T)-11110 /* only used for cterm.bg_rgb and | 217 #define CTERMCOLOR (guicolor_T)-11110 // only used for cterm.bg_rgb and |
218 cterm.fg_rgb: use cterm color */ | 218 // cterm.fg_rgb: use cterm color |
219 | 219 |
220 #ifdef FEAT_GUI_GTK | 220 #ifdef FEAT_GUI_GTK |
221 typedef PangoFontDescription *GuiFont; /* handle for a GUI font */ | 221 typedef PangoFontDescription *GuiFont; // handle for a GUI font |
222 typedef PangoFontDescription *GuiFontset; /* handle for a GUI fontset */ | 222 typedef PangoFontDescription *GuiFontset; // handle for a GUI fontset |
223 # define NOFONT (GuiFont)NULL | 223 # define NOFONT (GuiFont)NULL |
224 # define NOFONTSET (GuiFontset)NULL | 224 # define NOFONTSET (GuiFontset)NULL |
225 #else | 225 #else |
226 # ifdef FEAT_GUI_PHOTON | 226 # ifdef FEAT_GUI_PHOTON |
227 typedef char *GuiFont; | 227 typedef char *GuiFont; |
228 typedef char *GuiFontset; | 228 typedef char *GuiFontset; |
229 # define NOFONT (GuiFont)NULL | 229 # define NOFONT (GuiFont)NULL |
230 # define NOFONTSET (GuiFontset)NULL | 230 # define NOFONTSET (GuiFontset)NULL |
231 # else | 231 # else |
232 # ifdef FEAT_GUI_X11 | 232 # ifdef FEAT_GUI_X11 |
233 typedef XFontStruct *GuiFont; /* handle for a GUI font */ | 233 typedef XFontStruct *GuiFont; // handle for a GUI font |
234 typedef XFontSet GuiFontset; /* handle for a GUI fontset */ | 234 typedef XFontSet GuiFontset; // handle for a GUI fontset |
235 # define NOFONT (GuiFont)0 | 235 # define NOFONT (GuiFont)0 |
236 # define NOFONTSET (GuiFontset)0 | 236 # define NOFONTSET (GuiFontset)0 |
237 # else | 237 # else |
238 typedef long_u GuiFont; /* handle for a GUI font */ | 238 typedef long_u GuiFont; // handle for a GUI font |
239 typedef long_u GuiFontset; /* handle for a GUI fontset */ | 239 typedef long_u GuiFontset; // handle for a GUI fontset |
240 # define NOFONT (GuiFont)0 | 240 # define NOFONT (GuiFont)0 |
241 # define NOFONTSET (GuiFontset)0 | 241 # define NOFONTSET (GuiFontset)0 |
242 # endif | 242 # endif |
243 # endif | 243 # endif |
244 #endif | 244 #endif |
253 //# define EXPERIMENTAL_GUI_CMD | 253 //# define EXPERIMENTAL_GUI_CMD |
254 #endif | 254 #endif |
255 | 255 |
256 typedef struct Gui | 256 typedef struct Gui |
257 { | 257 { |
258 int in_focus; /* Vim has input focus */ | 258 int in_focus; // Vim has input focus |
259 int in_use; /* Is the GUI being used? */ | 259 int in_use; // Is the GUI being used? |
260 int starting; /* GUI will start in a little while */ | 260 int starting; // GUI will start in a little while |
261 int shell_created; /* Has the shell been created yet? */ | 261 int shell_created; // Has the shell been created yet? |
262 int dying; /* Is vim dying? Then output to terminal */ | 262 int dying; // Is vim dying? Then output to terminal |
263 int dofork; /* Use fork() when GUI is starting */ | 263 int dofork; // Use fork() when GUI is starting |
264 #ifdef GUI_MAY_SPAWN | 264 #ifdef GUI_MAY_SPAWN |
265 int dospawn; /* Use spawn() when GUI is starting */ | 265 int dospawn; // Use spawn() when GUI is starting |
266 #endif | 266 #endif |
267 int dragged_sb; /* Which scrollbar being dragged, if any? */ | 267 int dragged_sb; // Which scrollbar being dragged, if any? |
268 win_T *dragged_wp; /* Which WIN's sb being dragged, if any? */ | 268 win_T *dragged_wp; // Which WIN's sb being dragged, if any? |
269 int pointer_hidden; /* Is the mouse pointer hidden? */ | 269 int pointer_hidden; // Is the mouse pointer hidden? |
270 int col; /* Current cursor column in GUI display */ | 270 int col; // Current cursor column in GUI display |
271 int row; /* Current cursor row in GUI display */ | 271 int row; // Current cursor row in GUI display |
272 int cursor_col; /* Physical cursor column in GUI display */ | 272 int cursor_col; // Physical cursor column in GUI display |
273 int cursor_row; /* Physical cursor row in GUI display */ | 273 int cursor_row; // Physical cursor row in GUI display |
274 char cursor_is_valid; /* There is a cursor at cursor_row/col */ | 274 char cursor_is_valid; // There is a cursor at cursor_row/col |
275 int num_cols; /* Number of columns */ | 275 int num_cols; // Number of columns |
276 int num_rows; /* Number of rows */ | 276 int num_rows; // Number of rows |
277 int scroll_region_top; /* Top (first) line of scroll region */ | 277 int scroll_region_top; // Top (first) line of scroll region |
278 int scroll_region_bot; /* Bottom (last) line of scroll region */ | 278 int scroll_region_bot; // Bottom (last) line of scroll region |
279 int scroll_region_left; /* Left (first) column of scroll region */ | 279 int scroll_region_left; // Left (first) column of scroll region |
280 int scroll_region_right; /* Right (last) col. of scroll region */ | 280 int scroll_region_right; // Right (last) col. of scroll region |
281 int highlight_mask; /* Highlight attribute mask */ | 281 int highlight_mask; // Highlight attribute mask |
282 int scrollbar_width; /* Width of vertical scrollbars */ | 282 int scrollbar_width; // Width of vertical scrollbars |
283 int scrollbar_height; /* Height of horizontal scrollbar */ | 283 int scrollbar_height; // Height of horizontal scrollbar |
284 int left_sbar_x; /* Calculated x coord for left scrollbar */ | 284 int left_sbar_x; // Calculated x coord for left scrollbar |
285 int right_sbar_x; /* Calculated x coord for right scrollbar */ | 285 int right_sbar_x; // Calculated x coord for right scrollbar |
286 | 286 |
287 #ifdef FEAT_MENU | 287 #ifdef FEAT_MENU |
288 # ifndef FEAT_GUI_GTK | 288 # ifndef FEAT_GUI_GTK |
289 int menu_height; /* Height of the menu bar */ | 289 int menu_height; // Height of the menu bar |
290 int menu_width; /* Width of the menu bar */ | 290 int menu_width; // Width of the menu bar |
291 # endif | 291 # endif |
292 char menu_is_active; /* TRUE if menu is present */ | 292 char menu_is_active; // TRUE if menu is present |
293 # ifdef FEAT_GUI_ATHENA | 293 # ifdef FEAT_GUI_ATHENA |
294 char menu_height_fixed; /* TRUE if menu height fixed */ | 294 char menu_height_fixed; // TRUE if menu height fixed |
295 # endif | 295 # endif |
296 #endif | 296 #endif |
297 | 297 |
298 scrollbar_T bottom_sbar; /* Bottom scrollbar */ | 298 scrollbar_T bottom_sbar; // Bottom scrollbar |
299 int which_scrollbars[3];/* Which scrollbar boxes are active? */ | 299 int which_scrollbars[3];// Which scrollbar boxes are active? |
300 int prev_wrap; /* For updating the horizontal scrollbar */ | 300 int prev_wrap; // For updating the horizontal scrollbar |
301 int char_width; /* Width of char cell in pixels */ | 301 int char_width; // Width of char cell in pixels |
302 int char_height; /* Height of char cell in pixels, includes | 302 int char_height; // Height of char cell in pixels, includes |
303 'linespace' */ | 303 // 'linespace' |
304 int char_ascent; /* Ascent of char in pixels */ | 304 int char_ascent; // Ascent of char in pixels |
305 int border_width; /* Width of our border around text area */ | 305 int border_width; // Width of our border around text area |
306 int border_offset; /* Total pixel offset for all borders */ | 306 int border_offset; // Total pixel offset for all borders |
307 | 307 |
308 GuiFont norm_font; /* Normal font */ | 308 GuiFont norm_font; // Normal font |
309 #ifndef FEAT_GUI_GTK | 309 #ifndef FEAT_GUI_GTK |
310 GuiFont bold_font; /* Bold font */ | 310 GuiFont bold_font; // Bold font |
311 GuiFont ital_font; /* Italic font */ | 311 GuiFont ital_font; // Italic font |
312 GuiFont boldital_font; /* Bold-Italic font */ | 312 GuiFont boldital_font; // Bold-Italic font |
313 #else | 313 #else |
314 int font_can_bold; /* Whether norm_font supports bold weight. | 314 int font_can_bold; // Whether norm_font supports bold weight. |
315 * The styled font variants are not used. */ | 315 // The styled font variants are not used. |
316 #endif | 316 #endif |
317 | 317 |
318 #if defined(FEAT_MENU) && !defined(FEAT_GUI_GTK) | 318 #if defined(FEAT_MENU) && !defined(FEAT_GUI_GTK) |
319 # ifdef FONTSET_ALWAYS | 319 # ifdef FONTSET_ALWAYS |
320 GuiFontset menu_fontset; /* set of fonts for multi-byte chars */ | 320 GuiFontset menu_fontset; // set of fonts for multi-byte chars |
321 # else | 321 # else |
322 GuiFont menu_font; /* menu item font */ | 322 GuiFont menu_font; // menu item font |
323 # endif | 323 # endif |
324 #endif | 324 #endif |
325 GuiFont wide_font; /* Normal 'guifontwide' font */ | 325 GuiFont wide_font; // Normal 'guifontwide' font |
326 #ifndef FEAT_GUI_GTK | 326 #ifndef FEAT_GUI_GTK |
327 GuiFont wide_bold_font; /* Bold 'guifontwide' font */ | 327 GuiFont wide_bold_font; // Bold 'guifontwide' font |
328 GuiFont wide_ital_font; /* Italic 'guifontwide' font */ | 328 GuiFont wide_ital_font; // Italic 'guifontwide' font |
329 GuiFont wide_boldital_font; /* Bold-Italic 'guifontwide' font */ | 329 GuiFont wide_boldital_font; // Bold-Italic 'guifontwide' font |
330 #endif | 330 #endif |
331 #ifdef FEAT_XFONTSET | 331 #ifdef FEAT_XFONTSET |
332 GuiFontset fontset; /* set of fonts for multi-byte chars */ | 332 GuiFontset fontset; // set of fonts for multi-byte chars |
333 #endif | 333 #endif |
334 guicolor_T back_pixel; /* Color of background */ | 334 guicolor_T back_pixel; // Color of background |
335 guicolor_T norm_pixel; /* Color of normal text */ | 335 guicolor_T norm_pixel; // Color of normal text |
336 guicolor_T def_back_pixel; /* default Color of background */ | 336 guicolor_T def_back_pixel; // default Color of background |
337 guicolor_T def_norm_pixel; /* default Color of normal text */ | 337 guicolor_T def_norm_pixel; // default Color of normal text |
338 | 338 |
339 #ifdef FEAT_GUI_X11 | 339 #ifdef FEAT_GUI_X11 |
340 char *rsrc_menu_fg_name; /* Color of menu & dialog foreground */ | 340 char *rsrc_menu_fg_name; // Color of menu & dialog foreground |
341 guicolor_T menu_fg_pixel; /* Same in Pixel format */ | 341 guicolor_T menu_fg_pixel; // Same in Pixel format |
342 char *rsrc_menu_bg_name; /* Color of menu & dialog background */ | 342 char *rsrc_menu_bg_name; // Color of menu & dialog background |
343 guicolor_T menu_bg_pixel; /* Same in Pixel format */ | 343 guicolor_T menu_bg_pixel; // Same in Pixel format |
344 char *rsrc_scroll_fg_name; /* Color of scrollbar foreground */ | 344 char *rsrc_scroll_fg_name; // Color of scrollbar foreground |
345 guicolor_T scroll_fg_pixel; /* Same in Pixel format */ | 345 guicolor_T scroll_fg_pixel; // Same in Pixel format |
346 char *rsrc_scroll_bg_name; /* Color of scrollbar background */ | 346 char *rsrc_scroll_bg_name; // Color of scrollbar background |
347 guicolor_T scroll_bg_pixel; /* Same in Pixel format */ | 347 guicolor_T scroll_bg_pixel; // Same in Pixel format |
348 | 348 |
349 # ifdef FEAT_GUI_MOTIF | 349 # ifdef FEAT_GUI_MOTIF |
350 guicolor_T menu_def_fg_pixel; /* Default menu foreground */ | 350 guicolor_T menu_def_fg_pixel; // Default menu foreground |
351 guicolor_T menu_def_bg_pixel; /* Default menu background */ | 351 guicolor_T menu_def_bg_pixel; // Default menu background |
352 guicolor_T scroll_def_fg_pixel; /* Default scrollbar foreground */ | 352 guicolor_T scroll_def_fg_pixel; // Default scrollbar foreground |
353 guicolor_T scroll_def_bg_pixel; /* Default scrollbar background */ | 353 guicolor_T scroll_def_bg_pixel; // Default scrollbar background |
354 # endif | 354 # endif |
355 Display *dpy; /* X display */ | 355 Display *dpy; // X display |
356 Window wid; /* Window id of text area */ | 356 Window wid; // Window id of text area |
357 int visibility; /* Is shell partially/fully obscured? */ | 357 int visibility; // Is shell partially/fully obscured? |
358 GC text_gc; | 358 GC text_gc; |
359 GC back_gc; | 359 GC back_gc; |
360 GC invert_gc; | 360 GC invert_gc; |
361 Cursor blank_pointer; /* Blank pointer */ | 361 Cursor blank_pointer; // Blank pointer |
362 | 362 |
363 /* X Resources */ | 363 // X Resources |
364 char_u *rsrc_font_name; /* Resource font name, used if 'guifont' | 364 char_u *rsrc_font_name; // Resource font name, used if 'guifont' |
365 not set */ | 365 // not set |
366 char_u *rsrc_bold_font_name; /* Resource bold font name */ | 366 char_u *rsrc_bold_font_name; // Resource bold font name |
367 char_u *rsrc_ital_font_name; /* Resource italic font name */ | 367 char_u *rsrc_ital_font_name; // Resource italic font name |
368 char_u *rsrc_boldital_font_name; /* Resource bold-italic font name */ | 368 char_u *rsrc_boldital_font_name; // Resource bold-italic font name |
369 char_u *rsrc_menu_font_name; /* Resource menu Font name */ | 369 char_u *rsrc_menu_font_name; // Resource menu Font name |
370 Bool rsrc_rev_video; /* Use reverse video? */ | 370 Bool rsrc_rev_video; // Use reverse video? |
371 | 371 |
372 char_u *geom; /* Geometry, eg "80x24" */ | 372 char_u *geom; // Geometry, eg "80x24" |
373 Bool color_approx; /* Some color was approximated */ | 373 Bool color_approx; // Some color was approximated |
374 #endif | 374 #endif |
375 | 375 |
376 #ifdef FEAT_GUI_GTK | 376 #ifdef FEAT_GUI_GTK |
377 # ifndef USE_GTK3 | 377 # ifndef USE_GTK3 |
378 int visibility; /* Is shell partially/fully obscured? */ | 378 int visibility; // Is shell partially/fully obscured? |
379 # endif | 379 # endif |
380 GdkCursor *blank_pointer; /* Blank pointer */ | 380 GdkCursor *blank_pointer; // Blank pointer |
381 | 381 |
382 /* X Resources */ | 382 // X Resources |
383 char_u *geom; /* Geometry, eg "80x24" */ | 383 char_u *geom; // Geometry, eg "80x24" |
384 | 384 |
385 GtkWidget *mainwin; /* top level GTK window */ | 385 GtkWidget *mainwin; // top level GTK window |
386 GtkWidget *formwin; /* manages all the windows below */ | 386 GtkWidget *formwin; // manages all the windows below |
387 GtkWidget *drawarea; /* the "text" area */ | 387 GtkWidget *drawarea; // the "text" area |
388 # ifdef FEAT_MENU | 388 # ifdef FEAT_MENU |
389 GtkWidget *menubar; /* menubar */ | 389 GtkWidget *menubar; // menubar |
390 # endif | 390 # endif |
391 # ifdef FEAT_TOOLBAR | 391 # ifdef FEAT_TOOLBAR |
392 GtkWidget *toolbar; /* toolbar */ | 392 GtkWidget *toolbar; // toolbar |
393 # endif | 393 # endif |
394 # ifdef FEAT_GUI_GNOME | 394 # ifdef FEAT_GUI_GNOME |
395 GtkWidget *menubar_h; /* menubar handle */ | 395 GtkWidget *menubar_h; // menubar handle |
396 GtkWidget *toolbar_h; /* toolbar handle */ | 396 GtkWidget *toolbar_h; // toolbar handle |
397 # endif | 397 # endif |
398 # ifdef USE_GTK3 | 398 # ifdef USE_GTK3 |
399 GdkRGBA *fgcolor; /* GDK-styled foreground color */ | 399 GdkRGBA *fgcolor; // GDK-styled foreground color |
400 GdkRGBA *bgcolor; /* GDK-styled background color */ | 400 GdkRGBA *bgcolor; // GDK-styled background color |
401 GdkRGBA *spcolor; /* GDK-styled special color */ | 401 GdkRGBA *spcolor; // GDK-styled special color |
402 # else | 402 # else |
403 GdkColor *fgcolor; /* GDK-styled foreground color */ | 403 GdkColor *fgcolor; // GDK-styled foreground color |
404 GdkColor *bgcolor; /* GDK-styled background color */ | 404 GdkColor *bgcolor; // GDK-styled background color |
405 GdkColor *spcolor; /* GDK-styled special color */ | 405 GdkColor *spcolor; // GDK-styled special color |
406 # endif | 406 # endif |
407 # ifdef USE_GTK3 | 407 # ifdef USE_GTK3 |
408 cairo_surface_t *surface; /* drawarea surface */ | 408 cairo_surface_t *surface; // drawarea surface |
409 gboolean by_signal; /* cause of draw operation */ | 409 gboolean by_signal; // cause of draw operation |
410 # else | 410 # else |
411 GdkGC *text_gc; /* cached GC for normal text */ | 411 GdkGC *text_gc; // cached GC for normal text |
412 # endif | 412 # endif |
413 PangoContext *text_context; /* the context used for all text */ | 413 PangoContext *text_context; // the context used for all text |
414 PangoFont *ascii_font; /* cached font for ASCII strings */ | 414 PangoFont *ascii_font; // cached font for ASCII strings |
415 PangoGlyphString *ascii_glyphs; /* cached code point -> glyph map */ | 415 PangoGlyphString *ascii_glyphs; // cached code point -> glyph map |
416 # ifdef FEAT_GUI_TABLINE | 416 # ifdef FEAT_GUI_TABLINE |
417 GtkWidget *tabline; /* tab pages line handle */ | 417 GtkWidget *tabline; // tab pages line handle |
418 # endif | 418 # endif |
419 | 419 |
420 GtkAccelGroup *accel_group; | 420 GtkAccelGroup *accel_group; |
421 GtkWidget *filedlg; /* file selection dialog */ | 421 GtkWidget *filedlg; // file selection dialog |
422 char_u *browse_fname; /* file name from filedlg */ | 422 char_u *browse_fname; // file name from filedlg |
423 | 423 |
424 guint32 event_time; | 424 guint32 event_time; |
425 #endif /* FEAT_GUI_GTK */ | 425 #endif // FEAT_GUI_GTK |
426 | 426 |
427 #if defined(FEAT_GUI_TABLINE) \ | 427 #if defined(FEAT_GUI_TABLINE) \ |
428 && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ | 428 && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_MOTIF) \ |
429 || defined(FEAT_GUI_MAC)) | 429 || defined(FEAT_GUI_MAC)) |
430 int tabline_height; | 430 int tabline_height; |
431 #endif | 431 #endif |
432 | 432 |
433 #ifdef FEAT_FOOTER | 433 #ifdef FEAT_FOOTER |
434 int footer_height; /* height of the message footer */ | 434 int footer_height; // height of the message footer |
435 #endif | 435 #endif |
436 | 436 |
437 #if defined(FEAT_TOOLBAR) \ | 437 #if defined(FEAT_TOOLBAR) \ |
438 && (defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) | 438 && (defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MOTIF)) |
439 int toolbar_height; /* height of the toolbar */ | 439 int toolbar_height; // height of the toolbar |
440 #endif | 440 #endif |
441 | 441 |
442 #ifdef FEAT_BEVAL_TIP | 442 #ifdef FEAT_BEVAL_TIP |
443 /* Tooltip properties; also used for balloon evaluation */ | 443 // Tooltip properties; also used for balloon evaluation |
444 char_u *rsrc_tooltip_font_name; /* tooltip font name */ | 444 char_u *rsrc_tooltip_font_name; // tooltip font name |
445 char *rsrc_tooltip_fg_name; /* tooltip foreground color name */ | 445 char *rsrc_tooltip_fg_name; // tooltip foreground color name |
446 char *rsrc_tooltip_bg_name; /* tooltip background color name */ | 446 char *rsrc_tooltip_bg_name; // tooltip background color name |
447 guicolor_T tooltip_fg_pixel; /* tooltip foreground color */ | 447 guicolor_T tooltip_fg_pixel; // tooltip foreground color |
448 guicolor_T tooltip_bg_pixel; /* tooltip background color */ | 448 guicolor_T tooltip_bg_pixel; // tooltip background color |
449 XFontSet tooltip_fontset; /* tooltip fontset */ | 449 XFontSet tooltip_fontset; // tooltip fontset |
450 #endif | 450 #endif |
451 | 451 |
452 #ifdef FEAT_GUI_MSWIN | 452 #ifdef FEAT_GUI_MSWIN |
453 GuiFont currFont; /* Current font */ | 453 GuiFont currFont; // Current font |
454 guicolor_T currFgColor; /* Current foreground text color */ | 454 guicolor_T currFgColor; // Current foreground text color |
455 guicolor_T currBgColor; /* Current background text color */ | 455 guicolor_T currBgColor; // Current background text color |
456 guicolor_T currSpColor; /* Current special text color */ | 456 guicolor_T currSpColor; // Current special text color |
457 #endif | 457 #endif |
458 | 458 |
459 #ifdef FEAT_GUI_MAC | 459 #ifdef FEAT_GUI_MAC |
460 WindowPtr VimWindow; | 460 WindowPtr VimWindow; |
461 MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */ | 461 MenuHandle MacOSHelpMenu; // Help menu provided by the MacOS |
462 int MacOSHelpItems; /* Nr of help-items supplied by MacOS */ | 462 int MacOSHelpItems; // Nr of help-items supplied by MacOS |
463 WindowPtr wid; /* Window id of text area */ | 463 WindowPtr wid; // Window id of text area |
464 int visibility; /* Is window partially/fully obscured? */ | 464 int visibility; // Is window partially/fully obscured? |
465 #endif | 465 #endif |
466 | 466 |
467 #ifdef FEAT_GUI_PHOTON | 467 #ifdef FEAT_GUI_PHOTON |
468 PtWidget_t *vimWindow; /* PtWindow */ | 468 PtWidget_t *vimWindow; // PtWindow |
469 PtWidget_t *vimTextArea; /* PtRaw */ | 469 PtWidget_t *vimTextArea; // PtRaw |
470 PtWidget_t *vimContainer; /* PtPanel */ | 470 PtWidget_t *vimContainer; // PtPanel |
471 # if defined(FEAT_MENU) || defined(FEAT_TOOLBAR) | 471 # if defined(FEAT_MENU) || defined(FEAT_TOOLBAR) |
472 PtWidget_t *vimToolBarGroup; | 472 PtWidget_t *vimToolBarGroup; |
473 # endif | 473 # endif |
474 # ifdef FEAT_MENU | 474 # ifdef FEAT_MENU |
475 PtWidget_t *vimMenuBar; | 475 PtWidget_t *vimMenuBar; |
485 char *rsrc_input_method; | 485 char *rsrc_input_method; |
486 char *rsrc_preedit_type_name; | 486 char *rsrc_preedit_type_name; |
487 #endif | 487 #endif |
488 } gui_T; | 488 } gui_T; |
489 | 489 |
490 extern gui_T gui; /* this is defined in gui.c */ | 490 extern gui_T gui; // this is defined in gui.c |
491 | 491 |
492 /* definitions of available window positionings for gui_*_position_in_parent() | 492 // definitions of available window positionings for gui_*_position_in_parent() |
493 */ | |
494 typedef enum | 493 typedef enum |
495 { | 494 { |
496 VW_POS_MOUSE, | 495 VW_POS_MOUSE, |
497 VW_POS_CENTER, | 496 VW_POS_CENTER, |
498 VW_POS_TOP_CENTER | 497 VW_POS_TOP_CENTER |
501 #ifdef FIND_REPLACE_DIALOG | 500 #ifdef FIND_REPLACE_DIALOG |
502 /* | 501 /* |
503 * Flags used to distinguish the different contexts in which the | 502 * Flags used to distinguish the different contexts in which the |
504 * find/replace callback may be called. | 503 * find/replace callback may be called. |
505 */ | 504 */ |
506 # define FRD_FINDNEXT 1 /* Find next in find dialog */ | 505 # define FRD_FINDNEXT 1 // Find next in find dialog |
507 # define FRD_R_FINDNEXT 2 /* Find next in repl dialog */ | 506 # define FRD_R_FINDNEXT 2 // Find next in repl dialog |
508 # define FRD_REPLACE 3 /* Replace once */ | 507 # define FRD_REPLACE 3 // Replace once |
509 # define FRD_REPLACEALL 4 /* Replace remaining matches */ | 508 # define FRD_REPLACEALL 4 // Replace remaining matches |
510 # define FRD_UNDO 5 /* Undo replaced text */ | 509 # define FRD_UNDO 5 // Undo replaced text |
511 # define FRD_TYPE_MASK 7 /* Mask for the callback type */ | 510 # define FRD_TYPE_MASK 7 // Mask for the callback type |
512 /* Flags which change the way searching is done. */ | 511 // Flags which change the way searching is done. |
513 # define FRD_WHOLE_WORD 0x08 /* match whole word only */ | 512 # define FRD_WHOLE_WORD 0x08 // match whole word only |
514 # define FRD_MATCH_CASE 0x10 /* match case */ | 513 # define FRD_MATCH_CASE 0x10 // match case |
515 #endif | 514 #endif |
516 | 515 |
517 #ifdef FEAT_GUI_GTK | 516 #ifdef FEAT_GUI_GTK |
518 /* | 517 /* |
519 * Convenience macros to convert from 'encoding' to 'termencoding' and | 518 * Convenience macros to convert from 'encoding' to 'termencoding' and |
553 #else | 552 #else |
554 # define CONVERT_TO_UTF8(String) (String) | 553 # define CONVERT_TO_UTF8(String) (String) |
555 # define CONVERT_TO_UTF8_FREE(String) ((String) = (char_u *)NULL) | 554 # define CONVERT_TO_UTF8_FREE(String) ((String) = (char_u *)NULL) |
556 # define CONVERT_FROM_UTF8(String) (String) | 555 # define CONVERT_FROM_UTF8(String) (String) |
557 # define CONVERT_FROM_UTF8_FREE(String) ((String) = (char_u *)NULL) | 556 # define CONVERT_FROM_UTF8_FREE(String) ((String) = (char_u *)NULL) |
558 #endif /* FEAT_GUI_GTK */ | 557 #endif // FEAT_GUI_GTK |
559 | 558 |
560 #ifdef FEAT_GUI_GTK | 559 #ifdef FEAT_GUI_GTK |
561 /* | 560 /* |
562 * The second parameter of g_signal_handlers_disconnect_by_func() is supposed | 561 * The second parameter of g_signal_handlers_disconnect_by_func() is supposed |
563 * to be a function pointer which was passed to g_signal_connect_*() somewhere | 562 * to be a function pointer which was passed to g_signal_connect_*() somewhere |
579 # if defined(__SUNPRO_C) && defined(USE_GTK3) | 578 # if defined(__SUNPRO_C) && defined(USE_GTK3) |
580 # define FUNC2GENERIC(func) (void *)(func) | 579 # define FUNC2GENERIC(func) (void *)(func) |
581 # else | 580 # else |
582 # define FUNC2GENERIC(func) G_CALLBACK(func) | 581 # define FUNC2GENERIC(func) G_CALLBACK(func) |
583 # endif | 582 # endif |
584 #endif /* FEAT_GUI_GTK */ | 583 #endif // FEAT_GUI_GTK |
585 | 584 |
586 #if defined(UNIX) && !defined(FEAT_GUI_MAC) | 585 #if defined(UNIX) && !defined(FEAT_GUI_MAC) |
587 # define GUI_MAY_FORK | 586 # define GUI_MAY_FORK |
588 #endif | 587 #endif |