From c55bef0c4144a5efc9ca864392b3e8da23b34928 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 27 Feb 2012 13:14:19 -0800 Subject: [PATCH] Fix transfer function indices. --- libguac/include/protocol.h | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libguac/include/protocol.h b/libguac/include/protocol.h index 1539c323..11727fec 100644 --- a/libguac/include/protocol.h +++ b/libguac/include/protocol.h @@ -112,43 +112,43 @@ typedef enum guac_composite_mode { */ typedef enum guac_transfer_function { - /* Constant functions */ /* ABCD */ - GUAC_TRANSFER_BINARY_BLACK = 0x10, /* 0000 */ - GUAC_TRANSFER_BINARY_WHITE = 0x1F, /* 1111 */ + /* Constant functions */ /* ABCD */ + GUAC_TRANSFER_BINARY_BLACK = 0x0, /* 0000 */ + GUAC_TRANSFER_BINARY_WHITE = 0xF, /* 1111 */ /* Copy functions */ - GUAC_TRANSFER_BINARY_SRC = 0x13, /* 0011 */ - GUAC_TRANSFER_BINARY_DEST = 0x15, /* 0101 */ - GUAC_TRANSFER_BINARY_NSRC = 0x1C, /* 1100 */ - GUAC_TRANSFER_BINARY_NDEST = 0x1A, /* 1010 */ + GUAC_TRANSFER_BINARY_SRC = 0x3, /* 0011 */ + GUAC_TRANSFER_BINARY_DEST = 0x5, /* 0101 */ + GUAC_TRANSFER_BINARY_NSRC = 0xC, /* 1100 */ + GUAC_TRANSFER_BINARY_NDEST = 0xA, /* 1010 */ /* AND / NAND */ - GUAC_TRANSFER_BINARY_AND = 0x11, /* 0001 */ - GUAC_TRANSFER_BINARY_NAND = 0x1E, /* 1110 */ + GUAC_TRANSFER_BINARY_AND = 0x1, /* 0001 */ + GUAC_TRANSFER_BINARY_NAND = 0xE, /* 1110 */ /* OR / NOR */ - GUAC_TRANSFER_BINARY_OR = 0x17, /* 0111 */ - GUAC_TRANSFER_BINARY_NOR = 0x18, /* 1000 */ + GUAC_TRANSFER_BINARY_OR = 0x7, /* 0111 */ + GUAC_TRANSFER_BINARY_NOR = 0x8, /* 1000 */ /* XOR / XNOR */ - GUAC_TRANSFER_BINARY_XOR = 0x16, /* 0110 */ - GUAC_TRANSFER_BINARY_XNOR = 0x19, /* 1001 */ + GUAC_TRANSFER_BINARY_XOR = 0x6, /* 0110 */ + GUAC_TRANSFER_BINARY_XNOR = 0x9, /* 1001 */ /* AND / NAND with inverted source */ - GUAC_TRANSFER_BINARY_NSRC_AND = 0x14, /* 0100 */ - GUAC_TRANSFER_BINARY_NSRC_NAND = 0x1B, /* 1011 */ + GUAC_TRANSFER_BINARY_NSRC_AND = 0x4, /* 0100 */ + GUAC_TRANSFER_BINARY_NSRC_NAND = 0xB, /* 1011 */ /* OR / NOR with inverted source */ - GUAC_TRANSFER_BINARY_NSRC_OR = 0x1D, /* 1101 */ - GUAC_TRANSFER_BINARY_NSRC_NOR = 0x12, /* 0010 */ + GUAC_TRANSFER_BINARY_NSRC_OR = 0xD, /* 1101 */ + GUAC_TRANSFER_BINARY_NSRC_NOR = 0x2, /* 0010 */ /* AND / NAND with inverted destination */ - GUAC_TRANSFER_BINARY_NDEST_AND = 0x12, /* 0010 */ - GUAC_TRANSFER_BINARY_NDEST_NAND = 0x1D, /* 1101 */ + GUAC_TRANSFER_BINARY_NDEST_AND = 0x2, /* 0010 */ + GUAC_TRANSFER_BINARY_NDEST_NAND = 0xD, /* 1101 */ /* OR / NOR with inverted destination */ - GUAC_TRANSFER_BINARY_NDEST_OR = 0x1B, /* 1011 */ - GUAC_TRANSFER_BINARY_NDEST_NOR = 0x14 /* 0100 */ + GUAC_TRANSFER_BINARY_NDEST_OR = 0xB, /* 1011 */ + GUAC_TRANSFER_BINARY_NDEST_NOR = 0x4 /* 0100 */ } guac_transfer_function;