Mercurial > vim

comparison src/os_win32.c @ 31091:551ce1a137da v9.0.0880

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0880: preprocessor indenting is off Commit: https://github.com/vim/vim/commit/161b6ac04f257ab17779e9ba6f5b3e3e15d2a0fd Author: K.Takata <kentkt@csc.jp> Date: Mon Nov 14 15:31:07 2022 +0000 patch 9.0.0880: preprocessor indenting is off Problem: Preprocessor indenting is off. Solution: Adjust preprocessor indentation. (Ken Takata, closes https://github.com/vim/vim/issues/11546)
author Bram Moolenaar <Bram@vim.org>
date Mon, 14 Nov 2022 16:45:04 +0100
parents 983c16e2dfb7
children 25f6c7f77c70
comparison
equal deleted inserted replaced
31090:a681edbc4386 31091:551ce1a137da
1260 int zDelta = pmer->dwButtonState; 1260 int zDelta = pmer->dwButtonState;
1261 1261
1262 g_xMouse = pmer->dwMousePosition.X; 1262 g_xMouse = pmer->dwMousePosition.X;
1263 g_yMouse = pmer->dwMousePosition.Y; 1263 g_yMouse = pmer->dwMousePosition.Y;
1264 1264
1265 #ifdef FEAT_PROP_POPUP 1265 # ifdef FEAT_PROP_POPUP
1266 int lcol = g_xMouse; 1266 int lcol = g_xMouse;
1267 int lrow = g_yMouse; 1267 int lrow = g_yMouse;
1268 win_T *wp = mouse_find_win(&lrow, &lcol, FIND_POPUP); 1268 win_T *wp = mouse_find_win(&lrow, &lcol, FIND_POPUP);
1269 if (wp != NULL && popup_is_popup(wp)) 1269 if (wp != NULL && popup_is_popup(wp))
1270 { 1270 {
1292 update_screen(0); 1292 update_screen(0);
1293 setcursor(); 1293 setcursor();
1294 out_flush(); 1294 out_flush();
1295 return; 1295 return;
1296 } 1296 }
1297 #endif 1297 # endif
1298 mouse_col = g_xMouse; 1298 mouse_col = g_xMouse;
1299 mouse_row = g_yMouse; 1299 mouse_row = g_yMouse;
1300 1300
1301 char_u modifiers = 0; 1301 char_u modifiers = 0;
1302 char_u direction = 0; 1302 char_u direction = 0;
6057 clip.Right = g_srScrollRegion.Right; 6057 clip.Right = g_srScrollRegion.Right;
6058 clip.Bottom = g_srScrollRegion.Bottom; 6058 clip.Bottom = g_srScrollRegion.Bottom;
6059 6059
6060 fill.Char.AsciiChar = ' '; 6060 fill.Char.AsciiChar = ' ';
6061 if (!(vtp_working 6061 if (!(vtp_working
6062 #ifdef FEAT_TERMGUICOLORS 6062 # ifdef FEAT_TERMGUICOLORS
6063 && (p_tgc || t_colors >= 256) 6063 && (p_tgc || t_colors >= 256)
6064 #endif 6064 # endif
6065 )) 6065 ))
6066 fill.Attributes = g_attrCurrent; 6066 fill.Attributes = g_attrCurrent;
6067 else 6067 else
6068 fill.Attributes = g_attrDefault; 6068 fill.Attributes = g_attrDefault;
6069 6069
6185 { 6185 {
6186 if (x < 1 || x > (unsigned)Columns || y < 1 || y > (unsigned)Rows) 6186 if (x < 1 || x > (unsigned)Columns || y < 1 || y > (unsigned)Rows)
6187 return; 6187 return;
6188 6188
6189 if (!(vtp_working 6189 if (!(vtp_working
6190 #ifdef FEAT_TERMGUICOLORS 6190 # ifdef FEAT_TERMGUICOLORS
6191 && (p_tgc || t_colors >= 256) 6191 && (p_tgc || t_colors >= 256)
6192 #endif 6192 # endif
6193 )) 6193 ))
6194 { 6194 {
6195 // There are reports of double-width characters not displayed 6195 // There are reports of double-width characters not displayed
6196 // correctly. This workaround should fix it, similar to how it's done 6196 // correctly. This workaround should fix it, similar to how it's done
6197 // for VTP. 6197 // for VTP.
6433 } 6433 }
6434 } 6434 }
6435 } 6435 }
6436 6436
6437 if (!(vtp_working 6437 if (!(vtp_working
6438 #ifdef FEAT_TERMGUICOLORS 6438 # ifdef FEAT_TERMGUICOLORS
6439 && (p_tgc || t_colors >= 256) 6439 && (p_tgc || t_colors >= 256)
6440 #endif 6440 # endif
6441 )) 6441 ))
6442 { 6442 {
6443 FillConsoleOutputAttribute(g_hConOut, g_attrCurrent, cells, 6443 FillConsoleOutputAttribute(g_hConOut, g_attrCurrent, cells,
6444 coord, &written); 6444 coord, &written);
6445 // When writing fails or didn't write a single character, pretend one 6445 // When writing fails or didn't write a single character, pretend one
6477 g_coord.Y++; 6477 g_coord.Y++;
6478 } 6478 }
6479 6479
6480 // Cursor under VTP is always in the correct position, no need to reset. 6480 // Cursor under VTP is always in the correct position, no need to reset.
6481 if (!(vtp_working 6481 if (!(vtp_working
6482 #ifdef FEAT_TERMGUICOLORS 6482 # ifdef FEAT_TERMGUICOLORS
6483 && (p_tgc || t_colors >= 256) 6483 && (p_tgc || t_colors >= 256)
6484 #endif 6484 # endif
6485 )) 6485 ))
6486 gotoxy(g_coord.X + 1, g_coord.Y + 1); 6486 gotoxy(g_coord.X + 1, g_coord.Y + 1);
6487 6487
6488 return written; 6488 return written;
6489 } 6489 }