Add 4K UHD (3840x2160) to default resolution list

+ use correct names for 3200x1800 and 2880x1800 in the code comments.
3200x1800 has 4x the pixels of 1600x900 (HD+), so it is QHD+.  2880x1800
has 4x the pixels of 1440x900 (WXGA+), so it is WQXGA+.

Closes #436

CMakeLists.txt

@@ -16,7 +16,7 @@ project(TurboVNC NONE)
 string(TOLOWER ${CMAKE_PROJECT_NAME} CMAKE_PROJECT_NAME_LC)
 set(VERSION 3.0.4)
 set(DOCVERSION 3.0.4)
-set(COPYRIGHT_YEAR "1999-2024")
+set(COPYRIGHT_YEAR "1999-2025")
 set(COPYRIGHT "The VirtualGL Project and many others (see README.txt)")
 set(URLTEXT "Visit http://www.TurboVNC.org for more information on TurboVNC")
 

README.txt

@@ -24,7 +24,7 @@ Legal
 
 TurboVNC is
 
-    Copyright (C) 2009-2024 D. R. Commander
+    Copyright (C) 2009-2025 D. R. Commander
     Copyright (C) 2011-2019 Brian P. Hinz
     Copyright (C) 2010 University Corporation for Atmospheric Research
     Copyright (C) 2004-2008 Sun Microsystems, Inc.

java/com/turbovnc/vncviewer/OptionsDialog.java

@@ -1,4 +1,5 @@
-/* Copyright (C) 2012-2018, 2020-2022 D. R. Commander.  All Rights Reserved.
+/* Copyright (C) 2012-2018, 2020-2022, 2025 D. R. Commander.
+ *                                          All Rights Reserved.
  * Copyright (C) 2011-2013 Brian P. Hinz
  * Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
  *
@@ -292,7 +293,8 @@ class OptionsDialog extends Dialog implements ActionListener, ChangeListener,
       "2560x1440", "2560x1440+0+0,2560x1440+2560+0",
       "2560x1600", "2560x1600+0+0,2560x1600+2560+0",
       "2880x1800", "2880x1800+0+0,2880x1800+2880+0",
-      "3200x1800", "3200x1800+0+0,3200x1800+3200+0"
+      "3200x1800", "3200x1800+0+0,3200x1800+3200+0",
+      "3840x2160", "3840x2160+0+0,3840x2160+3840+0"
     };
     JLabel desktopSizeLabel = new JLabel("Remote desktop size:");
     desktopSize = new JComboBox(desktopSizeOptions);

unix/Xvnc/programs/Xserver/hw/vnc/randr.c

@@ -1,4 +1,5 @@
-/* Copyright (C) 2013-2019, 2021, 2024 D. R. Commander.  All Rights Reserved.
+/* Copyright (C) 2013-2019, 2021, 2024-2025 D. R. Commander.
+ *                                          All Rights Reserved.
  * Copyright 2012-2015 Pierre Ossman for Cendio AB
  *
  * This is free software; you can redistribute it and/or modify
@@ -54,8 +55,9 @@
 
 static Res vncRRResolutions[] = {
   {   -1,   -1 },  /* Original resolution of the VNC server          */
-  { 3200, 1800 },  /* WQXGA+  16:9                                   */
-  { 2880, 1800 },  /*          8:5 (Mac)                             */
+  { 3840, 2160 },  /* 4K UHD  16:9                                   */
+  { 3200, 1800 },  /* QHD+    16:9                                   */
+  { 2880, 1800 },  /* WQXGA+   8:5                                   */
   { 2560, 1600 },  /* WQXGA    8:5                                   */
   { 2560, 1440 },  /* QHD     16:9                                   */
   { 2048, 1536 },  /* QXGA     4:3 (iPad)                            */

unix/turbovncserver-security.conf

@@ -9,7 +9,7 @@
 # this or to use remote desktop resizing to increase the desktop size to a size
 # larger than this, the desktop size will be clamped to this width/height.
 
-#max-desktop-size = 3200x1800
+#max-desktop-size = 3840x2160
 
 # This specifies the maximum idle timeout (in seconds) for all TurboVNC
 # sessions started on this host.  The idle timeout is the amount of time that