[Gtk-sharp-list] Cairo integration patches: preview.

[Miguel de Icaza]

--=-vT1M0OgPtNSstPTGchhS
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

This is a small preview of the Cairo integration patches.  We are going
to make some changes to the Cairo naming conventions, so this patch
should not be applied to CVS.

But with this, you can use the CairoSample.cs program that implements a
widget using Cairo, and no Gdk.

After we are done with the naming changes, we should get some docs for
Cairo on CVS as well.

Miguel.

--=-vT1M0OgPtNSstPTGchhS
Content-Disposition: attachment; filename=cairo-patch.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=cairo-patch.diff; charset=ISO-8859-1

SW5kZXg6IGdkay9EcmF3YWJsZS5jdXN0b20NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL3B1
YmxpYy9ndGstc2hhcnAvZ2RrL0RyYXdhYmxlLmN1c3RvbSx2DQpyZXRyaWV2aW5nIHJldmlzaW9u
IDEuNg0KZGlmZiAtdSAtdSAtcjEuNiBEcmF3YWJsZS5jdXN0b20NCi0tLSBnZGsvRHJhd2FibGUu
Y3VzdG9tCTI3IE9jdCAyMDAzIDIwOjAwOjE1IC0wMDAwCTEuNg0KKysrIGdkay9EcmF3YWJsZS5j
dXN0b20JMjkgTm92IDIwMDMgMjI6MTg6MDcgLTAwMDANCkBAIC00MSwzICs0MSwxOCBAQA0KIAln
ZGtfZHJhd19saW5lcyhIYW5kbGUsIGdjLkhhbmRsZSwgcG9pbnRzLCBwb2ludHMuTGVuZ3RoKTsN
CiB9DQogDQorW0RsbEltcG9ydCgibGliZ2RrLXdpbjMyLTIuMC0wLmRsbCIpXQ0KK2ludGVybmFs
IHN0YXRpYyBleHRlcm4gSW50UHRyIGdka194MTFfZHJhd2FibGVfZ2V0X3hkaXNwbGF5IChJbnRQ
dHIgcmF3KTsNCisNCitbRGxsSW1wb3J0KCJsaWJnZGstd2luMzItMi4wLTAuZGxsIildDQoraW50
ZXJuYWwgc3RhdGljIGV4dGVybiBJbnRQdHIgZ2RrX3gxMV9kcmF3YWJsZV9nZXRfeGlkIChJbnRQ
dHIgcmF3KTsNCisNCisJcHVibGljIENhaXJvLk9iamVjdCBDYWlyb0dyYXBoaWNzICgpDQorCXsN
CisJCUNhaXJvLk9iamVjdCBvID0gbmV3IENhaXJvLk9iamVjdCAoKTsNCisNCisJCUludFB0ciBk
aXNwbGF5ID0gZ2RrX3gxMV9kcmF3YWJsZV9nZXRfeGRpc3BsYXkgKEhhbmRsZSk7DQorCQlvLlNl
dFRhcmdldERyYXdhYmxlIChkaXNwbGF5LCBnZGtfeDExX2RyYXdhYmxlX2dldF94aWQgKEhhbmRs
ZSkpOw0KKw0KKwkJcmV0dXJuIG87DQorCX0NClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQ0K
SW5kZXg6IGdkay9NYWtlZmlsZS5pbg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMvcHVibGlj
L2d0ay1zaGFycC9nZGsvTWFrZWZpbGUuaW4sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjE1DQpk
aWZmIC11IC11IC1yMS4xNSBNYWtlZmlsZS5pbg0KLS0tIGdkay9NYWtlZmlsZS5pbgkyOCBPY3Qg
MjAwMyAyMDowMzoyNyAtMDAwMAkxLjE1DQorKysgZ2RrL01ha2VmaWxlLmluCTI5IE5vdiAyMDAz
IDIyOjE4OjA3IC0wMDAwDQpAQCAtMTcsNyArMTcsNyBAQA0KIA0KICQoQVNTRU1CTFkpOiAqLmNz
IGdlbmVyYXRlZC1zdGFtcA0KIAkkKE1DUykgLS11bnNhZmUgLW5vd2FybjowNjYwLDA2NjEgLS10
YXJnZXQgbGlicmFyeSAJXA0KLQktciBTeXN0ZW0uRHJhd2luZyAtciAuLi9nbGliL2dsaWItc2hh
cnAuZGxsIAkJXA0KKwktciBTeXN0ZW0uRHJhd2luZyAtcjpNb25vLkNhaXJvIC1yIC4uL2dsaWIv
Z2xpYi1zaGFycC5kbGwgCQlcDQogCS1yIC4uL3BhbmdvL3BhbmdvLXNoYXJwLmRsbCAtciAuLi9h
dGsvYXRrLXNoYXJwLmRsbCAJXA0KIAktbyAkKEFTU0VNQkxZKSAtLXJlY3Vyc2UgJyouY3MnDQog
DQpJbmRleDogZ2RrL1dpbmRvdy5jdXN0b20NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL3B1
YmxpYy9ndGstc2hhcnAvZ2RrL1dpbmRvdy5jdXN0b20sdg0KcmV0cmlldmluZyByZXZpc2lvbiAx
LjINCmRpZmYgLXUgLXUgLXIxLjIgV2luZG93LmN1c3RvbQ0KLS0tIGdkay9XaW5kb3cuY3VzdG9t
CTE4IE5vdiAyMDAzIDIxOjU5OjE4IC0wMDAwCTEuMg0KKysrIGdkay9XaW5kb3cuY3VzdG9tCTI5
IE5vdiAyMDAzIDIyOjE4OjA3IC0wMDAwDQpAQCAtNjEsMyArNjEsMjMgQEANCiAJCWVsc2UNCiAJ
CQlnZGtfd2luZG93X2NsZWFyX2FyZWEgKEhhbmRsZSwgcmVjdC5YLCByZWN0LlksIHJlY3QuV2lk
dGgsIHJlY3QuSGVpZ2h0KTsNCiAJfQ0KKw0KKwlwdWJsaWMgQ2Fpcm8uT2JqZWN0IENhaXJvR3Jh
cGhpY3MgKG91dCBpbnQgb2Zmc2V0X3gsIG91dCBpbnQgb2Zmc2V0X3kpDQorCXsNCisJCUludFB0
ciByZWFsX2RyYXdhYmxlOw0KKwkJQ2Fpcm8uT2JqZWN0IG8gPSBuZXcgQ2Fpcm8uT2JqZWN0ICgp
Ow0KKw0KKwkJZ2RrX3dpbmRvd19nZXRfaW50ZXJuYWxfcGFpbnRfaW5mbyAoSGFuZGxlLCBvdXQg
cmVhbF9kcmF3YWJsZSwgb3V0IG9mZnNldF94LCBvdXQgb2Zmc2V0X3kpOw0KKwkJSW50UHRyIHgx
MSA9IGdka194MTFfZHJhd2FibGVfZ2V0X3hpZCAocmVhbF9kcmF3YWJsZSk7DQorCQlJbnRQdHIg
ZGlzcGxheSA9IGdka194MTFfZHJhd2FibGVfZ2V0X3hkaXNwbGF5IChyZWFsX2RyYXdhYmxlKTsN
CisJCW8uU2V0VGFyZ2V0RHJhd2FibGUgKGRpc3BsYXksIHgxMSk7DQorDQorCQlyZXR1cm4gbzsN
CisJfQ0KKw0KKw0KKwlwdWJsaWMgbmV3IENhaXJvLk9iamVjdCBDYWlyb0dyYXBoaWNzICgpDQor
CXsNCisJCWludCB4LCB5Ow0KKwkJcmV0dXJuIENhaXJvR3JhcGhpY3MgKG91dCB4LCBvdXQgeSk7
DQorCX0NClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQ0KSW5kZXg6IHNhbXBsZS9NYWtlZmls
ZS5pbg0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMvcHVibGljL2d0ay1zaGFycC9zYW1wbGUv
TWFrZWZpbGUuaW4sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI3DQpkaWZmIC11IC11IC1yMS4y
NyBNYWtlZmlsZS5pbg0KLS0tIHNhbXBsZS9NYWtlZmlsZS5pbgkyMyBOb3YgMjAwMyAwMDo1Mzox
NCAtMDAwMAkxLjI3DQorKysgc2FtcGxlL01ha2VmaWxlLmluCTI5IE5vdiAyMDAzIDIyOjE4OjE0
IC0wMDAwDQpAQCAtMSw0ICsxLDQgQEANCi1NQ1M9bWNzDQorTUNTPW1jcyAtZw0KIA0KIEBFTkFC
TEVfR05PTUVfVFJVRUAgR05PTUVfUEFUSD0tTCAuLi9hcnQgLUwgLi4vZ25vbWUNCiBARU5BQkxF
X0dOT01FX1RSVUVAIEdOT01FX0FTU0VNQkxZPS1yIGFydC1zaGFycC5kbGwgLXIgZ25vbWUtc2hh
cnAuZGxsDQpAQCAtMTgsNTQgKzE4LDU3IEBADQogCSQoQ1NDKSAvdW5zYWZlIC9vdXQ6Z3RrLWhl
bGxvLXdvcmxkLmV4ZSAvcjouLi9nbGliL2dsaWItc2hhcnAuZGxsIC9yOi4uL2d0ay9ndGstc2hh
cnAuZGxsIC9yOi4uL2dkay9nZGstc2hhcnAuZGxsIEhlbGxvV29ybGQuY3MNCiAJJChDU0MpIC91
bnNhZmUgL291dDpidXR0b24uZXhlIC9yOi4uL2dsaWIvZ2xpYi1zaGFycC5kbGwgL3I6Li4vZ3Rr
L2d0ay1zaGFycC5kbGwgQnV0dG9uQXBwLmNzDQogDQotbGludXg6IGd0ay1oZWxsby13b3JsZC5l
eGUgYnV0dG9uLmV4ZSBjYWxlbmRhci5leGUgc3ViY2xhc3MuZXhlIG1lbnUuZXhlIHNpemUuZXhl
IHNjcmliYmxlLmV4ZSB0cmVldmlld2RlbW8uZXhlIG1hbmFnZWR0cmVldmlld2RlbW8uZXhlICQo
R05PTUVfVEFSR0VUUykgJChHTEFERV9UQVJHRVRTKQ0KK2xpbnV4OiBjYWlyby1zYW1wbGUuZXhl
IGd0ay1oZWxsby13b3JsZC5leGUgYnV0dG9uLmV4ZSBjYWxlbmRhci5leGUgc3ViY2xhc3MuZXhl
IG1lbnUuZXhlIHNpemUuZXhlIHNjcmliYmxlLmV4ZSB0cmVldmlld2RlbW8uZXhlIG1hbmFnZWR0
cmVldmlld2RlbW8uZXhlICQoR05PTUVfVEFSR0VUUykgJChHTEFERV9UQVJHRVRTKQ0KIEBFTkFC
TEVfR05PTUVfVFJVRUAJJChNQUtFKSAtQyBnY29uZiANCiBARU5BQkxFX0dOT01FX1RSVUVACSQo
TUFLRSkgLUMgcnN2Zw0KIA0KIGd0ay1oZWxsby13b3JsZC5leGU6IEhlbGxvV29ybGQuY3MNCi0J
JChNQ1MpIC0tdW5zYWZlIC1vIGd0ay1oZWxsby13b3JsZC5leGUgJChsb2NhbF9wYXRocykgJChh
bGxfYXNzZW1ibGllcykgSGVsbG9Xb3JsZC5jcw0KKwkkKE1DUykgIC1vdXQ6Z3RrLWhlbGxvLXdv
cmxkLmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBIZWxsb1dvcmxkLmNzDQog
DQogZ25vbWUtaGVsbG8td29ybGQuZXhlOiBHbm9tZUhlbGxvV29ybGQuY3MNCi0JJChNQ1MpIC0t
dW5zYWZlIC1vIGdub21lLWhlbGxvLXdvcmxkLmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3Nl
bWJsaWVzKSBHbm9tZUhlbGxvV29ybGQuY3MNCisJJChNQ1MpICAtb3V0Omdub21lLWhlbGxvLXdv
cmxkLmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBHbm9tZUhlbGxvV29ybGQu
Y3MNCiANCiBjYW52YXMtZXhhbXBsZS5leGU6IENhbnZhc0V4YW1wbGUuY3MNCi0JJChNQ1MpIC0t
dW5zYWZlIC1vIGNhbnZhcy1leGFtcGxlLmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJs
aWVzKSBDYW52YXNFeGFtcGxlLmNzDQorCSQoTUNTKSAgLW91dDpjYW52YXMtZXhhbXBsZS5leGUg
JChsb2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGllcykgQ2FudmFzRXhhbXBsZS5jcw0KIA0KIGZp
ZnRlZW4uZXhlOiBGaWZ0ZWVuLmNzDQotCSQoTUNTKSAtLXVuc2FmZSAtbyBmaWZ0ZWVuLmV4ZSAk
KGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBGaWZ0ZWVuLmNzDQotCQ0KKwkkKE1DUykg
IC1vdXQ6ZmlmdGVlbi5leGUgJChsb2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGllcykgRmlmdGVl
bi5jcw0KKw0KIHByaW50LmV4ZTogUHJpbnRTYW1wbGUuY3MNCi0JJChNQ1MpIC0tdW5zYWZlIC1v
IHByaW50LmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBQcmludFNhbXBsZS5j
cw0KKwkkKE1DUykgIC1vdXQ6cHJpbnQuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxp
ZXMpIFByaW50U2FtcGxlLmNzDQogDQogYnV0dG9uLmV4ZTogQnV0dG9uQXBwLmNzDQotCSQoTUNT
KSAtLXVuc2FmZSAtbyBidXR0b24uZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMp
IEJ1dHRvbkFwcC5jcw0KKwkkKE1DUykgIC1vdXQ6YnV0dG9uLmV4ZSAkKGxvY2FsX3BhdGhzKSAk
KGFsbF9hc3NlbWJsaWVzKSBCdXR0b25BcHAuY3MNCiANCiBjYWxlbmRhci5leGU6IENhbGVuZGFy
QXBwLmNzDQotCSQoTUNTKSAtLXVuc2FmZSAtbyBjYWxlbmRhci5leGUgJChsb2NhbF9wYXRocykg
JChhbGxfYXNzZW1ibGllcykgQ2FsZW5kYXJBcHAuY3MNCisJJChNQ1MpICAtb3V0OmNhbGVuZGFy
LmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBDYWxlbmRhckFwcC5jcw0KIA0K
IHN1YmNsYXNzLmV4ZTogU3ViY2xhc3MuY3MNCi0JJChNQ1MpIC0tdW5zYWZlIC1vIHN1YmNsYXNz
LmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBTdWJjbGFzcy5jcw0KKwkkKE1D
UykgIC1vdXQ6c3ViY2xhc3MuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMpIFN1
YmNsYXNzLmNzDQogDQogbWVudS5leGU6IE1lbnUuY3MNCi0JJChNQ1MpIC0tdW5zYWZlIC1vIG1l
bnUuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMpIE1lbnUuY3MNCisJJChNQ1Mp
ICAtb3V0Om1lbnUuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMpIE1lbnUuY3MN
CiANCiBzaXplLmV4ZTogU2l6ZS5jcw0KLQkkKE1DUykgLS11bnNhZmUgLW8gc2l6ZS5leGUgJChs
b2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGllcykgU2l6ZS5jcw0KKwkkKE1DUykgIC1vdXQ6c2l6
ZS5leGUgJChsb2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGllcykgU2l6ZS5jcw0KIA0KIHNjcmli
YmxlLmV4ZTogU2NyaWJibGUuY3MNCi0JJChNQ1MpIC0tdW5zYWZlIC1vIHNjcmliYmxlLmV4ZSAk
KGxvY2FsX3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBTY3JpYmJsZS5jcw0KKwkkKE1DUykgIC1v
dXQ6c2NyaWJibGUuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMpIFNjcmliYmxl
LmNzDQogDQogdHJlZXZpZXdkZW1vLmV4ZTogVHJlZVZpZXdEZW1vLmNzDQotCSQoTUNTKSAtLXVu
c2FmZSAtbyB0cmVldmlld2RlbW8uZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMp
IFRyZWVWaWV3RGVtby5jcw0KKwkkKE1DUykgIC1vdXQ6dHJlZXZpZXdkZW1vLmV4ZSAkKGxvY2Fs
X3BhdGhzKSAkKGFsbF9hc3NlbWJsaWVzKSBUcmVlVmlld0RlbW8uY3MNCiANCiBtYW5hZ2VkdHJl
ZXZpZXdkZW1vLmV4ZTogTWFuYWdlZFRyZWVWaWV3RGVtby5jcw0KLQkkKE1DUykgLS11bnNhZmUg
LW8gbWFuYWdlZHRyZWV2aWV3ZGVtby5leGUgJChsb2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGll
cykgTWFuYWdlZFRyZWVWaWV3RGVtby5jcw0KKwkkKE1DUykgIC1vdXQ6bWFuYWdlZHRyZWV2aWV3
ZGVtby5leGUgJChsb2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGllcykgTWFuYWdlZFRyZWVWaWV3
RGVtby5jcw0KIA0KIGdsYWRlLXZpZXdlci5leGU6IEdsYWRlVmlld2VyLmNzDQotCSQoTUNTKSAt
LXVuc2FmZSAtbyBnbGFkZS12aWV3ZXIuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxp
ZXMpIEdsYWRlVmlld2VyLmNzDQorCSQoTUNTKSAgLW91dDpnbGFkZS12aWV3ZXIuZXhlICQobG9j
YWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMpIEdsYWRlVmlld2VyLmNzDQogDQogZ2xhZGUtdGVz
dC5leGU6IEdsYWRlVGVzdC5jcyB0ZXN0LmdsYWRlDQotCSQoTUNTKSAtLXVuc2FmZSAtcmVzb3Vy
Y2U6dGVzdC5nbGFkZSAtbyBnbGFkZS10ZXN0LmV4ZSAkKGxvY2FsX3BhdGhzKSAkKGFsbF9hc3Nl
bWJsaWVzKSBHbGFkZVRlc3QuY3MNCisJJChNQ1MpICAtcmVzb3VyY2U6dGVzdC5nbGFkZSAtb3V0
OmdsYWRlLXRlc3QuZXhlICQobG9jYWxfcGF0aHMpICQoYWxsX2Fzc2VtYmxpZXMpIEdsYWRlVGVz
dC5jcw0KKw0KK2NhaXJvLXNhbXBsZS5leGU6IENhaXJvU2FtcGxlLmNzDQorCSQoTUNTKSAtb3V0
OmNhaXJvLXNhbXBsZS5leGUgJChsb2NhbF9wYXRocykgJChhbGxfYXNzZW1ibGllcykgLXI6TW9u
by5DYWlybyBDYWlyb1NhbXBsZS5jcw0KIA0KIGNsZWFuOg0KIAlybSAtZiAqLmV4ZQ0KQEAgLTgx
LDQgKzg0LDQgQEANCiANCiBpbnN0YWxsOiBsaW51eA0KIEBFTkFCTEVfR05PTUVfVFJVRUAJJChN
QUtFKSAtQyBnY29uZiBpbnN0YWxsIA0KLQkNCisNCg==

--=-vT1M0OgPtNSstPTGchhS--