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

document selection line width DPI scaling #401

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 0 additions & 33 deletions .github/workflows/full-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,36 +49,3 @@ jobs:
clang-tidy --version
find src -name '*.c' -print | xargs -P$(nproc) -I{} \
clang-tidy --quiet {} -- $(pkg-config --cflags ./deps.pc)
cygwin:
runs-on: windows-latest
env:
CYGWIN_NOWINPATH: 1 # Removes non-Cygwin dirs from PATH.
CHERE_INVOKING: '' # Makes Cygwin's `bash.exe --login` not cd.
defaults:
run:
shell: C:\cygwin\bin\bash.exe --login -o igncr {0}
steps:
- run: git config --global core.autocrlf input
# This is NOT the Cygwin bash, it's the Git for Windows bash from the
# default Github Actions Windows VM. This step tells git to translate Unix
# newlines to DOS newlines.
shell: bash
- uses: actions/checkout@v4
- uses: cygwin/cygwin-install-action@v1
with:
packages: autoconf autoconf-archive automake gcc-core libImlib2-devel \
libXcomposite-devel libXext-devel libXfixes-devel libXinerama-devel \
make
- name: distcheck
# NOTE: cygwin's imlib2 version is too old, and it's imlib_apply_filter
# lacks `const` qualifier. so use `-Wno-error=discarded-qualifiers`.
run: |
cd ${GITHUB_WORKSPACE}
./autogen.sh
./configure SCROT_PRIVATE_FLAGS="-Werror -Wno-error=cpp -Wno-error=pedantic -Wno-error=discarded-qualifiers"
make distcheck
- name: run_program
run: |
cd ${GITHUB_WORKSPACE}
make
src/scrot -v
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ scrot requires a few projects and libraries:
- libXfixes [(can be found in X.Org)](https://gitlab.freedesktop.org/xorg/lib/libxfixes)
- libXinerama [(can be found in X.Org)](https://gitlab.freedesktop.org/xorg/lib/libxinerama)

The [deps.pc](./deps.pc) file documents minimum version requirement for some of
the libraries.

### Generic installation instructions ###

If you are building from a git checkout, or if you have applied additional
Expand Down
16 changes: 8 additions & 8 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ Work for it happens on the `v2` branch.
It will be released when Imlib2 v1.11 is available on Debian stable to ease the
transition for users and avoid depending on bleeding edge library versions.

- [ ] Require Imlib2 v1.11.0
- [ ] Document minimum version of other dependencies [#307](https://github.com/resurrecting-open-source-projects/scrot/issues/307)
- [ ] Use file descriptors when saving images
- [ ] https://github.com/resurrecting-open-source-projects/scrot/issues/244
- [ ] https://github.com/resurrecting-open-source-projects/scrot/issues/246
- [x] Require Imlib2 v1.11.0
- [x] Document minimum version of other dependencies [#307](https://github.com/resurrecting-open-source-projects/scrot/issues/307)
- [x] Use file descriptors when saving images
- [x] https://github.com/resurrecting-open-source-projects/scrot/issues/244
- [x] https://github.com/resurrecting-open-source-projects/scrot/issues/246
- [ ] https://github.com/resurrecting-open-source-projects/scrot/issues/226
- [ ] Remove deprecated features
- [ ] --note [#236](https://github.com/resurrecting-open-source-projects/scrot/issues/236)
- [ ] --script
- [x] Remove deprecated features
- [x] --note [#236](https://github.com/resurrecting-open-source-projects/scrot/issues/236)
- [x] --script
2 changes: 1 addition & 1 deletion deps.pc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Name: scrot's mandatory dependencies
Description: ditto
Version: infinite
Cflags: -D_XOPEN_SOURCE=700L
Requires: x11 imlib2 xcomposite xext xfixes xinerama
Requires: x11 imlib2 >= 1.11.0 xcomposite >= 0.2.0 xext xfixes >= 5.0.1 xinerama >= 1.1.3
4 changes: 3 additions & 1 deletion man/scrot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ SELECTION STYLE

Without the -l option, a default style is used:

mode=auto,style=solid,width=1,opacity=100
mode=auto,style=solid,width=...,opacity=100
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe remove width=... entirely.


The default width automatically scales with DPI.

Example:

Expand Down
1 change: 0 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ MAINTAINERCLEANFILES = Makefile.in

bin_PROGRAMS = scrot
scrot_SOURCES = scrot.c scrot.h \
note.c note.h \
options.c options.h \
scrot_selection.c scrot_selection.h \
selection_classic.c selection_classic.h \
Expand Down
281 changes: 0 additions & 281 deletions src/note.c

This file was deleted.

Loading