Skip to content

Commit

Permalink
Merge tag '1.7.7' into wayland
Browse files Browse the repository at this point in the history
  • Loading branch information
lbonn committed Jan 5, 2025
2 parents 0abd887 + c8d0bd3 commit 57c53bd
Show file tree
Hide file tree
Showing 55 changed files with 10,242 additions and 878 deletions.
1 change: 1 addition & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ runs:
libxkbcommon-dev \
libxkbcommon-dev \
libxkbcommon-x11-dev \
libgdk-pixbuf-2.0-dev \
ninja-build \
pandoc \
python3-pip \
Expand Down
28 changes: 11 additions & 17 deletions CONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ configuration {

}
```
You can now set the options in the `configuration` block.

You can now set the options in the `configuration` block.

## Create a configuration file from current setup

Expand All @@ -35,6 +36,7 @@ This will have all the possible settings and their current value.
If a value is the default value, the entry will be commented.

For example:

```css
configuration {
/* modes: "window,run,ssh,drun";*/
Expand Down Expand Up @@ -68,8 +70,8 @@ newlines format are supported. But Unix is preferred.

C and C++ file comments are supported.

- Anything after `// ` and before a newline is considered a comment.
- Everything between `/*` and `*/` is a comment.
- Anything after `//` and before a newline is considered a comment.
- Everything between `/*` and `*/` is a comment.

Comments can be nested and the C comments can be inline.

Expand Down Expand Up @@ -124,12 +126,12 @@ For example:
#### Number

An integer may contain any full number.
For example:
```css

For example:

```css
eh: 2;
```
```

#### Boolean

Expand All @@ -144,15 +146,6 @@ show-icons: true;
This is equal to the `-show-icons` option on the commandline, and `show-icons:
false;` is equal to `-no-show-icons`.

#### Character

Character value is always surrounded by single quotes (') and should contain a
single character. It supports escaping.

```css
matching-negate-char: '-';
```

#### List

This is not supported by the old configuration system, but can be used in the
Expand All @@ -164,6 +157,7 @@ comma-separated. The entry in the list single ASCII words.
```css
combi-modes: [window,drun];
```

For older versions you have :

```css
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MIT/X11 License
Modified 2013-2023 Qball Cow <[email protected]>
Modified 2013-2024 Qball Cow <[email protected]>
Copyright (c) 2012 Sean Pringle <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining
Expand Down
2 changes: 2 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
For newer release ChangeLogs please see the releasenotes.

v1.7.3: Sturtled!
- [Help] Print out the parsed config/theme files in -help output.
- [Keybindings] Fix keybindings being modified by -theme-str
Expand Down
88 changes: 44 additions & 44 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h1 align="center"> Rofi </h1>
<p align="center"><i>A window switcher, Application launcher and dmenu replacement</i>.</p>

https://user-images.githubusercontent.com/84911063/139428874-fe182dd6-82c6-49b8-8da1-920ddda3d1ed.mp4
<https://user-images.githubusercontent.com/84911063/139428874-fe182dd6-82c6-49b8-8da1-920ddda3d1ed.mp4>

**This is a fork of [Rofi](https://github.com/davatorium/rofi) with added support for Wayland via the [layer shell protocol](https://github.com/swaywm/wlr-protocols).**
**For more information, see the [Wayland support section](#wayland-support)**
Expand All @@ -33,15 +33,15 @@ provided by an external script.

Rofi is not:

- A UI toolkit.
- A UI toolkit.

- A library to be used in other applications.
- A library to be used in other applications.

- An application that can support every possible use-case. It tries to be
- An application that can support every possible use-case. It tries to be
generic enough to be usable by everybody.
- Specific functionality can be added using scripts or plugins, many exists.
- Specific functionality can be added using scripts or plugins, many exists.

- Just a dmenu replacement. The dmenu functionality is a nice 'extra' to
- Just a dmenu replacement. The dmenu functionality is a nice 'extra' to
**rofi**, not its main purpose.

## Table of Contents
Expand All @@ -50,7 +50,7 @@ Rofi is not:
- [Modes](#modes)
- [Manpages](#manpage)
- [Installation](#installation)
- [Quickstart](#quickstart)
- [Quickstart](#quickstart)
- [Usage](#usage)
- [Configuration](#configuration)
- [Themes](#themes)
Expand All @@ -61,47 +61,47 @@ Rofi is not:

Its main features are:

- Fully configurable keyboard navigation
- Fully configurable keyboard navigation

- Type to filter
- Tokenized: type any word in any order to filter
- Case insensitive (togglable)
- Support for fuzzy-, regex-, prefix-, and glob-matching
- Type to filter
- Tokenized: type any word in any order to filter
- Case insensitive (togglable)
- Support for fuzzy-, regex-, prefix-, and glob-matching

- UTF-8 enabled
- UTF-8-aware string collating
- International keyboard support (\`e -> è)
- UTF-8 enabled
- UTF-8-aware string collating
- International keyboard support (\`e -> è)

- RTL language support
- RTL language support

- Cairo drawing and Pango font rendering
- Cairo drawing and Pango font rendering

- Built-in modes:
- Window switcher mode
- EWMH compatible WM
- Work arounds for i3,bspwm
- Built-in modes:
- Window switcher mode
- EWMH compatible WM
- Work arounds for i3,bspwm

- Application launcher
- Application launcher

- Desktop file application launcher
- Desktop file application launcher

- SSH launcher mode
- SSH launcher mode

- File browser
- File browser

- Combi mode, allowing several modes to be merged into one list
- Combi mode, allowing several modes to be merged into one list

- History-based ordering — last 25 choices are ordered on top based on use
- History-based ordering — last 25 choices are ordered on top based on use
(optional)

- Levenshtein distance or fzf like sorting of matches (optional)
- Levenshtein distance or fzf like sorting of matches (optional)

- Drop-in dmenu replacement
- Many added improvements
- Drop-in dmenu replacement
- Many added improvements

- Easily extensible using scripts and plugins
- Easily extensible using scripts and plugins

- Advanced Theming
- Advanced Theming

## Modes

Expand All @@ -111,22 +111,22 @@ extended by scripts (either called from

Below is a list of the different modes:

- **run**: launch applications from $PATH, with option to launch in terminal.
- **run**: launch applications from $PATH, with option to launch in terminal.

- **drun**: launch applications based on desktop files. It tries to be
- **drun**: launch applications based on desktop files. It tries to be
compliant to the XDG standard.

- **window**: Switch between windows on an EWMH compatible window manager.
- **window**: Switch between windows on an EWMH compatible window manager.

- **ssh**: Connect to a remote host via ssh.
- **ssh**: Connect to a remote host via ssh.

- **filebrowser**: A basic file-browser for opening files.
- **filebrowser**: A basic file-browser for opening files.

- **keys**: list internal keybindings.
- **keys**: list internal keybindings.

- **script**: Write (limited) custom mode using simple scripts.
- **script**: Write (limited) custom mode using simple scripts.

- **combi**: Combine multiple modes into one.
- **combi**: Combine multiple modes into one.

**Rofi** is known to work on Linux and BSD.

Expand Down Expand Up @@ -212,11 +212,11 @@ launcher:
```

The modes to combine in combi mode.
For syntax to `-combi-modes `, see `-modes`.
For syntax to `-combi-modes`, see `-modes`.
To get one merge view, of `window`,`run`, and `ssh`:

```bash
rofi -show combi -combi-modes "window,run,ssh" -modes combi
rofi -show combi -combi-modes "window,run,ssh" -modes combi
```

### Configuration
Expand Down Expand Up @@ -256,9 +256,9 @@ Default theme:

![default](https://raw.githubusercontent.com/davatorium/rofi/next/releasenotes/1.4.0/rofi-no-fzf.png)

## Wiki
## Wiki

|**The upstream rofi Wiki is currently unmaintained and might contain outdated data ** |
|**The upstream rofi Wiki is currently unmaintained and might contain outdated data** |
| --- |

[Go to upstream rofi wiki](https://github.com/davatorium/rofi/wiki) .
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([rofi], [1.7.5-dev], [https://github.com/davatorium/rofi/],[],[https://github.com/davatorium/rofi/discussions])
AC_INIT([rofi], [1.7.7], [https://github.com/davatorium/rofi/],[],[https://github.com/davatorium/rofi/discussions])

AC_CONFIG_SRCDIR([source/rofi.c])
AC_CONFIG_HEADER([config.h])
Expand Down
Loading

0 comments on commit 57c53bd

Please sign in to comment.