Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
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
Container 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
Main
Synchronet
Commits
7f01faf0
Commit
7f01faf0
authored
1 year ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Fix wildly incorrect usage of set_win_property().
parent
6ec4d431
No related branches found
No related tags found
1 merge request
!463
MRC mods by Codefenix (2024-10-20)
Pipeline
#4428
failed
1 year ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/conio/x_events.c
+4
-4
4 additions, 4 deletions
src/conio/x_events.c
with
4 additions
and
4 deletions
src/conio/x_events.c
+
4
−
4
View file @
7f01faf0
...
@@ -982,7 +982,7 @@ static int init_window()
...
@@ -982,7 +982,7 @@ static int init_window()
x11
.
XSetWMProperties
(
dpy
,
win
,
NULL
,
NULL
,
0
,
0
,
NULL
,
wmhints
,
classhints
);
x11
.
XSetWMProperties
(
dpy
,
win
,
NULL
,
NULL
,
0
,
0
,
NULL
,
wmhints
,
classhints
);
x11
.
XFree
(
wmhints
);
x11
.
XFree
(
wmhints
);
}
}
set_win_property
(
A
(
_NET_WM_ICON
)
,
XA_CARDINAL
,
32
,
PropModeReplace
,
ciolib_initial_icon
,
ciolib_initial_icon_width
*
ciolib_initial_icon_width
);
set_win_property
(
A
TOM_
_NET_WM_ICON
,
XA_CARDINAL
,
32
,
PropModeReplace
,
ciolib_initial_icon
,
ciolib_initial_icon_width
*
ciolib_initial_icon_width
);
pid_l
=
getpid
();
pid_l
=
getpid
();
set_win_property
(
ATOM__NET_WM_PID
,
XA_CARDINAL
,
32
,
PropModeReplace
,
&
pid_l
,
1
);
set_win_property
(
ATOM__NET_WM_PID
,
XA_CARDINAL
,
32
,
PropModeReplace
,
&
pid_l
,
1
);
...
@@ -2104,12 +2104,12 @@ void x11_event_thread(void *args)
...
@@ -2104,12 +2104,12 @@ void x11_event_thread(void *args)
break
;
break
;
case
X11_LOCAL_SETNAME
:
case
X11_LOCAL_SETNAME
:
x11
.
XSetIconName
(
dpy
,
win
,
lev
.
data
.
name
);
x11
.
XSetIconName
(
dpy
,
win
,
lev
.
data
.
name
);
set_win_property
(
A
(
_NET_WM_ICON_NAME
)
,
A
(
UTF8_STRING
),
8
,
PropModeReplace
,
lev
.
data
.
name
,
strlen
(
lev
.
data
.
name
));
set_win_property
(
A
TOM_
_NET_WM_ICON_NAME
,
A
(
UTF8_STRING
),
8
,
PropModeReplace
,
lev
.
data
.
name
,
strlen
(
lev
.
data
.
name
));
x11
.
XFlush
(
dpy
);
x11
.
XFlush
(
dpy
);
break
;
break
;
case
X11_LOCAL_SETTITLE
:
case
X11_LOCAL_SETTITLE
:
x11
.
XStoreName
(
dpy
,
win
,
lev
.
data
.
title
);
x11
.
XStoreName
(
dpy
,
win
,
lev
.
data
.
title
);
set_win_property
(
A
(
_NET_WM_NAME
)
,
A
(
UTF8_STRING
),
8
,
PropModeReplace
,
lev
.
data
.
name
,
strlen
(
lev
.
data
.
name
));
set_win_property
(
A
TOM_
_NET_WM_NAME
,
A
(
UTF8_STRING
),
8
,
PropModeReplace
,
lev
.
data
.
name
,
strlen
(
lev
.
data
.
name
));
x11
.
XFlush
(
dpy
);
x11
.
XFlush
(
dpy
);
break
;
break
;
case
X11_LOCAL_COPY
:
case
X11_LOCAL_COPY
:
...
@@ -2156,7 +2156,7 @@ void x11_event_thread(void *args)
...
@@ -2156,7 +2156,7 @@ void x11_event_thread(void *args)
case
X11_LOCAL_SETICON
:
{
case
X11_LOCAL_SETICON
:
{
// TODO: set_icon() is obsolete... delete
// TODO: set_icon() is obsolete... delete
set_icon
(
&
lev
.
data
.
icon_data
[
2
],
lev
.
data
.
icon_data
[
0
],
NULL
);
set_icon
(
&
lev
.
data
.
icon_data
[
2
],
lev
.
data
.
icon_data
[
0
],
NULL
);
set_win_property
(
A
(
_NET_WM_ICON
)
,
XA_CARDINAL
,
32
,
PropModeReplace
,
lev
.
data
.
icon_data
,
lev
.
data
.
icon_data
[
0
]
*
lev
.
data
.
icon_data
[
1
]
+
2
);
set_win_property
(
A
TOM_
_NET_WM_ICON
,
XA_CARDINAL
,
32
,
PropModeReplace
,
lev
.
data
.
icon_data
,
lev
.
data
.
icon_data
[
0
]
*
lev
.
data
.
icon_data
[
1
]
+
2
);
x11
.
XFlush
(
dpy
);
x11
.
XFlush
(
dpy
);
free
(
lev
.
data
.
icon_data
);
free
(
lev
.
data
.
icon_data
);
break
;
break
;
...
...
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