summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2020-06-24 16:05:21 +0100
committerDaniel P. Berrangé <berrange@redhat.com>2020-06-26 15:50:50 +0100
commite587274b76a58f1321881104d101a026d077a4ea (patch)
treed90cf712fac412c20fca87e956f6d3b5d96ce54a
parentbb3d020cb9f5f3ea79cbfc69755b6621278c21d8 (diff)
src: remove tab characters from indent
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--src/virt-viewer-app.c104
-rw-r--r--src/virt-viewer-timed-revealer.c8
-rw-r--r--src/virt-viewer-window.c54
3 files changed, 83 insertions, 83 deletions
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 9801d79..1537f67 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -577,9 +577,9 @@ void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string)
guint *mappedArray, *ptrMove;
if (keymap_string == NULL) {
- g_debug("keymap string is empty - nothing to do");
- self->priv->keyMappings = NULL;
- return;
+ g_debug("keymap string is empty - nothing to do");
+ self->priv->keyMappings = NULL;
+ return;
}
g_debug("keymap string set to %s", keymap_string);
@@ -588,12 +588,12 @@ void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string)
g_debug("keymap command-line set to %s", keymap_string);
if (keymap_string) {
- keymaps = g_strsplit(keymap_string, ",", -1);
+ keymaps = g_strsplit(keymap_string, ",", -1);
}
if (!keymaps || g_strv_length(keymaps) == 0) {
- g_strfreev(keymaps);
- return;
+ g_strfreev(keymaps);
+ return;
}
keyMappingPtr = keyMappingArray = g_new0(VirtViewerKeyMapping, g_strv_length(keymaps));
@@ -601,52 +601,52 @@ void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string)
g_debug("Allocated %d number of mappings", g_strv_length(keymaps));
for (key = keymaps; *key != NULL; key++) {
- gchar *srcKey = strstr(*key, "=");
- const gchar *value = (srcKey == NULL) ? NULL : (*srcKey = '\0', srcKey + 1);
- if (value == NULL) {
- g_warning("Missing mapping value for key '%s'", srcKey);
- continue;
- }
-
- // Key value must be resolved to GDK key code
- // along with mapped key which can also be void (for no action)
- guint kcode;
- kcode = gdk_keyval_from_name(*key);
- if (kcode == GDK_KEY_VoidSymbol) {
- g_warning("Unable to lookup '%s' key", *key);
- continue;
- }
- g_debug("Mapped source key '%s' to %x", *key, kcode);
-
- valuekeys = g_strsplit(value, "+", -1);
-
- keyMappingPtr->sourceKey = kcode;
- keyMappingPtr->numMappedKeys = g_strv_length(valuekeys);
- keyMappingPtr->isLast = FALSE;
-
- if (!valuekeys || g_strv_length(valuekeys) == 0) {
- g_debug("No value set for key '%s' it will be blocked", *key);
- keyMappingPtr->mappedKeys = NULL;
- keyMappingPtr++;
- g_strfreev(valuekeys);
- continue;
- }
-
- ptrMove = mappedArray = g_new0(guint, g_strv_length(valuekeys));
-
- guint mcode;
- for (valkey = valuekeys; *valkey != NULL; valkey++) {
- g_debug("Value key to map '%s'", *valkey);
- mcode = gdk_keyval_from_name(*valkey);
- if (mcode == GDK_KEY_VoidSymbol) {
- g_warning("Unable to lookup mapped key '%s' it will be ignored", *valkey);
- }
- g_debug("Mapped dest key '%s' to %x", *valkey, mcode);
- *ptrMove++ = mcode;
- }
- keyMappingPtr->mappedKeys = mappedArray;
- keyMappingPtr++;
- g_strfreev(valuekeys);
+ gchar *srcKey = strstr(*key, "=");
+ const gchar *value = (srcKey == NULL) ? NULL : (*srcKey = '\0', srcKey + 1);
+ if (value == NULL) {
+ g_warning("Missing mapping value for key '%s'", srcKey);
+ continue;
+ }
+
+ // Key value must be resolved to GDK key code
+ // along with mapped key which can also be void (for no action)
+ guint kcode;
+ kcode = gdk_keyval_from_name(*key);
+ if (kcode == GDK_KEY_VoidSymbol) {
+ g_warning("Unable to lookup '%s' key", *key);
+ continue;
+ }
+ g_debug("Mapped source key '%s' to %x", *key, kcode);
+
+ valuekeys = g_strsplit(value, "+", -1);
+
+ keyMappingPtr->sourceKey = kcode;
+ keyMappingPtr->numMappedKeys = g_strv_length(valuekeys);
+ keyMappingPtr->isLast = FALSE;
+
+ if (!valuekeys || g_strv_length(valuekeys) == 0) {
+ g_debug("No value set for key '%s' it will be blocked", *key);
+ keyMappingPtr->mappedKeys = NULL;
+ keyMappingPtr++;
+ g_strfreev(valuekeys);
+ continue;
+ }
+
+ ptrMove = mappedArray = g_new0(guint, g_strv_length(valuekeys));
+
+ guint mcode;
+ for (valkey = valuekeys; *valkey != NULL; valkey++) {
+ g_debug("Value key to map '%s'", *valkey);
+ mcode = gdk_keyval_from_name(*valkey);
+ if (mcode == GDK_KEY_VoidSymbol) {
+ g_warning("Unable to lookup mapped key '%s' it will be ignored", *valkey);
+ }
+ g_debug("Mapped dest key '%s' to %x", *valkey, mcode);
+ *ptrMove++ = mcode;
+ }
+ keyMappingPtr->mappedKeys = mappedArray;
+ keyMappingPtr++;
+ g_strfreev(valuekeys);
}
keyMappingPtr--;
diff --git a/src/virt-viewer-timed-revealer.c b/src/virt-viewer-timed-revealer.c
index 4ee053d..a55e5eb 100644
--- a/src/virt-viewer-timed-revealer.c
+++ b/src/virt-viewer-timed-revealer.c
@@ -82,8 +82,8 @@ virt_viewer_timed_revealer_grab_notify(VirtViewerTimedRevealer *self,
static gboolean
virt_viewer_timed_revealer_enter_notify(VirtViewerTimedRevealer *self,
- GdkEventCrossing *event G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
+ GdkEventCrossing *event G_GNUC_UNUSED,
+ gpointer user_data G_GNUC_UNUSED)
{
VirtViewerTimedRevealerPrivate *priv = self->priv;
@@ -100,8 +100,8 @@ virt_viewer_timed_revealer_enter_notify(VirtViewerTimedRevealer *self,
static gboolean
virt_viewer_timed_revealer_leave_notify(VirtViewerTimedRevealer *self,
- GdkEventCrossing *event G_GNUC_UNUSED,
- gpointer user_data G_GNUC_UNUSED)
+ GdkEventCrossing *event G_GNUC_UNUSED,
+ gpointer user_data G_GNUC_UNUSED)
{
VirtViewerTimedRevealerPrivate *priv = self->priv;
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
index 7ecee21..5abadcd 100644
--- a/src/virt-viewer-window.c
+++ b/src/virt-viewer-window.c
@@ -168,9 +168,9 @@ virt_viewer_window_set_property (GObject *object, guint property_id,
break;
case PROP_KEYMAP:
- g_free(priv->keyMappings);
- priv->keyMappings = (VirtViewerKeyMapping *)g_value_get_pointer(value);
- break;
+ g_free(priv->keyMappings);
+ priv->keyMappings = (VirtViewerKeyMapping *)g_value_get_pointer(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1518,30 +1518,30 @@ window_key_pressed (GtkWidget *widget G_GNUC_UNUSED,
// Look through keymaps - if set for mappings and intercept
if (priv->keyMappings) {
- VirtViewerKeyMapping *ptr, *matched;
- ptr = priv->keyMappings;
- matched = NULL;
- do {
- if (event->keyval == ptr->sourceKey) {
- matched = ptr;
- }
- if (ptr->isLast) {
- break;
- }
- ptr++;
- } while (matched == NULL);
-
- if (matched) {
- if (matched->mappedKeys == NULL) {
- // Key to be ignored and not pass through to VM
- g_debug("Blocking keypress '%s'", gdk_keyval_name(matched->sourceKey));
- } else {
- g_debug("Sending through mapped keys");
- virt_viewer_display_send_keys(display,
- matched->mappedKeys, matched->numMappedKeys);
- }
- return TRUE;
- }
+ VirtViewerKeyMapping *ptr, *matched;
+ ptr = priv->keyMappings;
+ matched = NULL;
+ do {
+ if (event->keyval == ptr->sourceKey) {
+ matched = ptr;
+ }
+ if (ptr->isLast) {
+ break;
+ }
+ ptr++;
+ } while (matched == NULL);
+
+ if (matched) {
+ if (matched->mappedKeys == NULL) {
+ // Key to be ignored and not pass through to VM
+ g_debug("Blocking keypress '%s'", gdk_keyval_name(matched->sourceKey));
+ } else {
+ g_debug("Sending through mapped keys");
+ virt_viewer_display_send_keys(display,
+ matched->mappedKeys, matched->numMappedKeys);
+ }
+ return TRUE;
+ }
}
g_debug("Key pressed was keycode='0x%x', gdk_keyname='%s'", event->keyval, gdk_keyval_name(event->keyval));