fix https://github.com/rustdesk/rustdesk/issues/609#issuecomment-3931613118

Terminal tab keys use the format "peerId_terminalId". The previous code
used split('_')[0] or startsWith('$peerId_') to extract the peerId,
which breaks when the peerId itself contains underscores.

This can happen in two scenarios:
- Hostname-based ID: when OPTION_ALLOW_HOSTNAME_AS_ID is enabled, the
  peerId is derived from the system hostname, which commonly contains
  underscores (e.g. "my_dev_machine").
- Custom ID: the validation regex ^[a-zA-Z][\w-]{5,15}$ allows
  underscores since \w matches [a-zA-Z0-9_], so IDs like "my_dev_01"
  are valid.

Fix all three parsing sites in terminal_tab_page.dart to use
lastIndexOf('_'), which is safe because terminalId is always a plain
integer with no underscores.

flutter/lib/common/hbbs/hbbs.dart

@@ -25,7 +25,6 @@ enum UserStatus { kDisabled, kNormal, kUnverified }
 // Is all the fields of the user needed?
 class UserPayload {
   String name = '';
-  String displayName = '';
   String email = '';
   String note = '';
   String? verifier;
@@ -34,7 +33,6 @@ class UserPayload {
 
   UserPayload.fromJson(Map<String, dynamic> json)
       : name = json['name'] ?? '',
-        displayName = json['display_name'] ?? '',
         email = json['email'] ?? '',
         note = json['note'] ?? '',
         verifier = json['verifier'],
@@ -48,7 +46,6 @@ class UserPayload {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> map = {
       'name': name,
-      'display_name': displayName,
       'status': status == UserStatus.kDisabled
           ? 0
           : status == UserStatus.kUnverified
@@ -61,14 +58,9 @@ class UserPayload {
   Map<String, dynamic> toGroupCacheJson() {
     final Map<String, dynamic> map = {
       'name': name,
-      'display_name': displayName,
     };
     return map;
   }
-
-  String get displayNameOrName {
-    return displayName.trim().isEmpty ? name : displayName;
-  }
 }
 
 class PeerPayload {

flutter/lib/common/widgets/my_group.dart

@@ -158,18 +158,12 @@ class _MyGroupState extends State<MyGroup> {
     return Obx(() {
       final userItems = gFFI.groupModel.users.where((p0) {
         if (searchAccessibleItemNameText.isNotEmpty) {
-          final search = searchAccessibleItemNameText.value.toLowerCase();
-          return p0.name.toLowerCase().contains(search) ||
-              p0.displayNameOrName.toLowerCase().contains(search);
+          return p0.name
+              .toLowerCase()
+              .contains(searchAccessibleItemNameText.value.toLowerCase());
         }
         return true;
       }).toList();
-      // Count occurrences of each displayNameOrName to detect duplicates
-      final displayNameCount = <String, int>{};
-      for (final u in userItems) {
-        final dn = u.displayNameOrName;
-        displayNameCount[dn] = (displayNameCount[dn] ?? 0) + 1;
-      }
       final deviceGroupItems = gFFI.groupModel.deviceGroups.where((p0) {
         if (searchAccessibleItemNameText.isNotEmpty) {
           return p0.name
@@ -183,8 +177,7 @@ class _MyGroupState extends State<MyGroup> {
           itemCount: deviceGroupItems.length + userItems.length,
           itemBuilder: (context, index) => index < deviceGroupItems.length
               ? _buildDeviceGroupItem(deviceGroupItems[index])
-              : _buildUserItem(userItems[index - deviceGroupItems.length],
-                  displayNameCount));
+              : _buildUserItem(userItems[index - deviceGroupItems.length]));
       var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
       return Obx(() => stateGlobal.isPortrait.isFalse
           ? listView(false)
@@ -192,14 +185,8 @@ class _MyGroupState extends State<MyGroup> {
     });
   }
 
-  Widget _buildUserItem(UserPayload user, Map<String, int> displayNameCount) {
+  Widget _buildUserItem(UserPayload user) {
     final username = user.name;
-    final dn = user.displayNameOrName;
-    final isDuplicate = (displayNameCount[dn] ?? 0) > 1;
-    final displayName =
-        isDuplicate && user.displayName.trim().isNotEmpty
-            ? '${user.displayName} (@$username)'
-            : dn;
     return InkWell(onTap: () {
       isSelectedDeviceGroup.value = false;
       if (selectedAccessibleItemName.value != username) {
@@ -235,14 +222,14 @@ class _MyGroupState extends State<MyGroup> {
                     alignment: Alignment.center,
                     child: Center(
                       child: Text(
-                        displayName.characters.first.toUpperCase(),
+                        username.characters.first.toUpperCase(),
                         style: TextStyle(color: Colors.white),
                         textAlign: TextAlign.center,
                       ),
                     ),
                   ),
                 ).marginOnly(right: 4),
-                if (isMe) Flexible(child: Text(displayName)),
+                if (isMe) Flexible(child: Text(username)),
                 if (isMe)
                   Flexible(
                     child: Container(
@@ -259,7 +246,7 @@ class _MyGroupState extends State<MyGroup> {
                       ),
                     ),
                   ),
-                if (!isMe) Expanded(child: Text(displayName)),
+                if (!isMe) Expanded(child: Text(username)),
               ],
             ).paddingSymmetric(vertical: 4),
           ),

flutter/lib/common/widgets/peers_view.dart

@@ -570,14 +570,11 @@ class MyGroupPeerView extends BasePeersView {
   static bool filter(Peer peer) {
     final model = gFFI.groupModel;
     if (model.searchAccessibleItemNameText.isNotEmpty) {
-      final text = model.searchAccessibleItemNameText.value.toLowerCase();
-      final searchPeersOfUser = model.users.any((user) =>
-          user.name == peer.loginName &&
-          (user.name.toLowerCase().contains(text) ||
-              user.displayNameOrName.toLowerCase().contains(text)));
-      final searchPeersOfDeviceGroup =
-          peer.device_group_name.toLowerCase().contains(text) &&
-              model.deviceGroups.any((g) => g.name == peer.device_group_name);
+      final text = model.searchAccessibleItemNameText.value;
+      final searchPeersOfUser = peer.loginName.contains(text) &&
+          model.users.any((user) => user.name == peer.loginName);
+      final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) &&
+          model.deviceGroups.any((g) => g.name == peer.device_group_name);
       if (!searchPeersOfUser && !searchPeersOfDeviceGroup) {
         return false;
       }

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -2016,9 +2016,7 @@ class _AccountState extends State<_Account> {
 
   Widget accountAction() {
     return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty
-            ? 'Login'
-            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
+        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
         () => {
               gFFI.userModel.userName.value.isEmpty
                   ? loginDialog()
@@ -2039,10 +2037,6 @@ class _AccountState extends State<_Account> {
           offstage: gFFI.userModel.userName.value.isEmpty,
           child: Column(
             children: [
-              if (gFFI.userModel.displayName.value.trim().isNotEmpty &&
-                  gFFI.userModel.displayName.value.trim() !=
-                      gFFI.userModel.userName.value.trim())
-                text('Display Name', gFFI.userModel.displayName.value.trim()),
               text('Username', gFFI.userModel.userName.value),
               // text('Group', gFFI.groupModel.groupName.value),
             ],
@@ -2136,9 +2130,7 @@ class _PluginState extends State<_Plugin> {
 
   Widget accountAction() {
     return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty
-            ? 'Login'
-            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
+        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
         () => {
               gFFI.userModel.userName.value.isEmpty
                   ? loginDialog()

flutter/lib/desktop/pages/terminal_tab_page.dart

@@ -194,7 +194,10 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
         final currentTab = tabController.state.value.selectedTabInfo;
         assert(call.arguments is String,
             "Expected String arguments for kWindowEventActiveSession, got ${call.arguments.runtimeType}");
-        if (currentTab.key.startsWith(call.arguments)) {
+        // Use lastIndexOf to handle peerIds containing underscores
+        final lastUnderscore = currentTab.key.lastIndexOf('_');
+        if (lastUnderscore > 0 &&
+            currentTab.key.substring(0, lastUnderscore) == call.arguments) {
           windowOnTop(windowId());
           return true;
         }
@@ -329,7 +332,10 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
   void _addNewTerminal(String peerId, {int? terminalId}) {
     // Find first tab for this peer to get connection parameters
     final firstTab = tabController.state.value.tabs.firstWhere(
-      (tab) => tab.key.startsWith('$peerId\_'),
+      (tab) {
+        final last = tab.key.lastIndexOf('_');
+        return last > 0 && tab.key.substring(0, last) == peerId;
+      },
     );
     if (firstTab.page is TerminalPage) {
       final page = firstTab.page as TerminalPage;
@@ -350,9 +356,10 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
 
   void _addNewTerminalForCurrentPeer({int? terminalId}) {
     final currentTab = tabController.state.value.selectedTabInfo;
-    final parts = currentTab.key.split('_');
-    if (parts.isNotEmpty) {
-      final peerId = parts[0];
+    final tabKey = currentTab.key;
+    final lastUnderscore = tabKey.lastIndexOf('_');
+    if (lastUnderscore > 0) {
+      final peerId = tabKey.substring(0, lastUnderscore);
       _addNewTerminal(peerId, terminalId: terminalId);
     }
   }
@@ -369,9 +376,10 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
           labelGetter: DesktopTab.tablabelGetter,
           tabMenuBuilder: (key) {
             // Extract peerId from tab key (format: "peerId_terminalId")
-            final parts = key.split('_');
-            if (parts.isEmpty) return Container();
-            final peerId = parts[0];
+            // Use lastIndexOf to handle peerIds containing underscores
+            final lastUnderscore = key.lastIndexOf('_');
+            if (lastUnderscore <= 0) return Container();
+            final peerId = key.substring(0, lastUnderscore);
             return _tabMenuBuilder(peerId, () {});
           },
         ));

flutter/lib/mobile/pages/settings_page.dart

@@ -688,7 +688,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
               SettingsTile(
                 title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty
                     ? translate('Login')
-                    : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})')),
+                    : '${translate('Logout')} (${gFFI.userModel.userName.value})')),
                 leading: Icon(Icons.person),
                 onPressed: (context) {
                   if (gFFI.userModel.userName.value.isEmpty) {

flutter/lib/models/user_model.dart

@@ -16,23 +16,9 @@ bool refreshingUser = false;
 
 class UserModel {
   final RxString userName = ''.obs;
-  final RxString displayName = ''.obs;
   final RxBool isAdmin = false.obs;
   final RxString networkError = ''.obs;
   bool get isLogin => userName.isNotEmpty;
-  String get displayNameOrUserName =>
-      displayName.value.trim().isEmpty ? userName.value : displayName.value;
-  String get accountLabelWithHandle {
-    final username = userName.value.trim();
-    if (username.isEmpty) {
-      return '';
-    }
-    final preferred = displayName.value.trim();
-    if (preferred.isEmpty || preferred == username) {
-      return username;
-    }
-    return '$preferred (@$username)';
-  }
   WeakReference<FFI> parent;
 
   UserModel(this.parent) {
@@ -112,8 +98,7 @@ class UserModel {
   _updateLocalUserInfo() {
     final userInfo = getLocalUserInfo();
     if (userInfo != null) {
-      userName.value = (userInfo['name'] ?? '').toString();
-      displayName.value = (userInfo['display_name'] ?? '').toString();
+      userName.value = userInfo['name'];
     }
   }
 
@@ -125,12 +110,10 @@ class UserModel {
       await gFFI.groupModel.reset();
     }
     userName.value = '';
-    displayName.value = '';
   }
 
   _parseAndUpdateUser(UserPayload user) {
     userName.value = user.name;
-    displayName.value = user.displayName;
     isAdmin.value = user.isAdmin;
     bind.mainSetLocalOption(key: 'user_info', value: jsonEncode(user));
     if (isWeb) {

res/msi/preprocess.py

@@ -336,9 +336,7 @@ def gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir):
             f'{indent}<RegistryValue Type="integer" Name="Language" Value="[ProductLanguage]" />\n'
         )
 
-        # EstimatedSize in uninstall registry must be in KB.
-        estimated_size_bytes = get_folder_size(dist_dir)
-        estimated_size = max(1, (estimated_size_bytes + 1023) // 1024)
+        estimated_size = get_folder_size(dist_dir)
         lines_new.append(
             f'{indent}<RegistryValue Type="integer" Name="EstimatedSize" Value="{estimated_size}" />\n'
         )

src/client.rs

@@ -2630,13 +2630,10 @@ impl LoginConfigHandler {
             display_name =
                 serde_json::from_str::<serde_json::Value>(&LocalConfig::get_option("user_info"))
                     .map(|x| {
-                        x.get("display_name")
-                            .and_then(|x| x.as_str())
-                            .map(|x| x.trim())
-                            .filter(|x| !x.is_empty())
-                            .or_else(|| x.get("name").and_then(|x| x.as_str()))
-                            .map(|x| x.to_owned())
+                        x.get("name")
+                            .map(|x| x.as_str().unwrap_or_default())
                             .unwrap_or_default()
+                            .to_owned()
                     })
                     .unwrap_or_default();
         }

src/hbbs_http/account.rs

@@ -80,8 +80,6 @@ pub enum UserStatus {
 pub struct UserPayload {
     pub name: String,
     #[serde(default)]
-    pub display_name: Option<String>,
-    #[serde(default)]
     pub email: Option<String>,
     #[serde(default)]
     pub note: Option<String>,
@@ -270,12 +268,7 @@ impl OidcSession {
                             );
                             LocalConfig::set_option(
                                 "user_info".to_owned(),
-                                serde_json::json!({
-                                    "name": auth_body.user.name,
-                                    "display_name": auth_body.user.display_name,
-                                    "status": auth_body.user.status
-                                })
-                                .to_string(),
+                                serde_json::json!({ "name": auth_body.user.name, "status": auth_body.user.status }).to_string(),
                             );
                         }
                     }

src/lang/ar.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "متابعة مع {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/be.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Працягнуць з {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/bg.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Продължи с {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ca.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Continua amb {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/cn.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "使用 {} 登录"),
-        ("Display Name", "显示名称"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Pokračovat s {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Fortsæt med {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Bildschirm während ausgehender Sitzungen aktiv halten"),
         ("keep-awake-during-incoming-sessions-label", "Bildschirm während eingehender Sitzungen aktiv halten"),
         ("Continue with {}", "Fortfahren mit {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/el.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Συνέχεια με {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", ""),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Continuar con {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/et.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Jätka koos {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/eu.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "{} honekin jarraitu"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "ادامه با {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/fi.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Jatka käyttäen {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Maintenir l’écran allumé lors des sessions sortantes"),
         ("keep-awake-during-incoming-sessions-label", "Maintenir l’écran allumé lors des sessions entrantes"),
         ("Continue with {}", "Continuer avec {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ge.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "{}-ით გაგრძელება"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/he.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "המשך עם {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/hr.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Nastavi sa {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Képernyő aktív állapotban tartása a kimenő munkamenetek során"),
         ("keep-awake-during-incoming-sessions-label", "Képernyő aktív állapotban tartása a bejövő munkamenetek során"),
         ("Continue with {}", "Folytatás a következővel: {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Lanjutkan dengan {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Mantieni lo schermo attivo durante le sessioni in uscita"),
         ("keep-awake-during-incoming-sessions-label", "Mantieni lo schermo attivo durante le sessioni in ingresso"),
         ("Continue with {}", "Continua con {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "{} で続行"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "발신 세션 중 화면 켜짐 유지"),
         ("keep-awake-during-incoming-sessions-label", "수신 세션 중 화면 켜짐 유지"),
         ("Continue with {}", "{}(으)로 계속"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", ""),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/lt.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Tęsti su {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/lv.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Turpināt ar {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/nb.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Fortsett med {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/nl.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Houd het scherm open tijdens de uitgaande sessies."),
         ("keep-awake-during-incoming-sessions-label", "Houd het scherm open tijdens de inkomende sessies."),
         ("Continue with {}", "Ga verder met {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji wychodzących"),
         ("keep-awake-during-incoming-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji przychodzących"),
         ("Continue with {}", "Kontynuuj z {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", ""),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Manter tela ativa durante sessões de saída"),
         ("keep-awake-during-incoming-sessions-label", "Manter tela ativa durante sessões de entrada"),
         ("Continue with {}", "Continuar com {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ro.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Continuă cu {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Не отключать экран во время исходящих сеансов"),
         ("keep-awake-during-incoming-sessions-label", "Не отключать экран во время входящих сеансов"),
         ("Continue with {}", "Продолжить с {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/sc.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Sighi cun {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Pokračovať s {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/sl.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Nadaljuj z {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/sq.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Vazhdo me {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/sr.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Nastavi sa {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/sv.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Fortsätt med {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/ta.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "{} உடன் தொடர்"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", ""),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/th.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "ทำต่อด้วย {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "Giden oturumlar süresince ekranı açık tutun"),
         ("keep-awake-during-incoming-sessions-label", "Gelen oturumlar süresince ekranı açık tutun"),
         ("Continue with {}", "{} ile devam et"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/tw.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", "在連出工作階段期間保持螢幕喚醒"),
         ("keep-awake-during-incoming-sessions-label", "在連入工作階段期間保持螢幕喚醒"),
         ("Continue with {}", "使用 {} 登入"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/uk.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Продовжити з {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/lang/vi.rs

@@ -739,6 +739,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-outgoing-sessions-label", ""),
         ("keep-awake-during-incoming-sessions-label", ""),
         ("Continue with {}", "Tiếp tục với {}"),
-        ("Display Name", ""),
     ].iter().cloned().collect();
 }

src/platform/windows.rs

@@ -107,9 +107,9 @@ pub fn get_focused_display(displays: Vec<DisplayInfo>) -> Option<usize> {
             let center_x = rect.left + (rect.right - rect.left) / 2;
             let center_y = rect.top + (rect.bottom - rect.top) / 2;
             center_x >= display.x
-                && center_x <= display.x + display.width
+                && center_x < display.x + display.width
                 && center_y >= display.y
-                && center_y <= display.y + display.height
+                && center_y < display.y + display.height
         })
     }
 }

src/ui/chatbox.html

@@ -12,7 +12,11 @@
             include "common.tis";
             var p = view.parameters;
             view.refresh = function() {
+                var draft_input = $(input);
+                var draft = draft_input ? (draft_input.value || "") : "";
                 $(body).content(<ChatBox msgs={p.msgs} callback={p.callback} />);
+                var next_input = $(input);
+                if (next_input) next_input.value = draft;
                 view.focus = $(input);
             }
             function self.closing() {

src/ui/index.tis

@@ -358,22 +358,6 @@ function getUserName() {
     return '';
 }
 
-function getAccountLabelWithHandle() {
-    try {
-        var user = JSON.parse(handler.get_local_option("user_info"));
-        var username = (user.name || '').trim();
-        if (!username) {
-            return '';
-        }
-        var displayName = (user.display_name || '').trim();
-        if (!displayName || displayName == username) {
-            return username;
-        }
-        return displayName + " (@" + username + ")";
-    } catch(e) {}
-    return '';
-}
-
 // Shared dialog functions
 function open_custom_server_dialog() {
     var configOptions = handler.get_options();
@@ -509,7 +493,7 @@ class MyIdMenu: Reactor.Component {
     }
 
     function renderPop() {
-        var accountLabel = handler.get_local_option("access_token") ? getAccountLabelWithHandle() : '';
+        var username = handler.get_local_option("access_token") ? getUserName() : '';
         return <popup>
             <menu.context #config-options>
                 {!disable_settings && <li #enable-keyboard><span>{svg_checkmark}</span>{translate('Enable keyboard/mouse')}</li>}
@@ -537,8 +521,8 @@ class MyIdMenu: Reactor.Component {
                 {!disable_settings && <DirectServer />}
                 {!disable_settings && false && handler.using_public_server() && <li #allow-always-relay><span>{svg_checkmark}</span>{translate('Always connect via relay')}</li>}
                 {!disable_change_id && handler.is_ok_change_id() ? <div .separator /> : ""}
-                {!disable_account && (accountLabel ?
-                <li #logout>{translate('Logout')} ({accountLabel})</li> :
+                {!disable_account && (username ?
+                <li #logout>{translate('Logout')} ({username})</li> :
                 <li #login>{translate('Login')}</li>)}
                 {!disable_change_id && !disable_settings && handler.is_ok_change_id() && key_confirmed && connect_status > 0 ? <li #change-id>{translate('Change ID')}</li> : ""}
                 <div .separator />
@@ -1446,9 +1430,6 @@ checkConnectStatus();
 
 function set_local_user_info(user) {
     var user_info = {name: user.name};
-    if (user.display_name) {
-        user_info.display_name = user.display_name;
-    }
     if (user.status) {
         user_info.status = user.status;
     }