From: Pierre Ossman Date: Wed, 7 Sep 2022 08:49:43 +0000 (+0200) Subject: Rename MonitorArrangement to Fl_Monitor_Arrangement X-Git-Tag: v1.13.90~108^2~10 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=65c820867dfc7b704a0b46de03fb4386a7173d7e;p=tigervnc.git Rename MonitorArrangement to Fl_Monitor_Arrangement Follow upstream FLTK naming to more clearly indicate that this is a general widget and not TigerVNC specific. --- diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt index 2596b10b..0e1b27b8 100644 --- a/vncviewer/CMakeLists.txt +++ b/vncviewer/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(${GETTEXT_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/common) add_executable(vncviewer - fltk/MonitorArrangement.cxx + fltk/Fl_Monitor_Arrangement.cxx fltk/theme.cxx menukey.cxx BaseTouchHandler.cxx diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx index 9ce00316..9dd00c33 100644 --- a/vncviewer/OptionsDialog.cxx +++ b/vncviewer/OptionsDialog.cxx @@ -42,7 +42,7 @@ #include "fltk/layout.h" #include "fltk/util.h" -#include "fltk/MonitorArrangement.h" +#include "fltk/Fl_Monitor_Arrangement.h" #include #include @@ -984,7 +984,7 @@ void OptionsDialog::createDisplayPage(int tx, int ty, int tw, int th) selectedMonitorsButton->callback(handleFullScreenMode, this); ty += RADIO_HEIGHT + TIGHT_MARGIN; - monitorArrangement = new MonitorArrangement( + monitorArrangement = new Fl_Monitor_Arrangement( tx + INDENT, ty, width - INDENT, 150); ty += 150 + TIGHT_MARGIN; diff --git a/vncviewer/OptionsDialog.h b/vncviewer/OptionsDialog.h index 14cfe619..be08620d 100644 --- a/vncviewer/OptionsDialog.h +++ b/vncviewer/OptionsDialog.h @@ -30,7 +30,7 @@ class Fl_Round_Button; class Fl_Input; class Fl_Int_Input; class Fl_Choice; -class MonitorArrangement; +class Fl_Monitor_Arrangement; typedef void (OptionsCallback)(void*); @@ -135,7 +135,7 @@ protected: Fl_Round_Button *currentMonitorButton; Fl_Round_Button *allMonitorsButton; Fl_Round_Button *selectedMonitorsButton; - MonitorArrangement *monitorArrangement; + Fl_Monitor_Arrangement *monitorArrangement; /* Misc. */ Fl_Check_Button *sharedCheckbox; diff --git a/vncviewer/fltk/Fl_Monitor_Arrangement.cxx b/vncviewer/fltk/Fl_Monitor_Arrangement.cxx new file mode 100644 index 00000000..062a5051 --- /dev/null +++ b/vncviewer/fltk/Fl_Monitor_Arrangement.cxx @@ -0,0 +1,591 @@ +/* Copyright 2021 Hugo Lundin for Cendio AB. + * Copyright 2021 Pierre Ossman for Cendio AB + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#if defined(HAVE_XRANDR) && !defined(__APPLE__) +#include +#include +#include +#include +#endif + +#ifdef __APPLE__ +#include +#include +#include +#include +#endif + +#include "Fl_Monitor_Arrangement.h" + +static std::set instances; +static const Fl_Boxtype FL_CHECKERED_BOX = FL_FREE_BOXTYPE; + +Fl_Monitor_Arrangement::Fl_Monitor_Arrangement( + int x, int y, int w, int h) +: Fl_Group(x, y, w, h), + SELECTION_COLOR(fl_lighter(FL_BLUE)), + AVAILABLE_COLOR(fl_lighter(fl_lighter(fl_lighter(FL_BACKGROUND_COLOR)))) +{ + // Used for required monitors. + Fl::set_boxtype(FL_CHECKERED_BOX, checkered_pattern_draw, 0, 0, 0, 0); + + if (instances.size() == 0) + Fl::add_handler(fltk_event_handler); + instances.insert(this); + + box(FL_DOWN_BOX); + color(fl_lighter(FL_BACKGROUND_COLOR)); + layout(); + end(); +} + +Fl_Monitor_Arrangement::~Fl_Monitor_Arrangement() +{ + instances.erase(this); + + if (instances.size() == 0) + Fl::remove_handler(fltk_event_handler); +} + +std::set Fl_Monitor_Arrangement::get() +{ + std::set indices; + MonitorMap::const_iterator iter; + + for (iter = monitors.begin(); iter != monitors.end(); ++iter) { + if (iter->second->value() == 1) + indices.insert(iter->first); + } + + return indices; +} + +void Fl_Monitor_Arrangement::set(std::set indices) +{ + MonitorMap::const_iterator iter; + + for (iter = monitors.begin(); iter != monitors.end(); ++iter) { + bool selected = std::find(indices.begin(), indices.end(), + iter->first) != indices.end(); + iter->second->value(selected ? 1 : 0); + } +} + +void Fl_Monitor_Arrangement::draw() +{ + MonitorMap::const_iterator iter; + + for (iter = monitors.begin(); iter != monitors.end(); ++iter) { + Fl_Button * monitor = iter->second; + + if (is_required(iter->first)) { + monitor->box(FL_CHECKERED_BOX); + monitor->color(SELECTION_COLOR); + } else { + monitor->box(FL_BORDER_BOX); + monitor->color(AVAILABLE_COLOR); + monitor->selection_color(SELECTION_COLOR); + } + } + + Fl_Group::draw(); +} + +void Fl_Monitor_Arrangement::layout() +{ + int x, y, w, h; + double scale = this->scale(); + const double MARGIN_SCALE_FACTOR = 0.99; + std::pair offset = this->offset(); + + for (int i = 0; i < Fl::screen_count(); i++) { + bool match; + + Fl::screen_xywh(x, y, w, h, i); + + // Only keep a single entry for mirrored screens + match = false; + for (int j = 0; j < i; j++) { + int x2, y2, w2, h2; + + Fl::screen_xywh(x2, y2, w2, h2, j); + + if ((x != x2) || (y != y2) || (w != w2) || (h != h2)) + continue; + + match = true; + break; + } + if (match) + continue; + + Fl_Button *monitor = new Fl_Button( + /* x = */ this->x() + offset.first + x*scale + (1 - MARGIN_SCALE_FACTOR)*x*scale, + /* y = */ this->y() + offset.second + y*scale + (1 - MARGIN_SCALE_FACTOR)*y*scale, + /* w = */ w*scale*MARGIN_SCALE_FACTOR, + /* h = */ h*scale*MARGIN_SCALE_FACTOR + ); + + monitor->clear_visible_focus(); + monitor->callback(monitor_pressed, this); + monitor->type(FL_TOGGLE_BUTTON); + monitor->when(FL_WHEN_CHANGED); + monitor->copy_tooltip(description(i).c_str()); + monitors[i] = monitor; + } +} + +void Fl_Monitor_Arrangement::refresh() +{ + // The selection state is only saved persistently when "OK" is + // pressed. We need to manually restore the current selection + // when the widget is refreshed. + std::set indices = get(); + monitors.clear(); + + // FLTK recursively deletes all children for us. + clear(); + begin(); + layout(); + end(); + + // Restore the current selection state. + set(indices); + redraw(); +} + +bool Fl_Monitor_Arrangement::is_required(int m) +{ + // A selected monitor is never required. + if (monitors[m]->value() == 1) + return false; + + // If no monitors are selected, none are required. + std::set selected = get(); + if (selected.size() <= 0) + return false; + + + // Go through all selected monitors and find the monitor + // indices that bounds the fullscreen frame buffer. If + // the given monitor's coordinates are inside the bounds, + // while not being selected, it is instead required. + + int x, y, w, h; + int top_y, bottom_y, left_x, right_x; + std::set::iterator it = selected.begin(); + + // Base the rest of the calculations on the dimensions + // obtained for the first monitor. + Fl::screen_xywh(x, y, w, h, *it); + top_y = y; + bottom_y = y + h; + left_x = x; + right_x = x + w; + + // Go through the rest of the monitors, + // exhausting the rest of the iterator. + for (; it != selected.end(); it++) { + Fl::screen_xywh(x, y, w, h, *it); + + if (y < top_y) { + top_y = y; + } + + if ((y + h) > bottom_y) { + bottom_y = y + h; + } + + if (x < left_x) { + left_x = x; + } + + if ((x + w) > right_x) { + right_x = x + w; + } + } + + + Fl::screen_xywh(x, y, w, h, m); + + if (x < left_x) + return false; + if ((x + w) > right_x) + return false; + if (y < top_y) + return false; + if ((y + h) > bottom_y) + return false; + + return true; +} + +double Fl_Monitor_Arrangement::scale() +{ + const int MARGIN = 20; + std::pair size = this->size(); + + double s_w = static_cast(this->w()-MARGIN) / static_cast(size.first); + double s_h = static_cast(this->h()-MARGIN) / static_cast(size.second); + + // Choose the one that scales the least, in order to + // maximize our use of the given bounding area. + if (s_w > s_h) + return s_h; + else + return s_w; +} + +std::pair Fl_Monitor_Arrangement::size() +{ + int x, y, w, h; + int top, bottom, left, right; + int x_min, x_max, y_min, y_max; + x_min = x_max = y_min = y_max = 0; + + for (int i = 0; i < Fl::screen_count(); i++) { + Fl::screen_xywh(x, y, w, h, i); + + top = y; + bottom = y + h; + left = x; + right = x + w; + + if (top < y_min) + y_min = top; + + if (bottom > y_max) + y_max = bottom; + + if (left < x_min) + x_min = left; + + if (right > x_max) + x_max = right; + } + + return std::make_pair(x_max - x_min, y_max - y_min); +} + +std::pair Fl_Monitor_Arrangement::offset() +{ + double scale = this->scale(); + std::pair size = this->size(); + std::pair origin = this->origin(); + + int offset_x = (this->w()/2) - (size.first/2 * scale); + int offset_y = (this->h()/2) - (size.second/2 * scale); + + return std::make_pair(offset_x + abs(origin.first)*scale, offset_y + abs(origin.second)*scale); +} + +std::pair Fl_Monitor_Arrangement::origin() +{ + int x, y, w, h, ox, oy; + ox = oy = 0; + + for (int i = 0; i < Fl::screen_count(); i++) { + Fl::screen_xywh(x, y, w, h, i); + + if (x < ox) + ox = x; + + if (y < oy) + oy = y; + } + + return std::make_pair(ox, oy); +} + +std::string Fl_Monitor_Arrangement::description(int m) +{ + std::string name; + int x, y, w, h; + std::stringstream ss; + + assert(m < Fl::screen_count()); + + name = get_monitor_name(m); + Fl::screen_xywh(x, y, w, h, m); + + if (!name.empty()) + ss << name << " (" << w << "x" << h << ")"; + else + ss << w << "x" << h; + + return ss.str(); +} + +#if defined(WIN32) +static BOOL CALLBACK EnumDisplayMonitorsCallback( + HMONITOR monitor, HDC deviceContext, LPRECT rect, LPARAM userData) +{ + std::set* sys_monitors = (std::set*)userData; + sys_monitors->insert(monitor); + return TRUE; +} +#endif + +std::string Fl_Monitor_Arrangement::get_monitor_name(int m) +{ +#if defined(WIN32) + std::set sys_monitors; + std::set::const_iterator iter; + int x, y, w, h; + + Fl::screen_xywh(x, y, w, h, m); + + EnumDisplayMonitors(NULL, NULL, EnumDisplayMonitorsCallback, + (LPARAM)&sys_monitors); + + for (iter = sys_monitors.begin(); iter != sys_monitors.end(); ++iter) { + MONITORINFOEX info; + DISPLAY_DEVICE dev; + std::string name; + + info.cbSize = sizeof(info); + GetMonitorInfo(*iter, (LPMONITORINFO)&info); + + if (info.rcMonitor.left != x) + continue; + if (info.rcMonitor.top != y) + continue; + if ((info.rcMonitor.right - info.rcMonitor.left) != w) + continue; + if ((info.rcMonitor.bottom - info.rcMonitor.top) != h) + continue; + + for (int i = 0; ; i++) { + dev.cb = sizeof(dev); + if (!EnumDisplayDevices(info.szDevice, i, &dev, 0)) + break; + + if (!(dev.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + if (!name.empty()) + name += " / "; + name += dev.DeviceString; + } + + return name; + } + + return ""; +#elif defined(__APPLE__) + CGDisplayCount count; + CGDirectDisplayID displays[16]; + + CGDirectDisplayID displayID; + CFDictionaryRef info; + CFDictionaryRef dict; + CFIndex dict_len; + + std::string name; + + if (CGGetActiveDisplayList(16, displays, &count) != kCGErrorSuccess) + return ""; + + if (count != (unsigned)Fl::screen_count()) + return ""; + + if (m >= (int)count) + return ""; + + // Notice: Here we assume indices to be ordered the same as in FLTK (we rely on that in cocoa.mm as well). + displayID = displays[m]; + + info = IODisplayCreateInfoDictionary(CGDisplayIOServicePort(displayID), + kIODisplayOnlyPreferredName); + if (info == NULL) + return ""; + + dict = (CFDictionaryRef) CFDictionaryGetValue(info, CFSTR(kDisplayProductName)); + if (dict == NULL) { + CFRelease(info); + return ""; + } + + dict_len = CFDictionaryGetCount(dict); + + if (dict_len > 0) { + CFTypeRef * names = new CFTypeRef[dict_len]; + CFDictionaryGetKeysAndValues(dict, NULL, (const void **) names); + + if (names[0]) { + + // Because of `kIODisplayOnlyPreferredName` names *should* only contain the name with + // the current system localization. + CFStringRef localized_name = (CFStringRef) names[0]; + CFIndex localized_name_len = CFStringGetLength(localized_name); + + // Even though we already have the length of `localized_name` above, we know that we will format it + // as UTF-8 when we put it in the destination buffer. Therefore we need to check whether the name + // with that encoding will fit. + CFIndex localized_name_max_size = CFStringGetMaximumSizeForEncoding(localized_name_len, kCFStringEncodingUTF8) + 1; + + if (localized_name_max_size != kCFNotFound) { + char *utf8_name = new char[localized_name_max_size]; + if (CFStringGetCString( + /* ref = */ localized_name, + /* dest = */ utf8_name, + /* dest_len = */ localized_name_max_size, + /* encoding = */ kCFStringEncodingUTF8)) + { + name = utf8_name; + } + delete [] utf8_name; + } + } + + delete[] names; + } + + CFRelease(info); + + return name; + +#else +#if defined (HAVE_XRANDR) + int x, y, w, h; + int ev, err, xi_major; + std::string name; + + fl_open_display(); + assert(fl_display != NULL); + Fl::screen_xywh(x, y, w, h, m); + + if (!XQueryExtension(fl_display, "RANDR", &xi_major, &ev, &err)) + return ""; + + XRRScreenResources *res = XRRGetScreenResources(fl_display, DefaultRootWindow(fl_display)); + if (!res) + return ""; + + for (int i = 0; i < res->ncrtc; i++) { + XRRCrtcInfo *crtc = XRRGetCrtcInfo(fl_display, res, res->crtcs[i]); + + if (!crtc) + continue; + + if ((crtc->x != x) || (crtc->y != y) || + ((int)crtc->width != w) || ((int)crtc->height != h)) + continue; + + for (int j = 0; j < crtc->noutput; j++) { + XRROutputInfo *output; + + output = XRRGetOutputInfo(fl_display, res, crtc->outputs[j]); + if (!output) + continue; + + if (!name.empty()) + name += " / "; + name += output->name; + } + } + + return name; + +#endif // !HAVE_XRANDR + return ""; +#endif +} + +int Fl_Monitor_Arrangement::fltk_event_handler(int event) +{ + std::set::iterator it; + + if (event != FL_SCREEN_CONFIGURATION_CHANGED) + return 0; + + for (it = instances.begin(); it != instances.end(); it++) + (*it)->refresh(); + + return 0; +} + +void Fl_Monitor_Arrangement::monitor_pressed(Fl_Widget *widget, void *user_data) +{ + Fl_Monitor_Arrangement *self = (Fl_Monitor_Arrangement *) user_data; + + // When a monitor is selected, FLTK changes the state of it for us. + // However, selecting a monitor might implicitly change the state of + // others (if they become required). FLTK only redraws the selected + // monitor. Therefore, we must trigger a redraw of the whole widget + // manually. + self->redraw(); +} + +void Fl_Monitor_Arrangement::checkered_pattern_draw( + int x, int y, int width, int height, Fl_Color color) +{ + bool draw_checker = false; + const int CHECKER_SIZE = 8; + + fl_color(fl_lighter(fl_lighter(fl_lighter(color)))); + fl_rectf(x, y, width, height); + + fl_color(Fl::draw_box_active() ? color : fl_inactive(color)); + + // Round up the square count. Later on, we remove square area that are + // outside the given bounding area. + const int count = (width + CHECKER_SIZE - 1) / CHECKER_SIZE; + + for (int i = 0; i < count; i++) { + for (int j = 0; j < count; j++) { + + draw_checker = (i + j) % 2 == 0; + + if (draw_checker) { + fl_rectf( + /* x = */ x + i * CHECKER_SIZE, + /* y = */ y + j * CHECKER_SIZE, + /* w = */ CHECKER_SIZE - std::max(0, ((i + 1) * CHECKER_SIZE) - width), + /* h = */ CHECKER_SIZE - std::max(0, ((j + 1) * CHECKER_SIZE) - height) + ); + } + } + } + + fl_color(Fl::draw_box_active() ? FL_BLACK : fl_inactive(FL_BLACK)); + fl_rect(x, y, width, height); +} diff --git a/vncviewer/fltk/Fl_Monitor_Arrangement.h b/vncviewer/fltk/Fl_Monitor_Arrangement.h new file mode 100644 index 00000000..770503bf --- /dev/null +++ b/vncviewer/fltk/Fl_Monitor_Arrangement.h @@ -0,0 +1,90 @@ +/* Copyright 2021 Hugo Lundin for Cendio AB. + * Copyright 2021 Pierre Ossman for Cendio AB + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef __FL_MONITOR_ARRANGEMENT_H__ +#define __FL_MONITOR_ARRANGEMENT_H__ + +#include +#include +#include + +#include + +class Fl_Button; + +class Fl_Monitor_Arrangement: public Fl_Group { +public: + Fl_Monitor_Arrangement(int x, int y, int w, int h); + ~Fl_Monitor_Arrangement(); + + // Get selected indices. + std::set get(); + + // Set selected indices. + void set(std::set indices); + +protected: + virtual void draw(); + +private: + const Fl_Color SELECTION_COLOR; + const Fl_Color AVAILABLE_COLOR; + typedef std::map MonitorMap; + MonitorMap monitors; + + // Layout the monitor arrangement. + void layout(); + + // Refresh the monitor arrangement. + void refresh(); + + // Return true if the given monitor is required to be part of the configuration + // for it to be valid. A configuration is only valid if the framebuffer created + // from is rectangular. + bool is_required(int m); + + // Calculate the scale of the monitor arrangement. + double scale(); + + // Return the size of the monitor arrangement. + std::pair size(); + + // Return the offset required for centering the monitor + // arrangement in the given bounding area. + std::pair offset(); + + // Return the origin of the monitor arrangement (top left corner). + std::pair origin(); + + // Get a textual description of the given monitor. + std::string description(int m); + std::string get_monitor_name(int m); + + static int fltk_event_handler(int event); + static void monitor_pressed(Fl_Widget *widget, void *user_data); + static void checkered_pattern_draw( + int x, int y, int width, int height, Fl_Color color); +}; + +#endif diff --git a/vncviewer/fltk/MonitorArrangement.cxx b/vncviewer/fltk/MonitorArrangement.cxx deleted file mode 100644 index 7910ab88..00000000 --- a/vncviewer/fltk/MonitorArrangement.cxx +++ /dev/null @@ -1,591 +0,0 @@ -/* Copyright 2021 Hugo Lundin for Cendio AB. - * Copyright 2021 Pierre Ossman for Cendio AB - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#if defined(HAVE_XRANDR) && !defined(__APPLE__) -#include -#include -#include -#include -#endif - -#ifdef __APPLE__ -#include -#include -#include -#include -#endif - -#include "MonitorArrangement.h" - -static std::set instances; -static const Fl_Boxtype FL_CHECKERED_BOX = FL_FREE_BOXTYPE; - -MonitorArrangement::MonitorArrangement( - int x, int y, int w, int h) -: Fl_Group(x, y, w, h), - SELECTION_COLOR(fl_lighter(FL_BLUE)), - AVAILABLE_COLOR(fl_lighter(fl_lighter(fl_lighter(FL_BACKGROUND_COLOR)))) -{ - // Used for required monitors. - Fl::set_boxtype(FL_CHECKERED_BOX, checkered_pattern_draw, 0, 0, 0, 0); - - if (instances.size() == 0) - Fl::add_handler(fltk_event_handler); - instances.insert(this); - - box(FL_DOWN_BOX); - color(fl_lighter(FL_BACKGROUND_COLOR)); - layout(); - end(); -} - -MonitorArrangement::~MonitorArrangement() -{ - instances.erase(this); - - if (instances.size() == 0) - Fl::remove_handler(fltk_event_handler); -} - -std::set MonitorArrangement::get() -{ - std::set indices; - MonitorMap::const_iterator iter; - - for (iter = monitors.begin(); iter != monitors.end(); ++iter) { - if (iter->second->value() == 1) - indices.insert(iter->first); - } - - return indices; -} - -void MonitorArrangement::set(std::set indices) -{ - MonitorMap::const_iterator iter; - - for (iter = monitors.begin(); iter != monitors.end(); ++iter) { - bool selected = std::find(indices.begin(), indices.end(), - iter->first) != indices.end(); - iter->second->value(selected ? 1 : 0); - } -} - -void MonitorArrangement::draw() -{ - MonitorMap::const_iterator iter; - - for (iter = monitors.begin(); iter != monitors.end(); ++iter) { - Fl_Button * monitor = iter->second; - - if (is_required(iter->first)) { - monitor->box(FL_CHECKERED_BOX); - monitor->color(SELECTION_COLOR); - } else { - monitor->box(FL_BORDER_BOX); - monitor->color(AVAILABLE_COLOR); - monitor->selection_color(SELECTION_COLOR); - } - } - - Fl_Group::draw(); -} - -void MonitorArrangement::layout() -{ - int x, y, w, h; - double scale = this->scale(); - const double MARGIN_SCALE_FACTOR = 0.99; - std::pair offset = this->offset(); - - for (int i = 0; i < Fl::screen_count(); i++) { - bool match; - - Fl::screen_xywh(x, y, w, h, i); - - // Only keep a single entry for mirrored screens - match = false; - for (int j = 0; j < i; j++) { - int x2, y2, w2, h2; - - Fl::screen_xywh(x2, y2, w2, h2, j); - - if ((x != x2) || (y != y2) || (w != w2) || (h != h2)) - continue; - - match = true; - break; - } - if (match) - continue; - - Fl_Button *monitor = new Fl_Button( - /* x = */ this->x() + offset.first + x*scale + (1 - MARGIN_SCALE_FACTOR)*x*scale, - /* y = */ this->y() + offset.second + y*scale + (1 - MARGIN_SCALE_FACTOR)*y*scale, - /* w = */ w*scale*MARGIN_SCALE_FACTOR, - /* h = */ h*scale*MARGIN_SCALE_FACTOR - ); - - monitor->clear_visible_focus(); - monitor->callback(monitor_pressed, this); - monitor->type(FL_TOGGLE_BUTTON); - monitor->when(FL_WHEN_CHANGED); - monitor->copy_tooltip(description(i).c_str()); - monitors[i] = monitor; - } -} - -void MonitorArrangement::refresh() -{ - // The selection state is only saved persistently when "OK" is - // pressed. We need to manually restore the current selection - // when the widget is refreshed. - std::set indices = get(); - monitors.clear(); - - // FLTK recursively deletes all children for us. - clear(); - begin(); - layout(); - end(); - - // Restore the current selection state. - set(indices); - redraw(); -} - -bool MonitorArrangement::is_required(int m) -{ - // A selected monitor is never required. - if (monitors[m]->value() == 1) - return false; - - // If no monitors are selected, none are required. - std::set selected = get(); - if (selected.size() <= 0) - return false; - - - // Go through all selected monitors and find the monitor - // indices that bounds the fullscreen frame buffer. If - // the given monitor's coordinates are inside the bounds, - // while not being selected, it is instead required. - - int x, y, w, h; - int top_y, bottom_y, left_x, right_x; - std::set::iterator it = selected.begin(); - - // Base the rest of the calculations on the dimensions - // obtained for the first monitor. - Fl::screen_xywh(x, y, w, h, *it); - top_y = y; - bottom_y = y + h; - left_x = x; - right_x = x + w; - - // Go through the rest of the monitors, - // exhausting the rest of the iterator. - for (; it != selected.end(); it++) { - Fl::screen_xywh(x, y, w, h, *it); - - if (y < top_y) { - top_y = y; - } - - if ((y + h) > bottom_y) { - bottom_y = y + h; - } - - if (x < left_x) { - left_x = x; - } - - if ((x + w) > right_x) { - right_x = x + w; - } - } - - - Fl::screen_xywh(x, y, w, h, m); - - if (x < left_x) - return false; - if ((x + w) > right_x) - return false; - if (y < top_y) - return false; - if ((y + h) > bottom_y) - return false; - - return true; -} - -double MonitorArrangement::scale() -{ - const int MARGIN = 20; - std::pair size = this->size(); - - double s_w = static_cast(this->w()-MARGIN) / static_cast(size.first); - double s_h = static_cast(this->h()-MARGIN) / static_cast(size.second); - - // Choose the one that scales the least, in order to - // maximize our use of the given bounding area. - if (s_w > s_h) - return s_h; - else - return s_w; -} - -std::pair MonitorArrangement::size() -{ - int x, y, w, h; - int top, bottom, left, right; - int x_min, x_max, y_min, y_max; - x_min = x_max = y_min = y_max = 0; - - for (int i = 0; i < Fl::screen_count(); i++) { - Fl::screen_xywh(x, y, w, h, i); - - top = y; - bottom = y + h; - left = x; - right = x + w; - - if (top < y_min) - y_min = top; - - if (bottom > y_max) - y_max = bottom; - - if (left < x_min) - x_min = left; - - if (right > x_max) - x_max = right; - } - - return std::make_pair(x_max - x_min, y_max - y_min); -} - -std::pair MonitorArrangement::offset() -{ - double scale = this->scale(); - std::pair size = this->size(); - std::pair origin = this->origin(); - - int offset_x = (this->w()/2) - (size.first/2 * scale); - int offset_y = (this->h()/2) - (size.second/2 * scale); - - return std::make_pair(offset_x + abs(origin.first)*scale, offset_y + abs(origin.second)*scale); -} - -std::pair MonitorArrangement::origin() -{ - int x, y, w, h, ox, oy; - ox = oy = 0; - - for (int i = 0; i < Fl::screen_count(); i++) { - Fl::screen_xywh(x, y, w, h, i); - - if (x < ox) - ox = x; - - if (y < oy) - oy = y; - } - - return std::make_pair(ox, oy); -} - -std::string MonitorArrangement::description(int m) -{ - std::string name; - int x, y, w, h; - std::stringstream ss; - - assert(m < Fl::screen_count()); - - name = get_monitor_name(m); - Fl::screen_xywh(x, y, w, h, m); - - if (!name.empty()) - ss << name << " (" << w << "x" << h << ")"; - else - ss << w << "x" << h; - - return ss.str(); -} - -#if defined(WIN32) -static BOOL CALLBACK EnumDisplayMonitorsCallback( - HMONITOR monitor, HDC deviceContext, LPRECT rect, LPARAM userData) -{ - std::set* sys_monitors = (std::set*)userData; - sys_monitors->insert(monitor); - return TRUE; -} -#endif - -std::string MonitorArrangement::get_monitor_name(int m) -{ -#if defined(WIN32) - std::set sys_monitors; - std::set::const_iterator iter; - int x, y, w, h; - - Fl::screen_xywh(x, y, w, h, m); - - EnumDisplayMonitors(NULL, NULL, EnumDisplayMonitorsCallback, - (LPARAM)&sys_monitors); - - for (iter = sys_monitors.begin(); iter != sys_monitors.end(); ++iter) { - MONITORINFOEX info; - DISPLAY_DEVICE dev; - std::string name; - - info.cbSize = sizeof(info); - GetMonitorInfo(*iter, (LPMONITORINFO)&info); - - if (info.rcMonitor.left != x) - continue; - if (info.rcMonitor.top != y) - continue; - if ((info.rcMonitor.right - info.rcMonitor.left) != w) - continue; - if ((info.rcMonitor.bottom - info.rcMonitor.top) != h) - continue; - - for (int i = 0; ; i++) { - dev.cb = sizeof(dev); - if (!EnumDisplayDevices(info.szDevice, i, &dev, 0)) - break; - - if (!(dev.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) - continue; - - if (!name.empty()) - name += " / "; - name += dev.DeviceString; - } - - return name; - } - - return ""; -#elif defined(__APPLE__) - CGDisplayCount count; - CGDirectDisplayID displays[16]; - - CGDirectDisplayID displayID; - CFDictionaryRef info; - CFDictionaryRef dict; - CFIndex dict_len; - - std::string name; - - if (CGGetActiveDisplayList(16, displays, &count) != kCGErrorSuccess) - return ""; - - if (count != (unsigned)Fl::screen_count()) - return ""; - - if (m >= (int)count) - return ""; - - // Notice: Here we assume indices to be ordered the same as in FLTK (we rely on that in cocoa.mm as well). - displayID = displays[m]; - - info = IODisplayCreateInfoDictionary(CGDisplayIOServicePort(displayID), - kIODisplayOnlyPreferredName); - if (info == NULL) - return ""; - - dict = (CFDictionaryRef) CFDictionaryGetValue(info, CFSTR(kDisplayProductName)); - if (dict == NULL) { - CFRelease(info); - return ""; - } - - dict_len = CFDictionaryGetCount(dict); - - if (dict_len > 0) { - CFTypeRef * names = new CFTypeRef[dict_len]; - CFDictionaryGetKeysAndValues(dict, NULL, (const void **) names); - - if (names[0]) { - - // Because of `kIODisplayOnlyPreferredName` names *should* only contain the name with - // the current system localization. - CFStringRef localized_name = (CFStringRef) names[0]; - CFIndex localized_name_len = CFStringGetLength(localized_name); - - // Even though we already have the length of `localized_name` above, we know that we will format it - // as UTF-8 when we put it in the destination buffer. Therefore we need to check whether the name - // with that encoding will fit. - CFIndex localized_name_max_size = CFStringGetMaximumSizeForEncoding(localized_name_len, kCFStringEncodingUTF8) + 1; - - if (localized_name_max_size != kCFNotFound) { - char *utf8_name = new char[localized_name_max_size]; - if (CFStringGetCString( - /* ref = */ localized_name, - /* dest = */ utf8_name, - /* dest_len = */ localized_name_max_size, - /* encoding = */ kCFStringEncodingUTF8)) - { - name = utf8_name; - } - delete [] utf8_name; - } - } - - delete[] names; - } - - CFRelease(info); - - return name; - -#else -#if defined (HAVE_XRANDR) - int x, y, w, h; - int ev, err, xi_major; - std::string name; - - fl_open_display(); - assert(fl_display != NULL); - Fl::screen_xywh(x, y, w, h, m); - - if (!XQueryExtension(fl_display, "RANDR", &xi_major, &ev, &err)) - return ""; - - XRRScreenResources *res = XRRGetScreenResources(fl_display, DefaultRootWindow(fl_display)); - if (!res) - return ""; - - for (int i = 0; i < res->ncrtc; i++) { - XRRCrtcInfo *crtc = XRRGetCrtcInfo(fl_display, res, res->crtcs[i]); - - if (!crtc) - continue; - - if ((crtc->x != x) || (crtc->y != y) || - ((int)crtc->width != w) || ((int)crtc->height != h)) - continue; - - for (int j = 0; j < crtc->noutput; j++) { - XRROutputInfo *output; - - output = XRRGetOutputInfo(fl_display, res, crtc->outputs[j]); - if (!output) - continue; - - if (!name.empty()) - name += " / "; - name += output->name; - } - } - - return name; - -#endif // !HAVE_XRANDR - return ""; -#endif -} - -int MonitorArrangement::fltk_event_handler(int event) -{ - std::set::iterator it; - - if (event != FL_SCREEN_CONFIGURATION_CHANGED) - return 0; - - for (it = instances.begin(); it != instances.end(); it++) - (*it)->refresh(); - - return 0; -} - -void MonitorArrangement::monitor_pressed(Fl_Widget *widget, void *user_data) -{ - MonitorArrangement *self = (MonitorArrangement *) user_data; - - // When a monitor is selected, FLTK changes the state of it for us. - // However, selecting a monitor might implicitly change the state of - // others (if they become required). FLTK only redraws the selected - // monitor. Therefore, we must trigger a redraw of the whole widget - // manually. - self->redraw(); -} - -void MonitorArrangement::checkered_pattern_draw( - int x, int y, int width, int height, Fl_Color color) -{ - bool draw_checker = false; - const int CHECKER_SIZE = 8; - - fl_color(fl_lighter(fl_lighter(fl_lighter(color)))); - fl_rectf(x, y, width, height); - - fl_color(Fl::draw_box_active() ? color : fl_inactive(color)); - - // Round up the square count. Later on, we remove square area that are - // outside the given bounding area. - const int count = (width + CHECKER_SIZE - 1) / CHECKER_SIZE; - - for (int i = 0; i < count; i++) { - for (int j = 0; j < count; j++) { - - draw_checker = (i + j) % 2 == 0; - - if (draw_checker) { - fl_rectf( - /* x = */ x + i * CHECKER_SIZE, - /* y = */ y + j * CHECKER_SIZE, - /* w = */ CHECKER_SIZE - std::max(0, ((i + 1) * CHECKER_SIZE) - width), - /* h = */ CHECKER_SIZE - std::max(0, ((j + 1) * CHECKER_SIZE) - height) - ); - } - } - } - - fl_color(Fl::draw_box_active() ? FL_BLACK : fl_inactive(FL_BLACK)); - fl_rect(x, y, width, height); -} diff --git a/vncviewer/fltk/MonitorArrangement.h b/vncviewer/fltk/MonitorArrangement.h deleted file mode 100644 index d6db2677..00000000 --- a/vncviewer/fltk/MonitorArrangement.h +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright 2021 Hugo Lundin for Cendio AB. - * Copyright 2021 Pierre Ossman for Cendio AB - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#ifndef __MONITOR_ARRANGEMENT_H__ -#define __MONITOR_ARRANGEMENT_H__ - -#include -#include -#include - -#include - -class Fl_Button; - -class MonitorArrangement: public Fl_Group { -public: - MonitorArrangement(int x, int y, int w, int h); - ~MonitorArrangement(); - - // Get selected indices. - std::set get(); - - // Set selected indices. - void set(std::set indices); - -protected: - virtual void draw(); - -private: - const Fl_Color SELECTION_COLOR; - const Fl_Color AVAILABLE_COLOR; - typedef std::map MonitorMap; - MonitorMap monitors; - - // Layout the monitor arrangement. - void layout(); - - // Refresh the monitor arrangement. - void refresh(); - - // Return true if the given monitor is required to be part of the configuration - // for it to be valid. A configuration is only valid if the framebuffer created - // from is rectangular. - bool is_required(int m); - - // Calculate the scale of the monitor arrangement. - double scale(); - - // Return the size of the monitor arrangement. - std::pair size(); - - // Return the offset required for centering the monitor - // arrangement in the given bounding area. - std::pair offset(); - - // Return the origin of the monitor arrangement (top left corner). - std::pair origin(); - - // Get a textual description of the given monitor. - std::string description(int m); - std::string get_monitor_name(int m); - - static int fltk_event_handler(int event); - static void monitor_pressed(Fl_Widget *widget, void *user_data); - static void checkered_pattern_draw( - int x, int y, int width, int height, Fl_Color color); -}; - -#endif