From 2441e8296dd1f16efef18896d21f2da4689fc628 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 10 Jul 2012 11:11:23 +0000 Subject: [PATCH] Hide the full screen setting when support isn't present. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4930 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- vncviewer/OptionsDialog.cxx | 8 ++++++++ vncviewer/parameters.cxx | 2 ++ vncviewer/parameters.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx index 87cc5afd..c82079f5 100644 --- a/vncviewer/OptionsDialog.cxx +++ b/vncviewer/OptionsDialog.cxx @@ -286,7 +286,9 @@ void OptionsDialog::loadOptions(void) desktopHeightInput->value(buf); } remoteResizeCheckbox->value(remoteResize); +#ifdef HAVE_FLTK_FULLSCREEN fullScreenCheckbox->value(fullScreen); +#endif // HAVE_FLTK_FULLSCREEN handleDesktopSize(desktopSizeCheckbox, this); @@ -389,7 +391,9 @@ void OptionsDialog::storeOptions(void) desktopSize.setParam(""); } remoteResize.setParam(remoteResizeCheckbox->value()); +#ifdef HAVE_FLTK_FULLSCREEN fullScreen.setParam(fullScreenCheckbox->value()); +#endif // HAVE_FLTK_FULLSCREEN /* Misc. */ shared.setParam(sharedCheckbox->value()); @@ -748,12 +752,16 @@ void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th) _("Resize remote session to the local window"))); ty += CHECK_HEIGHT + TIGHT_MARGIN; +#ifdef HAVE_FLTK_FULLSCREEN + fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty, CHECK_MIN_WIDTH, CHECK_HEIGHT, _("Full-screen mode"))); ty += CHECK_HEIGHT + TIGHT_MARGIN; +#endif // HAVE_FLTK_FULLSCREEN + group->end(); } diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx index 7df173b8..4407bd95 100644 --- a/vncviewer/parameters.cxx +++ b/vncviewer/parameters.cxx @@ -64,7 +64,9 @@ IntParameter qualityLevel("QualityLevel", "JPEG quality level. 0 = Low, 9 = High", 8); +#ifdef HAVE_FLTK_FULLSCREEN BoolParameter fullScreen("FullScreen", "Full screen mode", false); +#endif // HAVE_FLTK_FULLSCREEN StringParameter desktopSize("DesktopSize", "Reconfigure desktop size on the server on " "connect (if possible)", ""); diff --git a/vncviewer/parameters.h b/vncviewer/parameters.h index ce122e74..a935ea0e 100644 --- a/vncviewer/parameters.h +++ b/vncviewer/parameters.h @@ -37,7 +37,9 @@ extern rfb::IntParameter compressLevel; extern rfb::BoolParameter noJpeg; extern rfb::IntParameter qualityLevel; +#ifdef HAVE_FLTK_FULLSCREEN extern rfb::BoolParameter fullScreen; +#endif // HAVE_FLTK_FULLSCREEN extern rfb::StringParameter desktopSize; extern rfb::BoolParameter remoteResize; -- 2.39.5