Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mutter
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
Marco Trevisan
mutter
Commits
cbb2a286
Commit
cbb2a286
authored
Sep 24, 2018
by
Dariusz Gadomski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor-manager: Don't use wacky physical dimensions in display name
parent
e9eaa374
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
16 deletions
+50
-16
src/backends/meta-monitor-manager-private.h
src/backends/meta-monitor-manager-private.h
+2
-0
src/backends/meta-monitor-manager.c
src/backends/meta-monitor-manager.c
+47
-12
src/backends/meta-monitor.c
src/backends/meta-monitor.c
+1
-4
No files found.
src/backends/meta-monitor-manager-private.h
View file @
cbb2a286
...
...
@@ -385,4 +385,6 @@ void meta_monitor_manager_clear_output (MetaOutput *output);
void
meta_monitor_manager_clear_mode
(
MetaCrtcMode
*
mode
);
void
meta_monitor_manager_clear_crtc
(
MetaCrtc
*
crtc
);
gboolean
meta_monitor_has_aspect_as_size
(
MetaMonitor
*
monitor
);
#endif
/* META_MONITOR_MANAGER_PRIVATE_H */
src/backends/meta-monitor-manager.c
View file @
cbb2a286
...
...
@@ -921,33 +921,62 @@ diagonal_to_str (double d)
return
g_strdup_printf
(
"%d
\"
"
,
(
int
)
(
d
+
0
.
5
));
}
gboolean
meta_monitor_has_aspect_as_size
(
MetaMonitor
*
monitor
)
{
int
width_mm
;
int
height_mm
;
meta_monitor_get_physical_dimensions
(
monitor
,
&
width_mm
,
&
height_mm
);
return
(
width_mm
==
160
&&
height_mm
==
90
)
||
(
width_mm
==
160
&&
height_mm
==
100
)
||
(
width_mm
==
16
&&
height_mm
==
9
)
||
(
width_mm
==
16
&&
height_mm
==
10
);
}
static
char
*
make_display_name
(
MetaMonitorManager
*
manager
,
Meta
Output
*
output
)
Meta
Monitor
*
monitor
)
{
g_autofree
char
*
inches
=
NULL
;
g_autofree
char
*
vendor_name
=
NULL
;
const
char
*
vendor
=
NULL
;
const
char
*
product_name
=
NULL
;
int
width_mm
;
int
height_mm
;
if
(
meta_output_is_laptop
(
output
))
meta_monitor_get_physical_dimensions
(
monitor
,
&
width_mm
,
&
height_mm
);
if
(
meta_monitor_is_laptop_panel
(
monitor
))
return
g_strdup
(
_
(
"Built-in display"
));
if
(
output
->
width_mm
>
0
&&
output
->
height_mm
>
0
)
if
(
width_mm
>
0
&&
height_mm
>
0
)
{
double
d
=
sqrt
(
output
->
width_mm
*
output
->
width_mm
+
output
->
height_mm
*
output
->
height_mm
);
inches
=
diagonal_to_str
(
d
/
25
.
4
);
if
(
!
meta_monitor_has_aspect_as_size
(
monitor
))
{
double
d
=
sqrt
(
width_mm
*
width_mm
+
height_mm
*
height_mm
);
inches
=
diagonal_to_str
(
d
/
25
.
4
);
}
else
{
product_name
=
meta_monitor_get_product
(
monitor
);
}
}
if
(
g_strcmp0
(
output
->
vendor
,
"unknown"
)
!=
0
)
vendor
=
meta_monitor_get_vendor
(
monitor
);
if
(
g_strcmp0
(
vendor
,
"unknown"
)
!=
0
)
{
if
(
!
manager
->
pnp_ids
)
manager
->
pnp_ids
=
gnome_pnp_ids_new
();
vendor_name
=
gnome_pnp_ids_get_pnp_id
(
manager
->
pnp_ids
,
output
->
vendor
);
vendor
);
if
(
!
vendor_name
)
vendor_name
=
g_strdup
(
output
->
vendor
);
vendor_name
=
g_strdup
(
vendor
);
}
else
{
...
...
@@ -964,6 +993,14 @@ make_display_name (MetaMonitorManager *manager,
*/
return
g_strdup_printf
(
_
(
"%s %s"
),
vendor_name
,
inches
);
}
else
if
(
product_name
!=
NULL
)
{
/* Translators: this is a monitor vendor name followed by
* product/model name where size in inches could not be calculated,
* e.g. Dell U2414H
*/
return
g_strdup_printf
(
_
(
"%s %s"
),
vendor_name
,
product_name
);
}
else
{
return
g_strdup
(
vendor_name
);
...
...
@@ -1318,7 +1355,6 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
GVariantBuilder
monitor_properties_builder
;
GList
*
k
;
gboolean
is_builtin
;
MetaOutput
*
main_output
;
char
*
display_name
;
current_mode
=
meta_monitor_get_current_mode
(
monitor
);
...
...
@@ -1408,8 +1444,7 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
"is-builtin"
,
g_variant_new_boolean
(
is_builtin
));
main_output
=
meta_monitor_get_main_output
(
monitor
);
display_name
=
make_display_name
(
manager
,
main_output
);
display_name
=
make_display_name
(
manager
,
monitor
);
g_variant_builder_add
(
&
monitor_properties_builder
,
"{sv}"
,
"display-name"
,
g_variant_new_take_string
(
display_name
));
...
...
src/backends/meta-monitor.c
View file @
cbb2a286
...
...
@@ -1523,10 +1523,7 @@ calculate_scale (MetaMonitor *monitor,
* Somebody encoded the aspect ratio (16/9 or 16/10) instead of the physical
* size.
*/
if
((
width_mm
==
160
&&
height_mm
==
90
)
||
(
width_mm
==
160
&&
height_mm
==
100
)
||
(
width_mm
==
16
&&
height_mm
==
9
)
||
(
width_mm
==
16
&&
height_mm
==
10
))
if
(
meta_monitor_has_aspect_as_size
(
monitor
))
goto
out
;
if
(
width_mm
>
0
&&
height_mm
>
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment