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

gui-agent: switch to automatic composition mode, fix in-vm screenshots #52

Merged
merged 1 commit into from
Oct 23, 2018
+18 −4
Merged

gui-agent: switch to automatic composition mode, fix in-vm screenshots #52

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
22 changes: 18 additions & 4 deletions gui-agent/vmside.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ struct _global_handles {
unsigned int clipboard_data_len;
int log_level;
int sync_all_modifiers;
int composite_redirect_automatic;
};

struct window_data {
Expand Down Expand Up @@ -1943,11 +1944,12 @@ void handle_guid_disconnect()

void usage()
{
fprintf(stderr, "Usage: qubes_gui [-v] [-q] [-h]\n");
fprintf(stderr, "Usage: qubes_gui [options]\n");
fprintf(stderr, " -v increase log verbosity\n");
fprintf(stderr, " -q decrease log verbosity\n");
fprintf(stderr, " -m sync all modifiers before key event (default)\n");
fprintf(stderr, " -M sync only Caps Lock key event\n");
fprintf(stderr, " -c turn off composite \"redirect automatic\" mode\n");
fprintf(stderr, " -h print this message\n");
fprintf(stderr, "\n");
fprintf(stderr, "Log levels:\n");
Expand All @@ -1963,7 +1965,8 @@ void parse_args(Ghandles * g, int argc, char **argv)
// defaults
g->log_level = 0;
g->sync_all_modifiers = 1;
while ((opt = getopt(argc, argv, "qvhmM")) != -1) {
g->composite_redirect_automatic = 1;
while ((opt = getopt(argc, argv, "qvchmM")) != -1) {
switch (opt) {
case 'q':
g->log_level--;
Expand All @@ -1977,6 +1980,9 @@ void parse_args(Ghandles * g, int argc, char **argv)
case 'M':
g->sync_all_modifiers = 0;
break;
case 'c':
g->composite_redirect_automatic = 0;
break;
case 'h':
usage();
exit(0);
Expand Down Expand Up @@ -2013,11 +2019,19 @@ int main(int argc, char **argv)
mkghandles(&g);
ghandles_for_vchan_reinitialize = &g;
parse_args(&g, argc, argv);
/* Turn on Composite for all children of root window. This way X server
* keeps separate buffers for each (root child) window.
* There are two modes:
* - manual - this way only off-screen buffers are maintained
* - automatic - in addition to manual, widows are rendered back to the
* root window
*/
for (i = 0; i < ScreenCount(g.display); i++)
XCompositeRedirectSubwindows(g.display,
RootWindow(g.display, i),
// CompositeRedirectAutomatic);
CompositeRedirectManual);
(g.composite_redirect_automatic ?
CompositeRedirectAutomatic :
CompositeRedirectManual));
for (i = 0; i < ScreenCount(g.display); i++)
XSelectInput(g.display, RootWindow(g.display, i),
SubstructureNotifyMask);
Expand Down