[Xcb-commit] Branch 'refs/tags/xcb-demo-0.1' - 6 commits - xcb
xcb-demo xcb-proto xcb-util
Josh Triplett
josh at kemper.freedesktop.org
Fri Apr 28 16:35:43 PDT 2006
Rebased ref, commits from common ancestor:
diff-tree 15983bfe03242f03db27e2b22d9b179d737a4fca (from parents)
Merge: 0b9e560df3bc99ccdffef6c80ba53f47880171cf a838193bad97a71df1ab13e671ae7b256e271a8e
Author: Josh Triplett <josh at freedesktop.org>
Date: Fri Apr 28 16:33:20 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
diff-tree 0b9e560df3bc99ccdffef6c80ba53f47880171cf (from bd971b8541c4df2e9b1357c4dd6cf4babf7b4add)
Author: Josh Triplett <josh at freedesktop.org>
Date: Fri Apr 28 16:32:59 2006 -0700
Add header files to _SOURCES so they get distributed.
diff --git a/xcb-demo/Makefile.am b/xcb-demo/Makefile.am
index 12ee08b..7adb7e0 100644
--- a/xcb-demo/Makefile.am
+++ b/xcb-demo/Makefile.am
@@ -13,13 +13,13 @@ bin_PROGRAMS = dpms hypnomoire rendertes
hypnomoire_CFLAGS = $(XCBAUX_CFLAGS)
hypnomoire_LDADD = $(XCBAUX_LIBS) -lm -lpthread
-hypnomoire_SOURCES = hypnomoire.c reply_formats.c
+hypnomoire_SOURCES = hypnomoire.c reply_formats.c reply_formats.h
xcbdpyinfo_SOURCES = xcbdpyinfo.c
xcb_test_CFLAGS = $(XCBAUX_CFLAGS)
xcb_test_LDADD = $(XCBAUX_LIBS) -lpthread
-xcb_test_SOURCES = main.c reply_formats.c
+xcb_test_SOURCES = main.c reply_formats.c reply_formats.h
dpms_CFLAGS = $(XCBDPMS_CFLAGS)
dpms_LDADD = $(XCBDPMS_LIBS)
diff --git a/xcb-demo/tests/Makefile.am b/xcb-demo/tests/Makefile.am
index 435eb98..67e97ca 100644
--- a/xcb-demo/tests/Makefile.am
+++ b/xcb-demo/tests/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES = $(XCBAUX_CFLAGS) $(XCBIMAGE_C
bin_PROGRAMS = julia lissajoux flames
julia_LDADD = $(XCBAUX_LIBS) $(XCBIMAGE_LIBS)
-julia_SOURCES = julia.c
+julia_SOURCES = julia.c julia.h
lissajoux_LDADD = $(XCBAUX_LIBS) $(XCBIMAGE_LIBS) -lm
-lissajoux_SOURCES =lissajoux.c
+lissajoux_SOURCES = lissajoux.c lissajoux.h
flames_CFLAGS = -O3
flames_LDADD = $(XCBAUX_LIBS) $(XCBIMAGE_LIBS) $(XCBICCCM_LIBS)
diff-tree bd971b8541c4df2e9b1357c4dd6cf4babf7b4add (from 58315b8478a5f9170146e71368e8d5bc872f4641)
Author: Josh Triplett <josh at freedesktop.org>
Date: Fri Apr 28 16:00:37 2006 -0700
Add m4 files to EXTRA_DIST.
diff --git a/xcb-util/atom/Makefile.am b/xcb-util/atom/Makefile.am
index 50011a2..62119d1 100644
--- a/xcb-util/atom/Makefile.am
+++ b/xcb-util/atom/Makefile.am
@@ -13,7 +13,7 @@ libXCBAtom_la_LIBADD = $(XCB_LIBS)
pkgconfig_DATA = xcb-atom.pc
-EXTRA_DIST = xcb-atom.pc.in
+EXTRA_DIST = xcb-atom.pc.in atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4
BUILT_SOURCES = atoms.c atoms.gperf xcb_atom.h
diff-tree a838193bad97a71df1ab13e671ae7b256e271a8e (from 428a71bb48704b4ff660f9722c61d630e554d95c)
Author: Ian Osgood <iano at quirkster.com>
Date: Fri Apr 28 15:27:09 2006 -0700
Move the remainder of the constants in X.h into XML enumerations.
Fix xcb_auth to use one of the new enumerations.
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index bed9c3c..caaaee3 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -107,6 +107,15 @@ authorization from the authors.
<pad bytes="5" />
</struct>
+ <enum name="VisualClass">
+ <item name="StaticGray"> <value>0</value></item>
+ <item name="GrayScale"> <value>1</value></item>
+ <item name="StaticColor"><value>2</value></item>
+ <item name="PseudoColor"><value>3</value></item>
+ <item name="TrueColor"> <value>4</value></item>
+ <item name="DirectColor"><value>5</value></item>
+ </enum>
+
<struct name="VISUALTYPE">
<field type="VISUALID" name="visual_id" />
<field type="CARD8" name="class" />
@@ -188,6 +197,11 @@ authorization from the authors.
</list>
</struct>
+ <enum name="ImageOrder">
+ <item name="LSBFirst"><value>0</value></item>
+ <item name="MSBFirst"><value>1</value></item>
+ </enum>
+
<struct name="Setup">
<field type="CARD8" name="status" /> <!-- always 1 -> Success -->
<pad bytes="1" />
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index b4dfc20..0a8a2de 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -26,7 +26,7 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="xproto">
- <!-- Core event and error types -->
+ <!-- Core event types -->
<enum name="ModMask">
<item name="Shift"> <bit>0</bit></item>
@@ -80,6 +80,12 @@ authorization from the authors.
<eventcopy name="ButtonRelease" number="5" ref="ButtonPress" />
+ <!-- MotionNotify detail -->
+ <enum name="Motion">
+ <item name="Normal"><value>0</value></item>
+ <item name="Hint"> <value>1</value></item>
+ </enum>
+
<event name="MotionNotify" number="6">
<field type="BYTE" name="detail" />
<field type="TIMESTAMP" name="time" />
@@ -94,6 +100,24 @@ authorization from the authors.
<field type="BOOL" name="same_screen" />
</event>
+ <enum name="NotifyDetail">
+ <item name="Ancestor"> <value>0</value></item>
+ <item name="Virtual"> <value>1</value></item>
+ <item name="Inferior"> <value>2</value></item>
+ <item name="Nonlinear"> <value>3</value></item>
+ <item name="NonlinearVirtual"><value>4</value></item>
+ <item name="Pointer"> <value>5</value></item>
+ <item name="PointerRoot"> <value>6</value></item>
+ <item name="None"> <value>7</value></item>
+ </enum>
+
+ <enum name="NotifyMode">
+ <item name="Normal"> <value>0</value></item>
+ <item name="Grab"> <value>1</value></item>
+ <item name="Ungrab"> <value>2</value></item>
+ <item name="WhileGrabbed"><value>3</value></item>
+ </enum>
+
<event name="EnterNotify" number="7">
<field type="BYTE" name="detail" />
<field type="TIMESTAMP" name="time" />
@@ -152,6 +176,12 @@ authorization from the authors.
<field type="CARD8" name="major_opcode" />
</event>
+ <enum name="Visibility">
+ <item name="Unobscured"> <value>0</value></item>
+ <item name="PartiallyObscured"><value>1</value></item>
+ <item name="FullyObscured"> <value>2</value></item>
+ </enum>
+
<event name="VisibilityNotify" number="15">
<pad bytes="1" />
<field type="WINDOW" name="window" />
@@ -247,6 +277,11 @@ authorization from the authors.
<field type="CARD16" name="height" />
</event>
+ <enum name="Place">
+ <item name="OnTop"> <value>0</value></item>
+ <item name="OnBottom"><value>1</value></item>
+ </enum>
+
<event name="CirculateNotify" number="26">
<pad bytes="1" />
<field type="WINDOW" name="event" />
@@ -296,6 +331,11 @@ authorization from the authors.
<field type="ATOM" name="property" />
</event>
+ <enum name="ColormapState">
+ <item name="Uninstalled"><value>0</value></item>
+ <item name="Installed"> <value>1</value></item>
+ </enum>
+
<event name="ColormapNotify" number="32">
<pad bytes="1" />
<field type="WINDOW" name="window" />
@@ -332,6 +372,12 @@ authorization from the authors.
<field type="CARD8" name="count" />
</event>
+
+
+ <!-- Core error types -->
+
+
+
<error name="Request" number="1">
<field type="CARD32" name="bad_value" />
<field type="CARD16" name="minor_opcode" />
@@ -360,9 +406,13 @@ authorization from the authors.
<errorcopy name="Length" number="16" ref="Request" />
<errorcopy name="Implementation" number="17" ref="Request" />
- <!-- The requests, in major number order. -->
+
+
+ <!-- The core requests, in major number order. -->
<!-- It is the caller's responsibility to free returned XCB*Rep objects. -->
+
+
<enum name="WindowClass">
<item name="CopyFromParent"><value>0</value></item>
<item name="InputOutput"> <value>1</value></item>
@@ -388,6 +438,27 @@ authorization from the authors.
<item name="Cursor"> <bit>14</bit></item>
</enum>
+ <enum name="BackPixmap">
+ <item name="None"> <value>0</value></item>
+ <item name="ParentRelative"><value>1</value></item>
+ </enum>
+
+ <enum name="Gravity">
+ <item name="BitForget"><value>0</value></item>
+ <item name="WinUnmap"> <value>0</value></item>
+ <item name="NorthWest"><value>1</value></item>
+ <item name="North"> <value>2</value></item>
+ <item name="NorthEast"><value>3</value></item>
+ <item name="West"> <value>4</value></item>
+ <item name="Center"> <value>5</value></item>
+ <item name="East"> <value>6</value></item>
+ <item name="SouthWest"><value>7</value></item>
+ <item name="South"> <value>8</value></item>
+ <item name="SouthEast"><value>9</value></item>
+ <item name="Static"> <value>10</value></item>
+ </enum>
+
+ <!-- Also used in XCBSCREEN field backing_stores -->
<enum name="BackingStore">
<item name="NotUseful"> <value>0</value></item>
<item name="WhenMapped"><value>1</value></item>
@@ -549,6 +620,11 @@ authorization from the authors.
value-list-name="value_list" />
</request>
+ <enum name="Circulate">
+ <item name="RaiseLowest"> <value>0</value></item>
+ <item name="LowerHighest"><value>1</value></item>
+ </enum>
+
<request name="CirculateWindow" opcode="13">
<field type="CARD8" name="direction" />
<field type="WINDOW" name="window" />
@@ -701,6 +777,11 @@ authorization from the authors.
<field type="TIMESTAMP" name="time" />
</request>
+ <enum name="SendEventDest">
+ <item name="PointerWindow"><value>0</value></item>
+ <item name="ItemFocus"> <value>1</value></item>
+ </enum>
+
<request name="SendEvent" opcode="25">
<field type="BOOL" name="propagate" />
<field type="WINDOW" name="destination" />
@@ -708,6 +789,19 @@ authorization from the authors.
<list type="char" name="event"><value>32</value></list>
</request>
+ <enum name="GrabMode">
+ <item name="Async"><value>0</value></item>
+ <item name="Sync"> <value>1</value></item>
+ </enum>
+
+ <enum name="GrabStatus">
+ <item name="Success"> <value>0</value></item>
+ <item name="AlreadyGrabbed"><value>1</value></item>
+ <item name="InvalidTime"> <value>2</value></item>
+ <item name="NotViewable"> <value>3</value></item>
+ <item name="Frozen"> <value>4</value></item>
+ </enum>
+
<request name="GrabPointer" opcode="26">
<field type="BOOL" name="owner_events" />
<field type="WINDOW" name="grab_window" />
@@ -779,6 +873,11 @@ authorization from the authors.
<field type="TIMESTAMP" name="time" />
</request>
+ <!-- Use KEYCODE any = { XCBGrabAny }; to grab any key -->
+ <enum name="Grab">
+ <item name="Any"><value>0</value></item>
+ </enum>
+
<request name="GrabKey" opcode="33">
<field type="BOOL" name="owner_events" />
<field type="WINDOW" name="grab_window" />
@@ -794,6 +893,17 @@ authorization from the authors.
<field type="CARD16" name="modifiers" />
</request>
+ <enum name="Allow">
+ <item name="AsyncPointer"> <value>0</value></item>
+ <item name="SyncPointer"> <value>1</value></item>
+ <item name="ReplayPointer"> <value>2</value></item>
+ <item name="AsyncKeyboard"> <value>3</value></item>
+ <item name="SyncKeyboard"> <value>4</value></item>
+ <item name="ReplayKeyboard"><value>5</value></item>
+ <item name="AsyncBoth"> <value>6</value></item>
+ <item name="SyncBoth"> <value>7</value></item>
+ </enum>
+
<request name="AllowEvents" opcode="35">
<field type="CARD8" name="mode" />
<field type="TIMESTAMP" name="time" />
@@ -865,6 +975,13 @@ authorization from the authors.
<field type="INT16" name="dst_y" />
</request>
+ <!-- used for revert_to and focus -->
+ <enum name="InputFocus">
+ <item name="None"> <value>0</value></item>
+ <item name="PointerRoot"><value>1</value></item>
+ <item name="Parent"> <value>2</value></item> <!-- revert_to only -->
+ </enum>
+
<request name="SetInputFocus" opcode="42">
<field type="CARD8" name="revert_to" />
<field type="WINDOW" name="focus" />
@@ -899,6 +1016,11 @@ authorization from the authors.
<field type="FONT" name="font" />
</request>
+ <enum name="FontDraw">
+ <item name="LeftToRight"><value>0</value></item>
+ <item name="RightToLeft"><value>1</value></item>
+ </enum>
+
<struct name="FONTPROP">
<field type="ATOM" name="name" />
<field type="CARD32" name="value" />
@@ -1168,6 +1290,13 @@ authorization from the authors.
</list>
</request>
+ <enum name="ClipOrdering">
+ <item name="Unsorted"><value>0</value></item>
+ <item name="YSorted"> <value>1</value></item>
+ <item name="YXSorted"><value>2</value></item>
+ <item name="YXBanded"><value>3</value></item>
+ </enum>
+
<request name="SetClipRectangles" opcode="59">
<field type="BYTE" name="ordering" />
<field type="GCONTEXT" name="gc" />
@@ -1304,11 +1433,6 @@ authorization from the authors.
<item name="ZPixmap"> <value>2</value></item>
</enum>
- <enum name="ImageOrder">
- <item name="LSBFirst"><value>0</value></item>
- <item name="MSBFirst"><value>1</value></item>
- </enum>
-
<request name="PutImage" opcode="72">
<field type="CARD8" name="format" />
<field type="DRAWABLE" name="drawable" />
@@ -1512,6 +1636,12 @@ authorization from the authors.
<list type="CARD32" name="pixels" />
</request>
+ <enum name="ColorFlag">
+ <item name="Red"> <bit>0</bit></item>
+ <item name="Green"><bit>1</bit></item>
+ <item name="Blue"> <bit>2</bit></item>
+ </enum>
+
<struct name="COLORITEM">
<field type="CARD32" name="pixel" />
<field type="CARD16" name="red" />
@@ -1622,6 +1752,12 @@ authorization from the authors.
<field type="CARD16" name="back_blue" />
</request>
+ <enum name="QueryShapeOf">
+ <item name="LargestCursor"> <value>0</value></item>
+ <item name="FastestTile"> <value>1</value></item>
+ <item name="FastestStipple"><value>2</value></item>
+ </enum>
+
<request name="QueryBestSize" opcode="97">
<field type="CARD8" name="class" />
<field type="DRAWABLE" name="drawable" />
@@ -1687,6 +1823,28 @@ authorization from the authors.
</reply>
</request>
+ <enum name="KB">
+ <item name="KeyClickPercent"><bit>0</bit></item>
+ <item name="BellPercent"> <bit>1</bit></item>
+ <item name="BellPitch"> <bit>2</bit></item>
+ <item name="BellDuration"> <bit>3</bit></item>
+ <item name="Led"> <bit>4</bit></item>
+ <item name="LedMode"> <bit>5</bit></item>
+ <item name="Key"> <bit>6</bit></item>
+ <item name="AutoRepeatMode"> <bit>7</bit></item>
+ </enum>
+
+ <enum name="LedMode">
+ <item name="Off"><value>0</value></item>
+ <item name="On"> <value>1</value></item>
+ </enum>
+
+ <enum name="AutoRepeatMode">
+ <item name="Off"> <value>0</value></item>
+ <item name="On"> <value>1</value></item>
+ <item name="Default"><value>2</value></item>
+ </enum>
+
<request name="ChangeKeyboardControl" opcode="102">
<pad bytes="1" />
<valueparam value-mask-type="CARD32"
@@ -1729,6 +1887,21 @@ authorization from the authors.
</reply>
</request>
+ <!-- Screen saver timeout and interval can be set to -1 to restore defaults
+ and set to 0 to disable the screen saver. -->
+
+ <enum name="Blanking">
+ <item name="NotPreferred"><value>0</value></item>
+ <item name="Preferred"> <value>1</value></item>
+ <item name="Default"> <value>2</value></item>
+ </enum>
+
+ <enum name="Exposures">
+ <item name="NotAllowed"><value>0</value></item>
+ <item name="Allowed"> <value>1</value></item>
+ <item name="Default"> <value>2</value></item>
+ </enum>
+
<request name="SetScreenSaver" opcode="107">
<pad bytes="1" />
<field type="INT16" name="timeout" />
@@ -1747,6 +1920,20 @@ authorization from the authors.
</reply>
</request>
+ <enum name="Host">
+ <item name="Insert"><value>0</value></item>
+ <item name="Delete"><value>1</value></item>
+ </enum>
+
+ <!-- also used and extended for Xau authentication -->
+ <enum name="Family">
+ <item name="Internet"> <value>0</value></item>
+ <item name="DECnet"> <value>1</value></item>
+ <item name="Chaos"> <value>2</value></item>
+ <item name="ServerInterpreted"><value>5</value></item>
+ <item name="Internet6"> <value>6</value></item>
+ </enum>
+
<request name="ChangeHosts" opcode="109">
<field type="CARD8" name="mode" />
<field type="CARD8" name="family" />
@@ -1777,14 +1964,29 @@ authorization from the authors.
</reply>
</request>
+ <enum name="AccessControl">
+ <item name="Disable"><value>0</value></item>
+ <item name="Enable"> <value>1</value></item>
+ </enum>
+
<request name="SetAccessControl" opcode="111">
<field type="CARD8" name="mode" />
</request>
+ <enum name="CloseDown">
+ <item name="DestroyAll"> <value>0</value></item>
+ <item name="RetainPermanent"><value>1</value></item>
+ <item name="RetainTemporary"><value>2</value></item>
+ </enum>
+
<request name="SetCloseDownMode" opcode="112">
<field type="CARD8" name="mode" />
</request>
+ <enum name="Kill">
+ <item name="AllTemporary"><value>0</value></item>
+ </enum>
+
<request name="KillClient" opcode="113">
<pad bytes="1" />
<field type="CARD32" name="resource" />
@@ -1799,10 +2001,22 @@ authorization from the authors.
</list>
</request>
+ <enum name="ScreenSaver">
+ <item name="Reset"> <value>0</value></item>
+ <item name="Active"><value>1</value></item>
+ </enum>
+
<request name="ForceScreenSaver" opcode="115">
<field type="CARD8" name="mode" />
</request>
+ <!-- Reply from SetPointerMapping or SetModifierMapping -->
+ <enum name="MappingStatus">
+ <item name="Success"><value>0</value></item>
+ <item name="Busy"> <value>1</value></item>
+ <item name="Failure"><value>2</value></item>
+ </enum>
+
<request name="SetPointerMapping" opcode="116">
<field type="CARD8" name="map_len" />
<list type="CARD8" name="map">
diff --git a/xcb/src/xcb.h b/xcb/src/xcb.h
index 096cff5..8e990fd 100644
--- a/xcb/src/xcb.h
+++ b/xcb/src/xcb.h
@@ -83,13 +83,6 @@ extern "C" {
#define XCB_TYPE_PAD(T,I) (-(I) & (sizeof(T) > 4 ? 3 : sizeof(T) - 1))
-
-/** XCBNone is the universal null resource or null atom parameter value for many core X requests */
-#define XCBNone 0L
-
-/** XCBCopyFromParent can be used for many CreateWindow parameters */
-#define XCBCopyFromParent 0L
-
/* Opaque structures */
/**
@@ -166,6 +159,19 @@ typedef struct {
#include "xproto.h"
+/** XCBNone is the universal null resource or null atom parameter value for many core X requests */
+#define XCBNone 0L
+
+/** XCBCopyFromParent can be used for many CreateWindow parameters */
+#define XCBCopyFromParent 0L
+
+/** XCBCurrentTime can be used in most requests that take an XCBTIMESTAMP */
+#define XCBCurrentTime 0L
+
+/** XCBNoSymbol fills in unused entries in XCBKEYSYM tables */
+#define XCBNoSymbol 0L
+
+
/* xcb_auth.c */
/**
diff --git a/xcb/src/xcb_auth.c b/xcb/src/xcb_auth.c
index f42400d..46c85fd 100644
--- a/xcb/src/xcb_auth.c
+++ b/xcb/src/xcb_auth.c
@@ -105,7 +105,7 @@ static Xauth *get_authptr(struct sockadd
addr = (char *) &si->sin_addr;
addrlen = 4;
if (ntohl(si->sin_addr.s_addr) != 0x7f000001)
- family = 0; /* X.h: FamilyInternet */
+ family = XCBFamilyInternet;
snprintf(dispbuf, sizeof(dispbuf), "%d", ntohs(si->sin_port) - X_TCP_PORT);
display = dispbuf;
}
diff-tree 428a71bb48704b4ff660f9722c61d630e554d95c (from parents)
Merge: c2d41f29d14e254bf64ca02d4a24e5b8175bdfcf 58315b8478a5f9170146e71368e8d5bc872f4641
Author: Ian Osgood <iano at quirkster.com>
Date: Fri Apr 28 15:23:39 2006 -0700
Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb
diff-tree c2d41f29d14e254bf64ca02d4a24e5b8175bdfcf (from f6deae50fc0df0d760dc87a3a5db4fe30a192332)
Author: Ian Osgood <iano at quirkster.com>
Date: Fri Apr 28 11:09:27 2006 -0700
Add flames demo to README
diff --git a/xcb-demo/README b/xcb-demo/README
index 6967b1c..fc7b78f 100644
--- a/xcb-demo/README
+++ b/xcb-demo/README
@@ -13,5 +13,6 @@ neko/.......: XCB port of xneko.
In tests/ :
+flames......: example of XCBImage use
julia.......: example of XCBImage use, with a colormap.
-lissajoux...: simple example of XCBImage use.
+lissajoux...: simple example of XCBImage and shared memory use.
More information about the xcb-commit
mailing list