Attachment 145994 Details for Bug 192783 – panel.h patch

[patch] panel.h patch

patch-panel.h (text/plain), 1.88 KB, created by DaLynX on 2014-08-18 18:47:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: DaLynX

Created: 2014-08-18 18:47:40 UTC

Size: 1.88 KB

patch

obsolete

>--- panel.h.orig	2014-08-12 18:08:28.000000000 +0200
>+++ panel.h	2014-08-12 18:09:20.000000000 +0200
>@@ -20,6 +20,7 @@
> #include <X11/Xmu/WinUtil.h>
> #include <sys/wait.h>
> #include <stdlib.h>
>+#include <stdint.h>
> #include <signal.h>
> #include <iostream>
> #include <string>
>@@ -86,20 +87,26 @@
> 	void ResetName(void);
> 	void ResetPasswd(void);
> 	void SetName(const std::string &name);
>-	const std::string& GetName(void) const;
>-	const std::string& GetPasswd(void) const;
>+	const std::string GetName(void) const;
>+	const std::string GetPasswd(void) const;
> 	void SwitchSession();
> private:
> 	Panel();
> 	void Cursor(int visible);
> 	unsigned long GetColor(const char *colorname);
> 	void OnExpose(void);
>-	void EraseLastChar(string &formerString);
>+	int FieldEraseLastChar(const uint16_t **buf, int *len);
>+	int FieldClear(const uint16_t **buf, int *len);
> 	bool OnKeyPress(XEvent& event);
> 	void ShowText();
> 	void ShowSession();
> 
>-	void SlimDrawString8(XftDraw *d, XftColor *color, XftFont *font,
>+	static bool isUtf16CharAllowed(uint16_t c);
>+	void SlimDrawString16(XftDraw *d, XftColor *color, XftFont *font,
>+						  int x, int y, const uint16_t *str, int strLen,
>+						  XftColor* shadowColor, int xOffset, int yOffset);
>+
>+	void SlimDrawStringUtf8(XftDraw *d, XftColor *color, XftFont *font,
> 							int x, int y, const std::string &str,
> 							XftColor *shadowColor,
> 							int xOffset, int yOffset);
>@@ -136,12 +143,16 @@
> 	XftColor entershadowcolor;
> 	ActionType action;
> 	FieldType field;
>+	XIM displayIm;
>+	XIC displayIc;
> 	//Pixmap   background;
> 	
> 	/* Username/Password */
>-	std::string NameBuffer;
>-	std::string PasswdBuffer;
>-	std::string HiddenPasswdBuffer;
>+	uint16_t nameBuffer[INPUT_MAXLENGTH_NAME + 1];
>+	int nameBufferLen;
>+	uint16_t passwdBuffer[INPUT_MAXLENGTH_PASSWD + 1];
>+	int passwdBufferLen;
>+	uint16_t hiddenPasswdBuffer[INPUT_MAXLENGTH_PASSWD + 1];
> 
> 	/* screen stuff */
> 	Rectangle viewport;

Actions: View | Diff

Attachments on bug 192783: 145959 | 145990 | 145992 | 145993 | 145994 | 145995 | 145996 | 145997 | 145998 | 146000 | 146003 | 146476