Add clang-format configuration, clean up
This commit is contained in:
		
							
								
								
									
										32
									
								
								.clang-format
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								.clang-format
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
				
			|||||||
 | 
					# clang-format is fairly limited, and these rules are approximate:
 | 
				
			||||||
 | 
					#  - array initializers can get terribly mangled with clang-format 12.0,
 | 
				
			||||||
 | 
					#  - sometimes it still aligns with space characters,
 | 
				
			||||||
 | 
					#  - struct name NL { NL ... NL } NL name; is unachievable.
 | 
				
			||||||
 | 
					BasedOnStyle: GNU
 | 
				
			||||||
 | 
					ColumnLimit: 80
 | 
				
			||||||
 | 
					IndentWidth: 4
 | 
				
			||||||
 | 
					TabWidth: 4
 | 
				
			||||||
 | 
					UseTab: ForContinuationAndIndentation
 | 
				
			||||||
 | 
					BreakBeforeBraces: Allman
 | 
				
			||||||
 | 
					SpaceAfterCStyleCast: true
 | 
				
			||||||
 | 
					AlignAfterOpenBracket: DontAlign
 | 
				
			||||||
 | 
					AlignEscapedNewlines: DontAlign
 | 
				
			||||||
 | 
					AlignOperands: DontAlign
 | 
				
			||||||
 | 
					AlignConsecutiveMacros: Consecutive
 | 
				
			||||||
 | 
					AllowAllArgumentsOnNextLine: false
 | 
				
			||||||
 | 
					AllowAllParametersOfDeclarationOnNextLine: false
 | 
				
			||||||
 | 
					IndentGotoLabels: false
 | 
				
			||||||
 | 
					MaxEmptyLinesToKeep: 2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# IncludeCategories has some potential, but it may also break the build.
 | 
				
			||||||
 | 
					# Note that the documentation says the value should be "Never".
 | 
				
			||||||
 | 
					SortIncludes: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Must be kept synchronized with gi18n.h and make-template.sh.
 | 
				
			||||||
 | 
					WhitespaceSensitiveMacros: ['_', 'Q_', 'N_', 'C_', 'NC_']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# This is a compromise, it generally works out aesthetically better.
 | 
				
			||||||
 | 
					BinPackArguments: false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Unfortunately, this can't be told to align to column 40 or so.
 | 
				
			||||||
 | 
					SpacesBeforeTrailingComments: 2
 | 
				
			||||||
@@ -305,7 +305,6 @@ on_open (G_GNUC_UNUSED GtkMenuItem *item, G_GNUC_UNUSED gpointer data)
 | 
				
			|||||||
			Dictionary *dict = g_malloc0 (sizeof *dict);
 | 
								Dictionary *dict = g_malloc0 (sizeof *dict);
 | 
				
			||||||
			dict->filename = iter->data;
 | 
								dict->filename = iter->data;
 | 
				
			||||||
			g_ptr_array_add (new_dictionaries, dict);
 | 
								g_ptr_array_add (new_dictionaries, dict);
 | 
				
			||||||
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		g_slist_free (paths);
 | 
							g_slist_free (paths);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,7 +67,7 @@ unichar_width (gunichar ch)
 | 
				
			|||||||
void
 | 
					void
 | 
				
			||||||
update_curses_terminal_size (void)
 | 
					update_curses_terminal_size (void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
#if defined (HAVE_RESIZETERM) && defined (TIOCGWINSZ)
 | 
					#if defined HAVE_RESIZETERM && defined TIOCGWINSZ
 | 
				
			||||||
	struct winsize size;
 | 
						struct winsize size;
 | 
				
			||||||
	if (!ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &size))
 | 
						if (!ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &size))
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user