after indent

2 files changed, 278 insertions, 264 deletions

diff --git a/tests/test_config.c b/tests/test_config.c
index a39957d..e1ddf0d 100644
--- a/tests/test_config.c
+++ b/tests/test_config.c
@@ -8,191 +8,201 @@
 #include <libxklavier/xklavier.h>
 #include <libxklavier/xklavier_config.h>
 
-extern void xkl_config_dump( FILE* file,
-                             XklConfigRec *data );
+extern void xkl_config_dump(FILE * file, XklConfigRec * data);
 
 enum { ACTION_NONE, ACTION_GET, ACTION_SET, ACTION_WRITE };
 
-static void print_usage(void)
+static void
+print_usage(void)
 {
-  printf( "Usage: test_config (-g)|(-s -m <model> -l <layouts> -o <options>)|(-h)|(-ws)|(-wb)(-d <debugLevel>)\n" );
-  printf( "Options:\n" );
-  printf( "         -g - Dump the current config, load original system settings and revert back\n" ); 
-  printf( "         -s - Set the configuration given my -m -l -o options. Similar to setxkbmap\n" ); 
-  printf( "         -ws - Write the binary XKB config file (" PACKAGE ".xkm)\n" );
-  printf( "         -wb - Write the source XKB config file (" PACKAGE ".xkb)\n" );
-  printf( "         -d - Set the debug level (by default, 0)\n" );
-  printf( "         -h - Show this help\n" );
+	printf
+	    ("Usage: test_config (-g)|(-s -m <model> -l <layouts> -o <options>)|(-h)|(-ws)|(-wb)(-d <debugLevel>)\n");
+	printf("Options:\n");
+	printf
+	    ("         -g - Dump the current config, load original system settings and revert back\n");
+	printf
+	    ("         -s - Set the configuration given my -m -l -o options. Similar to setxkbmap\n");
+	printf("         -ws - Write the binary XKB config file (" PACKAGE
+	       ".xkm)\n");
+	printf("         -wb - Write the source XKB config file (" PACKAGE
+	       ".xkb)\n");
+	printf("         -d - Set the debug level (by default, 0)\n");
+	printf("         -h - Show this help\n");
 }
 
-int main( int argc, char * const argv[] )
+int
+main(int argc, char *const argv[])
 {
-  int c;
-  int action = ACTION_NONE;
-  const char* model = NULL;
-  const char* layouts = NULL;
-  const char* options = NULL;
-  int debug_level = -1;
-  int binary = 0;
-  Display *dpy;
-
-  while (1)
-  {
-    c = getopt( argc, argv, "hsgm:l:o:d:w:" );
-    if ( c == -1 )
-      break;
-    switch (c)
-    {
-      case 's':
-        printf( "Set the config\n" );
-        action = ACTION_SET;
-        break;
-      case 'g':
-        printf( "Get the config\n" );
-        action = ACTION_GET;
-        break;
-      case 'm':
-        printf( "Model: [%s]\n", model = optarg );
-        break;
-      case 'l':
-        printf( "Layouts: [%s]\n", layouts = optarg );
-        break;
-      case 'o':
-        printf( "Options: [%s]\n", options = optarg );
-        break;
-      case 'h':
-        print_usage();
-        exit(0);
-      case 'd':
-        debug_level = atoi( optarg );
-        break;
-      case 'w':
-        action = ACTION_WRITE;
-        binary = ( 'b' == optarg[0] );
-      default:
-        fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-        print_usage();
-    }
-  }
-
-  if ( action == ACTION_NONE )
-  {
-    print_usage();
-    exit( 0 );
-  }
-
-  dpy = XOpenDisplay( NULL );
-  if ( dpy == NULL )
-  {
-    fprintf( stderr, "Could not open display\n" );
-    exit(1);
-  }
-  printf( "opened display: %p\n", dpy );
-  if ( !xkl_init( dpy ) )
-  {
-    XklConfigRec current_config, r2;
-    if( debug_level != -1 )
-      xkl_set_debug_level( debug_level );
-    xkl_debug( 0, "Xklavier initialized\n" );
-    xkl_config_init();
-    xkl_config_registry_load();
-    xkl_debug( 0, "Xklavier registry loaded\n" );
-    xkl_debug( 0, "Backend: [%s]\n", xkl_backend_get_name() );
-    xkl_debug( 0, "Supported features: 0x0%X\n", xkl_backend_get_features() );
-    xkl_debug( 0, "Max number of groups: %d\n", xkl_groups_get_max_num() );
-
-    xkl_config_rec_init( &current_config );
-    xkl_config_get_from_server( &current_config );
-
-    switch ( action )
-    {
-      case ACTION_GET:
-        xkl_debug( 0, "Got config from the server\n" );
-        xkl_config_dump( stdout, &current_config );
-
-        xkl_config_rec_init( &r2 );
-
-        if ( xkl_config_get_from_backup( &r2 ) )
-        {
-          xkl_debug( 0, "Got config from the backup\n" );
-          xkl_config_dump( stdout, &r2 );
-        }
-
-        if ( xkl_config_activate( &r2 ) )
-        {
-          xkl_debug( 0, "The backup configuration restored\n" );
-          if ( xkl_config_activate( &current_config ) )
-          {
-            xkl_debug( 0, "Reverting the configuration change\n" );
-          } else
-          {
-            xkl_debug( 0, "The configuration could not be reverted: %s\n", xkl_get_last_error() );
-          }
-        } else
-        {
-          xkl_debug( 0, "The backup configuration could not be restored: %s\n", xkl_get_last_error() );
-        }
-
-        xkl_config_rec_destroy( &r2 );
-        break;
-      case ACTION_SET:
-        if ( model != NULL )
-        {
-          if ( current_config.model != NULL ) g_free ( current_config.model );
-          current_config.model = g_strdup( model );
-        }
-
-        if ( layouts != NULL )
-        {
-          if ( current_config.layouts != NULL ) 
-            g_strfreev (current_config.layouts);
-          if ( current_config.variants != NULL ) 
-            g_strfreev (current_config.variants);
-
-          current_config.layouts = g_new0( char *, 2 );
-          current_config.layouts[0] = g_strdup( layouts );
-          current_config.variants = g_new0( char *, 2 );
-          current_config.variants[0] = g_strdup( "" );
-        }
-
-        if ( options != NULL )
-        {
-          if ( current_config.options != NULL ) 
-            g_strfreev (current_config.options);
-
-          current_config.options = g_new0( char *, 2 );
-          current_config.options[0] = g_strdup( options );
-        }
-
-        xkl_debug( 0, "New config:\n" );
-        xkl_config_dump( stdout, &current_config );
-        if ( xkl_config_activate( &current_config ) )
-          xkl_debug( 0, "Set the config\n" );
-        else
-          xkl_debug( 0, "Could not set the config: %s\n", xkl_get_last_error() );
-        break;
-      case ACTION_WRITE:
-        xkl_config_write_file( binary ? ( PACKAGE ".xkm" ) : ( PACKAGE ".xkb" ),
-                               &current_config, 
-                               binary );     
-        xkl_debug( 0, "The file " PACKAGE "%s is written\n", 
-                  binary ? ".xkm" : ".xkb"  );
-        break;
-    }
-
-    xkl_config_rec_destroy( &current_config );
-
-    xkl_config_registry_free();
-    xkl_config_term();
-    xkl_debug( 0, "Xklavier registry freed\n" );
-    xkl_debug( 0, "Xklavier terminating\n" );
-    xkl_term();
-  } else
-  {
-    fprintf( stderr, "Could not init _xklavier: %s\n", xkl_get_last_error() );
-    exit(2);
-  }
-  printf( "closing display: %p\n", dpy );
-  XCloseDisplay(dpy);
-  return 0;
+	int c;
+	int action = ACTION_NONE;
+	const char *model = NULL;
+	const char *layouts = NULL;
+	const char *options = NULL;
+	int debug_level = -1;
+	int binary = 0;
+	Display *dpy;
+
+	while (1) {
+		c = getopt(argc, argv, "hsgm:l:o:d:w:");
+		if (c == -1)
+			break;
+		switch (c) {
+		case 's':
+			printf("Set the config\n");
+			action = ACTION_SET;
+			break;
+		case 'g':
+			printf("Get the config\n");
+			action = ACTION_GET;
+			break;
+		case 'm':
+			printf("Model: [%s]\n", model = optarg);
+			break;
+		case 'l':
+			printf("Layouts: [%s]\n", layouts = optarg);
+			break;
+		case 'o':
+			printf("Options: [%s]\n", options = optarg);
+			break;
+		case 'h':
+			print_usage();
+			exit(0);
+		case 'd':
+			debug_level = atoi(optarg);
+			break;
+		case 'w':
+			action = ACTION_WRITE;
+			binary = ('b' == optarg[0]);
+		default:
+			fprintf(stderr,
+				"?? getopt returned character code 0%o ??\n",
+				c);
+			print_usage();
+		}
+	}
+
+	if (action == ACTION_NONE) {
+		print_usage();
+		exit(0);
+	}
+
+	dpy = XOpenDisplay(NULL);
+	if (dpy == NULL) {
+		fprintf(stderr, "Could not open display\n");
+		exit(1);
+	}
+	printf("opened display: %p\n", dpy);
+	if (!xkl_init(dpy)) {
+		XklConfigRec current_config, r2;
+		if (debug_level != -1)
+			xkl_set_debug_level(debug_level);
+		xkl_debug(0, "Xklavier initialized\n");
+		xkl_config_init();
+		xkl_config_registry_load();
+		xkl_debug(0, "Xklavier registry loaded\n");
+		xkl_debug(0, "Backend: [%s]\n", xkl_backend_get_name());
+		xkl_debug(0, "Supported features: 0x0%X\n",
+			  xkl_backend_get_features());
+		xkl_debug(0, "Max number of groups: %d\n",
+			  xkl_groups_get_max_num());
+
+		xkl_config_rec_init(&current_config);
+		xkl_config_get_from_server(&current_config);
+
+		switch (action) {
+		case ACTION_GET:
+			xkl_debug(0, "Got config from the server\n");
+			xkl_config_dump(stdout, &current_config);
+
+			xkl_config_rec_init(&r2);
+
+			if (xkl_config_get_from_backup(&r2)) {
+				xkl_debug(0,
+					  "Got config from the backup\n");
+				xkl_config_dump(stdout, &r2);
+			}
+
+			if (xkl_config_activate(&r2)) {
+				xkl_debug(0,
+					  "The backup configuration restored\n");
+				if (xkl_config_activate(&current_config)) {
+					xkl_debug(0,
+						  "Reverting the configuration change\n");
+				} else {
+					xkl_debug(0,
+						  "The configuration could not be reverted: %s\n",
+						  xkl_get_last_error());
+				}
+			} else {
+				xkl_debug(0,
+					  "The backup configuration could not be restored: %s\n",
+					  xkl_get_last_error());
+			}
+
+			xkl_config_rec_destroy(&r2);
+			break;
+		case ACTION_SET:
+			if (model != NULL) {
+				if (current_config.model != NULL)
+					g_free(current_config.model);
+				current_config.model = g_strdup(model);
+			}
+
+			if (layouts != NULL) {
+				if (current_config.layouts != NULL)
+					g_strfreev(current_config.layouts);
+				if (current_config.variants != NULL)
+					g_strfreev(current_config.
+						   variants);
+
+				current_config.layouts = g_new0(char *, 2);
+				current_config.layouts[0] =
+				    g_strdup(layouts);
+				current_config.variants =
+				    g_new0(char *, 2);
+				current_config.variants[0] = g_strdup("");
+			}
+
+			if (options != NULL) {
+				if (current_config.options != NULL)
+					g_strfreev(current_config.options);
+
+				current_config.options = g_new0(char *, 2);
+				current_config.options[0] =
+				    g_strdup(options);
+			}
+
+			xkl_debug(0, "New config:\n");
+			xkl_config_dump(stdout, &current_config);
+			if (xkl_config_activate(&current_config))
+				xkl_debug(0, "Set the config\n");
+			else
+				xkl_debug(0,
+					  "Could not set the config: %s\n",
+					  xkl_get_last_error());
+			break;
+		case ACTION_WRITE:
+			xkl_config_write_file(binary ? (PACKAGE ".xkm")
+					      : (PACKAGE ".xkb"),
+					      &current_config, binary);
+			xkl_debug(0, "The file " PACKAGE "%s is written\n",
+				  binary ? ".xkm" : ".xkb");
+			break;
+		}
+
+		xkl_config_rec_destroy(&current_config);
+
+		xkl_config_registry_free();
+		xkl_config_term();
+		xkl_debug(0, "Xklavier registry freed\n");
+		xkl_debug(0, "Xklavier terminating\n");
+		xkl_term();
+	} else {
+		fprintf(stderr, "Could not init _xklavier: %s\n",
+			xkl_get_last_error());
+		exit(2);
+	}
+	printf("closing display: %p\n", dpy);
+	XCloseDisplay(dpy);
+	return 0;
 }
diff --git a/tests/test_monitor.c b/tests/test_monitor.c
index e880307..159c355 100644
--- a/tests/test_monitor.c
+++ b/tests/test_monitor.c
@@ -8,101 +8,105 @@
 #include <libxklavier/xklavier.h>
 #include <libxklavier/xklavier_config.h>
 
-extern void xkl_config_dump( FILE* file,
-                             XklConfigRec *data );
+extern void xkl_config_dump(FILE * file, XklConfigRec * data);
 
-static void print_usage()
+static void
+print_usage()
 {
-  printf( "Usage: test_monitor (-l1)(-l2)(-l3)(-h)(-d <debugLevel>)\n" );
-  printf( "Options:\n" );
-  printf( "         -d - Set the debug level (by default, 0)\n" ); 
-  printf( "         -h - Show this help\n" );
-  printf( "         -l1 - listen to manage layouts\n" );
-  printf( "         -l2 - listen to manage window states\n" );
-  printf( "         -l3 - listen to track the keyboard state\n" );
+	printf
+	    ("Usage: test_monitor (-l1)(-l2)(-l3)(-h)(-d <debugLevel>)\n");
+	printf("Options:\n");
+	printf("         -d - Set the debug level (by default, 0)\n");
+	printf("         -h - Show this help\n");
+	printf("         -l1 - listen to manage layouts\n");
+	printf("         -l2 - listen to manage window states\n");
+	printf("         -l3 - listen to track the keyboard state\n");
 }
 
-int main( int argc, char * argv[] )
+int
+main(int argc, char *argv[])
 {
-  int c;
-  int debug_level = -1;
-  XkbEvent ev;
-  Display* dpy;
-  int listener_type = 0, lt;
-  int listener_types[] = { XKLL_MANAGE_LAYOUTS, 
-                           XKLL_MANAGE_WINDOW_STATES,
-                           XKLL_TRACK_KEYBOARD_STATE };
+	int c;
+	int debug_level = -1;
+	XkbEvent ev;
+	Display *dpy;
+	int listener_type = 0, lt;
+	int listener_types[] = { XKLL_MANAGE_LAYOUTS,
+		XKLL_MANAGE_WINDOW_STATES,
+		XKLL_TRACK_KEYBOARD_STATE
+	};
 
-  while (1)
-  {
-    c = getopt( argc, argv, "hd:l:" );
-    if ( c == -1 )
-      break;
-    switch (c)
-    {
-      case 'h':
-        print_usage();
-        exit(0);
-      case 'd':
-        debug_level = atoi( optarg );
-        break;
-      case 'l':
-        lt = optarg[0] - '1';
-        if( lt >= 0 && lt < sizeof(listener_types)/sizeof(listener_types[0]) )
-          listener_type |= listener_types[lt];
-        break;
-      default:
-        fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-        print_usage();
-        exit(0);
-    }
-  }
+	while (1) {
+		c = getopt(argc, argv, "hd:l:");
+		if (c == -1)
+			break;
+		switch (c) {
+		case 'h':
+			print_usage();
+			exit(0);
+		case 'd':
+			debug_level = atoi(optarg);
+			break;
+		case 'l':
+			lt = optarg[0] - '1';
+			if (lt >= 0
+			    && lt <
+			    sizeof(listener_types) /
+			    sizeof(listener_types[0]))
+				listener_type |= listener_types[lt];
+			break;
+		default:
+			fprintf(stderr,
+				"?? getopt returned character code 0%o ??\n",
+				c);
+			print_usage();
+			exit(0);
+		}
+	}
 
-  dpy = XOpenDisplay( NULL );
-  if ( dpy == NULL )
-  {
-    fprintf( stderr, "Could not open display\n" );
-    exit(1);
-  }
-  printf( "opened display: %p\n", dpy );
-  if( !xkl_init( dpy ) )
-  {
-    XklConfigRec current_config;
-    if( debug_level != -1 )
-      xkl_set_debug_level( debug_level );
-    xkl_debug( 0, "Xklavier initialized\n" );
-    xkl_config_init();
-    xkl_config_registry_load();
-    xkl_debug( 0, "Xklavier registry loaded\n" );
+	dpy = XOpenDisplay(NULL);
+	if (dpy == NULL) {
+		fprintf(stderr, "Could not open display\n");
+		exit(1);
+	}
+	printf("opened display: %p\n", dpy);
+	if (!xkl_init(dpy)) {
+		XklConfigRec current_config;
+		if (debug_level != -1)
+			xkl_set_debug_level(debug_level);
+		xkl_debug(0, "Xklavier initialized\n");
+		xkl_config_init();
+		xkl_config_registry_load();
+		xkl_debug(0, "Xklavier registry loaded\n");
 
-    xkl_config_rec_init( &current_config );
-    xkl_config_get_from_server( &current_config );
+		xkl_config_rec_init(&current_config);
+		xkl_config_get_from_server(&current_config);
 
-    xkl_debug( 0, "Now, listening...\n" );
-    xkl_listen_start( listener_type );
+		xkl_debug(0, "Now, listening...\n");
+		xkl_listen_start(listener_type);
 
-    while (1) 
-    {
-      XNextEvent( dpy, &ev.core );
-      if ( xkl_events_filter( &ev.core ) )
-        xkl_debug( 200, "Unknown event %d\n", ev.type );
-    }
+		while (1) {
+			XNextEvent(dpy, &ev.core);
+			if (xkl_events_filter(&ev.core))
+				xkl_debug(200, "Unknown event %d\n",
+					  ev.type);
+		}
 
-    xkl_listen_stop();
+		xkl_listen_stop();
 
-    xkl_config_rec_destroy( &current_config );
+		xkl_config_rec_destroy(&current_config);
 
-    xkl_config_registry_free();
-    xkl_config_term();
-    xkl_debug( 0, "Xklavier registry freed\n" );
-    xkl_debug( 0, "Xklavier terminating\n" );
-    xkl_term();
-  } else
-  {
-    fprintf( stderr, "Could not init Xklavier: %s\n", xkl_get_last_error() );
-    exit(2);
-  }
-  printf( "closing display: %p\n", dpy );
-  XCloseDisplay(dpy);
-  return 0;
+		xkl_config_registry_free();
+		xkl_config_term();
+		xkl_debug(0, "Xklavier registry freed\n");
+		xkl_debug(0, "Xklavier terminating\n");
+		xkl_term();
+	} else {
+		fprintf(stderr, "Could not init Xklavier: %s\n",
+			xkl_get_last_error());
+		exit(2);
+	}
+	printf("closing display: %p\n", dpy);
+	XCloseDisplay(dpy);
+	return 0;
 }