Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wordwiz #195

Open
wants to merge 58 commits into
base: stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
f686b41
Fix #78
Mar 27, 2019
9548b82
Merge pull request #79 from FrozenAndrey/fix#78
abishekvashok Mar 28, 2019
9b44b9b
Temporary solution for #83 to allow for use of config.h with cmake
incomingstick Jun 14, 2019
cdd3729
Merge pull request #84 from incomingstick/master
abishekvashok Jun 15, 2019
c15d24a
So I opened this PR again... (#92)
yikerman Nov 18, 2019
b55ee0d
Remove redundant assignment in `cmatrix.c`
tnaia Jan 10, 2020
b06ac1d
Merge pull request #96 from tnaia/iss95
abishekvashok Jan 12, 2020
2c4524c
Added custom message argument (-M)
igoro00 Feb 6, 2020
f2441d3
Add basic support for Windows and PDCurses.
Prince213 Feb 21, 2020
3190bba
autotools: use /usr/share/fonts/misc as fonts directory
Flowdalic Apr 24, 2020
cf22e02
autotools: respect DESTDIR when installing
Flowdalic Apr 24, 2020
1faf69a
autotools: correct --with(out)-fonts
Flowdalic Apr 24, 2020
3f94f1a
autotools: ensure $(DESTDIR)/usr/share/consolefonts exists
Flowdalic Apr 24, 2020
2451dca
add option to choose tty
kdkasad May 29, 2020
1faae51
Merge pull request #103 from kdkasad/master
abishekvashok May 31, 2020
a5ae646
Merge pull request #102 from Prince213/master
abishekvashok May 31, 2020
a2b78a1
Merge pull request #101 from Flowdalic/autotools-fixes
abishekvashok May 31, 2020
dbf1ffe
Update issue templates
abishekvashok May 31, 2020
0720ddf
Typo (scorlling -> scrolling)
forcegk Jun 10, 2020
3ed4d00
Merge pull request #104 from forcegk/patch-1
abishekvashok Jun 12, 2020
17f9b4a
no newline wfter help message fixed
igoro00 Jun 20, 2020
4dc056e
Merge branch 'master' into master
igoro00 Jun 24, 2020
9fda6ba
Adds sponsorship information
abishekvashok Jul 2, 2020
4efb952
Merge pull request #97 from igoro00/master
abishekvashok Jul 3, 2020
a85787e
Update .travis.yml
srinivas32 Sep 25, 2020
19ee9e7
Corrects string comparison.
efferifick Sep 25, 2020
3b247fc
Merge pull request #110 from srinivas32/master
abishekvashok Nov 9, 2020
9737409
docs: fix simple typo, collumn -> column
timgates42 Nov 27, 2020
bbab4c5
Merge pull request #111 from efferifick/patch-1
abishekvashok Dec 12, 2020
f785de6
Merge pull request #117 from timgates42/bugfix_typo_column
abishekvashok Dec 12, 2020
7ab2d95
Fixes #98: Properly initialise head to false
abishekvashok Dec 12, 2020
6d62080
Fixes #98: Don't try to print non-printable chars
abishekvashok Dec 14, 2020
eb2fd2a
Merge pull request #118 from abishekvashok/head-fix
abishekvashok Dec 21, 2020
01e821e
Use original unmodified licence file from gnu.org
a1346054 Aug 27, 2021
0bf6411
Unify codestyle
a1346054 Aug 27, 2021
c296dae
Invoke bash using /usr/bin/env
a1346054 Aug 27, 2021
b01348a
Fix shellcheck warnings
a1346054 Aug 27, 2021
e9b2544
Fix spelling
a1346054 Aug 27, 2021
198f8ea
Trim excess whitespace
a1346054 Aug 27, 2021
6d50015
Reset TERM variable on Windows
rashil2000 Aug 29, 2021
b72d629
Add CFLAG for static build
rashil2000 Aug 29, 2021
9035459
Add executable to gitignore
rashil2000 Aug 29, 2021
867da9c
Add info about mingw-w64-ncurses
rashil2000 Aug 31, 2021
65c1bd6
Merge pull request #131 from rashil2000/build-fixes
abishekvashok Aug 31, 2021
0365a63
Merge pull request #130 from a1346054/fixes
abishekvashok Aug 31, 2021
4ae5f68
Fix `‘TIOCSTI’ undeclared` error on Cygwin/MSYS2
rashil2000 Sep 1, 2021
3112b12
Merge pull request #132 from rashil2000/cygwin-fix
abishekvashok Sep 20, 2021
6ae316a
Also allow for X11 fonts in /usr/share/X11/fonts/misc as well
michel-slm Apr 12, 2022
349c13b
Merge pull request #145 from michel-slm/find-fedora-xorg-fonts-dir
abishekvashok Apr 21, 2022
571d68d
Readme beautified (#154)
zelfroster Jun 20, 2022
7f3a0ac
Updated man page (#156)
0ur4n05 Aug 10, 2022
7647b47
Fix unicode character printing (#112)
patatahooligan Oct 20, 2022
d86b2a0
Install man page (#158)
h3xx Nov 5, 2022
1be222a
Doc fix: small typos (#166)
Monster0506 Feb 21, 2023
ac78ef9
Check for use_default_colors (#146) (#168)
nikoof Mar 1, 2023
5c082c6
Update README.md (#179)
jeremymeyers Dec 9, 2023
13583ca
Update cmatrix.c
bluemage Oct 7, 2024
7da16f0
Merge branch 'stable' into wordwiz
bluemage Oct 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

patreon: abishekvashok
open_collective: cmatrix
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: Bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

- OS: [e.g. iOS]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: Feature
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cscope.in.out
cscope.po.out
cscope.files
cmatrix
cmatrix.exe
*.o
*.core
CMakeCache.txt
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
arch:
- amd64
- ppc64le
language: c

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

33 changes: 29 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,29 @@ cmake_minimum_required(VERSION 2.8)
project(CMatrix LANGUAGES C)
set(VERSION "2.0")

include(GNUInstallDirs)

# These are relative to CMAKE_INSTALL_PREFIX
# which by default is "/usr/local"
set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts")
set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc")

set(MKFONTDIR "/usr/bin/mkfontdir")

add_definitions(-DEXCLUDE_CONFIG_H)
message(STATUS "Looking for include file config.h")
if(NOT EXISTS "${CMAKE_SOURCE_DIR}/config.h")
add_definitions(-DEXCLUDE_CONFIG_H)
message(STATUS "Looking for include file config.h - missing")
else()
message(STATUS "Looking for include file config.h - found")
endif()

# configure_file(config.h.in config.h)

add_definitions(-DVERSION="${VERSION}")
add_definitions(-DUSE_TIOCSTI)
if (NOT WIN32)
add_definitions(-DUSE_TIOCSTI)
endif ()

include(CheckIncludeFiles)
check_include_files("sys/ioctl.h" HAVE_SYS_IOCTL_H)
Expand All @@ -33,17 +46,30 @@ check_include_files("termio.h" HAVE_TERMIO_H)
if (HAVE_TERMIO_H)
add_definitions(-DHAVE_TERMIO_H)
endif ()
check_include_files("getopt.h" HAVE_GETOPT_H)
if (HAVE_GETOPT_H)
add_definitions(-DHAVE_GETOPT_H)
endif ()

Set(CURSES_NEED_NCURSES TRUE)
Set(CURSES_NEED_WIDE TRUE)
find_package(Curses)
include_directories(${CURSES_INCLUDE_DIR})
add_definitions(-DHAVE_NCURSES_H)

include(CheckSymbolExists)
list(APPEND CMAKE_REQUIRED_LIBRARIES ncurses)
check_symbol_exists(use_default_colors "ncurses.h" HAVE_USE_DEFAULT_COLORS)
if (HAVE_USE_DEFAULT_COLORS)
add_definitions(-DHAVE_USE_DEFAULT_COLORS)
endif()

add_executable(cmatrix cmatrix.c)

target_link_libraries(cmatrix ${CURSES_LIBRARIES})

install(TARGETS cmatrix DESTINATION bin)
install(TARGETS cmatrix DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES cmatrix.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

if (UNIX)
foreach (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
Expand All @@ -70,4 +96,3 @@ if (UNIX)
endif ()
endforeach ()
endif ()

8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions COPYING
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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.

Expand All @@ -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>.
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 22 additions & 14 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,42 @@ install-data-local:
@if test $(BUILD_FONTS) = 1; then \
if test -d /usr/share/consolefonts; then \
echo " Installing matrix fonts in /usr/share/consolefonts..."; \
$(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
$(INSTALL_DATA) $(srcdir)/matrix.psf.gz /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; \
fi; \
if test -d /usr/lib/kbd/consolefonts; then \
echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
$(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
$(INSTALL_DATA) $(srcdir)/matrix.psf.gz /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/lib/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
$(MKFONTDIR) /usr/lib/X11/fonts/misc; \
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; \
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."; \
elif test -d /usr/share/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/share/X11/fonts/misc..."; \
echo " Running mkfontdir /usr/share/X11/fonts/misc..."; \
$(MKFONTDIR) $(DESTDIR)/usr/share/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/share/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."; \
else \
if test -d /usr/X11R6/lib/X11/fonts/misc; then \
echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
$(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
$(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; \
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

Loading