Configurable font support
Use fontconfig to load fonts. Fonts can be added to the `fonts` map in the config, and referenced from individual widgets' configurations for customizability. Fonts default to values "mono" and "sans" if nothing is set.
This commit is contained in:
Hilmar Gústafsson
committed by
Kenny Levinsen
Kenny Levinsen
parent
1a62696662
commit
48985c470a
Generated
+59
-1
@@ -1,5 +1,10 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "ab_glyph_rasterizer"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "alsa"
|
||||
version = "0.4.0"
|
||||
@@ -105,6 +110,11 @@ dependencies = [
|
||||
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "const-cstr"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "dbus"
|
||||
version = "0.6.5"
|
||||
@@ -145,6 +155,14 @@ name = "fake-simd"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "fontconfig"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"yeslogic-fontconfig-sys 2.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fuzzy-matcher"
|
||||
version = "0.3.1"
|
||||
@@ -353,6 +371,14 @@ dependencies = [
|
||||
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "owned_ttf_parser"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"ttf-parser 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pest"
|
||||
version = "2.1.2"
|
||||
@@ -476,6 +502,15 @@ dependencies = [
|
||||
"stb_truetype 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rusttype"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"ab_glyph_rasterizer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"owned_ttf_parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.2"
|
||||
@@ -603,6 +638,11 @@ dependencies = [
|
||||
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ttf-parser"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.11.2"
|
||||
@@ -726,6 +766,7 @@ dependencies = [
|
||||
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"dbus 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"fuzzy-matcher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libpulse-binding 2.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -734,7 +775,7 @@ dependencies = [
|
||||
"os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rcalc_lib 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rust-ini 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"rusttype 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -763,7 +804,18 @@ dependencies = [
|
||||
"linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "yeslogic-fontconfig-sys"
|
||||
version = "2.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"const-cstr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[metadata]
|
||||
"checksum ab_glyph_rasterizer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2b7e4e8cf778db814365e46839949ca74df4efb10e87ba4913e6ec5967ef0285"
|
||||
"checksum alsa 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91888c0eee9b75c72c7dfe71247d6bb7da2755420696fc507107c358431610f8"
|
||||
"checksum alsa-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7e95eaae787b8047ceefb94fd90682b03dd3f82f2d6fcaa83908c3814a8bef36"
|
||||
"checksum andrew 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
|
||||
@@ -778,12 +830,14 @@ dependencies = [
|
||||
"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
|
||||
"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||
"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
|
||||
"checksum const-cstr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
|
||||
"checksum dbus 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819"
|
||||
"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
|
||||
"checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
|
||||
"checksum downcast-rs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52ba6eb47c2131e784a38b726eb54c1e1484904f013e576a25354d0124161af6"
|
||||
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
|
||||
"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
|
||||
"checksum fontconfig 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a5570e7ce35ffb621b31934530c4b3b8ce9fdd8bf8436e98f9c7ebadff2ef259"
|
||||
"checksum fuzzy-matcher 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d860c6f043a7f367ffcbdb5833c36f7dc85fa8bc6e7898e2530f643ec90f9f3"
|
||||
"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
|
||||
"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
|
||||
@@ -809,6 +863,7 @@ dependencies = [
|
||||
"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
|
||||
"checksum ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518"
|
||||
"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22"
|
||||
"checksum owned_ttf_parser 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
|
||||
"checksum pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4fb201c5c22a55d8b24fef95f78be52738e5e1361129be1b5e862ecdb6894a"
|
||||
"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
|
||||
"checksum pest_generator 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9fcf299b5712d06ee128a556c94709aaa04512c4dffb8ead07c5c998447fc0"
|
||||
@@ -823,6 +878,7 @@ dependencies = [
|
||||
"checksum rust-ini 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c96a7d6722944454c68ff2ba2a252a4e9b0635c03dd510fdf482a2c8981cbf2"
|
||||
"checksum rusttype 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
|
||||
"checksum rusttype 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14a911032fb5791ccbeec9f28fdcb9bf0983b81f227bafdfd227c658d0731c8a"
|
||||
"checksum rusttype 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
|
||||
"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
|
||||
"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
|
||||
"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
|
||||
@@ -837,6 +893,7 @@ dependencies = [
|
||||
"checksum thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88ddf1ad580c7e3d1efff877d972bcc93f995556b9087a5a259630985c88ceab"
|
||||
"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
|
||||
"checksum timerfd 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9a7822e546fa39d0b5ae14a93a33903975b62af6597288aea77f0580a6abbe"
|
||||
"checksum ttf-parser 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52fbe7769f5af5d7d25aea74b9443b64e544a5ffb4d2b2968295ddea934f1a06"
|
||||
"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
|
||||
"checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2"
|
||||
"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
|
||||
@@ -855,3 +912,4 @@ dependencies = [
|
||||
"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57"
|
||||
"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
|
||||
"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
|
||||
"checksum yeslogic-fontconfig-sys 2.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e194a0c5cd1b5c87215eed9d26aca9799fa1b599fe2e178977d6f8ccc812e3d3"
|
||||
|
||||
+2
-1
@@ -22,7 +22,7 @@ pulseaudio-widget = ["libpulse-binding"]
|
||||
[dependencies]
|
||||
smithay-client-toolkit = "0.6.4"
|
||||
byteorder = "1.3"
|
||||
rusttype = "0.8"
|
||||
rusttype = "^0.9"
|
||||
chrono = "0.4"
|
||||
nix = "0.16"
|
||||
memmap = "0.7"
|
||||
@@ -43,3 +43,4 @@ serde_yaml = { version = "0.8", optional = true }
|
||||
|
||||
libpulse-binding = { version = "2.15", optional = true }
|
||||
alsa = { version = "0.4.0", optional = true }
|
||||
fontconfig = "0.2.0"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -1,38 +0,0 @@
|
||||
|
||||
==========================================================
|
||||
|
||||
Wen Quan Yi Micro Hei
|
||||
|
||||
ChangeLog
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
WenQuanYi Micro Hei ChangeLog:
|
||||
|
||||
== WenQuanYi Micro Hei 0.2 (BigBang), FangQ <fangq nmr mgh harvard edu> ==
|
||||
|
||||
2009/05/25 Updated contributor list in the NB and announced beta release
|
||||
2009/05/18 fixed hinting instr for M/N in MicroHeiMono by copying cvt table (F
|
||||
angQ)
|
||||
2009/05/16 added Micro Hei Mono by merging with Droid Sans Mono (FangQ)
|
||||
2009/05/15 rename uni00B9 to onesuperior to match the it in DroidSans (FangQ)
|
||||
2009/05/10 updated documentations (FangQ)
|
||||
2009/05/09 scale MicroHei to EM=2048 before merging to Droid Sans, keep
|
||||
all hinting and kerning info. (FangQ)
|
||||
2009/04/12 imported Chinese punctuations from UmeGothic (FangQ)
|
||||
2009/02/08 all characters in U4E00~U9FC3 were complete (review panel, wanghong
|
||||
)
|
||||
2009/01/16 Micro Hei nightly-build became active (FangQ)
|
||||
2009/01/15 GBK glyph review process started (FangQ)
|
||||
2009/01/03 Fontopia supported sub-contour editing (FangQ)
|
||||
2008/12/31 GBK char-set completed 90%, CJK Ext. A became online
|
||||
2008/12/29 project publicly announcement (FangQ)
|
||||
2008/12/09 Droid Font license confirmed (Apache2 as committed in git)
|
||||
2008/12/03 add theme and rename as Fontopia (FangQ)
|
||||
2008/11/23 Droid extension GUI milestone reached (mozbug, FangQ)
|
||||
2008/11/07 initial upload of BezierGlyph/Bezier_lib.js script (mozbug)
|
||||
2008/11/06 code point and script preparation (mozbug)
|
||||
2008/10/21 project conceptualized (FangQ)
|
||||
|
||||
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this
|
||||
document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code,
|
||||
documentation source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not
|
||||
limited to compiled object code, generated documentation, and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which
|
||||
the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
|
||||
For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by
|
||||
name) to the interfaces of, the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to
|
||||
that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition,
|
||||
"submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including
|
||||
but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are
|
||||
managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is
|
||||
conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor
|
||||
and subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a
|
||||
perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works
|
||||
of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with
|
||||
the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim
|
||||
or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or
|
||||
contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the
|
||||
date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You meet the following conditions:
|
||||
|
||||
1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
|
||||
|
||||
2. You must cause any modified files to carry prominent notices stating that You changed the files; and
|
||||
|
||||
3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative
|
||||
Works; and
|
||||
|
||||
4. If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to
|
||||
any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the
|
||||
Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display
|
||||
generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for
|
||||
informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You
|
||||
distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot
|
||||
be construed as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the
|
||||
Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have
|
||||
executed with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the
|
||||
Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of
|
||||
the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume
|
||||
any risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as
|
||||
a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has
|
||||
been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred
|
||||
by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
APPENDIX: How to apply the Apache License to your work
|
||||
|
||||
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment
|
||||
syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed
|
||||
page" as the copyright notice for easier identification within third-party archives.
|
||||
Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
|
||||
except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
|
||||
required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
|
||||
permissions and limitations under the License.
|
||||
@@ -1,674 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<http://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||
@@ -1,378 +0,0 @@
|
||||
|
||||
==========================================================
|
||||
|
||||
Wen Quan Yi Micro Hei
|
||||
|
||||
Release Notes
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
Summary:
|
||||
|
||||
Author : WenQuanYi Project Contributors
|
||||
Webpage : http://wenq.org/en/ or http://wqy.sourceforge.net/en/
|
||||
Font Name: WenQuanYi Micro Hei
|
||||
Version : 0.2.0-beta (Big-Bang)
|
||||
Release : 0
|
||||
Copyright Digitized data copyright © 2007, Google Corporation.
|
||||
Copyright © 2008-2009, WenQuanYi Project Board of
|
||||
Trustees, All rights reserved.
|
||||
|
||||
Droid Sans Fallback extension interface
|
||||
( http://wenq.org/index.cgi?Fontopia(cn) ),
|
||||
copyright © 2008-2009 mozbug and Qianqian Fang
|
||||
License : This font is licensed under Apache2.0 or GPLv3
|
||||
with font embedding exceptions (see Appendix B).
|
||||
Read LICENSE_Apache2.txt and LICENSE_GPLv3.txt for details
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
Table of Content
|
||||
|
||||
I. About this font
|
||||
II. Development History
|
||||
III. Credits
|
||||
IV. Language Coverage
|
||||
V. About "WenQuanYi Project"
|
||||
VI. Links
|
||||
VII. Appendix
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
I. About this font
|
||||
|
||||
WenQuanYi Micro Hei font family is a Sans-Serif style (also known as Hei,
|
||||
Gothic or Dotum among the Chinese/Japanese/Korean users) high quality
|
||||
CJK outline font. It was derived from "Droid Sans Fallback", "Droid
|
||||
Sans" and "Droid Sans Mono" released by Google Corp. This font package
|
||||
contains two faces, "Micro Hei" and "Micro Hei Mono", in form of a
|
||||
True-Type Collection (ttc) file. All the unified CJK Han glyphs, i.e.
|
||||
GBK Hanzi, in the range of U+4E00-U+9FC3 defined in Unicode Standard 5.1
|
||||
are covered, with additional support to many other international
|
||||
languages such as Latin, Extended Latin, Hanguls and Kanas. The font
|
||||
file is extremely compact (~5M) compared with most known CJK fonts.
|
||||
As a result, it can be used for hand-held devices or embedded systems, or
|
||||
used on PC with a significantly small memory footprint. Because both
|
||||
font faces carry hinting and kerning instructions for Latin glyphs,
|
||||
they are the excellent choices for desktop fonts.
|
||||
|
||||
|
||||
II. Development History
|
||||
|
||||
The original Droid Sans Fallback font contain 16,000 Unified Han glyphs,
|
||||
and was officially released by Google under Apache2 license on Dec. 9,
|
||||
2008 [2]. With a Javascript-based web interface, Fontopia(TM) [1], developed
|
||||
by mozbug and Qianqian Fang, the WenQuanYi contributors had completed
|
||||
over 10,000 new glyphs by combining the spline contours from the existing
|
||||
Droid Han glyphs. By the end of 2008, project phase-1 had almost
|
||||
completed, and phase-2 for CJK Extension A (U+3400-U+4DB5) was brought
|
||||
online on Dec. 29, 2009. A review panel was formed to reinforce the
|
||||
quality of all submitted glyphs [3]. In Jan. 2009, the reviewers
|
||||
had redone over 2000 Hanzi and completed all the missing characters.
|
||||
The nightly-build font has become online since Jan. 16. As of Feb. 2009, there
|
||||
has been over 5500 CJK Extension A Han glyphs completed, which led this
|
||||
font toward a complete GB18030 coverage.
|
||||
|
||||
In this font, we incorporated the high quality Latin glyphs from "Droid Sans"
|
||||
and "Droid Sans Mono", which contain not only a better coverage but also
|
||||
the additional hinting and kerning information. The EM of MicroHei
|
||||
and MicroHeiMono fonts were unified to 2048 to retain all the advanced
|
||||
typesetting features.
|
||||
|
||||
|
||||
III. Credits
|
||||
|
||||
We cordially thank Google(TM) for generously releasing Droid fonts to
|
||||
public under an open-source license. Google purchased the font from
|
||||
Ascenders Corp. (which was originally designed by a Chinese company).
|
||||
|
||||
The project for extending the Droid fonts is based on the web-based
|
||||
glyph-composing applet [1], created by mozbug and Qianqian Fang
|
||||
jointly. They are constantly improving this application targeting at
|
||||
a web-based collaborative font development environment.
|
||||
|
||||
Over a thousand anonymous contributors have participated the project;
|
||||
they submitted over 10,000 new Hanzi glyphs and many modifications.
|
||||
The full update history of the glyphs can be found at [4].
|
||||
|
||||
The key members of the review panel, i.e. lsz, FangQ, kmc, Xhacker,
|
||||
philacorns, and an "anonymous" (as requested) contributor, had
|
||||
spent significant amount of efforts to redesign nearly half of the
|
||||
submitted glyphs. We appreciate the incredible effort from this team
|
||||
to make this font available. The detailed review credit can be found
|
||||
at [3]
|
||||
|
||||
|
||||
IV. Language Coverage
|
||||
|
||||
The following table is based on the locale data provided by fontconfig
|
||||
(generated by langcover.pl from Dejavu Project
|
||||
http://dejavu.sourceforge.net/wiki/index.php/Font_utilities).
|
||||
----------------------------------------------------------------
|
||||
Locale MicroHei
|
||||
----------------------------------------------------------------
|
||||
aa Afar 100% (62/62)
|
||||
ab Abkhazia 100% (90/90)
|
||||
af Afrikaans 100% (69/69)
|
||||
am Amharic (0/264)
|
||||
ar Arabic (0/125)
|
||||
as (0/89)
|
||||
ast Asturian 100% (72/72)
|
||||
ava Avaric 100% (67/67)
|
||||
ay Aymara 100% (60/60)
|
||||
az Azerbaijani 98% (146/148)
|
||||
az-ir Azerbaijani in Iran (0/130)
|
||||
ba Bashkir 100% (82/82)
|
||||
bam Bambara 90% (54/60)
|
||||
be Byelorussian 100% (68/68)
|
||||
bg Bulgarian 100% (60/60)
|
||||
bh Bihari (Devanagari script) (0/68)
|
||||
bho Bhojpuri (Devanagari script) (0/68)
|
||||
bi Bislama 100% (58/58)
|
||||
bin Edo or Bini 100% (78/78)
|
||||
bn Bengali (0/89)
|
||||
bo Tibetan (0/95)
|
||||
br Breton 100% (64/64)
|
||||
bs Bosnian 100% (62/62)
|
||||
bua Buriat (Buryat) 100% (70/70)
|
||||
ca Catalan 100% (74/74)
|
||||
ce Chechen 100% (67/67)
|
||||
ch Chamorro 100% (58/58)
|
||||
chm Mari (Lower Cheremis / Upper Cheremis) 100% (76/76)
|
||||
chr Cherokee (0/85)
|
||||
co Corsican 100% (85/85)
|
||||
cs Czech 100% (82/82)
|
||||
cu Old Church Slavonic 100% (103/103)
|
||||
cv Chuvash 100% (74/74)
|
||||
cy Welsh 100% (78/78)
|
||||
da Danish 100% (70/70)
|
||||
de German 100% (60/60)
|
||||
dz Dzongkha (0/95)
|
||||
el Greek 100% (70/70)
|
||||
en English 100% (73/73)
|
||||
eo Esperanto 100% (64/64)
|
||||
es Spanish 100% (67/67)
|
||||
et Estonian 100% (64/64)
|
||||
eu Basque 100% (56/56)
|
||||
fa Persian (0/129)
|
||||
fi Finnish 100% (63/63)
|
||||
fj Fijian 100% (52/52)
|
||||
fo Faroese 100% (68/68)
|
||||
fr French 100% (85/85)
|
||||
ful Fulah (Fula) 87% (54/62)
|
||||
fur Friulian 100% (66/66)
|
||||
fy Frisian 100% (75/75)
|
||||
ga Irish 82% (66/80)
|
||||
gd Scots Gaelic 100% (70/70)
|
||||
gez Ethiopic (Geez) (0/218)
|
||||
gl Galician 100% (66/66)
|
||||
gn Guarani 100% (70/70)
|
||||
gu Gujarati (0/78)
|
||||
gv Manx Gaelic 100% (54/54)
|
||||
ha Hausa 86% (52/60)
|
||||
haw Hawaiian 98% (62/63)
|
||||
he Hebrew (0/27)
|
||||
hi Hindi (Devanagari script) (0/68)
|
||||
ho Hiri Motu 100% (52/52)
|
||||
hr Croatian 100% (62/62)
|
||||
hu Hungarian 100% (70/70)
|
||||
hy Armenian (0/77)
|
||||
ia Interlingua 100% (52/52)
|
||||
ibo Igbo 100% (58/58)
|
||||
id Indonesian 100% (54/54)
|
||||
ie Interlingue 100% (52/52)
|
||||
ik Inupiaq (Inupiak, Eskimo) 100% (68/68)
|
||||
io Ido 100% (52/52)
|
||||
is Icelandic 100% (70/70)
|
||||
it Italian 100% (73/73)
|
||||
iu Inuktitut (0/161)
|
||||
ja Japanese 99% (6526/6538)
|
||||
ka Georgian (0/33)
|
||||
kaa Kara-Kalpak (Karakalpak) 100% (78/78)
|
||||
ki Kikuyu 100% (56/56)
|
||||
kk Kazakh 100% (77/77)
|
||||
kl Greenlandic 100% (81/81)
|
||||
km Khmer (0/70)
|
||||
kn Kannada (0/80)
|
||||
ko Korean 100% (2443/2443)
|
||||
kok Kokani (Devanagari script) (0/68)
|
||||
ks Kashmiri (Devanagari script) (0/68)
|
||||
ku Kurdish 100% (64/64)
|
||||
ku-ir Kurdish in Iran (0/32)
|
||||
kum Kumyk 100% (66/66)
|
||||
kv Komi (Komi-Permyak/Komi-Siryan) 100% (70/70)
|
||||
kw Cornish 96% (62/64)
|
||||
ky Kirgiz 100% (70/70)
|
||||
la Latin 100% (68/68)
|
||||
lb Luxembourgish (Letzeburgesch) 100% (75/75)
|
||||
lez Lezghian (Lezgian) 100% (67/67)
|
||||
ln Lingala 92% (75/81)
|
||||
lo Lao (0/65)
|
||||
lt Lithuanian 100% (70/70)
|
||||
lv Latvian 100% (78/78)
|
||||
mg Malagasy 100% (56/56)
|
||||
mh Marshallese 100% (62/62)
|
||||
mi Maori 96% (62/64)
|
||||
mk Macedonian 100% (42/42)
|
||||
ml Malayalam (0/78)
|
||||
mn Mongolian (0/130)
|
||||
mo Moldavian 98% (126/128)
|
||||
mr Marathi (Devanagari script) (0/68)
|
||||
mt Maltese 100% (72/72)
|
||||
my Burmese (Myanmar) (0/48)
|
||||
nb Norwegian Bokmal 100% (70/70)
|
||||
nds Low Saxon 100% (59/59)
|
||||
ne Nepali (Devanagari script) (0/68)
|
||||
nl Dutch 100% (83/83)
|
||||
nn Norwegian Nynorsk 100% (76/76)
|
||||
no Norwegian (Bokmal) 100% (70/70)
|
||||
ny Chichewa 100% (54/54)
|
||||
oc Occitan 100% (70/70)
|
||||
om Oromo or Galla 100% (52/52)
|
||||
or Oriya (0/79)
|
||||
os Ossetic 100% (66/66)
|
||||
pa Punjabi (Gurumukhi script) (0/63)
|
||||
pl Polish 100% (70/70)
|
||||
ps-af Pashto in Afghanistan (0/49)
|
||||
ps-pk Pashto in Pakistan (0/49)
|
||||
pt Portuguese 100% (83/83)
|
||||
rm Rhaeto-Romance (Romansch) 100% (66/66)
|
||||
ro Romanian 96% (60/62)
|
||||
ru Russian 100% (66/66)
|
||||
sa Sanskrit (Devanagari script) (0/68)
|
||||
sah Yakut 100% (76/76)
|
||||
sco Scots 92% (52/56)
|
||||
se North Sami 100% (66/66)
|
||||
sel Selkup (Ostyak-Samoyed) 100% (66/66)
|
||||
sh Serbo-Croatian 100% (76/76)
|
||||
si Sinhala (Sinhalese) (0/77)
|
||||
sk Slovak 100% (86/86)
|
||||
sl Slovenian 100% (62/62)
|
||||
sm Samoan 98% (52/53)
|
||||
sma South Sami 100% (60/60)
|
||||
smj Lule Sami 100% (60/60)
|
||||
smn Inari Sami 100% (68/68)
|
||||
sms Skolt Sami 87% (70/80)
|
||||
so Somali 100% (52/52)
|
||||
sq Albanian 100% (56/56)
|
||||
sr Serbian 100% (76/76)
|
||||
sv Swedish 100% (68/68)
|
||||
sw Swahili 100% (52/52)
|
||||
syr Syriac (0/45)
|
||||
ta Tamil (0/48)
|
||||
te Telugu (0/80)
|
||||
tg Tajik 100% (78/78)
|
||||
th Thai 1% (1/87)
|
||||
ti-er Eritrean Tigrinya (0/256)
|
||||
ti-et Ethiopian Tigrinya (0/282)
|
||||
tig Tigre (0/221)
|
||||
tk Turkmen 100% (74/74)
|
||||
tl Tagalog (0/19)
|
||||
tn Tswana 100% (56/56)
|
||||
to Tonga 98% (52/53)
|
||||
tr Turkish 100% (70/70)
|
||||
ts Tsonga 100% (52/52)
|
||||
tt Tatar 100% (76/76)
|
||||
tw Twi 91% (67/73)
|
||||
tyv Tuvinian 100% (70/70)
|
||||
ug Uighur (0/125)
|
||||
uk Ukrainian 100% (72/72)
|
||||
ur Urdu (0/145)
|
||||
uz Uzbek 100% (68/68)
|
||||
ven Venda 83% (52/62)
|
||||
vi Vietnamese 98% (191/194)
|
||||
vo Volapuk 100% (54/54)
|
||||
vot Votic 100% (62/62)
|
||||
wa Walloon 100% (70/70)
|
||||
wen Sorbian languages (lower and upper) 100% (76/76)
|
||||
wo Wolof 100% (66/66)
|
||||
xh Xhosa 100% (52/52)
|
||||
yap Yapese 100% (58/58)
|
||||
yi Yiddish (0/27)
|
||||
yo Yoruba 91% (109/119)
|
||||
zh-936 99% (21873/21920)
|
||||
zh-cn Chinese (simplified) 99% (6754/6765)
|
||||
zh-hk Chinese Hong Kong Supplementary Character Set 99% (2212/2213)
|
||||
zh-mo Chinese in Macau 99% (2212/2213)
|
||||
zh-sg Chinese in Singapore 99% (6754/6765)
|
||||
zh-tw Chinese (traditional) 99% (13051/13063)
|
||||
zu Zulu 100% (52/52)
|
||||
----------------------------------------------------------------
|
||||
|
||||
V. About "WenQuanYi Project"
|
||||
|
||||
The "Wen Quan Yi" Project [5] was founded by Qianqian Fang [6] in
|
||||
Oct. 2004. The goal of this project is to create a web-based
|
||||
collaborative environment for open-source type-face development.
|
||||
The initial focus of the project is to create high quality bitmap
|
||||
character glyphs and outline fonts for all 70,000+ CJK characters
|
||||
currently encoded by the Unicode Consortium. Some of the fonts
|
||||
released by this project have been widely used as the default
|
||||
Chinese desktop fonts by main-stream GNU/Linux distributions.
|
||||
|
||||
The Wen Quan Yi Project uses wiki [5] as the primary development
|
||||
tool for glyph creation, documentation and coordinations. Wen Quan Yi
|
||||
wiki also supports glyph version control and nightly build.
|
||||
|
||||
|
||||
VI. Links
|
||||
|
||||
[1] http://wenq.org/index.cgi?Fontopia(cn)
|
||||
[2] http://android.git.kernel.org/?p=platform/frameworks/base.git;a=commit;h=1a2
|
||||
d9dbe9c6f54c5e0dc26386dc01df1d18073ad
|
||||
[3] http://wenq.org/dev/index.cgi?BigBang_TASK
|
||||
[4] http://wenq.org/WQYHistory.html.gz
|
||||
[5] http://wenq.org/en/
|
||||
[6] http://nmr.mgh.harvard.edu/~fangq/
|
||||
|
||||
|
||||
VII. Appendix
|
||||
|
||||
Appendix A.
|
||||
|
||||
Copyright disclaimer for UmeFont
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
3. Neither the name of the Wada Laboratory, the University of Tokyo nor
|
||||
the names of its contributors may be used to endorse or promote products
|
||||
derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY WADA LABORATORY, THE UNIVERSITY OF TOKYO AND
|
||||
CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
|
||||
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE LABORATORY OR
|
||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
Appendix B.
|
||||
|
||||
GPL with font embedding exception:
|
||||
|
||||
http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html#FontException
|
||||
|
||||
As a special exception, if you create a document which uses this
|
||||
font, and embed this font or unaltered portions of this font into
|
||||
the document, this font does not by itself cause the resulting
|
||||
document to be covered by the GNU General Public License. This
|
||||
exception does not however invalidate any other reasons why the
|
||||
document might be covered by the GNU General Public License. If you
|
||||
modify this font, you may extend this exception to your version of
|
||||
the font, but you are not obligated to do so. If you do not wish to
|
||||
do so, delete this exception statement from your version.
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
+6
-6
@@ -199,19 +199,19 @@ impl AppInner {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct App {
|
||||
pub struct App<'a> {
|
||||
pools: DoubleMemPool,
|
||||
display: Display,
|
||||
event_queue: EventQueue,
|
||||
cmd_queue: Arc<Mutex<VecDeque<Cmd>>>,
|
||||
widget: Option<Box<dyn Widget + Send>>,
|
||||
widget: Option<Box<dyn Widget + Send + 'a>>,
|
||||
bg: Color,
|
||||
inner: Arc<Mutex<AppInner>>,
|
||||
last_damage: Option<Vec<(i32, i32, i32, i32)>>,
|
||||
last_dim: (u32, u32),
|
||||
}
|
||||
|
||||
impl App {
|
||||
impl<'a> App<'a> {
|
||||
pub fn redraw(&mut self, force: bool) -> Result<(), ::std::io::Error> {
|
||||
let widget = match self.widget {
|
||||
Some(ref mut widget) => widget,
|
||||
@@ -341,16 +341,16 @@ impl App {
|
||||
&mut self.event_queue
|
||||
}
|
||||
|
||||
pub fn get_widget(&mut self) -> &mut Box<dyn Widget + Send> {
|
||||
pub fn get_widget(&mut self) -> &mut Box<dyn Widget + Send + 'a> {
|
||||
self.widget.as_mut().unwrap()
|
||||
}
|
||||
|
||||
pub fn set_widget(&mut self, w: Box<dyn Widget + Send>) -> Result<(), ::std::io::Error> {
|
||||
pub fn set_widget(&mut self, w: Box<dyn Widget + Send + 'a>) -> Result<(), ::std::io::Error> {
|
||||
self.widget = Some(w);
|
||||
self.redraw(true)
|
||||
}
|
||||
|
||||
pub fn new(tx: Sender<Cmd>, output_mode: OutputMode, bg: Color, scale: u32) -> App {
|
||||
pub fn new(tx: Sender<Cmd>, output_mode: OutputMode, bg: Color, scale: u32) -> App<'a> {
|
||||
let inner = Arc::new(Mutex::new(AppInner::new(tx, output_mode, scale)));
|
||||
|
||||
//
|
||||
|
||||
+117
-21
@@ -1,13 +1,16 @@
|
||||
use crate::cmd::Cmd;
|
||||
use crate::color::Color;
|
||||
use crate::widget;
|
||||
use crate::widgets;
|
||||
use crate::{
|
||||
fonts::{FontMap, FontRef},
|
||||
widgets,
|
||||
};
|
||||
use chrono::NaiveDateTime;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::default::Default;
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::{collections::HashMap, sync::mpsc::Sender};
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub enum Widget {
|
||||
Margin {
|
||||
@@ -22,16 +25,21 @@ pub enum Widget {
|
||||
HorizontalLayout(Vec<Widget>),
|
||||
VerticalLayout(Vec<Widget>),
|
||||
Clock {
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
},
|
||||
Date {
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
},
|
||||
Calendar {
|
||||
font_primary: Option<String>,
|
||||
font_secondary: Option<String>,
|
||||
font_size: f32,
|
||||
sections: u32,
|
||||
},
|
||||
Launcher {
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
#[serde(default)]
|
||||
@@ -42,35 +50,40 @@ pub enum Widget {
|
||||
url_opener: String,
|
||||
},
|
||||
Battery {
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
},
|
||||
Backlight {
|
||||
#[serde(default)]
|
||||
device: String,
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
},
|
||||
#[cfg(feature = "pulseaudio-widget")]
|
||||
PulseAudio {
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
},
|
||||
#[cfg(feature = "alsa-widget")]
|
||||
AlsaSound {
|
||||
font: Option<String>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
},
|
||||
}
|
||||
|
||||
impl Widget {
|
||||
pub fn construct(
|
||||
pub fn construct<'a>(
|
||||
self,
|
||||
time: NaiveDateTime,
|
||||
tx: Sender<Cmd>,
|
||||
) -> Option<Box<dyn widget::Widget + Send>> {
|
||||
fonts: &'a FontMap,
|
||||
) -> Option<Box<dyn widget::Widget + Send + 'a>> {
|
||||
match self {
|
||||
Widget::Margin { margins, widget } => match widget.construct(time, tx) {
|
||||
Widget::Margin { margins, widget } => match widget.construct(time, tx, fonts) {
|
||||
Some(w) => Some(widget::Margin::new(margins, w)),
|
||||
None => None,
|
||||
},
|
||||
@@ -78,14 +91,14 @@ impl Widget {
|
||||
width,
|
||||
height,
|
||||
widget,
|
||||
} => match widget.construct(time, tx) {
|
||||
} => match widget.construct(time, tx, fonts) {
|
||||
Some(w) => Some(widget::Fixed::new((width, height), w)),
|
||||
None => None,
|
||||
},
|
||||
Widget::HorizontalLayout(widgets) => Some(widget::HorizontalLayout::new(
|
||||
widgets
|
||||
.into_iter()
|
||||
.map(|x| x.construct(time, tx.clone()))
|
||||
.map(|x| x.construct(time, tx.clone(), fonts))
|
||||
.filter(|x| x.is_some())
|
||||
.map(|x| x.unwrap())
|
||||
.collect(),
|
||||
@@ -93,24 +106,48 @@ impl Widget {
|
||||
Widget::VerticalLayout(widgets) => Some(widget::VerticalLayout::new(
|
||||
widgets
|
||||
.into_iter()
|
||||
.map(|x| x.construct(time, tx.clone()))
|
||||
.map(|x| x.construct(time, tx.clone(), fonts))
|
||||
.filter(|x| x.is_some())
|
||||
.map(|x| x.unwrap())
|
||||
.collect(),
|
||||
)),
|
||||
Widget::Clock { font_size } => Some(widgets::clock::Clock::new(time, font_size)),
|
||||
Widget::Date { font_size } => Some(widgets::date::Date::new(time, font_size)),
|
||||
Widget::Clock { font, font_size } => Some(widgets::clock::Clock::new(
|
||||
time,
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
)),
|
||||
Widget::Date { font, font_size } => Some(widgets::date::Date::new(
|
||||
time,
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
)),
|
||||
Widget::Calendar {
|
||||
font_primary,
|
||||
font_secondary,
|
||||
font_size,
|
||||
sections,
|
||||
} => Some(widgets::calendar::Calendar::new(time, font_size, sections)),
|
||||
} => Some(widgets::calendar::Calendar::new(
|
||||
time,
|
||||
get_font(
|
||||
&font_primary.or_else(|| Some("sans".to_string())).unwrap(),
|
||||
&fonts,
|
||||
),
|
||||
get_font(
|
||||
&font_secondary.or_else(|| Some("mono".to_string())).unwrap(),
|
||||
&fonts,
|
||||
),
|
||||
font_size,
|
||||
sections,
|
||||
)),
|
||||
Widget::Launcher {
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
app_opener,
|
||||
term_opener,
|
||||
url_opener,
|
||||
} => Some(widgets::launcher::Launcher::new(
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
length,
|
||||
tx,
|
||||
@@ -122,14 +159,24 @@ impl Widget {
|
||||
url_opener
|
||||
},
|
||||
)),
|
||||
Widget::Battery { font_size, length } => {
|
||||
match widgets::battery::UpowerBattery::new(font_size, length, tx) {
|
||||
Widget::Battery {
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
} => {
|
||||
match widgets::battery::UpowerBattery::new(
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
length,
|
||||
tx,
|
||||
) {
|
||||
Ok(w) => Some(w),
|
||||
Err(_) => None,
|
||||
}
|
||||
}
|
||||
Widget::Backlight {
|
||||
device,
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
} => {
|
||||
@@ -138,21 +185,43 @@ impl Widget {
|
||||
} else {
|
||||
&device
|
||||
};
|
||||
match widgets::backlight::Backlight::new(d, font_size, length) {
|
||||
match widgets::backlight::Backlight::new(
|
||||
d,
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
length,
|
||||
) {
|
||||
Ok(w) => Some(w),
|
||||
Err(_) => None,
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "pulseaudio-widget")]
|
||||
Widget::PulseAudio { font_size, length } => {
|
||||
match widgets::audio::PulseAudio::new(font_size, length, tx) {
|
||||
Widget::PulseAudio {
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
} => {
|
||||
match widgets::audio::PulseAudio::new(
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
length,
|
||||
tx,
|
||||
) {
|
||||
Ok(w) => Some(w),
|
||||
Err(_) => None,
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "alsa-widget")]
|
||||
Widget::AlsaSound { font_size, length } => {
|
||||
match widgets::audio::Alsa::new(font_size, length) {
|
||||
Widget::AlsaSound {
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
} => {
|
||||
match widgets::audio::Alsa::new(
|
||||
get_font(&font.or_else(|| Some("sans".to_string())).unwrap(), &fonts),
|
||||
font_size,
|
||||
length,
|
||||
) {
|
||||
Ok(w) => Some(w),
|
||||
Err(_) => None,
|
||||
}
|
||||
@@ -181,6 +250,7 @@ pub struct Config {
|
||||
pub scale: u32,
|
||||
pub background: Color,
|
||||
pub widget: Widget,
|
||||
pub fonts: HashMap<String, String>,
|
||||
}
|
||||
|
||||
impl Default for Config {
|
||||
@@ -193,14 +263,21 @@ impl Default for Config {
|
||||
Widget::Margin {
|
||||
margins: (0, 88, 0, 32),
|
||||
widget: Box::new(Widget::VerticalLayout(vec![
|
||||
Widget::Date { font_size: 64.0 },
|
||||
Widget::Clock { font_size: 256.0 },
|
||||
Widget::Date {
|
||||
font: None,
|
||||
font_size: 64.0,
|
||||
},
|
||||
Widget::Clock {
|
||||
font: None,
|
||||
font_size: 256.0,
|
||||
},
|
||||
])),
|
||||
},
|
||||
Widget::VerticalLayout(vec![
|
||||
Widget::Margin {
|
||||
margins: (0, 0, 0, 8),
|
||||
widget: Box::new(Widget::Battery {
|
||||
font: None,
|
||||
font_size: 24.0,
|
||||
length: 600,
|
||||
}),
|
||||
@@ -209,6 +286,7 @@ impl Default for Config {
|
||||
margins: (0, 0, 0, 8),
|
||||
widget: Box::new(Widget::Backlight {
|
||||
device: "intel_backlight".to_string(),
|
||||
font: None,
|
||||
font_size: 24.0,
|
||||
length: 600,
|
||||
}),
|
||||
@@ -217,6 +295,7 @@ impl Default for Config {
|
||||
Widget::Margin {
|
||||
margins: (0, 0, 0, 8),
|
||||
widget: Box::new(Widget::PulseAudio {
|
||||
font: None,
|
||||
font_size: 24.0,
|
||||
length: 600,
|
||||
}),
|
||||
@@ -224,10 +303,13 @@ impl Default for Config {
|
||||
]),
|
||||
]),
|
||||
Widget::Calendar {
|
||||
font_primary: None,
|
||||
font_secondary: None,
|
||||
font_size: 16.0,
|
||||
sections: 3,
|
||||
},
|
||||
Widget::Launcher {
|
||||
font: None,
|
||||
font_size: 32.0,
|
||||
length: 1200,
|
||||
app_opener: "".to_string(),
|
||||
@@ -239,6 +321,20 @@ impl Default for Config {
|
||||
output_mode: Default::default(),
|
||||
scale: 1,
|
||||
background: Color::new(0.0, 0.0, 0.0, 0.9),
|
||||
fonts: {
|
||||
let mut map = HashMap::with_capacity(2);
|
||||
map.insert("mono".to_string(), "mono".to_string());
|
||||
map.insert("sans".to_string(), "sans".to_string());
|
||||
map
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn get_font<'a>(name: &str, map: &'a FontMap) -> FontRef<'a> {
|
||||
match map.get(name) {
|
||||
Some(f) => f,
|
||||
None => panic!(format!("Font {} is missing from the config", name)),
|
||||
}
|
||||
}
|
||||
|
||||
+7
-21
@@ -1,23 +1,9 @@
|
||||
use crate::buffer::Buffer;
|
||||
use crate::color::Color;
|
||||
use crate::{color::Color, fonts::FontRef};
|
||||
|
||||
use rusttype::{point, Scale};
|
||||
use std::collections::HashMap;
|
||||
|
||||
use lazy_static::lazy_static;
|
||||
use rusttype::{point, Font as RustFont, Scale};
|
||||
|
||||
pub static DEJAVUSANS_MONO_FONT_DATA: &[u8] = include_bytes!("../fonts/dejavu/DejaVuSansMono.ttf");
|
||||
pub static ROBOTO_REGULAR_FONT_DATA: &[u8] = include_bytes!("../fonts/Roboto-Regular.ttf");
|
||||
|
||||
lazy_static! {
|
||||
pub static ref DEJAVUSANS_MONO: RustFont<'static> =
|
||||
RustFont::from_bytes(DEJAVUSANS_MONO_FONT_DATA as &[u8])
|
||||
.expect("error constructing DejaVuSansMono");
|
||||
pub static ref ROBOTO_REGULAR: RustFont<'static> =
|
||||
RustFont::from_bytes(ROBOTO_REGULAR_FONT_DATA as &[u8])
|
||||
.expect("error constructing Roboto-Regular");
|
||||
}
|
||||
|
||||
struct CachedGlyph {
|
||||
dimensions: (u32, u32),
|
||||
origin: (i32, i32),
|
||||
@@ -25,7 +11,7 @@ struct CachedGlyph {
|
||||
}
|
||||
|
||||
impl CachedGlyph {
|
||||
fn new(font: &RustFont, size: f32, ch: char) -> CachedGlyph {
|
||||
fn new(font: FontRef, size: f32, ch: char) -> CachedGlyph {
|
||||
let scale = Scale::uniform(size);
|
||||
let v_metrics = font.v_metrics(scale);
|
||||
let glyph = font
|
||||
@@ -81,14 +67,14 @@ impl CachedGlyph {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Font {
|
||||
pub struct Font<'a> {
|
||||
glyphs: HashMap<char, CachedGlyph>,
|
||||
font: &'static RustFont<'static>,
|
||||
font: FontRef<'a>,
|
||||
size: f32,
|
||||
}
|
||||
|
||||
impl Font {
|
||||
pub fn new(font: &'static RustFont, size: f32) -> Font {
|
||||
impl<'a> Font<'a> {
|
||||
pub fn new(font: FontRef<'a>, size: f32) -> Font {
|
||||
Font {
|
||||
glyphs: HashMap::new(),
|
||||
font,
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
//! Utility module for fonts
|
||||
|
||||
use fontconfig::Fontconfig as FontConfig;
|
||||
use rusttype::Font;
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
fs::File,
|
||||
io::Read,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
||||
/// FontMap is used to store different font configurations
|
||||
pub type FontMap<'a> = HashMap<String, rusttype::Font<'a>>;
|
||||
|
||||
/// FontRef is used to store Fonts on widgets.
|
||||
pub type FontRef<'a> = &'a rusttype::Font<'a>;
|
||||
|
||||
/// FontSeeker is a marker struct that is used to look up fonts
|
||||
pub(crate) struct FontSeeker;
|
||||
|
||||
impl FontSeeker {
|
||||
/// Acts like fc-match.
|
||||
/// Given a string, it matches it to a font file and returns its path.
|
||||
pub(crate) fn from_string(name: &str) -> PathBuf {
|
||||
let fc = FontConfig::new().unwrap();
|
||||
fc.find(name, None).unwrap().path
|
||||
}
|
||||
}
|
||||
|
||||
/// FontLoader is a marker struct that is used to load files
|
||||
pub(crate) struct FontLoader;
|
||||
|
||||
impl FontLoader {
|
||||
/// Given a path, loads it as a Font, which can be rendered to the screen.
|
||||
pub(crate) fn from_path<'a, P>(path: P) -> Option<Font<'a>>
|
||||
where
|
||||
P: AsRef<Path>,
|
||||
{
|
||||
let mut file = File::open(path).expect("Font file not found");
|
||||
let mut data = match file.metadata() {
|
||||
Ok(metadata) => Vec::with_capacity(metadata.len() as usize),
|
||||
Err(_) => vec![],
|
||||
};
|
||||
file.read_to_end(&mut data).unwrap();
|
||||
Font::try_from_vec(data)
|
||||
}
|
||||
}
|
||||
+22
-13
@@ -3,7 +3,7 @@ use std::fs::File;
|
||||
use std::io::{BufRead, BufReader, Read, Write};
|
||||
use std::os::unix::io::AsRawFd;
|
||||
use std::os::unix::net::{UnixListener, UnixStream};
|
||||
use std::sync::mpsc::channel;
|
||||
use std::{collections::HashMap, sync::mpsc::channel};
|
||||
|
||||
use chrono::{Duration, Local};
|
||||
use nix::poll::{poll, PollFd, PollFlags};
|
||||
@@ -19,6 +19,7 @@ mod configfmt;
|
||||
mod desktop;
|
||||
mod doublemempool;
|
||||
mod draw;
|
||||
mod fonts;
|
||||
mod widget;
|
||||
mod widgets;
|
||||
|
||||
@@ -26,6 +27,7 @@ use app::{App, OutputMode};
|
||||
use cmd::Cmd;
|
||||
use config::Config;
|
||||
use configfmt::ConfigFmt;
|
||||
use fonts::{FontLoader, FontMap, FontSeeker};
|
||||
use widget::WaitContext;
|
||||
|
||||
enum Mode {
|
||||
@@ -79,6 +81,19 @@ fn main() {
|
||||
|
||||
let scale = config.scale;
|
||||
|
||||
let fonts: FontMap = {
|
||||
let load_font = |font_name| {
|
||||
let path = FontSeeker::from_string(font_name);
|
||||
FontLoader::from_path(&path).expect(&format!("Loading {} failed", path.display()))
|
||||
};
|
||||
|
||||
config
|
||||
.fonts
|
||||
.iter()
|
||||
.map(|(key, val)| (key.clone(), load_font(val)))
|
||||
.collect::<HashMap<_, _>>()
|
||||
};
|
||||
|
||||
let mut args = env::args();
|
||||
let _ = args.next();
|
||||
let mode = match args.next() {
|
||||
@@ -159,17 +174,12 @@ fn main() {
|
||||
|
||||
let (tx_draw, rx_draw) = channel();
|
||||
let tx_draw_mod = tx_draw.clone();
|
||||
let (mod_tx, mod_rx) = channel();
|
||||
std::thread::spawn(move || {
|
||||
// Print, write to a file, or send to an HTTP server.
|
||||
match config
|
||||
.widget
|
||||
.construct(Local::now().naive_local(), tx_draw_mod)
|
||||
{
|
||||
Some(w) => mod_tx.send(w).unwrap(),
|
||||
None => panic!("no widget configured"),
|
||||
}
|
||||
});
|
||||
|
||||
// Print, write to a file, or send to an HTTP server.
|
||||
let widget = config
|
||||
.widget
|
||||
.construct(Local::now().naive_local(), tx_draw_mod, &fonts)
|
||||
.expect("no widget configured");
|
||||
|
||||
let mut app = App::new(tx_draw, output_mode, background, scale);
|
||||
if daemon {
|
||||
@@ -177,7 +187,6 @@ fn main() {
|
||||
} else {
|
||||
app.show();
|
||||
}
|
||||
let widget = mod_rx.recv().unwrap();
|
||||
app.set_widget(widget).unwrap();
|
||||
|
||||
let (mut rx_pipe, mut tx_pipe) = pipe().unwrap();
|
||||
|
||||
+20
-20
@@ -69,18 +69,18 @@ pub trait Widget {
|
||||
fn mouse_scroll(&mut self, scroll: (f64, f64), pos: (u32, u32));
|
||||
}
|
||||
|
||||
pub struct VerticalLayout {
|
||||
pub children: Vec<Box<dyn Widget + Send>>,
|
||||
pub struct VerticalLayout<'a> {
|
||||
pub children: Vec<Box<dyn Widget + Send + 'a>>,
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl VerticalLayout {
|
||||
pub fn new(children: Vec<Box<dyn Widget + Send>>) -> Box<VerticalLayout> {
|
||||
impl<'a> VerticalLayout<'a> {
|
||||
pub fn new(children: Vec<Box<dyn Widget + Send + 'a>>) -> Box<VerticalLayout> {
|
||||
Box::new(VerticalLayout { children })
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for VerticalLayout {
|
||||
impl<'a> Widget for VerticalLayout<'a> {
|
||||
fn wait(&mut self, ctx: &mut WaitContext) {
|
||||
for child in &mut self.children {
|
||||
child.wait(ctx);
|
||||
@@ -180,18 +180,18 @@ impl Widget for VerticalLayout {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct HorizontalLayout {
|
||||
pub children: Vec<Box<dyn Widget + Send>>,
|
||||
pub struct HorizontalLayout<'a> {
|
||||
pub children: Vec<Box<dyn Widget + Send + 'a>>,
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl HorizontalLayout {
|
||||
pub fn new(children: Vec<Box<dyn Widget + Send>>) -> Box<HorizontalLayout> {
|
||||
impl<'a> HorizontalLayout<'a> {
|
||||
pub fn new(children: Vec<Box<dyn Widget + Send + 'a>>) -> Box<HorizontalLayout> {
|
||||
Box::new(HorizontalLayout { children })
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for HorizontalLayout {
|
||||
impl<'a> Widget for HorizontalLayout<'a> {
|
||||
fn wait(&mut self, ctx: &mut WaitContext) {
|
||||
for child in &mut self.children {
|
||||
child.wait(ctx);
|
||||
@@ -293,19 +293,19 @@ impl Widget for HorizontalLayout {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Margin {
|
||||
pub child: Box<dyn Widget + Send>,
|
||||
pub struct Margin<'a> {
|
||||
pub child: Box<dyn Widget + Send + 'a>,
|
||||
pub margins: (u32, u32, u32, u32), // left, right, top, bottom
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl Margin {
|
||||
pub fn new(margins: (u32, u32, u32, u32), child: Box<dyn Widget + Send>) -> Box<Margin> {
|
||||
impl<'a> Margin<'a> {
|
||||
pub fn new(margins: (u32, u32, u32, u32), child: Box<dyn Widget + Send + 'a>) -> Box<Margin> {
|
||||
Box::new(Margin { child, margins })
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for Margin {
|
||||
impl<'a> Widget for Margin<'a> {
|
||||
fn wait(&mut self, ctx: &mut WaitContext) {
|
||||
self.child.wait(ctx)
|
||||
}
|
||||
@@ -367,19 +367,19 @@ impl Widget for Margin {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Fixed {
|
||||
pub child: Box<dyn Widget + Send>,
|
||||
pub struct Fixed<'a> {
|
||||
pub child: Box<dyn Widget + Send + 'a>,
|
||||
pub size: (u32, u32),
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl Fixed {
|
||||
pub fn new(size: (u32, u32), child: Box<dyn Widget + Send>) -> Box<Fixed> {
|
||||
impl<'a> Fixed<'a> {
|
||||
pub fn new(size: (u32, u32), child: Box<dyn Widget + Send + 'a>) -> Box<Fixed> {
|
||||
Box::new(Fixed { child, size })
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for Fixed {
|
||||
impl<'a> Widget for Fixed<'a> {
|
||||
fn wait(&mut self, ctx: &mut WaitContext) {
|
||||
self.child.wait(ctx)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
use crate::color::Color;
|
||||
use crate::widget::WaitContext;
|
||||
use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widgets::bar_widget::{BarWidget, BarWidgetImpl},
|
||||
};
|
||||
|
||||
use alsa::mixer::{Mixer, Selem, SelemChannelId, SelemId};
|
||||
|
||||
@@ -34,15 +37,20 @@ pub struct Alsa {
|
||||
}
|
||||
|
||||
impl Alsa {
|
||||
pub fn new(font_size: f32, length: u32) -> ::std::io::Result<Box<BarWidget>> {
|
||||
pub fn new(font: FontRef, font_size: f32, length: u32) -> ::std::io::Result<Box<BarWidget>> {
|
||||
let mixer = Mixer::new(CARD_NAME, true)
|
||||
.map_err(|err| alsa_error_to_io_error("Failed to create ALSA mixer", &err))?;
|
||||
let mixer = Self { mixer };
|
||||
mixer.get_master_volume()?; // probing
|
||||
Ok(BarWidget::new_simple(font_size, length, Box::new(mixer)))
|
||||
Ok(BarWidget::new_simple(
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
Box::new(mixer),
|
||||
))
|
||||
}
|
||||
#[inline]
|
||||
pub fn get_master<'a>(&'a self) -> ::std::io::Result<Selem<'a>> {
|
||||
pub fn get_master(&self) -> ::std::io::Result<Selem> {
|
||||
let master_id = SelemId::new(SELEM_NAME, SELEM_ID);
|
||||
match self.mixer.find_selem(&master_id) {
|
||||
Some(master) => Ok(master),
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
use crate::cmd::Cmd;
|
||||
use crate::color::Color;
|
||||
use crate::widget::WaitContext;
|
||||
use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widgets::bar_widget::{BarWidget, BarWidgetImpl},
|
||||
};
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::collections::HashMap;
|
||||
@@ -484,11 +487,12 @@ pub struct PulseAudio {
|
||||
|
||||
impl PulseAudio {
|
||||
pub fn new(
|
||||
font: FontRef,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
sender: Sender<Cmd>,
|
||||
) -> Result<Box<BarWidget>, ::std::io::Error> {
|
||||
BarWidget::new(font_size, length, move |dirty| {
|
||||
BarWidget::new(font, font_size, length, move |dirty| {
|
||||
let device = PulseAudioSoundDevice::new(move || {
|
||||
*dirty.lock().unwrap() = true;
|
||||
sender.send(Cmd::Draw).unwrap();
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
use crate::color::Color;
|
||||
use crate::widget::WaitContext;
|
||||
use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widgets::bar_widget::{BarWidget, BarWidgetImpl},
|
||||
};
|
||||
|
||||
use std::fs;
|
||||
use std::fs::OpenOptions;
|
||||
@@ -70,7 +73,12 @@ impl Backlight {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn new(path: &str, font_size: f32, length: u32) -> Result<Box<BarWidget>, Error> {
|
||||
pub fn new<'a>(
|
||||
path: &str,
|
||||
font: FontRef<'a>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
) -> Result<Box<BarWidget<'a>>, Error> {
|
||||
let mut dev = Backlight {
|
||||
device_path: Path::new("/sys/class/backlight").to_path_buf().join(path),
|
||||
cur_brightness: 0,
|
||||
@@ -79,7 +87,12 @@ impl Backlight {
|
||||
|
||||
dev.update()?;
|
||||
|
||||
Ok(BarWidget::new_simple(font_size, length, Box::new(dev)))
|
||||
Ok(BarWidget::new_simple(
|
||||
font,
|
||||
font_size,
|
||||
length,
|
||||
Box::new(dev),
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+19
-10
@@ -1,6 +1,9 @@
|
||||
use crate::color::Color;
|
||||
use crate::draw::{draw_bar, draw_box, Font, ROBOTO_REGULAR};
|
||||
use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
|
||||
use crate::draw::{draw_bar, draw_box, Font};
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
|
||||
};
|
||||
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
||||
@@ -14,21 +17,22 @@ pub trait BarWidgetImpl {
|
||||
fn toggle(&mut self);
|
||||
}
|
||||
|
||||
pub struct BarWidget {
|
||||
pub struct BarWidget<'a> {
|
||||
bar_impl: Box<dyn BarWidgetImpl + Send>,
|
||||
font: Font,
|
||||
font: Font<'a>,
|
||||
font_size: u32,
|
||||
length: u32,
|
||||
dirty: Arc<Mutex<bool>>,
|
||||
}
|
||||
|
||||
impl BarWidget {
|
||||
impl<'a> BarWidget<'a> {
|
||||
pub fn new_simple(
|
||||
font: FontRef,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
w: Box<dyn BarWidgetImpl + Send>,
|
||||
) -> Box<BarWidget> {
|
||||
let mut font = Font::new(&ROBOTO_REGULAR, font_size);
|
||||
let mut font = Font::new(font, font_size);
|
||||
font.add_str_to_cache(w.name());
|
||||
|
||||
Box::new(BarWidget {
|
||||
@@ -40,15 +44,20 @@ impl BarWidget {
|
||||
})
|
||||
}
|
||||
|
||||
pub fn new<F>(font_size: f32, length: u32, f: F) -> Result<Box<BarWidget>, ::std::io::Error>
|
||||
pub fn new<F>(
|
||||
font: FontRef<'a>,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
f: F,
|
||||
) -> Result<Box<BarWidget>, ::std::io::Error>
|
||||
where
|
||||
F: FnOnce(Arc<Mutex<bool>>) -> Result<Box<dyn BarWidgetImpl + Send>, ::std::io::Error>,
|
||||
F: Send + 'static + Clone,
|
||||
F: Send + 'a + Clone,
|
||||
{
|
||||
let dirty = Arc::new(Mutex::new(true));
|
||||
let im = f(dirty.clone())?;
|
||||
|
||||
let mut font = Font::new(&ROBOTO_REGULAR, font_size);
|
||||
let mut font = Font::new(font, font_size);
|
||||
font.add_str_to_cache(im.name());
|
||||
|
||||
Ok(Box::new(BarWidget {
|
||||
@@ -61,7 +70,7 @@ impl BarWidget {
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for BarWidget {
|
||||
impl<'a> Widget for BarWidget<'a> {
|
||||
fn wait(&mut self, ctx: &mut WaitContext) {
|
||||
self.bar_impl.wait(ctx);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
use crate::cmd::Cmd;
|
||||
use crate::color::Color;
|
||||
use crate::widget::WaitContext;
|
||||
use crate::widgets::bar_widget::{BarWidget, BarWidgetImpl};
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widgets::bar_widget::{BarWidget, BarWidgetImpl},
|
||||
};
|
||||
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::sync::{Arc, Mutex};
|
||||
@@ -161,11 +164,12 @@ impl UpowerBattery {
|
||||
}
|
||||
|
||||
pub fn new(
|
||||
font: FontRef,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
sender: Sender<Cmd>,
|
||||
) -> Result<Box<BarWidget>, ::std::io::Error> {
|
||||
BarWidget::new(font_size, length, move |dirty| {
|
||||
BarWidget::new(font, font_size, length, move |dirty| {
|
||||
let d = UpowerBattery::from_device(dirty, sender, "DisplayDevice")?;
|
||||
Ok(Box::new(d))
|
||||
})
|
||||
|
||||
+24
-15
@@ -1,23 +1,26 @@
|
||||
use crate::buffer::Buffer;
|
||||
use crate::color::Color;
|
||||
use crate::draw::{Font, DEJAVUSANS_MONO, ROBOTO_REGULAR};
|
||||
use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
|
||||
use crate::draw::Font;
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
|
||||
};
|
||||
|
||||
use chrono::{Datelike, NaiveDate, NaiveDateTime};
|
||||
|
||||
pub struct Calendar {
|
||||
pub struct Calendar<'a> {
|
||||
cur_date: NaiveDate,
|
||||
dirty: bool,
|
||||
offset: f64,
|
||||
sections: u32,
|
||||
font_size: u32,
|
||||
calendar_cache: Font,
|
||||
month_cache: Font,
|
||||
year_cache: Font,
|
||||
day_cache: Font,
|
||||
calendar_cache: Font<'a>,
|
||||
month_cache: Font<'a>,
|
||||
year_cache: Font<'a>,
|
||||
day_cache: Font<'a>,
|
||||
}
|
||||
|
||||
impl Calendar {
|
||||
impl<'a> Calendar<'a> {
|
||||
fn draw_month(
|
||||
&self,
|
||||
buf: &mut Buffer,
|
||||
@@ -152,15 +155,21 @@ impl Calendar {
|
||||
}
|
||||
}
|
||||
|
||||
impl Calendar {
|
||||
pub fn new(time: NaiveDateTime, font_size: f32, sections: u32) -> Box<Calendar> {
|
||||
let mut calendar_cache = Font::new(&DEJAVUSANS_MONO, font_size * 2.0);
|
||||
impl<'a> Calendar<'a> {
|
||||
pub fn new(
|
||||
time: NaiveDateTime,
|
||||
font_primary: FontRef<'a>,
|
||||
font_secondary: FontRef<'a>,
|
||||
font_size: f32,
|
||||
sections: u32,
|
||||
) -> Box<Calendar<'a>> {
|
||||
let mut calendar_cache = Font::new(font_secondary, font_size * 2.0);
|
||||
calendar_cache.add_str_to_cache("0123456789");
|
||||
let mut month_cache = Font::new(&ROBOTO_REGULAR, font_size * 4.0);
|
||||
let mut month_cache = Font::new(font_primary, font_size * 4.0);
|
||||
month_cache.add_str_to_cache("JanuryFebMchApilJgstSmOoNvD");
|
||||
let mut year_cache = Font::new(&DEJAVUSANS_MONO, font_size * 1.5);
|
||||
let mut year_cache = Font::new(font_primary, font_size * 1.5);
|
||||
year_cache.add_str_to_cache("-0123456789");
|
||||
let mut day_cache = Font::new(&DEJAVUSANS_MONO, font_size);
|
||||
let mut day_cache = Font::new(font_primary, font_size);
|
||||
day_cache.add_str_to_cache("MONTUEWDHFRISA");
|
||||
Box::new(Calendar {
|
||||
cur_date: time.date(),
|
||||
@@ -176,7 +185,7 @@ impl Calendar {
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for Calendar {
|
||||
impl<'a> Widget for Calendar<'a> {
|
||||
fn wait(&mut self, _: &mut WaitContext) {}
|
||||
fn enter(&mut self) {}
|
||||
fn leave(&mut self) {}
|
||||
|
||||
+11
-8
@@ -1,18 +1,21 @@
|
||||
use crate::color::Color;
|
||||
use crate::draw::{Font, ROBOTO_REGULAR};
|
||||
use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
|
||||
use crate::draw::Font;
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
|
||||
};
|
||||
|
||||
use chrono::{Duration, NaiveDateTime, Timelike};
|
||||
|
||||
pub struct Clock {
|
||||
pub struct Clock<'a> {
|
||||
cur_time: NaiveDateTime,
|
||||
clock_cache: Font,
|
||||
clock_cache: Font<'a>,
|
||||
size: f32,
|
||||
}
|
||||
|
||||
impl Clock {
|
||||
pub fn new(time: NaiveDateTime, size: f32) -> Box<Clock> {
|
||||
let mut clock_cache = Font::new(&ROBOTO_REGULAR, size);
|
||||
impl<'a> Clock<'a> {
|
||||
pub fn new(time: NaiveDateTime, font: FontRef, size: f32) -> Box<Clock> {
|
||||
let mut clock_cache = Font::new(font, size);
|
||||
clock_cache.add_str_to_cache("0123456789:");
|
||||
|
||||
Box::new(Clock {
|
||||
@@ -23,7 +26,7 @@ impl Clock {
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for Clock {
|
||||
impl<'a> Widget for Clock<'a> {
|
||||
fn wait(&mut self, ctx: &mut WaitContext) {
|
||||
let target = (self.cur_time + Duration::seconds(60))
|
||||
.with_second(0)
|
||||
|
||||
+11
-8
@@ -1,18 +1,21 @@
|
||||
use crate::color::Color;
|
||||
use crate::draw::{Font, ROBOTO_REGULAR};
|
||||
use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
|
||||
use crate::draw::Font;
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
|
||||
};
|
||||
|
||||
use chrono::{Datelike, NaiveDateTime};
|
||||
|
||||
pub struct Date {
|
||||
pub struct Date<'a> {
|
||||
cur_time: NaiveDateTime,
|
||||
date_cache: Font,
|
||||
date_cache: Font<'a>,
|
||||
size: f32,
|
||||
}
|
||||
|
||||
impl Date {
|
||||
pub fn new(time: NaiveDateTime, size: f32) -> Box<Date> {
|
||||
let mut date_cache = Font::new(&ROBOTO_REGULAR, size);
|
||||
impl<'a> Date<'a> {
|
||||
pub fn new(time: NaiveDateTime, font: FontRef, size: f32) -> Box<Date> {
|
||||
let mut date_cache = Font::new(font, size);
|
||||
date_cache
|
||||
.add_str_to_cache("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789,/ ");
|
||||
|
||||
@@ -24,7 +27,7 @@ impl Date {
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for Date {
|
||||
impl<'a> Widget for Date<'a> {
|
||||
fn wait(&mut self, _: &mut WaitContext) {}
|
||||
fn enter(&mut self) {}
|
||||
fn leave(&mut self) {}
|
||||
|
||||
+11
-7
@@ -2,8 +2,11 @@ use crate::buffer::Buffer;
|
||||
use crate::cmd::Cmd;
|
||||
use crate::color::Color;
|
||||
use crate::desktop::{load_desktop_files, Desktop};
|
||||
use crate::draw::{Font, ROBOTO_REGULAR};
|
||||
use crate::widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget};
|
||||
use crate::draw::Font;
|
||||
use crate::{
|
||||
fonts::FontRef,
|
||||
widget::{DrawContext, DrawReport, KeyState, ModifiersState, WaitContext, Widget},
|
||||
};
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::cmp::Ordering;
|
||||
@@ -14,7 +17,7 @@ use std::sync::mpsc::Sender;
|
||||
use fuzzy_matcher::skim::{fuzzy_indices, fuzzy_match};
|
||||
use smithay_client_toolkit::keyboard::keysyms;
|
||||
|
||||
pub struct Launcher {
|
||||
pub struct Launcher<'a> {
|
||||
options: Vec<Desktop>,
|
||||
term_opener: String,
|
||||
app_opener: String,
|
||||
@@ -23,15 +26,16 @@ pub struct Launcher {
|
||||
input: String,
|
||||
result: Option<String>,
|
||||
offset: usize,
|
||||
font: RefCell<Font>,
|
||||
font: RefCell<Font<'a>>,
|
||||
font_size: u32,
|
||||
length: u32,
|
||||
dirty: bool,
|
||||
tx: Sender<Cmd>,
|
||||
}
|
||||
|
||||
impl Launcher {
|
||||
impl<'a> Launcher<'a> {
|
||||
pub fn new(
|
||||
font: FontRef,
|
||||
font_size: f32,
|
||||
length: u32,
|
||||
listener: Sender<Cmd>,
|
||||
@@ -48,7 +52,7 @@ impl Launcher {
|
||||
input: "".to_string(),
|
||||
result: None,
|
||||
offset: 0,
|
||||
font: RefCell::new(Font::new(&ROBOTO_REGULAR, font_size)),
|
||||
font: RefCell::new(Font::new(font, font_size)),
|
||||
font_size: font_size as u32,
|
||||
length,
|
||||
dirty: true,
|
||||
@@ -244,7 +248,7 @@ impl Matcher {
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for Launcher {
|
||||
impl<'a> Widget for Launcher<'a> {
|
||||
fn wait(&mut self, _: &mut WaitContext) {}
|
||||
fn enter(&mut self) {}
|
||||
fn leave(&mut self) {
|
||||
|
||||
Reference in New Issue
Block a user