diff options
author | Jory Pratt <anarchy@gentoo.org> | 2006-06-01 01:09:15 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2006-06-01 01:09:15 +0000 |
commit | 208ddcfdf19892f75bc4f87a35564ea223c36817 (patch) | |
tree | e4778139cd0fd4b07d0a50fad20652acf1bb7d27 /x11-wm | |
parent | Use the right PN. (diff) | |
download | historical-208ddcfdf19892f75bc4f87a35564ea223c36817.tar.gz historical-208ddcfdf19892f75bc4f87a35564ea223c36817.tar.bz2 historical-208ddcfdf19892f75bc4f87a35564ea223c36817.zip |
revision for hiding menu header, and pipedslitgradient patch for more advanced themeing possibilities
Package-Manager: portage-2.1_rc3-r3
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/openbox/ChangeLog | 11 | ||||
-rw-r--r-- | x11-wm/openbox/Manifest | 49 | ||||
-rw-r--r-- | x11-wm/openbox/files/digest-openbox-20060509-r1 | 6 | ||||
-rw-r--r-- | x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch | 64 | ||||
-rw-r--r-- | x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch | 256 | ||||
-rw-r--r-- | x11-wm/openbox/openbox-20060509-r1.ebuild | 67 |
6 files changed, 435 insertions, 18 deletions
diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog index 9f4b47336b22..59c3baa65f16 100644 --- a/x11-wm/openbox/ChangeLog +++ b/x11-wm/openbox/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-wm/openbox # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.107 2006/05/10 00:44:23 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.108 2006/06/01 01:09:15 anarchy Exp $ + +*openbox-20060509-r1 (01 Jun 2006) + + 01 Jun 2006; Jory A. Pratt <anarchy@gentoo.org> + +files/openbox-20060509-hideMenuHeader.patch, + +files/openbox-20060509-pipedsplitgradient.patch, + +openbox-20060509-r1.ebuild: + revision for hiding menu header, and pipedslitgradient patch for more + advanced themeing possibilities *openbox-20060509 (10 May 2006) diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest index 52860d11c3f5..19f762c38cb3 100644 --- a/x11-wm/openbox/Manifest +++ b/x11-wm/openbox/Manifest @@ -1,50 +1,65 @@ -AUX openbox-20060509-asneeded.patch 325 RMD160 78461369eb39f22289ae2c8339c31f1a5cc95e96 SHA1 b3223bf7ad9fc04fdb915714a372d79260b44736 SHA256 8d04d9ed3a827e9b58616cff4e4333e02c48a0306028c94d6b0b2244daf6f349 size 325 +AUX openbox-20060509-asneeded.patch 325 RMD160 78461369eb39f22289ae2c8339c31f1a5cc95e96 SHA1 b3223bf7ad9fc04fdb915714a372d79260b44736 SHA256 8d04d9ed3a827e9b58616cff4e4333e02c48a0306028c94d6b0b2244daf6f349 MD5 402889e38296ea7b8d1f03b49a8a7549 files/openbox-20060509-asneeded.patch 325 RMD160 78461369eb39f22289ae2c8339c31f1a5cc95e96 files/openbox-20060509-asneeded.patch 325 SHA256 8d04d9ed3a827e9b58616cff4e4333e02c48a0306028c94d6b0b2244daf6f349 files/openbox-20060509-asneeded.patch 325 -AUX openbox-3.2-makefile.patch 413 RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de4c SHA1 7fd443482ff10487a0bb8d0840b36604209b03cb SHA256 8cef7c7543e7b95302df9179d50d0ce79c34107b9f91053bb7e64e3bf3219c7a size 413 +AUX openbox-20060509-hideMenuHeader.patch 2455 RMD160 5c5abeeb9964ab0735dbffa0bc8a687585d57a11 SHA1 0b9cd352e2c1299022c30c5bc9594d6087eb63d0 SHA256 758e776c6301e003c14d8efedf81311d1b408abfb47370bcb26d613bb420bd82 +MD5 e82bfd747e4b24f433b44b72cdf91c25 files/openbox-20060509-hideMenuHeader.patch 2455 +RMD160 5c5abeeb9964ab0735dbffa0bc8a687585d57a11 files/openbox-20060509-hideMenuHeader.patch 2455 +SHA256 758e776c6301e003c14d8efedf81311d1b408abfb47370bcb26d613bb420bd82 files/openbox-20060509-hideMenuHeader.patch 2455 +AUX openbox-20060509-pipedsplitgradient.patch 8034 RMD160 d2fa4e97f4dfe421d9f1a240f1cbad92ccb6022d SHA1 fcc76b1e6e9851f78f1141ed21a4a9295957a39b SHA256 16c52a8917fee7aaa6fcbf29360d0bc60bcdd56975cbd62fe6cbe737b573f2fc +MD5 8dc2f39ce11fe90f958ea83c186999ab files/openbox-20060509-pipedsplitgradient.patch 8034 +RMD160 d2fa4e97f4dfe421d9f1a240f1cbad92ccb6022d files/openbox-20060509-pipedsplitgradient.patch 8034 +SHA256 16c52a8917fee7aaa6fcbf29360d0bc60bcdd56975cbd62fe6cbe737b573f2fc files/openbox-20060509-pipedsplitgradient.patch 8034 +AUX openbox-3.2-makefile.patch 413 RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de4c SHA1 7fd443482ff10487a0bb8d0840b36604209b03cb SHA256 8cef7c7543e7b95302df9179d50d0ce79c34107b9f91053bb7e64e3bf3219c7a MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413 RMD160 827d2d6bae6bd6583a3ee5350e9b715eb555de4c files/openbox-3.2-makefile.patch 413 SHA256 8cef7c7543e7b95302df9179d50d0ce79c34107b9f91053bb7e64e3bf3219c7a files/openbox-3.2-makefile.patch 413 -AUX openbox-3.3_rc2-64bit-property.patch 6458 RMD160 503e0d806c2084beb7d75c8670d8c512e4c289cc SHA1 ae4dc629df8082b4a7dfd99285df1555292adc64 SHA256 0f8833392f3ec63c84f835a28943a767e41ff44e20d3436438d10278f1b34395 size 6458 +AUX openbox-3.3_rc2-64bit-property.patch 6458 RMD160 503e0d806c2084beb7d75c8670d8c512e4c289cc SHA1 ae4dc629df8082b4a7dfd99285df1555292adc64 SHA256 0f8833392f3ec63c84f835a28943a767e41ff44e20d3436438d10278f1b34395 MD5 f628d964589ac827c70bca569312d813 files/openbox-3.3_rc2-64bit-property.patch 6458 RMD160 503e0d806c2084beb7d75c8670d8c512e4c289cc files/openbox-3.3_rc2-64bit-property.patch 6458 SHA256 0f8833392f3ec63c84f835a28943a767e41ff44e20d3436438d10278f1b34395 files/openbox-3.3_rc2-64bit-property.patch 6458 -AUX openbox-3.3_rc2-asneeded.patch 423 RMD160 d388b22842a2da7311b07c127927f2b1df68e8c9 SHA1 c00c330a2beb41af02cef8b6e894711e488ae317 SHA256 013d4da392119414ef25b1152495c39b834b952051cd940697a61233449d923e size 423 +AUX openbox-3.3_rc2-asneeded.patch 423 RMD160 d388b22842a2da7311b07c127927f2b1df68e8c9 SHA1 c00c330a2beb41af02cef8b6e894711e488ae317 SHA256 013d4da392119414ef25b1152495c39b834b952051cd940697a61233449d923e MD5 8c4e16f0734dd4a37adc4c4dd8c5d862 files/openbox-3.3_rc2-asneeded.patch 423 RMD160 d388b22842a2da7311b07c127927f2b1df68e8c9 files/openbox-3.3_rc2-asneeded.patch 423 SHA256 013d4da392119414ef25b1152495c39b834b952051cd940697a61233449d923e files/openbox-3.3_rc2-asneeded.patch 423 -AUX openbox.desktop 192 RMD160 af9f75aea5e8ed978ce0283be559e396101e994b SHA1 78ce3e081c9080ff4f4af63413497cc238a56be8 SHA256 5b4e837b3d4bf068a568c6fbc49489be560eb83bca0bdd15b8395cc0622a8320 size 192 +AUX openbox.desktop 192 RMD160 af9f75aea5e8ed978ce0283be559e396101e994b SHA1 78ce3e081c9080ff4f4af63413497cc238a56be8 SHA256 5b4e837b3d4bf068a568c6fbc49489be560eb83bca0bdd15b8395cc0622a8320 MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192 RMD160 af9f75aea5e8ed978ce0283be559e396101e994b files/openbox.desktop 192 SHA256 5b4e837b3d4bf068a568c6fbc49489be560eb83bca0bdd15b8395cc0622a8320 files/openbox.desktop 192 -DIST ob-themes-usability.tar.bz2 19204 RMD160 0d5307746ba743647fe912eb8a364ca61c68b61a SHA256 36ce83c2d10abcc503dbaa6c89c0ce9a8793e5760d281973a38a41577421f5c5 size 19204 -DIST openbox-20060509.tar.gz 827216 RMD160 dcd93e081ba1db144b87b0758a76a45256a543a1 SHA256 c097806666b63dfc312f769a3f60b30c60d73996fb44e37f484d4321fd2e7fb2 size 827216 -DIST openbox-3.2.tar.gz 561115 RMD160 bd1045dc8c57a66ac2e6d6a0fb967ea65a02936d SHA256 1b21ae976ca84217aa34ee72c4dda81df5eff57bade5e0fd9f1910c92e56b647 size 561115 -DIST openbox-3.3-rc2.tar.gz 585486 RMD160 d12f6bda7145975754626e4c421baaa2ea25d07f SHA256 066c4add6cc16bbc1c30f3dcb84c16cfd6453c06d7fe1de3d04e279236d35692 size 585486 -EBUILD openbox-20060509.ebuild 1662 RMD160 4a0d2709333be8439cb809c0a172987cffc1e12b SHA1 0cba4ab26cd55df52e7e4f90920f9bce872133c3 SHA256 82a6226363e6cc839cdd0d6a76dfc57e919785a3220813edf89ccb0f093e0190 size 1662 +DIST ob-themes-usability.tar.bz2 19204 RMD160 0d5307746ba743647fe912eb8a364ca61c68b61a SHA1 20aebf45a6b341b9147df8d8922dfd00f72c1e14 SHA256 36ce83c2d10abcc503dbaa6c89c0ce9a8793e5760d281973a38a41577421f5c5 +DIST openbox-20060509.tar.gz 827216 RMD160 dcd93e081ba1db144b87b0758a76a45256a543a1 SHA1 84288ffcb59967f4fa76a34da67aede25f201b89 SHA256 c097806666b63dfc312f769a3f60b30c60d73996fb44e37f484d4321fd2e7fb2 +DIST openbox-3.2.tar.gz 561115 RMD160 bd1045dc8c57a66ac2e6d6a0fb967ea65a02936d SHA256 1b21ae976ca84217aa34ee72c4dda81df5eff57bade5e0fd9f1910c92e56b647 +DIST openbox-3.3-rc2.tar.gz 585486 RMD160 d12f6bda7145975754626e4c421baaa2ea25d07f SHA256 066c4add6cc16bbc1c30f3dcb84c16cfd6453c06d7fe1de3d04e279236d35692 +EBUILD openbox-20060509-r1.ebuild 1761 RMD160 dc7d98facacb7066379d52410113b2c65191123c SHA1 bff8f4d769f76484911376fa326240471c296d05 SHA256 fabc6fdf5c5f9b6804a742bacd39b155b02e7183d21e3f73fc6e7f61ebad03ff +MD5 74e4dc8ff19f456bc38978a44fa257aa openbox-20060509-r1.ebuild 1761 +RMD160 dc7d98facacb7066379d52410113b2c65191123c openbox-20060509-r1.ebuild 1761 +SHA256 fabc6fdf5c5f9b6804a742bacd39b155b02e7183d21e3f73fc6e7f61ebad03ff openbox-20060509-r1.ebuild 1761 +EBUILD openbox-20060509.ebuild 1662 RMD160 4a0d2709333be8439cb809c0a172987cffc1e12b SHA1 0cba4ab26cd55df52e7e4f90920f9bce872133c3 SHA256 82a6226363e6cc839cdd0d6a76dfc57e919785a3220813edf89ccb0f093e0190 MD5 6f2d301179a4dc7c2465d020dfc7f4a4 openbox-20060509.ebuild 1662 RMD160 4a0d2709333be8439cb809c0a172987cffc1e12b openbox-20060509.ebuild 1662 SHA256 82a6226363e6cc839cdd0d6a76dfc57e919785a3220813edf89ccb0f093e0190 openbox-20060509.ebuild 1662 -EBUILD openbox-3.2-r2.ebuild 1750 RMD160 5d1e0c4217e7645d20bd4cf5dbaba1276afc1a45 SHA1 395ada1c75de892f1f3dcfd457c515b7b0dc6b61 SHA256 84c606b487bfe812f6c53429168e915c116f8f46087cd48a378fad7f798d04fb size 1750 +EBUILD openbox-3.2-r2.ebuild 1750 RMD160 5d1e0c4217e7645d20bd4cf5dbaba1276afc1a45 SHA1 395ada1c75de892f1f3dcfd457c515b7b0dc6b61 SHA256 84c606b487bfe812f6c53429168e915c116f8f46087cd48a378fad7f798d04fb MD5 7b9ffb545abceef21c7ad60e54121719 openbox-3.2-r2.ebuild 1750 RMD160 5d1e0c4217e7645d20bd4cf5dbaba1276afc1a45 openbox-3.2-r2.ebuild 1750 SHA256 84c606b487bfe812f6c53429168e915c116f8f46087cd48a378fad7f798d04fb openbox-3.2-r2.ebuild 1750 -EBUILD openbox-3.3_rc2-r2.ebuild 1951 RMD160 a7b12a23cddbec8b339672ee036cbb596de81a2e SHA1 fcdbad256c948496ca26d64436e15e43c2351821 SHA256 039448255cda5aa4ec96aeeefc079b3d32b0456c3ebcef29edf9a3f6e7229eff size 1951 +EBUILD openbox-3.3_rc2-r2.ebuild 1951 RMD160 a7b12a23cddbec8b339672ee036cbb596de81a2e SHA1 fcdbad256c948496ca26d64436e15e43c2351821 SHA256 039448255cda5aa4ec96aeeefc079b3d32b0456c3ebcef29edf9a3f6e7229eff MD5 e86767e871873c541be8effcf1b7e97c openbox-3.3_rc2-r2.ebuild 1951 RMD160 a7b12a23cddbec8b339672ee036cbb596de81a2e openbox-3.3_rc2-r2.ebuild 1951 SHA256 039448255cda5aa4ec96aeeefc079b3d32b0456c3ebcef29edf9a3f6e7229eff openbox-3.3_rc2-r2.ebuild 1951 -MISC ChangeLog 18858 RMD160 dd1f0db3da880266926d968d2a9ebe2eb925cc5c SHA1 5fbe964c6700261dc3ad7639f0773c66b50b2d38 SHA256 f4943a24dc3facfc25d06d60ce999fb376809f70c51e48663cce11c9c51d9c53 size 18858 -MD5 be13d45c82944e908b70f22d9758775a ChangeLog 18858 -RMD160 dd1f0db3da880266926d968d2a9ebe2eb925cc5c ChangeLog 18858 -SHA256 f4943a24dc3facfc25d06d60ce999fb376809f70c51e48663cce11c9c51d9c53 ChangeLog 18858 -MISC metadata.xml 252 RMD160 9910b5b4d79ad4db9860760d072e527a1e86764c SHA1 c3795d7f97f379907ee077df1cbe5a65b3579d3f SHA256 fa65533c0d00c7a422a47a3e4beba53a15a0256a2cb9002c4f47882416670a6e size 252 +MISC ChangeLog 19182 RMD160 a552351a1c57fe12bfffd3043e0c8789c7e86f53 SHA1 8eb593ef2d495550079aa904c3833db5ad5bbed7 SHA256 f858497bf9812d3dbc96518ffec213b10b386ffe6eea09f96c7afe3fa3c1ed36 +MD5 582d1a5124a4e14a08cf87c43e6e51dc ChangeLog 19182 +RMD160 a552351a1c57fe12bfffd3043e0c8789c7e86f53 ChangeLog 19182 +SHA256 f858497bf9812d3dbc96518ffec213b10b386ffe6eea09f96c7afe3fa3c1ed36 ChangeLog 19182 +MISC metadata.xml 252 RMD160 9910b5b4d79ad4db9860760d072e527a1e86764c SHA1 c3795d7f97f379907ee077df1cbe5a65b3579d3f SHA256 fa65533c0d00c7a422a47a3e4beba53a15a0256a2cb9002c4f47882416670a6e MD5 ed7e3e0736adfe198661f5f351fd9e8a metadata.xml 252 RMD160 9910b5b4d79ad4db9860760d072e527a1e86764c metadata.xml 252 SHA256 fa65533c0d00c7a422a47a3e4beba53a15a0256a2cb9002c4f47882416670a6e metadata.xml 252 MD5 40791b4b800759dab416ca5a8a98f95c files/digest-openbox-20060509 509 RMD160 e1c1c6117bbfecb43a703393ca67ff89ea837316 files/digest-openbox-20060509 509 SHA256 32c25d1f04dc41796e243c6939f4d9a059b87541807a6932cf91872cc29fb8b9 files/digest-openbox-20060509 509 +MD5 40791b4b800759dab416ca5a8a98f95c files/digest-openbox-20060509-r1 509 +RMD160 e1c1c6117bbfecb43a703393ca67ff89ea837316 files/digest-openbox-20060509-r1 509 +SHA256 32c25d1f04dc41796e243c6939f4d9a059b87541807a6932cf91872cc29fb8b9 files/digest-openbox-20060509-r1 509 MD5 30d786a3ba34faec2401458b44bb8215 files/digest-openbox-3.2-r2 494 RMD160 6b451782ac3681b6694ad2947b8f6fbb68dadf36 files/digest-openbox-3.2-r2 494 SHA256 eba726a081f08d419cee76b8bd4c61395f5df36f02309a6aca8601e3bcaadadb files/digest-openbox-3.2-r2 494 diff --git a/x11-wm/openbox/files/digest-openbox-20060509-r1 b/x11-wm/openbox/files/digest-openbox-20060509-r1 new file mode 100644 index 000000000000..f185955cb253 --- /dev/null +++ b/x11-wm/openbox/files/digest-openbox-20060509-r1 @@ -0,0 +1,6 @@ +MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204 +RMD160 0d5307746ba743647fe912eb8a364ca61c68b61a ob-themes-usability.tar.bz2 19204 +SHA256 36ce83c2d10abcc503dbaa6c89c0ce9a8793e5760d281973a38a41577421f5c5 ob-themes-usability.tar.bz2 19204 +MD5 3ff8d5dd7fdae18e5bc1b49f917af16a openbox-20060509.tar.gz 827216 +RMD160 dcd93e081ba1db144b87b0758a76a45256a543a1 openbox-20060509.tar.gz 827216 +SHA256 c097806666b63dfc312f769a3f60b30c60d73996fb44e37f484d4321fd2e7fb2 openbox-20060509.tar.gz 827216 diff --git a/x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch b/x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch new file mode 100644 index 000000000000..cd09d7e15777 --- /dev/null +++ b/x11-wm/openbox/files/openbox-20060509-hideMenuHeader.patch @@ -0,0 +1,64 @@ +Index: openbox/config.c +=================================================================== +RCS file: /cvs/cvsroot/openbox/openbox/config.c,v +retrieving revision 1.92 +diff -u -p -r1.92 config.c +--- openbox/config.c 25 Sep 2005 14:45:24 -0000 1.92 ++++ openbox/config.c 16 Apr 2006 18:29:18 -0000 +@@ -36,6 +36,7 @@ ObPlacePolicy config_place_policy; + gchar *config_theme; + gboolean config_theme_keepborder; + gboolean config_theme_hidedisabled; ++gboolean config_theme_hidemenuheader; + + gchar *config_title_layout; + +@@ -260,6 +261,8 @@ static void parse_theme(ObParseInst *i, + config_theme_keepborder = parse_bool(doc, n); + if ((n = parse_find_node("hideDisabled", node))) + config_theme_hidedisabled = parse_bool(doc, n); ++ if ((n = parse_find_node("hideMenuHeader", node))) ++ config_theme_hidemenuheader = parse_bool(doc, n); + } + + static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, +@@ -563,6 +566,7 @@ void config_startup(ObParseInst *i) + config_title_layout = g_strdup("NLIMC"); + config_theme_keepborder = TRUE; + config_theme_hidedisabled = FALSE; ++ config_theme_hidemenuheader = FALSE; + + parse_register(i, "theme", parse_theme, NULL); + +Index: openbox/config.h +=================================================================== +RCS file: /cvs/cvsroot/openbox/openbox/config.h,v +retrieving revision 1.57 +diff -u -p -r1.57 config.h +--- openbox/config.h 25 Sep 2005 14:45:24 -0000 1.57 ++++ openbox/config.h 16 Apr 2006 18:29:18 -0000 +@@ -88,6 +88,8 @@ extern gchar *config_theme; + extern gboolean config_theme_keepborder; + /* Hide window frame buttons that the window doesn't allow */ + extern gboolean config_theme_hidedisabled; ++/* Hide the menu header? */ ++extern gboolean config_theme_hidemenuheader; + /* Titlebar button layout */ + extern gchar *config_title_layout; + +Index: openbox/menuframe.c +=================================================================== +RCS file: /cvs/cvsroot/openbox/openbox/menuframe.c,v +retrieving revision 1.52 +diff -u -p -r1.52 menuframe.c +--- openbox/menuframe.c 14 Sep 2005 17:40:47 -0000 1.52 ++++ openbox/menuframe.c 16 Apr 2006 18:29:18 -0000 +@@ -61,7 +61,7 @@ ObMenuFrame* menu_frame_new(ObMenu *menu + self->type = Window_Menu; + self->menu = menu; + self->selected = NULL; +- self->show_title = TRUE; ++ self->show_title = !config_theme_hidemenuheader; + self->client = client; + + attr.event_mask = FRAME_EVENTMASK; diff --git a/x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch b/x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch new file mode 100644 index 000000000000..f3de4dd3bd34 --- /dev/null +++ b/x11-wm/openbox/files/openbox-20060509-pipedsplitgradient.patch @@ -0,0 +1,256 @@ +Index: openbox/openbox.c +=================================================================== +RCS file: /cvs/cvsroot/openbox/openbox/openbox.c,v +retrieving revision 1.130 +diff -p -u -r1.130 openbox.c +--- openbox/openbox.c 1 Apr 2005 13:04:55 -0000 1.130 ++++ openbox/openbox.c 19 Feb 2006 22:21:25 -0000 +@@ -163,7 +163,7 @@ gint main(gint argc, gchar **argv) + cursors[OB_CURSOR_BUSY] = + XCreateFontCursor(ob_display, XC_watch); + cursors[OB_CURSOR_MOVE] = +- XCreateFontCursor(ob_display, XC_fleur); ++ XCreateFontCursor(ob_display, XC_cross); + cursors[OB_CURSOR_NORTH] = + XCreateFontCursor(ob_display, XC_top_side); + cursors[OB_CURSOR_NORTHEAST] = +Index: render/gradient.c +=================================================================== +RCS file: /cvs/cvsroot/openbox/render/gradient.c,v +retrieving revision 1.45 +diff -p -u -r1.45 gradient.c +--- render/gradient.c 15 Oct 2003 03:59:35 -0000 1.45 ++++ render/gradient.c 19 Feb 2006 22:21:26 -0000 +@@ -24,6 +24,7 @@ + + static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised); + static void gradient_solid(RrAppearance *l, gint w, gint h); ++static void gradient_split(RrAppearance *a, gint w, gint h); + static void gradient_vertical(RrSurface *sf, gint w, gint h); + static void gradient_horizontal(RrSurface *sf, gint w, gint h); + static void gradient_diagonal(RrSurface *sf, gint w, gint h); +@@ -41,6 +42,9 @@ void RrRender(RrAppearance *a, gint w, g + case RR_SURFACE_SOLID: + gradient_solid(a, w, h); + break; ++ case RR_SURFACE_SPLIT: ++ gradient_split(a, w, h); ++ break; + case RR_SURFACE_VERTICAL: + gradient_vertical(&a->surface, w, h); + break; +@@ -60,7 +64,7 @@ void RrRender(RrAppearance *a, gint w, g + g_assert_not_reached(); /* unhandled gradient */ + return; + } +- ++ + if (a->surface.interlaced) { + gint i; + RrPixel32 *p; +@@ -76,7 +80,7 @@ void RrRender(RrAppearance *a, gint w, g + for (x = 0; x < w; ++x, ++p) + *p = current; + } +- ++ + if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) { + r = a->surface.border_color->r; + g = a->surface.border_color->g; +@@ -132,11 +136,11 @@ static void highlight(RrPixel32 *x, RrPi + down = x; + } + r = (*up >> RrDefaultRedOffset) & 0xFF; +- r += r >> 1; ++ r += r >> 2; + g = (*up >> RrDefaultGreenOffset) & 0xFF; +- g += g >> 1; ++ g += g >> 2; + b = (*up >> RrDefaultBlueOffset) & 0xFF; +- b += b >> 1; ++ b += b >> 2; + if (r > 0xFF) r = 0xFF; + if (g > 0xFF) g = 0xFF; + if (b > 0xFF) b = 0xFF; +@@ -144,12 +148,15 @@ static void highlight(RrPixel32 *x, RrPi + + (b << RrDefaultBlueOffset); + + r = (*down >> RrDefaultRedOffset) & 0xFF; +- r = (r >> 1) + (r >> 2); ++ r = (r >> 1) + (r >> 2) * 1.6; + g = (*down >> RrDefaultGreenOffset) & 0xFF; +- g = (g >> 1) + (g >> 2); ++ g = (g >> 1) + (g >> 2) * 1.6; + b = (*down >> RrDefaultBlueOffset) & 0xFF; +- b = (b >> 1) + (b >> 2); +- *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) ++ b = (b >> 1) + (b >> 2) * 1.6; ++ if (r > 0xFF) r = 0xFF; ++ if (g > 0xFF) g = 0xFF; ++ if (b > 0xFF) b = 0xFF; ++ *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) + + (b << RrDefaultBlueOffset); + } + +@@ -159,11 +166,11 @@ static void create_bevel_colors(RrAppear + + /* light color */ + r = l->surface.primary->r; +- r += r >> 1; ++ r += r >> 2; + g = l->surface.primary->g; +- g += g >> 1; ++ g += g >> 2; + b = l->surface.primary->b; +- b += b >> 1; ++ b += b >> 2; + if (r > 0xFF) r = 0xFF; + if (g > 0xFF) g = 0xFF; + if (b > 0xFF) b = 0xFF; +@@ -172,11 +179,11 @@ static void create_bevel_colors(RrAppear + + /* dark color */ + r = l->surface.primary->r; +- r = (r >> 1) + (r >> 2); ++ r = (r >> 1) + (r >> 2) * 1.6; + g = l->surface.primary->g; +- g = (g >> 1) + (g >> 2); ++ g = (g >> 1) + (g >> 2) * 1.6; + b = l->surface.primary->b; +- b = (b >> 1) + (b >> 2); ++ b = (b >> 1) + (b >> 2) * 1.6; + g_assert(!l->surface.bevel_dark); + l->surface.bevel_dark = RrColorNew(l->inst, r, g, b); + } +@@ -198,7 +205,7 @@ static void gradient_solid(RrAppearance + + XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary), + 0, 0, w, h); +- ++ + if (sp->interlaced) { + for (i = 0; i < h; i += 2) + XDrawLine(RrDisplay(l->inst), l->pixmap, +@@ -359,6 +366,77 @@ static void gradient_solid(RrAppearance + } \ + } + ++static void gradient_split(RrAppearance *a, gint w, gint h) ++{ ++ gint x, y1, y3, r, g, b; ++ RrSurface *sf = &a->surface; ++ RrPixel32 *data = sf->pixel_data; ++ RrPixel32 current; ++ RrColor *primary_light, *secondary_light; ++ ++/* ++ maybe this is a better way, or maybe not! ++ r = sf->primary->r; ++ r = (r >> 1) + (r >> 2) + (r >> 3) ; ++ g = sf->primary->g; ++ g = (g >> 1) + (g >> 2) + (g >> 3); ++ b = sf->primary->b; ++ b = (b >> 1) + (b >> 2) + (b >> 3); ++ primary_dark = RrColorNew(a->inst, r, g, b); ++*/ ++ ++ ++ r = sf->primary->r; ++ r += r >> 2; ++ g = sf->primary->g; ++ g += g >> 2; ++ b = sf->primary->b; ++ b += b >> 2; ++ if (r > 0xFF) r = 0xFF; ++ if (g > 0xFF) g = 0xFF; ++ if (b > 0xFF) b = 0xFF; ++ primary_light = RrColorNew(a->inst, r, g, b); ++ ++ ++ r = sf->secondary->r; ++ r += r >> 4; ++ g = sf->secondary->g; ++ g += g >> 4; ++ b = sf->secondary->b; ++ b += b >> 4; ++ if (r > 0xFF) r = 0xFF; ++ if (g > 0xFF) g = 0xFF; ++ if (b > 0xFF) b = 0xFF; ++ secondary_light = RrColorNew(a->inst, r, g, b); ++ ++ VARS(y1); ++ SETUP(y1, primary_light, sf->primary, (h / 2) -1); ++ ++ VARS(y3); ++ SETUP(y3, sf->secondary, secondary_light, (h / 2) -1); ++ ++ for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */ ++ current = COLOR(y1); ++ for (x = w - 1; x >= 0; --x) /* 0 -> w */ ++ *(data++) = current; ++ ++ NEXT(y1); ++ } ++ ++ ++ for (y3 = (h / 2) - 1; y3 > 0; --y3) { ++ current = COLOR(y3); ++ for (x = w - 1; x >= 0; --x) ++ *(data++) = current; ++ ++ NEXT(y3); ++ } ++ ++ current = COLOR(y3); ++ for (x = w - 1; x >= 0; --x) /* 0 -> w */ ++ *(data++) = current; ++} ++ + static void gradient_horizontal(RrSurface *sf, gint w, gint h) + { + gint x, y; +@@ -567,4 +645,3 @@ static void gradient_pyramid(RrSurface * + *(end-x) = current; + *(end-(inw-x)) = current; + } +- +Index: render/render.h +=================================================================== +RCS file: /cvs/cvsroot/openbox/render/render.h,v +retrieving revision 1.57 +diff -p -u -r1.57 render.h +--- render/render.h 15 Jul 2005 14:39:31 -0000 1.57 ++++ render/render.h 19 Feb 2006 22:21:26 -0000 +@@ -61,6 +61,7 @@ typedef enum { + RR_SURFACE_NONE, + RR_SURFACE_PARENTREL, + RR_SURFACE_SOLID, ++ RR_SURFACE_SPLIT, + RR_SURFACE_HORIZONTAL, + RR_SURFACE_VERTICAL, + RR_SURFACE_DIAGONAL, +Index: render/theme.c +=================================================================== +RCS file: /cvs/cvsroot/openbox/render/theme.c,v +retrieving revision 1.76 +diff -p -u -r1.76 theme.c +--- render/theme.c 14 Jul 2005 20:41:24 -0000 1.76 ++++ render/theme.c 19 Feb 2006 22:21:28 -0000 +@@ -904,7 +904,7 @@ RrTheme* RrThemeNew(const RrInstance *in + theme->padding * 2; + } + theme->button_size = theme->label_height - 2; +- theme->grip_width = theme->title_height * 1.5; ++ theme->grip_width = 25; + + return theme; + } +@@ -1200,6 +1200,8 @@ static void parse_appearance(gchar *tex, + *grad = RR_SURFACE_HORIZONTAL; + else if (strstr(tex, "vertical") != NULL) + *grad = RR_SURFACE_VERTICAL; ++ else if (strstr(tex, "split") != NULL) ++ *grad = RR_SURFACE_SPLIT; + else + *grad = RR_SURFACE_DIAGONAL; + } else { diff --git a/x11-wm/openbox/openbox-20060509-r1.ebuild b/x11-wm/openbox/openbox-20060509-r1.ebuild new file mode 100644 index 000000000000..9c31de4259eb --- /dev/null +++ b/x11-wm/openbox/openbox-20060509-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-20060509-r1.ebuild,v 1.1 2006/06/01 01:09:15 anarchy Exp $ + +inherit eutils + +DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager." +HOMEPAGE="http://icculus.org/openbox/" +SRC_URI="mirror://gentoo/${P}.tar.gz + mirror://gentoo/ob-themes-usability.tar.bz2" + +LICENSE="GPL-2" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="pango nls startup-notification xinerama" + +RDEPEND="|| ( ( x11-libs/libXrandr + x11-libs/libXt + xinerama? ( x11-libs/libXinerama ) + ) + virtual/x11 + ) + virtual/xft + >=dev-libs/glib-2 + >=media-libs/fontconfig-2 + >=dev-libs/libxml2-2.0" +DEPEND="${RDEPEND} + || ( ( + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/xf86vidmodeproto + ) + virtual/x11 + ) + pango? ( x11-libs/pango ) + startup-notification? ( x11-libs/startup-notification ) + dev-util/pkgconfig" + +S=${WORKDIR}/${PN} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-asneeded.patch + epatch ${FILESDIR}/${P}-hideMenuHeader.patch + epatch ${FILESDIR}/${P}-pipedsplitgradient.patch +} + +src_compile() { + econf `use_enable nls` `use_enable pango` `use_enable startup-notification` ${myconf} || die "failed running configure" + emake || die "failed running make" +} + +src_install() { + dodir /etc/X11/Sessions + echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox + fperms a+x /etc/X11/Sessions/openbox + + insinto /usr/share/xsessions + doins ${FILESDIR}/${PN}.desktop + + make DESTDIR=${D} install || die + dodoc ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README + + insinto /usr/share/themes + doins -r ${WORKDIR}/ob-themes-usability/* +} |