Browse Source

Add debug log messages

tags/v1.8.90
Peter Åstrand (astrand) 6 years ago
parent
commit
651faf8127
1 changed files with 27 additions and 12 deletions
  1. 27
    12
      unix/common/randr.cxx

+ 27
- 12
unix/common/randr.cxx View File

static int ResizeScreen(int fb_width, int fb_height, static int ResizeScreen(int fb_width, int fb_height,
std::set<unsigned int>* disabledOutputs) std::set<unsigned int>* disabledOutputs)
{ {
vlog.debug("Resizing screen framebuffer to %dx%d", fb_width, fb_height);

/* /*
* Disable outputs which are larger than the target size * Disable outputs which are larger than the target size
*/ */
if (x + width > fb_width || y + height > fb_height) { if (x + width > fb_width || y + height > fb_height) {
/* Currently ignoring errors */ /* Currently ignoring errors */
/* FIXME: Save output rotation and restore when configuring output */ /* FIXME: Save output rotation and restore when configuring output */
char *name = vncRandRGetOutputName(i);
vlog.debug("Temporarily disabling output '%s'", name);
free(name);
vncRandRDisableOutput(i); vncRandRDisableOutput(i);
disabledOutputs->insert(vncRandRGetOutputId(i)); disabledOutputs->insert(vncRandRGetOutputId(i));
} }
iter->dimensions.tl.y, iter->dimensions.tl.y,
iter->dimensions.width(), iter->dimensions.width(),
iter->dimensions.height()); iter->dimensions.height());
if (!ret) {
char *name = vncRandRGetOutputName(i);
vlog.error("Failed to reconfigure output '%s' to %dx%d+%d+%d",
name,
char *name = vncRandRGetOutputName(i);
if (ret) {
vlog.debug("Reconfigured output '%s' to %dx%d+%d+%d", name,
iter->dimensions.width(), iter->dimensions.height(),
iter->dimensions.tl.x, iter->dimensions.tl.y);
} else {
vlog.error("Failed to reconfigure output '%s' to %dx%d+%d+%d", name,
iter->dimensions.width(), iter->dimensions.height(), iter->dimensions.width(), iter->dimensions.height(),
iter->dimensions.tl.x, iter->dimensions.tl.y); iter->dimensions.tl.x, iter->dimensions.tl.y);
free(name); free(name);
return rfb::resultInvalid; return rfb::resultInvalid;
} }
free(name);
} }


/* Allocate new outputs for new screens */ /* Allocate new outputs for new screens */
iter->dimensions.tl.y, iter->dimensions.tl.y,
iter->dimensions.width(), iter->dimensions.width(),
iter->dimensions.height()); iter->dimensions.height());
if (!ret) {
char *name = vncRandRGetOutputName(i);
vlog.error("Failed to reconfigure output '%s' to %dx%d+%d+%d",
name,
char *name = vncRandRGetOutputName(i);
if (ret) {
vlog.debug("Reconfigured new output '%s' to %dx%d+%d+%d", name,
iter->dimensions.width(), iter->dimensions.height(),
iter->dimensions.tl.x, iter->dimensions.tl.y);
} else {
vlog.error("Failed to reconfigure new output '%s' to %dx%d+%d+%d", name,
iter->dimensions.width(), iter->dimensions.height(), iter->dimensions.width(), iter->dimensions.height(),
iter->dimensions.tl.x, iter->dimensions.tl.y); iter->dimensions.tl.x, iter->dimensions.tl.y);
free(name); free(name);
return rfb::resultInvalid; return rfb::resultInvalid;
} }
free(name);
} }


/* Turn off unused outputs */ /* Turn off unused outputs */


/* Disable and move on... */ /* Disable and move on... */
ret = vncRandRDisableOutput(i); ret = vncRandRDisableOutput(i);
if (!ret) {
char *name = vncRandRGetOutputName(i);
vlog.error("Failed to disable unused output '%s'",
name);
char *name = vncRandRGetOutputName(i);
if (ret) {
vlog.debug("Disabled unused output '%s'", name);
} else {
vlog.error("Failed to disable unused output '%s'", name);
free(name); free(name);
return rfb::resultInvalid; return rfb::resultInvalid;
} }
free(name);
} }


/* /*

Loading…
Cancel
Save