Skip to content

Apply patch by muktupavels that restores window list functionality #798

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

Open
Photon89 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apply patch by muktupavels that restores window list functionality #798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 28 additions & 13 deletions bin/shutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,33 @@ sub STARTUP {

if ($x11_supported) {
$wnck_screen = Wnck::Screen::get_default();
$wnck_screen->force_update if $wnck_screen;
}

if ($wnck_screen) {
$wnck_screen->signal_connect('window-manager-changed' => sub {
$st->{_full}->set_menu(fct_ret_workspace_menu(FALSE));
});

$wnck_screen->signal_connect('viewports-changed' => sub {
$st->{_full}->set_menu(fct_ret_workspace_menu(FALSE));
});

$wnck_screen->signal_connect('workspace-created' => sub {
$st->{_full}->set_menu(fct_ret_workspace_menu(FALSE));
});

$wnck_screen->signal_connect('workspace-destroyed' => sub {
$st->{_full}->set_menu(fct_ret_workspace_menu(FALSE));
});

$wnck_screen->signal_connect('active-workspace-changed' => sub {
$st->{_full}->set_menu(fct_ret_workspace_menu(FALSE));
});

$wnck_screen->signal_connect('window-stacking-changed' => sub {
$st->{_window}->set_menu(fct_ret_window_menu());
fct_update_tray_menu(@_);
});
}

#TRAY ICON AND MENU
Expand Down Expand Up @@ -968,10 +994,8 @@ sub STARTUP {
$st->{_window}->set_menu(fct_ret_window_menu());

#and attach signal handlers
$st->{_full}->signal_connect('show-menu' => sub { $st->{_full}->set_menu(fct_ret_workspace_menu(FALSE)) });
$st->{_window}->signal_connect('clicked' => \&evt_take_screenshot, 'window');

$st->{_window}->signal_connect('show-menu' => sub { $st->{_window}->set_menu(fct_ret_window_menu()) });
#$st->{_section}->signal_connect('clicked' => \&evt_take_screenshot, 'section');
$st->{_menu}->signal_connect('clicked' => \&evt_take_screenshot, 'menu');
$st->{_tooltip}->signal_connect('clicked' => \&evt_take_screenshot, 'tooltip');
Expand Down Expand Up @@ -2904,14 +2928,6 @@ sub STARTUP {
if ($cmdname && $folder_to_save) {
evt_take_screenshot('global_keybinding', $cmdname, $folder_to_save, $extra);
}

#keep list of windows up-to-date (tray)
Glib::Idle->add(
sub {
$wnck_screen->signal_connect('window-stacking-changed' => sub { fct_update_tray_menu(@_); });
return FALSE;
}) if $wnck_screen;

}

#events
Expand Down Expand Up @@ -8442,7 +8458,6 @@ sub STARTUP {
$current_monitor_active = Gtk3::CheckMenuItem->new_with_label($d->get("Limit to current monitor"));
return $menu_wrksp;
}
$wnck_screen->force_update();

#we determine the wm name but on older
#version of libwnck (or the bindings)
Expand Down Expand Up @@ -8607,7 +8622,7 @@ sub STARTUP {
# Check if we can retrieve the list of stacked windows first, otherwise we will run into a crash, see issue 659

unless ($wnck_screen->get_windows_stacked) {
print "ERROR: The window list could not be retrieved and has been disabled, see https://github.com/shutter-project/shutter/issues/659";
$menu_windows->show_all;
return $menu_windows;
}

Expand Down