Merge pull request #130 from a1346054/fixes

Minor cleanup

Author: abishekvashok

.travis.yml

@@ -27,4 +27,3 @@ script:
         mkdir build && cd build && cmake -DCMAKE_C_COMPILER="${CC}" ..
       fi
   - make
-

CMakeLists.txt

@@ -85,4 +85,3 @@ if     (UNIX)
 		endif  ()
 	endforeach ()
 endif  ()
-

CONTRIBUTING.md

@@ -1,19 +1,19 @@
 # Contributing
 
 When contributing to this repository, please first discuss the change you wish to make via issue,
-email, or any other method with the owners of this repository before making a change. 
+email, or any other method with the owners of this repository before making a change.
 
 Please note we have a code of conduct, please follow it in all your interactions with the project.
 
 ## Pull Request Process
 
-1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a
    build.
-2. Update the README.md with details of changes to the interface, this includes new environment 
+2. Update the README.md with details of changes to the interface, this includes new environment
    variables, exposed ports, useful file locations and container parameters.
 3. Increase the version numbers in any examples files and the README.md to the new version that this
    Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
-4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
    do not have permission to do that, you may request the second reviewer to merge it for you.
 
 ## Code of Conduct

COPYING

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ 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/>.
+<https://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>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@ I am submitting a <!-- Feature Request / Bug Report -->
 ### Problem or Feature in Brief
 <!--- Explain the problem in detail here -->
 
-### 
+###
 
 ### Solution (if any)
 <!-- If you would like to offer any solutions, provide it here or leave this section

Makefile.am

@@ -19,33 +19,32 @@ install-data-local:
 	    		echo " Installing matrix fonts in /usr/share/consolefonts..."; \
 	    		mkdir -p $(DESTDIR)/usr/share/consolefonts; \
 	    		$(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \
-	    		$(INSTALL_DATA) $(srcdir)/matrix.psf.gz  $(DESTDIR)/usr/share/consolefonts; \
+	    		$(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/share/consolefonts; \
 		fi; \
 		if test -d /usr/lib/kbd/consolefonts; then \
 	    		echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
-	    		$(INSTALL_DATA) $(srcdir)/matrix.fnt  $(DESTDIR)/usr/lib/kbd/consolefonts; \
-	    		$(INSTALL_DATA) $(srcdir)/matrix.psf.gz  $(DESTDIR)/usr/lib/kbd/consolefonts; \
+	    		$(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \
+	    		$(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/usr/lib/kbd/consolefonts; \
 		fi; \
 		if test -d /usr/share/fonts/misc; then \
 	    		echo " Installing X window matrix fonts in /usr/share/fonts/misc..."; \
 	    		echo " Running mkfontdir /usr/share/fonts/misc..."; \
 	    		$(MKFONTDIR) $(DESTDIR)/usr/share/fonts/misc; \
-	    		$(INSTALL_DATA) $(srcdir)/mtx.pcf  $(DESTDIR)/usr/share/fonts/misc; \
-	    		$(INSTALL_DATA) $(srcdir)/mtx.pcf  $(DESTDIR)/usr/share/fonts/misc; \
+	    		$(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
+	    		$(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/fonts/misc; \
 	    		echo " Done.  If this is the first time you have installed CMatrix you will"; \
 	    		echo " probably have to restart X window in order to use the mtx.pcf font."; \
 		else \
 			if test -d /usr/X11R6/lib/X11/fonts/misc; then \
 	    			echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
 	    			echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
 	    			$(MKFONTDIR) $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
-	    			$(INSTALL_DATA) $(srcdir)/mtx.pcf  $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
-	    			$(INSTALL_DATA) $(srcdir)/mtx.pcf  $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
+	    			$(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
+	    			$(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \
 	    			echo " Done.  If this is the first time you have installed CMatrix you will"; \
 	    			echo " probably have to restart X window in order to use the mtx.pcf font."; \
 			fi \
 		fi; \
 	else \
 		echo "Not installing matrix fonts"; \
 	fi
-

README.md

@@ -66,9 +66,9 @@ _Note: cmatrix is probably not particularly portable or efficient, but it wont h
 - Abishek V Ashok (@abishekvashok) <[email protected]> [Core]
 
 ### Thanks to:
-- Chris Allegretta <[email protected]> for writing cmatrix up in a fornight and giving us
+- Chris Allegretta <[email protected]> for writing cmatrix up in a fortnight and giving us
   the responsibility to further improve it.
-- Krisjon Hanson and Bjoern Ganslandt for helping with bold support and 
+- Krisjon Hanson and Bjoern Ganslandt for helping with bold support and
   Bjoern again for the cursor removal code, helping with the `-u` and `-l`
   modes/flags, and Makefile improvements.
 - Adam Gurno for multi-color support.
@@ -90,4 +90,3 @@ This software is provided under the GNU GPL v3.
 ### Disclaimer
 We are in no way affiliated in any way with the movie "The Matrix", "Warner Bros" nor
 any of its affiliates in any way, just fans.
-

cmatrix.1

@@ -48,7 +48,7 @@ Print version information and exit
 Screen update delay 0 - 9, default 4
 .TP
 .I "\-C color"
-Use this color for matrix (default green). 
+Use this color for matrix (default green).
 Valid colors are green, red, blue, white, yellow, cyan, magenta and black.
 .I "\-t tty"
 Set tty to use

cmatrix.c

@@ -249,7 +249,7 @@ void resize_screen(void) {
     CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
 
     hStdHandle = GetStdHandle(STD_OUTPUT_HANDLE);
-    if(hStdHandle == INVALID_HANDLE_VALUE)
+    if (hStdHandle == INVALID_HANDLE_VALUE)
         return;
 #else
     char *tty;
@@ -263,7 +263,7 @@ void resize_screen(void) {
 #endif
 #ifdef _WIN32
     result = GetConsoleScreenBufferInfo(hStdHandle, &csbiInfo);
-    if(!result)
+    if (!result)
         return;
     LINES = csbiInfo.dwSize.Y;
     COLS = csbiInfo.dwSize.X;
@@ -282,10 +282,10 @@ void resize_screen(void) {
     LINES = win.ws_row;
 #endif
 
-    if(LINES <10){
+    if (LINES < 10) {
         LINES = 10;
     }
-    if(COLS <10){
+    if (COLS < 10) {
         COLS = 10;
     }
 
@@ -502,7 +502,7 @@ if (console) {
             init_pair(COLOR_YELLOW, COLOR_YELLOW, -1);
         } else {
 #else
-        { /* Hack to deal the after effects of else in HAVE_USE_DEFAULT_COLOURS*/
+        { /* Hack to deal the after effects of else in HAVE_USE_DEFAULT_COLOURS */
 #endif
             init_pair(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK);
             init_pair(COLOR_GREEN, COLOR_GREEN, COLOR_BLACK);
@@ -516,7 +516,7 @@ if (console) {
     }
 
     /* Set up values for random number generation */
-    if(classic) {
+    if (classic) {
         /* Japanese character unicode range [they are seen in the original cmatrix] */
         randmin = 12288;
         highnum = 12351;
@@ -535,7 +535,7 @@ if (console) {
 #ifndef _WIN32
         /* Check for signals */
         if (signal_status == SIGINT || signal_status == SIGQUIT) {
-            if(lock != 1)
+            if (lock != 1)
                 finish();
             /* exits */
         }
@@ -544,8 +544,8 @@ if (console) {
             signal_status = 0;
         }
 
-        if(signal_status == SIGTSTP){
-            if(lock != 1)
+        if (signal_status == SIGTSTP) {
+            if (lock != 1)
                     finish();
         }
 #endif
@@ -576,7 +576,7 @@ if (console) {
                 case 3: /* Ctrl-C. Fall through */
 #endif
                 case 'q':
-                    if(lock != 1)
+                    if (lock != 1)
                         finish();
                     break;
                 case 'a':
@@ -651,7 +651,7 @@ if (console) {
         for (j = 0; j <= COLS - 1; j += 2) {
             if ((count > updates[j] || asynch == 0) && pause == 0) {
 
-                /* I dont like old-style scrolling, yuck */
+                /* I don't like old-style scrolling, yuck */
                 if (oldstyle) {
                     for (i = LINES - 1; i >= 1; i--) {
                         matrix[i][j].val = matrix[i - 1][j].val;
@@ -715,8 +715,8 @@ if (console) {
                         while (i <= LINES && (matrix[i][j].val != ' ' &&
                                matrix[i][j].val != -1)) {
                             matrix[i][j].is_head = false;
-                            if(changes) {
-                                if(rand() % 8 == 0)
+                            if (changes) {
+                                if (rand() % 8 == 0)
                                     matrix[i][j].val = (int) rand() % randnum + randmin;
                             }
                             i++;
@@ -784,10 +784,10 @@ if (console) {
                         attroff(A_ALTCHARSET);
                     }
                 } else {
-                    if(rainbow) {
+                    if (rainbow) {
                         int randomColor = rand() % 6;
 
-                        switch(randomColor){
+                        switch (randomColor) {
                             case 0:
                                 mcolor = COLOR_GREEN;
                                 break;
@@ -846,15 +846,15 @@ if (console) {
         }
 
         //check if -M and/or -L was used
-        if (msg[0] != '\0'){
+        if (msg[0] != '\0') {
             //Add our message to the screen
             int msg_x = LINES/2;
             int msg_y = COLS/2 - strlen(msg)/2;
             int i = 0;
 
             //Add space before message
             move(msg_x-1, msg_y-2);
-            for(i = 0; i < strlen(msg)+4; i++)
+            for (i = 0; i < strlen(msg)+4; i++)
                 addch(' ');
 
             //Write message
@@ -867,12 +867,11 @@ if (console) {
 
             //Add space after message
             move(msg_x+1, msg_y-2);
-            for(i = 0; i < strlen(msg)+4; i++)
+            for (i = 0; i < strlen(msg)+4; i++)
                 addch(' ');
         }
 
         napms(update * 10);
     }
     finish();
 }
-

configure.ac

@@ -73,7 +73,7 @@ AC_CHECK_LIB($CURSES_LIB_NAME, resizeterm, [AC_DEFINE(HAVE_RESIZETERM)])
 AC_CHECK_LIB([$CURSES_LIB_NAME], wresize, [AC_DEFINE(HAVE_WRESIZE)])
 
 
-dnl Only change gcc options if we are using gcc.  
+dnl Only change gcc options if we are using gcc.
 if test "$ac_cv_prog_CC" = gcc -o "$ac_cv_prog_CC" = g++; then
   CFLAGS="$CFLAGS -Wall -Wno-comment"
 fi
@@ -103,7 +103,7 @@ if test "x$enable_fonts" != xfalse; then
 *** console without this program (it may still work in xterms). If you are
 *** using Linux, the package containing this program is usually called
 *** kbd, kbd-utils, or console-utils
-])	
+])
       else
 	  AC_DEFINE_UNQUOTED(HAVE_SETFONT, $SETFONT)
       fi
@@ -119,7 +119,7 @@ if test "x$enable_fonts" != xfalse; then
 
 	  if test "x$ac_cv_file__usr_lib_kbd_consolefonts" = "xno"; then
 	      if test "x$ac_cv_file__usr_share_consolefonts" = "xno"; then
-		  AC_MSG_WARN([ 
+		  AC_MSG_WARN([
 
 *** You do not appear to have a consolefonts directory in a standard location
 *** (/usr/lib/kbd or /usr/share), even though you appear to have the
@@ -138,7 +138,7 @@ if test "x$enable_fonts" != xfalse; then
 
   if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then
       if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then
-	  AC_MSG_WARN([ 
+	  AC_MSG_WARN([
 
 *** You do not appear to have an X window fonts directory in the standard
 *** locations (/usr/share/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The

takeScreenshots

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Produces a bunch of `cmatrix` screenshots and screencasts.
 # This script requires X and the following:
 #apt-get install rxvt byzanz
@@ -11,18 +11,17 @@ TERM_EMULATOR_BASE="rxvt +sb"
 CAPTURES_DIR="data/img"
 
 # Function to take a single cmatrix screenshot (takes about 3.5s to execute)
-# or optionally, a screncast of choosable length.
-function captureCMatrix()
-{
+# or optionally, a screencast of choosable length.
+captureCMatrix() {
 	CAPTURE_FILE="$1"
 	CMATRIX_OPTIONS="$2"
 	# If 0 (default if no 3rd param is given),
 	# we make a screenshot instead of a screencast.
 	SCREENCAST_DURATION="${3:-0}"
 
-	if [ ${SCREENCAST_DURATION} -gt 0 ]
+	if [ "${SCREENCAST_DURATION}" -gt 0 ]
 	then
-		let KILL_DELAY="${SCREENCAST_DURATION} + 1"
+		KILL_DELAY="$((SCREENCAST_DURATION + 1))"
 		CAPTURE_FILE="${CAPTURE_FILE}.gif"
 	else
 		KILL_DELAY=3
@@ -31,7 +30,7 @@ function captureCMatrix()
 	WINDOW_TITLE="CMatrix capture ${CAPTURE_FILE}"
 
 	# NOTE the "-PIPE" prevents output of the "Terminated: ..." message
-	( cmdpid=$BASHPID; ( sleep ${KILL_DELAY}; kill -PIPE $cmdpid ) & exec ${TERM_EMULATOR_BASE} -name "${WINDOW_TITLE}" -title "${WINDOW_TITLE}" -e bash -c "
+	( cmdpid=$BASHPID; ( sleep "${KILL_DELAY}"; kill -PIPE "$cmdpid" ) & exec ${TERM_EMULATOR_BASE} -name "${WINDOW_TITLE}" -title "${WINDOW_TITLE}" -e bash -c "
 		if [ ${SCREENCAST_DURATION} -gt 0 ]
 		then
 			# Take screencast (animated GIF)
@@ -74,4 +73,3 @@ do
 	${CMD_CS} "${CAPTURE_FILE_BASE}bold_C_${color}" "-b -C ${color}"
 done
 ${CMD_CS} "${CAPTURE_FILE_BASE}bold_rainbow" "-b -r"
-