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

Merge stable with changes from master #74

Merged
merged 60 commits into from
Mar 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
6525abe
Adds option to disable installing cmatrix font
abishekvashok Jul 22, 2017
6ce59e9
Adds rainbow mode and fixes screen resize bug
Jul 15, 2017
f0e4e99
Adds code of conduct
abishekvashok Aug 5, 2017
33cae7f
Adds CONTRIBUTING.md
abishekvashok Aug 5, 2017
c85f375
Enables building without matrix fonts
abishekvashok Aug 5, 2017
704df61
Fixes if condition in Makefile
shinenelson Aug 9, 2017
0096580
README.md: fixes typo
abishekvashok Aug 12, 2017
aab39a9
README.md: use a more accurate sub-heading [minor]
hoijui Oct 19, 2017
cb6fe7c
README.md: fix build instructions [fix]
hoijui Oct 19, 2017
38647dd
README.md: use more standard conform syntax [minor]
hoijui Oct 19, 2017
9fffb25
add support to build with CMake (a meta build system)
hoijui Sep 21, 2017
a8cb0fd
README.md: explain how to build and install with cmake [minor]
hoijui Oct 19, 2017
21ffe61
Travis: also test-compile with CLang (not just with GCC)
hoijui Oct 8, 2017
be5567e
README.md: Minor improvements
hoijui Oct 28, 2017
0cc3b18
Adds screenshot generator script and screenshots
hoijui Nov 4, 2017
dfae49d
.Travis.yml: test-compile with CLang aswell
abishekvashok Nov 4, 2017
eb62a12
Removes "./" from the commands
shameempk Nov 16, 2017
0ca86d1
Merge pull request #24 from shameempk/master
abishekvashok Nov 18, 2017
f52a93e
Fix signal handlers and memory related bugs (#26)
tansly Dec 1, 2017
c306e95
Merge branch 'master' into cmake
abishekvashok Dec 1, 2017
6fc9d2f
Merge branch 'master' into cmake
abishekvashok Dec 1, 2017
737d167
.github: Adds issue template
abishekvashok Dec 1, 2017
d4d8079
Merge pull request #17 from hoijui/cmake
abishekvashok Dec 4, 2017
f4f5690
Fixed Travis CI build
sachincool Dec 24, 2017
9046f1c
Merge pull request #29 from sachincool/master
abishekvashok Dec 25, 2017
b5c2543
remove unused assignment
hoijui Dec 4, 2017
66a0be3
`va_system()`: rename buffer variable and make buffer size a variable
hoijui Dec 4, 2017
bef9cad
fix improper 755 file mode on non-executable files (#32)
livibetter Jan 29, 2018
5cfe816
remove autotools generated files
livibetter Jan 29, 2018
c594b6a
Merge acconfig.h into configure.ac per autoheader's warning (#35)
livibetter Jan 31, 2018
de94079
remove the "132x300" screen limit statement (#37)
livibetter Feb 2, 2018
93fd357
only restore TERM when needed, and use putenv (#36)
livibetter Feb 2, 2018
d4d9881
add osx build on Travis CI (#39)
livibetter Feb 4, 2018
a785ff0
Call time(NULL) and remove unused variable (#41)
neuschaefer Mar 5, 2018
9e97178
Simplify buffer size handling in va_system: use sizeof(buf)
neuschaefer Mar 5, 2018
b5759ff
Don't restore the TERM variable before exiting
neuschaefer Mar 5, 2018
b0f3b89
Migrate putenv to setenv
abishekvashok Mar 27, 2018
2ccf323
Adds .rultor.yml
abishekvashok Mar 31, 2018
94e63cd
Contributing.md: Adds email address
abishekvashok Jun 14, 2018
afcc803
obvious fix for issue #48
fogti Jun 24, 2018
ac498eb
.gitignore: Add cmake generated files and cache
abishekvashok Jul 15, 2018
89a5c05
cmatrix.c: Simplify the bold attribute
abishekvashok Jul 15, 2018
0884f67
Add an option to lock computer (#61)
pierre42100 Nov 22, 2018
00ff332
Add lambda mode
io12 Dec 11, 2018
70be5c3
Merge pull request #62 from io12/master
abishekvashok Dec 12, 2018
1e53d6f
Small cmatrix.c fixes
Mar 24, 2019
173d8ec
Reolve issue #25
Mar 24, 2019
b5b2478
Moved for initial declarations out of loop
Mar 24, 2019
7d1af24
Merge pull request #66 from FrozenAndrey/small-fixes
abishekvashok Mar 26, 2019
0f820eb
Merge pull request #67 from FrozenAndrey/resolve#25
abishekvashok Mar 26, 2019
72460ba
Fix #70 (-B (all bold) option does not work.)
Mar 24, 2019
2f936b3
Small fixes about -l option
Mar 25, 2019
71f8240
Merge pull request #72 from FrozenAndrey/small-fixes-about-l-option
abishekvashok Mar 27, 2019
67cf6ee
Merge pull request #71 from FrozenAndrey/fix#70
abishekvashok Mar 27, 2019
3d76461
Fix #68
Mar 24, 2019
7ad0c61
Remove unnecessary loop
Mar 27, 2019
8b716ff
Merge pull request #69 from FrozenAndrey/fix#68
abishekvashok Mar 27, 2019
80e1c4a
cmatrix.c: Adds Japanese characters support
abishekvashok Mar 27, 2019
66ab05c
cmatrix.c: Calculate randnum against hardcoding it
abishekvashok Mar 27, 2019
ad212c8
Merge pull request #73 from abishekvashok/pull1
abishekvashok Mar 27, 2019
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
17 changes: 12 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
/build
config.h
Makefile
Makefile.in
stamp-h
stamp-h[0-9]*
config.cache
config.log
config.status
config.guess
config.*
compile
configure
configure.lineno
config.status.lineno
cmatrix.spec
depcomp
install-sh
missing
aclocal.m4
autom4te.cache/
.deps
*.tab.c
Expand All @@ -21,4 +27,5 @@ cscope.files
cmatrix
*.o
*.core

CMakeCache.txt
CMakeFiles/
1 change: 1 addition & 0 deletions .rultor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

21 changes: 18 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
language: c

os: linux
os:
- linux
- osx

sudo: required

compiler: gcc
compiler:
- gcc
- clang

env:
- CONFIGURE_CMD=configure
- CONFIGURE_CMD=cmake

script:
- ./configure
- |
if [[ $CONFIGURE_CMD == 'configure' ]]; then
export CC=${CC} && autoreconf -i && ./configure
fi
- |
if [[ $CONFIGURE_CMD == 'cmake' ]]; then
mkdir build && cd build && cmake -DCMAKE_C_COMPILER="${CC}" ..
fi
- make

73 changes: 73 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# CMake build system for CMatrix

cmake_minimum_required(VERSION 2.8)

project(CMatrix LANGUAGES C)
set(VERSION "1.2")

# 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)
add_definitions(-DVERSION="${VERSION}")
add_definitions(-DUSE_TIOCSTI)

include(CheckIncludeFiles)
check_include_files("sys/ioctl.h" HAVE_SYS_IOCTL_H)
if (HAVE_SYS_IOCTL_H)
add_definitions(-DHAVE_SYS_IOCTL_H)
endif ()
check_include_files("unistd.h" HAVE_UNISTD_H)
if (HAVE_UNISTD_H)
add_definitions(-DHAVE_UNISTD_H)
endif ()
check_include_files("termios.h" HAVE_TERMIOS_H)
if (HAVE_TERMIOS_H)
add_definitions(-DHAVE_TERMIOS_H)
endif ()
check_include_files("termio.h" HAVE_TERMIO_H)
if (HAVE_TERMIO_H)
add_definitions(-DHAVE_TERMIO_H)
endif ()

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

add_executable(cmatrix cmatrix.c)

target_link_libraries(cmatrix ${CURSES_LIBRARIES})

install(TARGETS cmatrix DESTINATION bin)

if (UNIX)
foreach (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
if (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
message(STATUS "Installing matrix console fonts to ${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
install(FILES
"${CMAKE_SOURCE_DIR}/matrix.fnt"
"${CMAKE_SOURCE_DIR}/matrix.psf.gz"
DESTINATION "${CONSOLE_FONTS_DIR}")
endif ()
endforeach ()
foreach (X_FONTS_DIR ${X_FONTS_DIRS})
if (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
message(STATUS "Installing matrix X window fonts to ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
install(FILES
"${CMAKE_SOURCE_DIR}/mtx.pcf"
DESTINATION "${X_FONTS_DIR}")
install(CODE
"message(STATUS \"Running mkfontdir ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR} ...\")")
install(CODE
"execute_process(COMMAND \"${MKFONTDIR}\" \"${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}\")")
install(CODE
"message(STATUS \"If this is the first time you have installed CMatrix you will probably have to restart X window in order to use the mtx.pcf font.\")")
endif ()
endforeach ()
endif ()

46 changes: 46 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
93 changes: 93 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# 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.

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
build.
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
do not have permission to do that, you may request the second reviewer to merge it for you.

## Code of Conduct

### Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.

### Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

### Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

### Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the current maintainer at abishekvashok at the rate
mail dot com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

### Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
Empty file modified COPYING
100755 → 100644
Empty file.
Empty file modified INSTALL
100755 → 100644
Empty file.
13 changes: 13 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
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
blank -->

### Would you like to work on it?
<!-- Answer with a simple yes or no :) -->
67 changes: 39 additions & 28 deletions Makefile.am
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,48 @@ cmatrix_SOURCES = cmatrix.c

man_MANS = cmatrix.1

EXTRA_DIST = COPYING INSTALL install-sh\
if MATRIX_FONTS
BUILD_FONTS = 1
else
BUILD_FONTS = 0
endif

EXTRA_DIST = COPYING INSTALL install-sh \
missing mkinstalldirs matrix.fnt \
matrix.psf.gz mtx.pcf cmatrix.1 cmatrix.spec

install-data-local:
@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; \
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; \
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; \
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."; \
@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; \
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; \
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; \
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; \
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 \
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; \
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 \
echo "Not installing matrix fonts"; \
fi

Loading