Ensure we're more specific about clang format options and include order

.clang-format

@@ -2,8 +2,7 @@
 AccessModifierOffset: 0
 AlignAfterOpenBracket: true
 AlignConsecutiveAssignments: false
-#uncomment for clang 3.9
-#AlignConsecutiveDeclarations: false
+AlignConsecutiveDeclarations: false
 AlignEscapedNewlinesLeft: false
 AlignOperands: true
 AlignTrailingComments: true
@@ -14,20 +13,17 @@ AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 # AlwaysBreakAfterDefinitionReturnType: None
-#uncomment for clang 3.9
-#AlwaysBreakAfterReturnType: None
+AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
 AlwaysBreakTemplateDeclarations: false
 BinPackArguments: false
 BinPackParameters: true
-# BraceWrapping: (not set since BreakBeforeBraces is not Custom)
 BreakBeforeBinaryOperators: None
-# BreakAfterJavaFieldAnnotations: (not java)
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
-#uncomment for clang 3.9
+# Too new for travis clang-format version
 # BreakStringLiterals: false
 ColumnLimit: 100
 CommentPragmas:  '\*\<'
@@ -39,35 +35,37 @@ DerivePointerAlignment: false
 DisableFormat: false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros: [ ]
-#Uncomment for clang 3.9
-#IncludeCategories:
-#  - Regex: '^"'
-#    Priority: 1
+SortIncludes: true
+# IncludeBlocksStyle changed to IncludeBlocks, between xenial and disco, so we can't use it for consistency
+# IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^"gamemode.h"'
+    Priority: 0
+  - Regex: '^"build-'
+    Priority: 1
+  - Regex: '^"common-'
+    Priority: 2
+  - Regex: '^"gamemode-'
+    Priority: 3
+  - Regex: '^<'
+    Priority: 4
 # IncludeIsMainRegex: (project doesn't use a main includes that can add other includes via regex)
 IndentCaseLabels: false
 IndentWidth: 4
 IndentWrappedFunctionNames: false
-# JavaScriptQuotes: (not javascript)
 KeepEmptyLinesAtTheStartOfBlocks: false
 Language: Cpp
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-# ObjCBlockIndentWidth: (not objc)
-# ObjCSpaceAfterProperty: (not objc)
-# ObjCSpaceBeforeProtocolList: (not objc)
 PenaltyBreakBeforeFirstCallParameter: 400
 PenaltyBreakComment: 0
-# PenaltyBreakFirstLessLess: (not cpp)
 PenaltyBreakString: 500
 PenaltyExcessCharacter: 10000
 PenaltyReturnTypeOnItsOwnLine: 600
 PointerAlignment: Right
-#uncomment for clang 3.9
-#ReflowComments: true
-#uncomment for clang 3.9
-#SortIncludes: true
+ReflowComments: true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
@@ -75,7 +73,6 @@ SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
-# SpacesInContainerLiterals: (not objc or javascript)
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard:        Cpp11

daemon/gamemode-context.c

@@ -36,8 +36,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-helpers.h"
 #include "common-logging.h"
 
-#include "gamemode-config.h"
 #include "gamemode.h"
+#include "gamemode-config.h"
 
 #include "build-config.h"
 
@@ -602,10 +602,12 @@ int game_mode_context_query_status(GameModeContext *self, pid_t client, pid_t re
  */
 static GameModeClient *game_mode_client_new(pid_t pid, char *executable)
 {
+	/* clang-format off */
 	GameModeClient c = {
 		.next = NULL,
 		.pid = pid,
 	};
+	/* clang-format on */
 	GameModeClient *ret = NULL;
 
 	ret = calloc(1, sizeof(struct GameModeClient));

daemon/gamemode-dbus.c

@@ -31,8 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define _GNU_SOURCE
 
-#include "common-logging.h"
 #include "gamemode.h"
+#include "common-logging.h"
 
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
@@ -216,6 +216,7 @@ static int method_refresh_config(sd_bus_message *m, void *userdata,
 /**
  * D-BUS vtable to dispatch virtual methods
  */
+/* clang-format off */
 static const sd_bus_vtable gamemode_vtable[] = {
 	SD_BUS_VTABLE_START(0),
 	SD_BUS_PROPERTY("ClientCount", "i", property_get_client_count, 0,
@@ -232,6 +233,7 @@ static const sd_bus_vtable gamemode_vtable[] = {
 	SD_BUS_METHOD("RefreshConfig", "", "i", method_refresh_config, SD_BUS_VTABLE_UNPRIVILEGED),
 	SD_BUS_VTABLE_END
 };
+/* clang-format on */
 
 /**
  * Main process loop for the daemon. Run until quitting has been requested.

daemon/gamemode-gpu.c

@@ -37,8 +37,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-helpers.h"
 #include "common-logging.h"
 
-#include "gamemode-config.h"
 #include "gamemode.h"
+#include "gamemode-config.h"
 
 #include "build-config.h"
 

daemon/gamemode-ioprio.c

@@ -31,10 +31,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define _GNU_SOURCE
 
+#include "gamemode.h"
 #include "common-helpers.h"
 #include "common-logging.h"
 #include "gamemode-config.h"
-#include "gamemode.h"
 
 #include <dirent.h>
 #include <sys/syscall.h>

daemon/gamemode-sched.c

@@ -31,9 +31,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define _GNU_SOURCE
 
+#include "gamemode.h"
 #include "common-logging.h"
 #include "gamemode-config.h"
-#include "gamemode.h"
 
 #include <dirent.h>
 #include <sched.h>

daemon/gamemode-tests.c

@@ -37,8 +37,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-helpers.h"
 #include "common-logging.h"
 
-#include "gamemode-config.h"
 #include "gamemode.h"
+#include "gamemode-config.h"
 #include "gamemode_client.h"
 
 #include <pthread.h>

daemon/gamemode-wine.c

@@ -31,9 +31,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define _GNU_SOURCE
 
+#include "gamemode.h"
 #include "common-helpers.h"
 #include "common-logging.h"
-#include "gamemode.h"
 
 #include <ctype.h>
 #include <fcntl.h>

daemon/gamemoded.c

@@ -49,9 +49,9 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define _GNU_SOURCE
 
+#include "gamemode.h"
 #include "common-logging.h"
 #include "gamemode-config.h"
-#include "gamemode.h"
 
 #include "gamemode_client.h"