From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Antipov Newsgroups: gmane.emacs.devel Subject: Proposal: window-system-version function Date: Mon, 21 May 2012 18:11:02 +0400 Message-ID: <4FBA4CF6.1030007@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010302030407010100030609" X-Trace: dough.gmane.org 1337609353 26734 80.91.229.3 (21 May 2012 14:09:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 21 May 2012 14:09:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 21 16:09:10 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SWTIL-0000eu-7b for ged-emacs-devel@m.gmane.org; Mon, 21 May 2012 16:09:09 +0200 Original-Received: from localhost ([::1]:33275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWTIK-00020f-J4 for ged-emacs-devel@m.gmane.org; Mon, 21 May 2012 10:09:08 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWTID-000202-C4 for emacs-devel@gnu.org; Mon, 21 May 2012 10:09:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SWTI6-0005yU-JQ for emacs-devel@gnu.org; Mon, 21 May 2012 10:09:00 -0400 Original-Received: from forward17.mail.yandex.net ([95.108.253.142]:50370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SWTI6-0005y9-0d for emacs-devel@gnu.org; Mon, 21 May 2012 10:08:54 -0400 Original-Received: from smtp18.mail.yandex.net (smtp18.mail.yandex.net [95.108.252.18]) by forward17.mail.yandex.net (Yandex) with ESMTP id 33C1310617F7 for ; Mon, 21 May 2012 18:08:52 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1337609332; bh=ZRuByeUQK++K/yurSTx6pR+X+0G+MRNjng0HWbaZ4fw=; h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type; b=dLmjWiCH65Z4hE0E3FW0lnpVyoQSZYAKaaKSlnLQdYpPjrukWlzaUWNq20tlj1HX8 I/0UNjz3e0+t/ov4Kxb6LSWyOoNBjhYwlhtAyevYdLw5nTfQMS3S0rUfbkBXG1OP3u Xg3wxZdBgvaGoSBRN/XO7+yJnFptp3sB9cdu0Mfg= Original-Received: from smtp18.mail.yandex.net (localhost [127.0.0.1]) by smtp18.mail.yandex.net (Yandex) with ESMTP id 20C5118A0194 for ; Mon, 21 May 2012 18:08:52 +0400 (MSK) Original-Received: from antipov.client.gelicon.ru (antipov.client.gelicon.ru [78.153.153.8]) by smtp18.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 8pwqCOVc-8pwGrL2W; Mon, 21 May 2012 18:08:51 +0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1337609332; bh=ZRuByeUQK++K/yurSTx6pR+X+0G+MRNjng0HWbaZ4fw=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type; b=LQrGSB0Smi/jeuuA6h0GbRGomFAq5mQJc0lSYC03LQGNKW6ZZfg7vd1pNSKVYYYY/ S08hu76a9NI5GCHBAo2RwDBXj5NvP5p6eDDBhDN+WmjIQb1yXMYW/gg9LcUw9TMlpX WZZ6BkNAqSew+AyiAgSdgHAWvpdYuPblb4qlO7kg= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 95.108.253.142 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:150576 Archived-At: This is a multi-part message in MIME format. --------------010302030407010100030609 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit This patch replaces global variable 'window-system-version' with the function which returns the window system version for the specified frame. An obvious reason for this is to have correct results when Emacs is running with both TTY and X frames. Dmitry --------------010302030407010100030609 Content-Type: text/plain; charset=UTF-8; name="window_system_version.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="window_system_version.patch" PT09IG1vZGlmaWVkIGZpbGUgJ2xpc3AvaW50ZXJuYXRpb25hbC9tdWxlLWRpYWcuZWwnCi0t LSBsaXNwL2ludGVybmF0aW9uYWwvbXVsZS1kaWFnLmVsCTIwMTItMDEtMTkgMDc6MjE6MjUg KzAwMDAKKysrIGxpc3AvaW50ZXJuYXRpb25hbC9tdWxlLWRpYWcuZWwJMjAxMi0wNS0yMSAx Mzo1NDo0OSArMDAwMApAQCAtMTEwNSw3ICsxMTA1LDcgQEAKICAgICAgIChpbnNlcnQtc2Vj dGlvbiAyICJEaXNwbGF5IikKICAgICAgIChpZiB3aW5kb3ctc3lzdGVtCiAJICAoaW5zZXJ0 IChmb3JtYXQgIldpbmRvdy1zeXN0ZW06ICVzLCB2ZXJzaW9uICVzIgotCQkJICB3aW5kb3ct c3lzdGVtIHdpbmRvdy1zeXN0ZW0tdmVyc2lvbikpCisJCQkgIHdpbmRvdy1zeXN0ZW0gKHdp bmRvdy1zeXN0ZW0tdmVyc2lvbikpKQogCShpbnNlcnQgIlRlcm1pbmFsOiAiIChnZXRlbnYg IlRFUk0iKSkpCiAgICAgICAoaW5zZXJ0ICJcblxuIikKIAoKPT09IG1vZGlmaWVkIGZpbGUg J2xpc3AvdGV4dG1vZGVzL2FydGlzdC5lbCcKLS0tIGxpc3AvdGV4dG1vZGVzL2FydGlzdC5l bAkyMDEyLTA0LTExIDExOjU3OjIxICswMDAwCisrKyBsaXNwL3RleHRtb2Rlcy9hcnRpc3Qu ZWwJMjAxMi0wNS0yMSAxMzo1ODozOCArMDAwMApAQCAtNTM3MSwyMCArNTM3MSwyMSBAQAog ICAoaW50ZXJhY3RpdmUpCiAgIChyZXF1aXJlICdyZXBvcnRlcikKICAgKGlmICh5LW9yLW4t cCAiRG8geW91IHdhbnQgdG8gc3VibWl0IGEgYnVnIHJlcG9ydCBvbiBBcnRpc3Q/ICIpCi0g ICAgICAobGV0ICgodG8gICBhcnRpc3QtbWFpbnRhaW5lci1hZGRyZXNzKQotCSAgICAodmFy cyAnKHdpbmRvdy1zeXN0ZW0KLQkJICAgIHdpbmRvdy1zeXN0ZW0tdmVyc2lvbgotCQkgICAg OzsKLQkJICAgIGFydGlzdC1ydWJiZXItYmFuZGluZwotCQkgICAgYXJ0aXN0LWludGVyZmFj ZS13aXRoLXJlY3QKLQkJICAgIGFydGlzdC1hc3BlY3QtcmF0aW8KLQkJICAgIDs7IE5vdyB0 aGUgaW50ZXJuYWwgb25lcwotCQkgICAgYXJ0aXN0LWN1cnItZ28KLQkJICAgIGFydGlzdC1r ZXktcG9seS1wb2ludC1saXN0Ci0JCSAgICBhcnRpc3Qta2V5LXNoYXBlCi0JCSAgICBhcnRp c3Qta2V5LWRyYXctaG93Ci0JCSAgICBhcnRpc3QtYXJyb3ctcG9pbnQtMQotCQkgICAgYXJ0 aXN0LWFycm93LXBvaW50LTIpKSkKKyAgICAgIChsZXQqICgodG8gYXJ0aXN0LW1haW50YWlu ZXItYWRkcmVzcykKKwkgICAgICh3aW5kb3ctc3lzdGVtLXZlcnNpb24gKHdpbmRvdy1zeXN0 ZW0tdmVyc2lvbikpCisJICAgICAodmFycyAnKHdpbmRvdy1zeXN0ZW0KKwkJICAgICB3aW5k b3ctc3lzdGVtLXZlcnNpb24KKwkJICAgICA7OworCQkgICAgIGFydGlzdC1ydWJiZXItYmFu ZGluZworCQkgICAgIGFydGlzdC1pbnRlcmZhY2Utd2l0aC1yZWN0CisJCSAgICAgYXJ0aXN0 LWFzcGVjdC1yYXRpbworCQkgICAgIDs7IE5vdyB0aGUgaW50ZXJuYWwgb25lcworCQkgICAg IGFydGlzdC1jdXJyLWdvCisJCSAgICAgYXJ0aXN0LWtleS1wb2x5LXBvaW50LWxpc3QKKwkJ ICAgICBhcnRpc3Qta2V5LXNoYXBlCisJCSAgICAgYXJ0aXN0LWtleS1kcmF3LWhvdworCQkg ICAgIGFydGlzdC1hcnJvdy1wb2ludC0xCisJCSAgICAgYXJ0aXN0LWFycm93LXBvaW50LTIp KSkKIAk7OyBSZW1vdmUgdGhvc2UgdmFyaWFibGVzIGZyb20gdmFycyB0aGF0IGFyZSBub3Qg Ym91bmQKIAkobWFwYwogCSAoZnVuY3Rpb24KCj09PSBtb2RpZmllZCBmaWxlICdzcmMvZGlz cG5ldy5jJwotLS0gc3JjL2Rpc3BuZXcuYwkyMDEyLTA1LTAxIDAwOjMwOjExICswMDAwCisr KyBzcmMvZGlzcG5ldy5jCTIwMTItMDUtMjEgMTM6NTU6NDggKzAwMDAKQEAgLTYzMDEsOSAr NjMwMSw2IEBACiAgIGlmICghaW5oaWJpdF93aW5kb3dfc3lzdGVtICYmIGRpc3BsYXlfYXJn KQogICAgIHsKICAgICAgIFZpbml0aWFsX3dpbmRvd19zeXN0ZW0gPSBReDsKLSNpZmRlZiBI QVZFX1gxMQotICAgICAgVndpbmRvd19zeXN0ZW1fdmVyc2lvbiA9IG1ha2VfbnVtYmVyICgx MSk7Ci0jZW5kaWYKICNpZmRlZiBHTlVfTElOVVgKICAgICAgIC8qIEluIHNvbWUgdmVyc2lv bnMgb2YgbmN1cnNlcywKIAkgdHB1dHMgY3Jhc2hlcyBpZiB3ZSBoYXZlIG5vdCBjYWxsZWQg dGdldGVudC4KQEAgLTYzMTksNyArNjMxNiw2IEBACiAgIGlmICghaW5oaWJpdF93aW5kb3df c3lzdGVtKQogICAgIHsKICAgICAgIFZpbml0aWFsX3dpbmRvd19zeXN0ZW0gPSBRdzMyOwot ICAgICAgVndpbmRvd19zeXN0ZW1fdmVyc2lvbiA9IG1ha2VfbnVtYmVyICgxKTsKICAgICAg IGFkanVzdF9mcmFtZV9nbHlwaHNfaW5pdGlhbGx5ICgpOwogICAgICAgcmV0dXJuOwogICAg IH0KQEAgLTYzMzMsNyArNjMyOSw2IEBACiAgICAgICApCiAgICAgewogICAgICAgVmluaXRp YWxfd2luZG93X3N5c3RlbSA9IFFuczsKLSAgICAgIFZ3aW5kb3dfc3lzdGVtX3ZlcnNpb24g PSBtYWtlX251bWJlciAoMTApOwogICAgICAgYWRqdXN0X2ZyYW1lX2dseXBoc19pbml0aWFs bHkgKCk7CiAgICAgICByZXR1cm47CiAgICAgfQpAQCAtNjU3NSwxMCArNjU3MCw2IEBACiB1 c2UgYGRpc3BsYXktZ3JhcGhpYy1wJyBvciBhbnkgb2YgdGhlIG90aGVyIGBkaXNwbGF5LSot cCcKIHByZWRpY2F0ZXMgd2hpY2ggcmVwb3J0IGZyYW1lJ3Mgc3BlY2lmaWMgVUktcmVsYXRl ZCBjYXBhYmlsaXRpZXMuICAqLyk7CiAKLSAgREVGVkFSX0xJU1AgKCJ3aW5kb3ctc3lzdGVt LXZlcnNpb24iLCBWd2luZG93X3N5c3RlbV92ZXJzaW9uLAotCSAgICAgICBkb2M6IC8qIFRo ZSB2ZXJzaW9uIG51bWJlciBvZiB0aGUgd2luZG93IHN5c3RlbSBpbiB1c2UuCi1Gb3IgWCB3 aW5kb3dzLCB0aGlzIGlzIDExLiAgKi8pOwotCiAgIERFRlZBUl9CT09MICgiY3Vyc29yLWlu LWVjaG8tYXJlYSIsIGN1cnNvcl9pbl9lY2hvX2FyZWEsCiAJICAgICAgIGRvYzogLyogTm9u LW5pbCBtZWFucyBwdXQgY3Vyc29yIGluIG1pbmlidWZmZXIsIGF0IGVuZCBvZiBhbnkgbWVz c2FnZSB0aGVyZS4gICovKTsKIApAQCAtNjYxNCw4ICs2NjA1LDUgQEAKICNpZmRlZiBDQU5O T1RfRFVNUAogICBpZiAobm9uaW50ZXJhY3RpdmUpCiAjZW5kaWYKLSAgICB7Ci0gICAgICBW aW5pdGlhbF93aW5kb3dfc3lzdGVtID0gUW5pbDsKLSAgICAgIFZ3aW5kb3dfc3lzdGVtX3Zl cnNpb24gPSBRbmlsOwotICAgIH0KKyAgICBWaW5pdGlhbF93aW5kb3dfc3lzdGVtID0gUW5p bDsKIH0KCj09PSBtb2RpZmllZCBmaWxlICdzcmMvZnJhbWUuYycKLS0tIHNyYy9mcmFtZS5j CTIwMTItMDMtMTAgMDc6NDY6MDcgKzAwMDAKKysrIHNyYy9mcmFtZS5jCTIwMTItMDUtMjEg MTM6NTQ6NDkgKzAwMDAKQEAgLTI1Niw2ICsyNTYsNTIgQEAKICAgICByZXR1cm4gdHlwZTsK IH0KIAorREVGVU4gKCJ3aW5kb3ctc3lzdGVtLXZlcnNpb24iLCBGd2luZG93X3N5c3RlbV92 ZXJzaW9uLCBTd2luZG93X3N5c3RlbV92ZXJzaW9uLCAwLCAxLCAwLAorICAgICAgIGRvYzog LyogVGhlIHZlcnNpb24gb2YgdGhlIHdpbmRvdyBzeXN0ZW0gdGhhdCBGUkFNRSBpcyBkaXNw bGF5aW5nIHRocm91Z2guCitJdCdzIHZhbHVlIGlzIGEgbnVtYmVyOgorIC0gMCBmb3IgYSB0 ZXJtY2FwIGZyYW1lLAorIC0gTWFqb3IgWCBwcm90b2NvbCB2ZXJzaW9uIGZvciB0aGUgZnJh bWUgb24gWCBkaXNwbGF5LAorIC0gTWFqb3IgT1MgdmVyc2lvbiBmb3IgdGhlIGZyYW1lIG9u IE1TLVdpbmRvd3MgZGlzcGxheSwKKyAtIDI0IGZvciB0aGUgZnJhbWUgb24gZGlyZWN0LXdy aXRlIE1TLURPUyBkaXNwbGF5LAorIC0gMTAgZm9yIHRoZSBmcmFtZSBvbiBhIEdOVXN0ZXAg b3IgTWFjaW50b3NoIENvY29hIGRpc3BsYXkuCisKK0ZSQU1FIGRlZmF1bHRzIHRvIHRoZSBj dXJyZW50bHkgc2VsZWN0ZWQgZnJhbWUuICAqLykKKyAgICAgKExpc3BfT2JqZWN0IGZyYW1l KQoreworICBzdHJ1Y3QgZnJhbWUgKmY7CisKKyAgaWYgKE5JTFAgKGZyYW1lKSkKKyAgICBm cmFtZSA9IHNlbGVjdGVkX2ZyYW1lOworICBDSEVDS19MSVZFX0ZSQU1FIChmcmFtZSk7Cisg IGYgPSBYRlJBTUUgKGZyYW1lKTsKKworICBzd2l0Y2ggKGYtPm91dHB1dF9tZXRob2QpCisg ICAgeworICAgIGNhc2Ugb3V0cHV0X2luaXRpYWw6CisgICAgY2FzZSBvdXRwdXRfdGVybWNh cDoKKyAgICAgIHJldHVybiBtYWtlX251bWJlciAoMCk7CisjaWZkZWYgSEFWRV9YX1dJTkRP V1MKKyAgICBjYXNlIG91dHB1dF94X3dpbmRvdzoKKyAgICAgIHJldHVybiBtYWtlX251bWJl ciAoUHJvdG9jb2xWZXJzaW9uIChGUkFNRV9YX0RJU1BMQVkgKGYpKSk7CisjZW5kaWYKKyNp ZmRlZiBXSU5ET1dTTlQKKyAgICBjYXNlIG91dHB1dF93MzI6CisgICAgICByZXR1cm4gbWFr ZV9udW1iZXIgKHczMl9tYWpvcl92ZXJzaW9uKTsKKyNlbmRpZgorI2lmZGVmIE1TRE9TCisg ICAgY2FzZSBvdXRwdXRfbXNkb3NfcmF3OgorICAgICAgcmV0dXJuIG1ha2VfbnVtYmVyICgy NCk7CisjZW5kaWYKKyNpZmRlZiBIQVZFX05TCisgICAgY2FzZSBvdXRwdXRfbWFjOgorICAg IGNhc2Ugb3V0cHV0X25zOgorICAgICAgcmV0dXJuIG1ha2VfbnVtYmVyICgxMCk7CisjZW5k aWYKKyAgICBkZWZhdWx0OgorICAgICAgYWJvcnQgKCk7CisgICAgfQorfQorCiBzdHJ1Y3Qg ZnJhbWUgKgogbWFrZV9mcmFtZSAoaW50IG1pbmlfcCkKIHsKQEAgLTQ0NTUsNiArNDUwMSw3 IEBACiAgIGRlZnN1YnIgKCZTZnJhbWVwKTsKICAgZGVmc3ViciAoJlNmcmFtZV9saXZlX3Ap OwogICBkZWZzdWJyICgmU3dpbmRvd19zeXN0ZW0pOworICBkZWZzdWJyICgmU3dpbmRvd19z eXN0ZW1fdmVyc2lvbik7CiAgIGRlZnN1YnIgKCZTbWFrZV90ZXJtaW5hbF9mcmFtZSk7CiAg IGRlZnN1YnIgKCZTaGFuZGxlX3N3aXRjaF9mcmFtZSk7CiAgIGRlZnN1YnIgKCZTc2VsZWN0 X2ZyYW1lKTsKCj09PSBtb2RpZmllZCBmaWxlICdzcmMvbXNkb3MuYycKLS0tIHNyYy9tc2Rv cy5jCTIwMTItMDQtMDkgMTM6MDU6NDggKzAwMDAKKysrIHNyYy9tc2Rvcy5jCTIwMTItMDUt MjEgMTM6NTQ6NDkgKzAwMDAKQEAgLTE4MTMsNyArMTgxMyw2IEBACiAJfQogCiAgICAgICBW aW5pdGlhbF93aW5kb3dfc3lzdGVtID0gUXBjOwotICAgICAgVndpbmRvd19zeXN0ZW1fdmVy c2lvbiA9IG1ha2VfbnVtYmVyICgyMyk7IC8qIFJFIEVtYWNzIHZlcnNpb24gKi8KICAgICAg IHR0eS0+dGVybWluYWwtPnR5cGUgPSBvdXRwdXRfbXNkb3NfcmF3OwogCiAgICAgICAvKiBJ ZiBFbWFjcyB3YXMgZHVtcGVkIG9uIERPUy9WIG1hY2hpbmUsIGZvcmdldCB0aGUgc3RhbGUg VlJBTQoKPT09IG1vZGlmaWVkIGZpbGUgJ3NyYy93MzJmbnMuYycKLS0tIHNyYy93MzJmbnMu YwkyMDEyLTA1LTE4IDA4OjM2OjUwICswMDAwCisrKyBzcmMvdzMyZm5zLmMJMjAxMi0wNS0y MSAxMzo1NDo0OSArMDAwMApAQCAtNDcyOSw3ICs0NzI5LDYgQEAKICAgICBlcnJvciAoIkNh bm5vdCBjb25uZWN0IHRvIHNlcnZlciAlcyIsIFNEQVRBIChuYW1lKSk7CiAKICAgdzMyX2lu X3VzZSA9IDE7Ci0gIFhTRVRGQVNUSU5UIChWd2luZG93X3N5c3RlbV92ZXJzaW9uLCB3MzJf bWFqb3JfdmVyc2lvbik7CiAKICAgcmV0dXJuIGRweWluZm87CiB9CkBAIC00ODIwLDcgKzQ4 MTksNiBAQAogCiAgIHczMl9pbl91c2UgPSAxOwogCi0gIFhTRVRGQVNUSU5UIChWd2luZG93 X3N5c3RlbV92ZXJzaW9uLCB3MzJfbWFqb3JfdmVyc2lvbik7CiAgIHJldHVybiBRbmlsOwog fQogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3JjL3hmbnMuYycKLS0tIHNyYy94Zm5zLmMJMjAx Mi0wNS0xOSAyMTo0Njo0MyArMDAwMAorKysgc3JjL3hmbnMuYwkyMDEyLTA1LTIxIDEzOjU0 OjQ5ICswMDAwCkBAIC00MDYzLDcgKzQwNjMsNiBAQAogICAgIGVycm9yICgiQ2Fubm90IGNv bm5lY3QgdG8gWCBzZXJ2ZXIgJXMiLCBTREFUQSAobmFtZSkpOwogCiAgIHhfaW5fdXNlID0g MTsKLSAgWFNFVEZBU1RJTlQgKFZ3aW5kb3dfc3lzdGVtX3ZlcnNpb24sIDExKTsKIAogICBy ZXR1cm4gZHB5aW5mbzsKIH0KQEAgLTQxMTgsNyArNDExNyw2IEBACiAKICAgeF9pbl91c2Ug PSAxOwogCi0gIFhTRVRGQVNUSU5UIChWd2luZG93X3N5c3RlbV92ZXJzaW9uLCAxMSk7CiAg IHJldHVybiBRbmlsOwogfQogCgo= --------------010302030407010100030609--