summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora1346054 <36859588+a1346054@users.noreply.github.com>2021-08-14 11:03:16 +0000
committerGitHub <noreply@github.com>2021-08-14 13:03:16 +0200
commitc62137f8ab4e7a9d033b57e6a77944bb621d90ff (patch)
tree84cdd1b40733d09ce7ec49d4bd050a8ebafc8309
parent69c6004681cc9bb2f7126226a86273c136b32756 (diff)
Simple maintenance improvements (#1370)
* rofi moved to libera.chat * unify some theme headers and whitespace * consistently use the same hashbang for bash * improve obsolete way of testing equality see https://github.com/koalaman/shellcheck/wiki/SC2268 for explanation * use consistent function definitions in bash scripts * remove duplicated author and fix whitespace * quote all variables in scripts fixes many warnings identified through shellcheck * fix whitespace in scripts * fix whitespace in non-source files * fix spelling in non-source files * fix whitespace and indentation in source files * fix spelling in source files
-rw-r--r--.github/CONTRIBUTING.md4
-rw-r--r--.github/ISSUE_TEMPLATE/config.yml2
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--AUTHORS11
-rw-r--r--Changelog14
-rwxr-xr-xExamples/i3_empty_workspace.sh10
-rwxr-xr-xExamples/i3_switch_workspaces.sh7
-rwxr-xr-xExamples/rofi-file-browser.sh17
-rwxr-xr-xExamples/test_script_mode_delim.sh2
-rw-r--r--Makefile.am23
-rw-r--r--config/config.c32
-rw-r--r--configure.ac2
-rw-r--r--data/uncrustify.cfg151
-rwxr-xr-xdoc/create_screenshot.sh4
-rw-r--r--doc/default_configuration.rasi1
-rw-r--r--doc/default_theme.rasi18
-rw-r--r--doc/rofi-script.52
-rw-r--r--doc/rofi-script.5.markdown2
-rw-r--r--doc/rofi-sensible-terminal.1.markdown5
-rw-r--r--doc/rofi-theme.52
-rw-r--r--doc/rofi-theme.5.markdown4
-rw-r--r--doc/rofi.14
-rw-r--r--doc/rofi.1.markdown4
-rw-r--r--include/rofi-types.h5
-rw-r--r--include/rofi.h2
-rw-r--r--include/theme.h12
-rw-r--r--include/view-internal.h4
-rw-r--r--include/view.h8
-rw-r--r--include/widgets/textbox.h2
-rw-r--r--lexer/theme-lexer.l24
-rw-r--r--lexer/theme-parser.y140
-rw-r--r--libgwater-xcb-nolibtool.mk2
-rw-r--r--releasenotes/0.15.12/release-0.15.12.markdown8
-rw-r--r--releasenotes/1.0.0/release-1.0.0.markdown3
-rw-r--r--releasenotes/1.1.0/release-1.1.0.markdown23
-rw-r--r--releasenotes/1.2.0/release-1.2.0.markdown8
-rw-r--r--releasenotes/1.3.0/release-1.3.0.markdown2
-rw-r--r--releasenotes/1.4.0/release-1.4.0.markdown13
-rw-r--r--releasenotes/1.5.0/release-1.5.0.markdown4
-rw-r--r--releasenotes/1.5.2/release-1.5.2.markdown6
-rw-r--r--releasenotes/1.5.3/release-1.5.3.markdown7
-rw-r--r--releasenotes/1.6.0/release-1.6.0.markdown2
-rwxr-xr-xscript/get_git_rev.sh14
-rwxr-xr-xscript/rofi-convert-theme.sh16
-rwxr-xr-xscript/rofi-create-screenshot-theme3.sh36
-rwxr-xr-xscript/rofi-create-screenshot.sh26
-rwxr-xr-xscript/rofi-sensible-terminal2
-rwxr-xr-xscript/rofi-theme-selector52
-rw-r--r--source/dialogs/combi.c4
-rw-r--r--source/dialogs/dmenu.c24
-rw-r--r--source/dialogs/drun.c37
-rw-r--r--source/dialogs/filebrowser.c8
-rw-r--r--source/dialogs/run.c45
-rw-r--r--source/dialogs/script.c2
-rw-r--r--source/dialogs/ssh.c12
-rw-r--r--source/dialogs/window.c12
-rw-r--r--source/helper.c10
-rw-r--r--source/history.c2
-rw-r--r--source/keyb.c2
-rw-r--r--source/rofi-icon-fetcher.c8
-rw-r--r--source/rofi-types.c2
-rw-r--r--source/rofi.c22
-rw-r--r--source/theme.c6
-rw-r--r--source/view.c32
-rw-r--r--source/widgets/box.c10
-rw-r--r--source/widgets/container.c6
-rw-r--r--source/widgets/icon.c10
-rw-r--r--source/widgets/listview.c8
-rw-r--r--source/widgets/widget.c4
-rw-r--r--source/xcb.c10
-rw-r--r--source/xrmoptions.c34
-rw-r--r--test/box-test.c6
-rwxr-xr-xtest/convert_old_theme_test.sh12
-rwxr-xr-xtest/default_theme_test.sh10
-rwxr-xr-xtest/help_output_test.sh10
-rw-r--r--test/helper-config-cmdline-parser.c15
-rw-r--r--test/helper-expand.c6
-rw-r--r--test/helper-pidfile.c10
-rw-r--r--test/helper-test.c8
-rw-r--r--test/helper-tokenize.c4
-rw-r--r--test/history-test.c2
-rw-r--r--test/mode-test.c7
-rwxr-xr-xtest/run_all_tests.sh6
-rwxr-xr-xtest/run_combi_test.sh10
-rwxr-xr-xtest/run_dmenu_empty.sh8
-rwxr-xr-xtest/run_dmenu_issue_292.sh16
-rwxr-xr-xtest/run_dmenu_normal_window_test.sh14
-rwxr-xr-xtest/run_dmenu_test.sh16
-rwxr-xr-xtest/run_drun_test.sh12
-rwxr-xr-xtest/run_errormsg_test.sh8
-rwxr-xr-xtest/run_glob_test.sh10
-rwxr-xr-xtest/run_issue333_test.sh14
-rwxr-xr-xtest/run_issue_256.sh10
-rwxr-xr-xtest/run_issue_275.sh14
-rwxr-xr-xtest/run_regex_test.sh12
-rwxr-xr-xtest/run_run_test.sh12
-rwxr-xr-xtest/run_screenshot_test.sh12
-rwxr-xr-xtest/run_script_meta_test.sh12
-rwxr-xr-xtest/run_script_test.sh16
-rwxr-xr-xtest/run_switchdialog_test.sh12
-rwxr-xr-xtest/run_test.sh18
-rwxr-xr-xtest/run_window_test.sh32
-rw-r--r--test/scrollbar-test.c2
-rwxr-xr-xtest/test_script.sh2
-rw-r--r--test/textbox-test.c19
-rw-r--r--test/theme-parser-test.c131
-rw-r--r--test/widget-test.c20
-rw-r--r--themes/Paper.rasi1
-rw-r--r--themes/arthur.rasi10
-rw-r--r--themes/blue.rasi6
-rw-r--r--themes/dmenu.rasi6
-rw-r--r--themes/paper-float.rasi3
-rw-r--r--themes/sidebar.rasi6
113 files changed, 784 insertions, 832 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8c128925..3133c348 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -69,10 +69,10 @@ When reporting a feature request include the following information:
* A use-case for the feature.
If possible try to explain how you would expect to use feature.
-For example, should it be a configuration option or a hot-key.
+For example, should it be a configuration option or a hot-key.
Requesting a feature is no guarantee it will be added.
-
+
**Please do not submit reports related to wayland, see
[here](https://github.com/DaveDavenport/rofi/wiki/Wayland) for more
information.**
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 57331829..afff87bf 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -7,5 +7,5 @@ contact_links:
url: https://www.reddit.com/r/qtools/
about: Please ask and answer questions here.
- name: Rofi IRC channel
- url: https://webchat.freenode.net/?channels=#rofi
+ url: https://web.libera.chat/?channels=#rofi
about: Please ask and answer question in real time here.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36ee0396..9830da93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ before_script:
- apt-get install --force-yes -y autoconf automake make libx11-dev libpango1.0-dev libcairo2-dev libstartup-notification0-dev libxcb-icccm4-dev libxcb-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libx11-xcb-dev
- apt-get install --force-yes -y libxcb1-dev xvfb discount xdotool fluxbox libxkbcommon-dev libxkbcommon-x11-dev libxcb-ewmh-dev xutils-dev libtool lcov libxcb-randr0-dev doxygen python flex bison librsvg2-dev texinfo
- git clone --recursive https://github.com/Airblader/xcb-util-xrm.git
- - cd xcb-util-xrm
+ - cd xcb-util-xrm
- ./autogen.sh --prefix=/usr
- make
- sudo make install
@@ -34,5 +34,5 @@ build-rofi:
artifacts:
expire_in: 2 weeks
paths:
- - coverage
+ - coverage
- doc/html
diff --git a/AUTHORS b/AUTHORS
index 87799bd8..371f786e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
-Aaron Ash
-Adrià Farrés
+Aaron Ash
+Adrià Farrés
Anton Löfgren
Avatar
bendem
@@ -9,7 +9,7 @@ Bruno Braga
Buglloc
Chris Salzberg
daemoni
- Dan Beste
+Dan Beste
Daniel Hahler
DanteFireX
Dave Davenport
@@ -18,9 +18,9 @@ Dimitar Yordanov
Edwin Pujols
eigengrau
Eric Engeström
- Fangrui Song
+Fangrui Song
fice-t
- Florian Franzen
+Florian Franzen
Gabriel Holodak
Gareth Poole
Georgios Bitzes
@@ -44,7 +44,6 @@ N. Izumi
Paulo Flabiano Smorigo
Peter Cannici
qedi
-qedi
Quentin Glidic
Rasmus Steinke
Roomcays
diff --git a/Changelog b/Changelog
index 6ba79e32..0491edef 100644
--- a/Changelog
+++ b/Changelog
@@ -139,14 +139,14 @@ v1.5.0:
- Fix drun history implementation. (#579)
- Add gentoo install instruction. (#685)
-v1.4.2:
+v1.4.2:
- Add sort to manpage. (#682)
- Add tranaparent to theme manpage. (#688)
- Re-add theme headers. (#679)
- Fix super key. (#684)
- Unknown option libnkutils:uuid. (#677)
- Mode window is not found. (#686)
- - Fix meson build in dist file.
+ - Fix meson build in dist file.
v1.4.1: All Hail Rasi
- Bump meson release version
@@ -233,7 +233,7 @@ v1.3.0: Dan vs. Greg: The never ending story.
- Add Control+G for cancel (#452)
- Add padding option to textbox (#449)
- Ctrl-click does alternate accept entry. (#429)
- - Hide window decoration in normal window mode.
+ - Hide window decoration in normal window mode.
- Click to exit option. (#460)
- Fix cursor blinking on moving. (#462)
- Remove entry from history if fails to execute (#466)
@@ -244,16 +244,16 @@ v1.3.0: Dan vs. Greg: The never ending story.
- Improve scrollbar behaviour.
Removals
- opacity option. The transparency support in the theme can do the same and more.
-
+
v1.2.0
New Features
- Highlight matched part of the string.
- Make window switcher string customizable.
Improvements
- - Improved selection mode in dmenu with selection counter.
+ - Improved selection mode in dmenu with selection counter.
- Improved selection mode with 'dot' indicator.
- Fix Current Desktop window switcher.
- - Fix launching in terminal.
+ - Fix launching in terminal.
- Supports include in config.
- Add Control+k remove till eol keybinding.
- Change clear line to Control+w and make Control+u remove till sol (matching readline)
@@ -471,7 +471,7 @@ v1.1.0
- Better way to determine font height.
- Fix font vertical centering.
- One-off when pasting text.
- - Improve rendering of boxes (fixed height and margins)
+ - Improve rendering of boxes (fixed height and margins)
- Fix modi switcher boxes size+layout.
- Reduce work on redraws (do not always calculate new size/position), set text, etc.
- OO-ify the switchers.
diff --git a/Examples/i3_empty_workspace.sh b/Examples/i3_empty_workspace.sh
index b4c28dc0..bc27e552 100755
--- a/Examples/i3_empty_workspace.sh
+++ b/Examples/i3_empty_workspace.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/usr/bin/env bash
MAX_DESKTOPS=20
-WORKSPACES=$(seq -s '\n' 1 1 ${MAX_DESKTOPS})
+WORKSPACES=$(seq -s '\n' 1 1 "${MAX_DESKTOPS}")
-EMPTY_WORKSPACE=$( (i3-msg -t get_workspaces | tr ',' '\n' | grep num | awk -F: '{print int($2)}' ; \
- echo -e ${WORKSPACES} ) | sort -n | uniq -u | head -n 1)
+EMPTY_WORKSPACE=$( (i3-msg -t get_workspaces | tr ',' '\n' | grep num | awk -F: '{print int($2)}' ; \
+ echo -e "${WORKSPACES}" ) | sort -n | uniq -u | head -n 1)
-i3-msg workspace ${EMPTY_WORKSPACE}
+i3-msg workspace "${EMPTY_WORKSPACE}"
diff --git a/Examples/i3_switch_workspaces.sh b/Examples/i3_switch_workspaces.sh
index a5920567..dd58296c 100755
--- a/Examples/i3_switch_workspaces.sh
+++ b/Examples/i3_switch_workspaces.sh
@@ -1,18 +1,17 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [ -z $@ ]
then
-function gen_workspaces()
+gen_workspaces()
{
i3-msg -t get_workspaces | tr ',' '\n' | grep "name" | sed 's/"name":"\(.*\)"/\1/g' | sort -n
}
-
echo empty; gen_workspaces
else
WORKSPACE=$@
- if [