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.

Sign up for GitHub

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

Jump to bottom

media-keys: Add support for display switch OSD #250

Merged
merged 2 commits into from Nov 25, 2018
Merged

media-keys: Add support for display switch OSD #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13954d2
media-keys: Add support for display switch OSD
zhangxianwei8 Nov 23, 2018
1fae094
media-keys: Add test for display switch OSD icons
zhangxianwei8 Nov 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion plugins/media-keys/acme.h
View file
Open in desktop
Expand Up @@ -58,6 +58,7 @@ enum {
LOGOUT_KEY,
RFKILL_KEY,
BLUETOOTH_RFKILL_KEY,
DISPLAY_KEY,
HANDLED_KEYS,
};

Expand Down Expand Up @@ -99,7 +100,8 @@ static struct {
{ ON_SCREEN_KEYBOARD_KEY, "on-screen-keyboard", NULL, NULL },
{ LOGOUT_KEY, "logout", NULL, NULL },
{ RFKILL_KEY, NULL, "XF86WLAN", NULL },
{ BLUETOOTH_RFKILL_KEY, NULL, "XF86Bluetooth", NULL }
{ BLUETOOTH_RFKILL_KEY, NULL, "XF86Bluetooth", NULL },
{ DISPLAY_KEY, NULL, "XF86Display", NULL }
};

#endif /* __ACME_H__ */
24 changes: 24 additions & 0 deletions plugins/media-keys/msd-media-keys-manager.c
View file
Open in desktop
Expand Up @@ -918,6 +918,27 @@ do_rfkill_action (MsdMediaKeysManager *manager,
data->property, new_state ? "true" : "false");
}

static void
do_display_osd_action (MsdMediaKeysManager *manager)
{
GdkDisplay *display;
int n_monitors;

display = gdk_display_get_default ();
n_monitors = gdk_display_get_n_monitors (display);

dialog_init (manager);
if (n_monitors > 1)
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
"video-joined-displays-symbolic",
_("Changing Screen Layout"));
else
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
"video-single-display-symbolic",
_("No External Display"));
dialog_show (manager);
}

static gint
find_by_application (gconstpointer a,
gconstpointer b)
Expand Down Expand Up @@ -1179,6 +1200,9 @@ do_action (MsdMediaKeysManager *manager,
case BLUETOOTH_RFKILL_KEY:
do_rfkill_action (manager, TRUE);
break;
case DISPLAY_KEY:
do_display_osd_action (manager);
break;
default:
g_assert_not_reached ();
}
Expand Down
14 changes: 14 additions & 0 deletions plugins/media-keys/test-media-window.c
View file
Open in desktop
Expand Up @@ -108,6 +108,20 @@ update_state (GtkWidget *window)
"network-wireless-signal-excellent-symbolic",
_("Airplane mode disabled"));

gtk_widget_show (window);
break;
case 11:
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
"video-single-display-symbolic",
_("No External Display"));

gtk_widget_show (window);
break;
case 12:
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
"video-joined-displays-symbolic",
_("Changing Screen Layout"));

gtk_widget_show (window);
break;
default:
Expand Down