Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
feh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
derf
feh
Commits
73c11d8a
Commit
73c11d8a
authored
6 years ago
by
Birte Kristina Friesel
Browse files
Options
Downloads
Plain Diff
Merge branch 'no-inplace-edit' of
https://github.com/ulteq/feh
into ulteq-no-inplace-edit
parents
bc8f6d80
4eb72706
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/imlib.c
+16
-0
16 additions, 0 deletions
src/imlib.c
src/options.c
+4
-0
4 additions, 0 deletions
src/options.c
src/options.h
+1
-0
1 addition, 0 deletions
src/options.h
with
21 additions
and
0 deletions
src/imlib.c
+
16
−
0
View file @
73c11d8a
...
...
@@ -1204,6 +1204,22 @@ void feh_edit_inplace(winwidget w, int op)
if
(
!
w
->
file
||
!
w
->
file
->
data
||
!
FEH_FILE
(
w
->
file
->
data
)
->
filename
)
return
;
if
(
opt
.
no_inplace_edit
)
{
imlib_context_set_image
(
w
->
im
);
if
(
op
==
INPLACE_EDIT_FLIP
)
imlib_image_flip_vertical
();
else
if
(
op
==
INPLACE_EDIT_MIRROR
)
imlib_image_flip_horizontal
();
else
{
imlib_image_orientate
(
op
);
tmp
=
w
->
im_w
;
FEH_FILE
(
w
->
file
->
data
)
->
info
->
width
=
w
->
im_w
=
w
->
im_h
;
FEH_FILE
(
w
->
file
->
data
)
->
info
->
height
=
w
->
im_h
=
tmp
;
}
winwidget_render_image
(
w
,
1
,
0
);
return
;
}
if
(
!
strcmp
(
gib_imlib_image_format
(
w
->
im
),
"jpeg"
)
&&
!
path_is_url
(
FEH_FILE
(
w
->
file
->
data
)
->
filename
))
{
feh_edit_inplace_lossless
(
w
,
op
);
...
...
This diff is collapsed.
Click to expand it.
src/options.c
+
4
−
0
View file @
73c11d8a
...
...
@@ -418,6 +418,7 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
{
"conversion-timeout"
,
1
,
0
,
245
},
{
"version-sort"
,
0
,
0
,
246
},
{
"offset"
,
1
,
0
,
247
},
{
"no-inplace-edit"
,
0
,
0
,
248
},
{
0
,
0
,
0
,
0
}
};
int
optch
=
0
,
cmdx
=
0
;
...
...
@@ -805,6 +806,9 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun)
opt
.
offset_flags
=
XParseGeometry
(
optarg
,
&
opt
.
offset_x
,
&
opt
.
offset_y
,
(
unsigned
int
*
)
&
discard
,
(
unsigned
int
*
)
&
discard
);
break
;
case
248
:
opt
.
no_inplace_edit
=
1
;
break
;
default:
break
;
}
...
...
This diff is collapsed.
Click to expand it.
src/options.h
+
1
−
0
View file @
73c11d8a
...
...
@@ -110,6 +110,7 @@ struct __fehoptions {
double
reload
;
int
sort
;
int
version_sort
;
int
no_inplace_edit
;
int
debug
;
int
geom_enabled
;
int
geom_flags
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment