diff options
| -rw-r--r-- | COPYING | 1 | ||||
| -rw-r--r-- | DEPENDENCIES | 1 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | examples/battery | 2 | ||||
| -rw-r--r-- | examples/comprehensive | 4 | ||||
| -rw-r--r-- | examples/lisp-esque.conf | 6 | ||||
| -rw-r--r-- | info/blueshift.texinfo | 10 | ||||
| -rw-r--r-- | src/blueshift_iccprofile.c | 14 | ||||
| -rw-r--r-- | src/weather.py | 2 |
10 files changed, 27 insertions, 28 deletions
@@ -47,4 +47,3 @@ or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You should have received a copy of the GNU General Public License along with this software package. If not, see <http://www.gnu.org/licenses/>. - diff --git a/DEPENDENCIES b/DEPENDENCIES index 02559cf..dda5df9 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -47,4 +47,3 @@ DEPENDENCY SOURCES: argparser-python https://codeberg.org/maandree/argparser adjbacklight https://codeberg.org/maandree/adjbacklight auto-auto-complete https://codeberg.org/maandree/auto-auto-complete - @@ -4,7 +4,7 @@ # without any warranty. -# The package path prefix, if you want to install to another root, set DESTDIR to that root +# The package path prefix. If you want to install to another root, set DESTDIR to that root PREFIX = /usr # The command path excluding prefix BIN = /bin @@ -30,6 +30,10 @@ SHEBANG = /usr/bin/env python3 # The name of the command as it should be installed COMMAND = blueshift # The name of the package as it should be installed + +# The C compiler to use +CC = c99 + PKGNAME = blueshift # Executable bindings for display server access @@ -56,11 +60,10 @@ WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self -Wmissi # -Wpadded (useless for this project), -Wc++-compat (bad practice) #not used because of libxcb's API: -Waggregate-return, -Wtraditional-conversion (also useless) # The C standard for C code compilation -STD = c99 LIBS_iccprofile = xcb LD_iccprofile = LIBS = $(foreach B,$(EXECS),$(LIBS_$(B))) -FLAGS = $$($(PKGCONFIG) --cflags $(LIBS)) -std=$(STD) $(WARN) $(OPTIMISE) \ +FLAGS = $$($(PKGCONFIG) --cflags $(LIBS)) $(WARN) $(OPTIMISE) \ $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) # Resource files @@ -184,7 +187,7 @@ bin/blueshift.fish: src/completion .PHONY: install install: install-base install-info install-examples install-shell -.PHONY: install +.PHONY: install-all install-all: install-base install-doc install-shell # Install base rules @@ -302,5 +305,4 @@ uninstall: .PHONY: clean clean: - -rm -r bin obj blueshift.{info,pdf,ps,dvi} *.su src/*.su - + -rm -r bin obj blueshift.info blueshift.pdf blueshift.ps blueshift.dvi *.su src/*.su @@ -28,4 +28,3 @@ Future stuff: How is it looking on the DirectFB front? Make an example that warns about UPS states (not too important, you should have that in /etc/inittab) - diff --git a/examples/battery b/examples/battery index 99e7e0f..2981adb 100644 --- a/examples/battery +++ b/examples/battery @@ -58,7 +58,7 @@ def get_capacity(): return (discharging, capacity) -# Lets wait only 30 seconds, instead of a minute before running again. +# Let's wait only 30 seconds, instead of a minute before running again. wait_period = 30 # Do not fade in or out. diff --git a/examples/comprehensive b/examples/comprehensive index 24393bc..57d5b45 100644 --- a/examples/comprehensive +++ b/examples/comprehensive @@ -239,7 +239,7 @@ gamma_blue_day, gamma_blue_night, gamma_blue_default = [1], [1], [1] # is exactly 2,2 and the colours look correct in relation # too each other. It is supported to have different settings # at day and night because there are no technical limitings -# and it can presumable increase readability on text when +# and it can presumably increase readability on text when # the colour temperature is low. @@ -536,7 +536,7 @@ def periodically(year, month, day, hour, minute, second, weekday, fade): else: apply_curves(monitors[m % len(monitors)]) - # Lets wait only 5 seconds, instead of a minute before running again. + # Let's wait only 5 seconds, instead of a minute before running again. wait_period = 5 diff --git a/examples/lisp-esque.conf b/examples/lisp-esque.conf index 62774ec..c2ac953 100644 --- a/examples/lisp-esque.conf +++ b/examples/lisp-esque.conf @@ -54,7 +54,7 @@ ; You can also store the text "(coordinates 59.3472 18.0728)" in ; file named ~/.location: ; :include "~/.location" - ; A more advance alternative is to have a Python file named "~/.location.py" + ; A more advanced alternative is to have a Python file named "~/.location.py" ; that is parsed and have its function `location` invoked with not arguments: ; (source "~/.location.py") ; (coordinates :eval "location()") @@ -152,7 +152,7 @@ ; what you are looking for. ### --- EXPERT LEVEL --- - ; If you want a more advance calculation of the correlated colour + ; If you want a more advanced calculation of the correlated colour ; temperature you can replace (temperature) in the step about with ; (temperature') and add the following *before* it: ; (compose temperature' temperature as-is (divide_by_maximum cmf_10deg)) @@ -275,7 +275,7 @@ ;; is exactly 2,2 and the colours look correct in relation ;; too each other. It is supported to have different settings ;; at day and night because there are no technical limitings - ;; and it can presumable increase readability on text when + ;; and it can presumably increase readability on text when ;; the colour temperature is low. diff --git a/info/blueshift.texinfo b/info/blueshift.texinfo index 15e0c1f..d8667ef 100644 --- a/info/blueshift.texinfo +++ b/info/blueshift.texinfo @@ -722,11 +722,11 @@ the default value will be used. Keep in mind that the order your call the function matters. For example, adjusting the gamma before the brightness does not -yeild the same result as in the reverse -order, the latter is the correct way to +yield the same result as in the reverse +order; the latter is the correct way to apply gamma correction. -Before performing adjusts you must (not required +Before performing adjustments you must (not required the very first time) reset the curves by invoking @code{start_over} (no parameters.) Otherwise the adjustments will accumulate. @@ -739,7 +739,7 @@ If you want to write your own functions @code{curves(r, g, b)} returns a tuple containing the tuples @code{(r_curve, r)}, @code{(g_curve, g)} and @code{(b_curve, b)}. -To make this easier Blueshift provies a set +To make this easier Blueshift provides a set of functions used to convert colour space: @table @code @@ -1351,7 +1351,7 @@ can and often is empty. Airports should publish METAR (Meteorological Aerodrome Report) reports at XX:20 and XX:50, -it can presumable take some time before the +it can presumably take some time before the collection server we use (weather.noaa.gov) have received it. Additionally some airports do not update while closed, and updates while closed diff --git a/src/blueshift_iccprofile.c b/src/blueshift_iccprofile.c index 806f47b..27c90bf 100644 --- a/src/blueshift_iccprofile.c +++ b/src/blueshift_iccprofile.c @@ -70,9 +70,9 @@ int main(int argc, char **argv) /* This acquires a connection to the X display indicated by the DISPLAY - environ variable, or as indicated + environment variable, or as indicated by the first command line argument - if existent. */ + if present. */ if (argc > 1) display = *(argv + 1); connection = xcb_connect(display, NULL); @@ -95,7 +95,7 @@ int main(int argc, char **argv) xcb_atom_t* atoms; xcb_atom_t* atoms_end; - /* We have acquired the screen, got to next in preperate for next iteration. */ + /* We have acquired the screen; proceed to prepare for the next iteration. */ xcb_screen_next(&iter); @@ -153,7 +153,7 @@ int main(int argc, char **argv) /* Extract the atom name from the data structure that holds it. */ name_ = xcb_get_atom_name_name(name_reply); - /* As well as the length of the name; it is not NUL-termianted.*/ + /* As well as the length of the name; it is not NUL-terminated. */ len = (uint32_t)xcb_get_atom_name_name_length(name_reply); /* NUL-terminate the atom name, */ @@ -190,7 +190,7 @@ int main(int argc, char **argv) /* Not numerical: did not match */ goto monitor_bad; } - /* Convert from negative to possitive. */ + /* Convert from negative to positive. */ monitor = -monitor; /* Check that it is not zero, zero is not a valid index, it should just be @@ -199,9 +199,9 @@ int main(int argc, char **argv) goto monitor_ok; monitor_bad: - /* Atom name ultimately did not match the, pattern + /* Atom name ultimately did not match the pattern; ignore it, it may be for something else, but it - is propably just invalid. */ + is probably just invalid. */ continue; } else diff --git a/src/weather.py b/src/weather.py index 17a8638..80131b8 100644 --- a/src/weather.py +++ b/src/weather.py @@ -25,7 +25,7 @@ def weather(station = None, downloader = None): Get a brief weather report Airports should publish METAR (Meteorological Aerodrome Report) reports at XX:20 and XX:50, - it can presumable take some time before the collection server we use (weather.noaa.gov) have + it can presumably take some time before the collection server we use (weather.noaa.gov) have received it. Additionally some airports do not update while closed, and updates while closed are less accurate. |