aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-18 11:59:15 +0200
committermarha <marha@users.sourceforge.net>2013-10-18 11:59:15 +0200
commitb821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch)
tree7b3c0b22d35eadf598cff3965413a96c76d5ad39 /include
parent56e12b1310b1b52d00bc27e919d915255af5bf03 (diff)
parentb8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff)
downloadvcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz
vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2
vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa pixman git update 18 okt 2013 Conflicts: mesalib/include/GL/glext.h mesalib/include/GL/glxext.h
Diffstat (limited to 'include')
-rw-r--r--include/xcb/render.h134
-rw-r--r--include/xcb/shape.h16
-rw-r--r--include/xcb/xproto.h136
3 files changed, 143 insertions, 143 deletions
diff --git a/include/xcb/render.h b/include/xcb/render.h
index 3242c11a5..d00b45926 100644
--- a/include/xcb/render.h
+++ b/include/xcb/render.h
@@ -25,78 +25,78 @@ extern "C" {
XCB_EXTERN xcb_extension_t xcb_render_id;
typedef enum xcb_render_pict_type_t {
- XCB_RENDER_PICT_TYPE_INDEXED,
- XCB_RENDER_PICT_TYPE_DIRECT
+ XCB_RENDER_PICT_TYPE_INDEXED = 0,
+ XCB_RENDER_PICT_TYPE_DIRECT = 1
} xcb_render_pict_type_t;
typedef enum xcb_render_picture_enum_t {
- XCB_RENDER_PICTURE_NONE
+ XCB_RENDER_PICTURE_NONE = 0
} xcb_render_picture_enum_t;
typedef enum xcb_render_pict_op_t {
- XCB_RENDER_PICT_OP_CLEAR,
- XCB_RENDER_PICT_OP_SRC,
- XCB_RENDER_PICT_OP_DST,
- XCB_RENDER_PICT_OP_OVER,
- XCB_RENDER_PICT_OP_OVER_REVERSE,
- XCB_RENDER_PICT_OP_IN,
- XCB_RENDER_PICT_OP_IN_REVERSE,
- XCB_RENDER_PICT_OP_OUT,
- XCB_RENDER_PICT_OP_OUT_REVERSE,
- XCB_RENDER_PICT_OP_ATOP,
- XCB_RENDER_PICT_OP_ATOP_REVERSE,
- XCB_RENDER_PICT_OP_XOR,
- XCB_RENDER_PICT_OP_ADD,
- XCB_RENDER_PICT_OP_SATURATE,
+ XCB_RENDER_PICT_OP_CLEAR = 0,
+ XCB_RENDER_PICT_OP_SRC = 1,
+ XCB_RENDER_PICT_OP_DST = 2,
+ XCB_RENDER_PICT_OP_OVER = 3,
+ XCB_RENDER_PICT_OP_OVER_REVERSE = 4,
+ XCB_RENDER_PICT_OP_IN = 5,
+ XCB_RENDER_PICT_OP_IN_REVERSE = 6,
+ XCB_RENDER_PICT_OP_OUT = 7,
+ XCB_RENDER_PICT_OP_OUT_REVERSE = 8,
+ XCB_RENDER_PICT_OP_ATOP = 9,
+ XCB_RENDER_PICT_OP_ATOP_REVERSE = 10,
+ XCB_RENDER_PICT_OP_XOR = 11,
+ XCB_RENDER_PICT_OP_ADD = 12,
+ XCB_RENDER_PICT_OP_SATURATE = 13,
XCB_RENDER_PICT_OP_DISJOINT_CLEAR = 16,
- XCB_RENDER_PICT_OP_DISJOINT_SRC,
- XCB_RENDER_PICT_OP_DISJOINT_DST,
- XCB_RENDER_PICT_OP_DISJOINT_OVER,
- XCB_RENDER_PICT_OP_DISJOINT_OVER_REVERSE,
- XCB_RENDER_PICT_OP_DISJOINT_IN,
- XCB_RENDER_PICT_OP_DISJOINT_IN_REVERSE,
- XCB_RENDER_PICT_OP_DISJOINT_OUT,
- XCB_RENDER_PICT_OP_DISJOINT_OUT_REVERSE,
- XCB_RENDER_PICT_OP_DISJOINT_ATOP,
- XCB_RENDER_PICT_OP_DISJOINT_ATOP_REVERSE,
- XCB_RENDER_PICT_OP_DISJOINT_XOR,
+ XCB_RENDER_PICT_OP_DISJOINT_SRC = 17,
+ XCB_RENDER_PICT_OP_DISJOINT_DST = 18,
+ XCB_RENDER_PICT_OP_DISJOINT_OVER = 19,
+ XCB_RENDER_PICT_OP_DISJOINT_OVER_REVERSE = 20,
+ XCB_RENDER_PICT_OP_DISJOINT_IN = 21,
+ XCB_RENDER_PICT_OP_DISJOINT_IN_REVERSE = 22,
+ XCB_RENDER_PICT_OP_DISJOINT_OUT = 23,
+ XCB_RENDER_PICT_OP_DISJOINT_OUT_REVERSE = 24,
+ XCB_RENDER_PICT_OP_DISJOINT_ATOP = 25,
+ XCB_RENDER_PICT_OP_DISJOINT_ATOP_REVERSE = 26,
+ XCB_RENDER_PICT_OP_DISJOINT_XOR = 27,
XCB_RENDER_PICT_OP_CONJOINT_CLEAR = 32,
- XCB_RENDER_PICT_OP_CONJOINT_SRC,
- XCB_RENDER_PICT_OP_CONJOINT_DST,
- XCB_RENDER_PICT_OP_CONJOINT_OVER,
- XCB_RENDER_PICT_OP_CONJOINT_OVER_REVERSE,
- XCB_RENDER_PICT_OP_CONJOINT_IN,
- XCB_RENDER_PICT_OP_CONJOINT_IN_REVERSE,
- XCB_RENDER_PICT_OP_CONJOINT_OUT,
- XCB_RENDER_PICT_OP_CONJOINT_OUT_REVERSE,
- XCB_RENDER_PICT_OP_CONJOINT_ATOP,
- XCB_RENDER_PICT_OP_CONJOINT_ATOP_REVERSE,
- XCB_RENDER_PICT_OP_CONJOINT_XOR,
+ XCB_RENDER_PICT_OP_CONJOINT_SRC = 33,
+ XCB_RENDER_PICT_OP_CONJOINT_DST = 34,
+ XCB_RENDER_PICT_OP_CONJOINT_OVER = 35,
+ XCB_RENDER_PICT_OP_CONJOINT_OVER_REVERSE = 36,
+ XCB_RENDER_PICT_OP_CONJOINT_IN = 37,
+ XCB_RENDER_PICT_OP_CONJOINT_IN_REVERSE = 38,
+ XCB_RENDER_PICT_OP_CONJOINT_OUT = 39,
+ XCB_RENDER_PICT_OP_CONJOINT_OUT_REVERSE = 40,
+ XCB_RENDER_PICT_OP_CONJOINT_ATOP = 41,
+ XCB_RENDER_PICT_OP_CONJOINT_ATOP_REVERSE = 42,
+ XCB_RENDER_PICT_OP_CONJOINT_XOR = 43,
XCB_RENDER_PICT_OP_MULTIPLY = 48,
- XCB_RENDER_PICT_OP_SCREEN,
- XCB_RENDER_PICT_OP_OVERLAY,
- XCB_RENDER_PICT_OP_DARKEN,
- XCB_RENDER_PICT_OP_LIGHTEN,
- XCB_RENDER_PICT_OP_COLOR_DODGE,
- XCB_RENDER_PICT_OP_COLOR_BURN,
- XCB_RENDER_PICT_OP_HARD_LIGHT,
- XCB_RENDER_PICT_OP_SOFT_LIGHT,
- XCB_RENDER_PICT_OP_DIFFERENCE,
- XCB_RENDER_PICT_OP_EXCLUSION,
- XCB_RENDER_PICT_OP_HSL_HUE,
- XCB_RENDER_PICT_OP_HSL_SATURATION,
- XCB_RENDER_PICT_OP_HSL_COLOR,
- XCB_RENDER_PICT_OP_HSL_LUMINOSITY
+ XCB_RENDER_PICT_OP_SCREEN = 49,
+ XCB_RENDER_PICT_OP_OVERLAY = 50,
+ XCB_RENDER_PICT_OP_DARKEN = 51,
+ XCB_RENDER_PICT_OP_LIGHTEN = 52,
+ XCB_RENDER_PICT_OP_COLOR_DODGE = 53,
+ XCB_RENDER_PICT_OP_COLOR_BURN = 54,
+ XCB_RENDER_PICT_OP_HARD_LIGHT = 55,
+ XCB_RENDER_PICT_OP_SOFT_LIGHT = 56,
+ XCB_RENDER_PICT_OP_DIFFERENCE = 57,
+ XCB_RENDER_PICT_OP_EXCLUSION = 58,
+ XCB_RENDER_PICT_OP_HSL_HUE = 59,
+ XCB_RENDER_PICT_OP_HSL_SATURATION = 60,
+ XCB_RENDER_PICT_OP_HSL_COLOR = 61,
+ XCB_RENDER_PICT_OP_HSL_LUMINOSITY = 62
} xcb_render_pict_op_t;
typedef enum xcb_render_poly_edge_t {
- XCB_RENDER_POLY_EDGE_SHARP,
- XCB_RENDER_POLY_EDGE_SMOOTH
+ XCB_RENDER_POLY_EDGE_SHARP = 0,
+ XCB_RENDER_POLY_EDGE_SMOOTH = 1
} xcb_render_poly_edge_t;
typedef enum xcb_render_poly_mode_t {
- XCB_RENDER_POLY_MODE_PRECISE,
- XCB_RENDER_POLY_MODE_IMPRECISE
+ XCB_RENDER_POLY_MODE_PRECISE = 0,
+ XCB_RENDER_POLY_MODE_IMPRECISE = 1
} xcb_render_poly_mode_t;
typedef enum xcb_render_cp_t {
@@ -116,19 +116,19 @@ typedef enum xcb_render_cp_t {
} xcb_render_cp_t;
typedef enum xcb_render_sub_pixel_t {
- XCB_RENDER_SUB_PIXEL_UNKNOWN,
- XCB_RENDER_SUB_PIXEL_HORIZONTAL_RGB,
- XCB_RENDER_SUB_PIXEL_HORIZONTAL_BGR,
- XCB_RENDER_SUB_PIXEL_VERTICAL_RGB,
- XCB_RENDER_SUB_PIXEL_VERTICAL_BGR,
- XCB_RENDER_SUB_PIXEL_NONE
+ XCB_RENDER_SUB_PIXEL_UNKNOWN = 0,
+ XCB_RENDER_SUB_PIXEL_HORIZONTAL_RGB = 1,
+ XCB_RENDER_SUB_PIXEL_HORIZONTAL_BGR = 2,
+ XCB_RENDER_SUB_PIXEL_VERTICAL_RGB = 3,
+ XCB_RENDER_SUB_PIXEL_VERTICAL_BGR = 4,
+ XCB_RENDER_SUB_PIXEL_NONE = 5
} xcb_render_sub_pixel_t;
typedef enum xcb_render_repeat_t {
- XCB_RENDER_REPEAT_NONE,
- XCB_RENDER_REPEAT_NORMAL,
- XCB_RENDER_REPEAT_PAD,
- XCB_RENDER_REPEAT_REFLECT
+ XCB_RENDER_REPEAT_NONE = 0,
+ XCB_RENDER_REPEAT_NORMAL = 1,
+ XCB_RENDER_REPEAT_PAD = 2,
+ XCB_RENDER_REPEAT_REFLECT = 3
} xcb_render_repeat_t;
typedef uint32_t xcb_render_glyph_t;
diff --git a/include/xcb/shape.h b/include/xcb/shape.h
index cafe42ffb..abb63c166 100644
--- a/include/xcb/shape.h
+++ b/include/xcb/shape.h
@@ -47,17 +47,17 @@ typedef struct xcb_shape_kind_iterator_t {
} xcb_shape_kind_iterator_t;
typedef enum xcb_shape_so_t {
- XCB_SHAPE_SO_SET,
- XCB_SHAPE_SO_UNION,
- XCB_SHAPE_SO_INTERSECT,
- XCB_SHAPE_SO_SUBTRACT,
- XCB_SHAPE_SO_INVERT
+ XCB_SHAPE_SO_SET = 0,
+ XCB_SHAPE_SO_UNION = 1,
+ XCB_SHAPE_SO_INTERSECT = 2,
+ XCB_SHAPE_SO_SUBTRACT = 3,
+ XCB_SHAPE_SO_INVERT = 4
} xcb_shape_so_t;
typedef enum xcb_shape_sk_t {
- XCB_SHAPE_SK_BOUNDING,
- XCB_SHAPE_SK_CLIP,
- XCB_SHAPE_SK_INPUT
+ XCB_SHAPE_SK_BOUNDING = 0,
+ XCB_SHAPE_SK_CLIP = 1,
+ XCB_SHAPE_SK_INPUT = 2
} xcb_shape_sk_t;
/** Opcode for xcb_shape_notify. */
diff --git a/include/xcb/xproto.h b/include/xcb/xproto.h
index c87fae444..ff5745b53 100644
--- a/include/xcb/xproto.h
+++ b/include/xcb/xproto.h
@@ -1010,74 +1010,74 @@ typedef enum xcb_time_t {
typedef enum xcb_atom_enum_t {
XCB_ATOM_NONE = 0,
XCB_ATOM_ANY = 0,
- XCB_ATOM_PRIMARY,
- XCB_ATOM_SECONDARY,
- XCB_ATOM_ARC,
- XCB_ATOM_ATOM,
- XCB_ATOM_BITMAP,
- XCB_ATOM_CARDINAL,
- XCB_ATOM_COLORMAP,
- XCB_ATOM_CURSOR,
- XCB_ATOM_CUT_BUFFER0,
- XCB_ATOM_CUT_BUFFER1,
- XCB_ATOM_CUT_BUFFER2,
- XCB_ATOM_CUT_BUFFER3,
- XCB_ATOM_CUT_BUFFER4,
- XCB_ATOM_CUT_BUFFER5,
- XCB_ATOM_CUT_BUFFER6,
- XCB_ATOM_CUT_BUFFER7,
- XCB_ATOM_DRAWABLE,
- XCB_ATOM_FONT,
- XCB_ATOM_INTEGER,
- XCB_ATOM_PIXMAP,
- XCB_ATOM_POINT,
- XCB_ATOM_RECTANGLE,
- XCB_ATOM_RESOURCE_MANAGER,
- XCB_ATOM_RGB_COLOR_MAP,
- XCB_ATOM_RGB_BEST_MAP,
- XCB_ATOM_RGB_BLUE_MAP,
- XCB_ATOM_RGB_DEFAULT_MAP,
- XCB_ATOM_RGB_GRAY_MAP,
- XCB_ATOM_RGB_GREEN_MAP,
- XCB_ATOM_RGB_RED_MAP,
- XCB_ATOM_STRING,
- XCB_ATOM_VISUALID,
- XCB_ATOM_WINDOW,
- XCB_ATOM_WM_COMMAND,
- XCB_ATOM_WM_HINTS,
- XCB_ATOM_WM_CLIENT_MACHINE,
- XCB_ATOM_WM_ICON_NAME,
- XCB_ATOM_WM_ICON_SIZE,
- XCB_ATOM_WM_NAME,
- XCB_ATOM_WM_NORMAL_HINTS,
- XCB_ATOM_WM_SIZE_HINTS,
- XCB_ATOM_WM_ZOOM_HINTS,
- XCB_ATOM_MIN_SPACE,
- XCB_ATOM_NORM_SPACE,
- XCB_ATOM_MAX_SPACE,
- XCB_ATOM_END_SPACE,
- XCB_ATOM_SUPERSCRIPT_X,
- XCB_ATOM_SUPERSCRIPT_Y,
- XCB_ATOM_SUBSCRIPT_X,
- XCB_ATOM_SUBSCRIPT_Y,
- XCB_ATOM_UNDERLINE_POSITION,
- XCB_ATOM_UNDERLINE_THICKNESS,
- XCB_ATOM_STRIKEOUT_ASCENT,
- XCB_ATOM_STRIKEOUT_DESCENT,
- XCB_ATOM_ITALIC_ANGLE,
- XCB_ATOM_X_HEIGHT,
- XCB_ATOM_QUAD_WIDTH,
- XCB_ATOM_WEIGHT,
- XCB_ATOM_POINT_SIZE,
- XCB_ATOM_RESOLUTION,
- XCB_ATOM_COPYRIGHT,
- XCB_ATOM_NOTICE,
- XCB_ATOM_FONT_NAME,
- XCB_ATOM_FAMILY_NAME,
- XCB_ATOM_FULL_NAME,
- XCB_ATOM_CAP_HEIGHT,
- XCB_ATOM_WM_CLASS,
- XCB_ATOM_WM_TRANSIENT_FOR
+ XCB_ATOM_PRIMARY = 1,
+ XCB_ATOM_SECONDARY = 2,
+ XCB_ATOM_ARC = 3,
+ XCB_ATOM_ATOM = 4,
+ XCB_ATOM_BITMAP = 5,
+ XCB_ATOM_CARDINAL = 6,
+ XCB_ATOM_COLORMAP = 7,
+ XCB_ATOM_CURSOR = 8,
+ XCB_ATOM_CUT_BUFFER0 = 9,
+ XCB_ATOM_CUT_BUFFER1 = 10,
+ XCB_ATOM_CUT_BUFFER2 = 11,
+ XCB_ATOM_CUT_BUFFER3 = 12,
+ XCB_ATOM_CUT_BUFFER4 = 13,
+ XCB_ATOM_CUT_BUFFER5 = 14,
+ XCB_ATOM_CUT_BUFFER6 = 15,
+ XCB_ATOM_CUT_BUFFER7 = 16,
+ XCB_ATOM_DRAWABLE = 17,
+ XCB_ATOM_FONT = 18,
+ XCB_ATOM_INTEGER = 19,
+ XCB_ATOM_PIXMAP = 20,
+ XCB_ATOM_POINT = 21,
+ XCB_ATOM_RECTANGLE = 22,
+ XCB_ATOM_RESOURCE_MANAGER = 23,
+ XCB_ATOM_RGB_COLOR_MAP = 24,
+ XCB_ATOM_RGB_BEST_MAP = 25,
+ XCB_ATOM_RGB_BLUE_MAP = 26,
+ XCB_ATOM_RGB_DEFAULT_MAP = 27,
+ XCB_ATOM_RGB_GRAY_MAP = 28,
+ XCB_ATOM_RGB_GREEN_MAP = 29,
+ XCB_ATOM_RGB_RED_MAP = 30,
+ XCB_ATOM_STRING = 31,
+ XCB_ATOM_VISUALID = 32,
+ XCB_ATOM_WINDOW = 33,
+ XCB_ATOM_WM_COMMAND = 34,
+ XCB_ATOM_WM_HINTS = 35,
+ XCB_ATOM_WM_CLIENT_MACHINE = 36,
+ XCB_ATOM_WM_ICON_NAME = 37,
+ XCB_ATOM_WM_ICON_SIZE = 38,
+ XCB_ATOM_WM_NAME = 39,
+ XCB_ATOM_WM_NORMAL_HINTS = 40,
+ XCB_ATOM_WM_SIZE_HINTS = 41,
+ XCB_ATOM_WM_ZOOM_HINTS = 42,
+ XCB_ATOM_MIN_SPACE = 43,
+ XCB_ATOM_NORM_SPACE = 44,
+ XCB_ATOM_MAX_SPACE = 45,
+ XCB_ATOM_END_SPACE = 46,
+ XCB_ATOM_SUPERSCRIPT_X = 47,
+ XCB_ATOM_SUPERSCRIPT_Y = 48,
+ XCB_ATOM_SUBSCRIPT_X = 49,
+ XCB_ATOM_SUBSCRIPT_Y = 50,
+ XCB_ATOM_UNDERLINE_POSITION = 51,
+ XCB_ATOM_UNDERLINE_THICKNESS = 52,
+ XCB_ATOM_STRIKEOUT_ASCENT = 53,
+ XCB_ATOM_STRIKEOUT_DESCENT = 54,
+ XCB_ATOM_ITALIC_ANGLE = 55,
+ XCB_ATOM_X_HEIGHT = 56,
+ XCB_ATOM_QUAD_WIDTH = 57,
+ XCB_ATOM_WEIGHT = 58,
+ XCB_ATOM_POINT_SIZE = 59,
+ XCB_ATOM_RESOLUTION = 60,
+ XCB_ATOM_COPYRIGHT = 61,
+ XCB_ATOM_NOTICE = 62,
+ XCB_ATOM_FONT_NAME = 63,
+ XCB_ATOM_FAMILY_NAME = 64,
+ XCB_ATOM_FULL_NAME = 65,
+ XCB_ATOM_CAP_HEIGHT = 66,
+ XCB_ATOM_WM_CLASS = 67,
+ XCB_ATOM_WM_TRANSIENT_FOR = 68
} xcb_atom_enum_t;
/** Opcode for xcb_selection_request. */