mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-24 18:13:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix clickable chat not properly checking input for invalid characters on non-FullCP437 servers. (Thanks WhatIDoHere)

Browse source
This commit is contained in:
UnknownShadow200 2016-01-05 13:33:31 +11:00
parent 8b72de5e79
commit edd321762e
4 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ClassicalSharp/2D/GuiElement.cs
View file

@ -63,6 +63,15 @@ namespace ClassicalSharp {
if( mode == Anchor.BottomOrRight) return axisSize - elemSize - offset; if( mode == Anchor.BottomOrRight) return axisSize - elemSize - offset;
return (axisSize - elemSize) / 2 + offset; return (axisSize - elemSize) / 2 + offset;
} }
protected bool IsValidInputChar( char c ) {
if( c >= ' ' && c <= '~' ) return true; // ascii
bool isCP437 = Utils.ControlCharReplacements.IndexOf( c ) >= 0 ||
Utils.ExtendedCharReplacements.IndexOf( c ) >= 0;
bool supportsCP437 = game.Network.ServerSupportsFullCP437;
return supportsCP437 && isCP437;
}
} }
public enum Anchor { public enum Anchor {

11
ClassicalSharp/2D/Screens/ChatScreen.cs
View file

@ -80,7 +80,7 @@ namespace ClassicalSharp {
Font chatFont, chatInputFont, chatUnderlineFont, announcementFont; Font chatFont, chatInputFont, chatUnderlineFont, announcementFont;
public override void Init() { public override void Init() {
int fontSize = (int)(12 * game.GuiChatScale); int fontSize = (int)(12 * game.GuiChatScale);
Utils.Clamp( ref fontSize, 8, 60 ); Utils.Clamp( ref fontSize, 8, 60 );
chatFont = new Font( "Arial", fontSize ); chatFont = new Font( "Arial", fontSize );
chatInputFont = new Font( "Arial", fontSize, FontStyle.Bold ); chatInputFont = new Font( "Arial", fontSize, FontStyle.Bold );
chatUnderlineFont = new Font( "Arial", fontSize, FontStyle.Underline ); chatUnderlineFont = new Font( "Arial", fontSize, FontStyle.Underline );
@ -151,7 +151,7 @@ namespace ClassicalSharp {
} }
} }
public override void Dispose() { public override void Dispose() {
if( HandlesAllInput ) { if( HandlesAllInput ) {
game.chatInInputBuffer = textInput.chatInputText.ToString(); game.chatInInputBuffer = textInput.chatInputText.ToString();
if( game.CursorVisible ) if( game.CursorVisible )
@ -307,6 +307,13 @@ namespace ClassicalSharp {
" may have viruses, or things you may not want to open/see." " may have viruses, or things you may not want to open/see."
) ); ) );
} else if( game.ClickableChat ) { } else if( game.ClickableChat ) {
for( int i = 0; i < text.Length; i++ ) {
if( !IsValidInputChar( text[i] ) ) {
Console.WriteLine( i + "," + text[i] );
game.Chat.Add( "&eChatline contained characters that can't be sent on this server." );
return true;
}
}
textInput.AppendText( text ); textInput.AppendText( text );
} }
return true; return true;

6
ClassicalSharp/2D/Widgets/Chat/TextInputWidget.Handlers.cs
View file

@ -8,7 +8,7 @@ namespace ClassicalSharp {
public sealed partial class TextInputWidget : Widget { public sealed partial class TextInputWidget : Widget {
public override bool HandlesKeyPress( char key ) { public override bool HandlesKeyPress( char key ) {
if( chatInputText.Length < len && IsValidChar( key ) ) { if( chatInputText.Length < len && IsValidInputChar( key ) && key != '&' ) {
if( caretPos == -1 ) { if( caretPos == -1 ) {
chatInputText.Append( chatInputText.Length, key ); chatInputText.Append( chatInputText.Length, key );
} else { } else {
@ -141,8 +141,8 @@ namespace ClassicalSharp {
if( String.IsNullOrEmpty( text ) ) return true; if( String.IsNullOrEmpty( text ) ) return true;
for( int i = 0; i < text.Length; i++ ) { for( int i = 0; i < text.Length; i++ ) {
if( !IsValidChar( text[i] ) ) { if( !IsValidInputChar( text[i] ) ) {
game.Chat.Add( "&eClipboard contained characters that can't be sent." ); game.Chat.Add( "&eClipboard contained characters that can't be sent on this server." );
return true; return true;
} }
} }

10
ClassicalSharp/2D/Widgets/Chat/TextInputWidget.cs
View file

@ -188,16 +188,6 @@ namespace ClassicalSharp {
altText.Y = altText.texture.Y1; altText.Y = altText.texture.Y1;
} }
bool IsValidChar( char c ) {
if( c == '&' ) return false;
if( c >= ' ' && c <= '~' ) return true; // ascii
bool isCP437 = Utils.ControlCharReplacements.IndexOf( c ) >= 0 ||
Utils.ExtendedCharReplacements.IndexOf( c ) >= 0;
bool supportsCP437 = game.Network.ServerSupportsFullCP437;
return supportsCP437 && isCP437;
}
public void SendTextInBufferAndReset() { public void SendTextInBufferAndReset() {
SendInBuffer(); SendInBuffer();
typingLogPos = game.Chat.InputLog.Count; // Index of newest entry + 1. typingLogPos = game.Chat.InputLog.Count; // Index of newest entry + 1.