diff options
| author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2007-10-05 12:59:49 +0000 |
|---|---|---|
| committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2007-10-05 12:59:49 +0000 |
| commit | 6c72999051b20a306d7e40a55f5df5a48253799f (patch) | |
| tree | 8afe8d755d2017bd662aa0c54bcf261cd53f4314 /src/corelib/x11 | |
| parent | 433fbe8a1810882eda822e4cf4ccdefdbd8de959 (diff) | |
| download | fpGUI-6c72999051b20a306d7e40a55f5df5a48253799f.tar.xz | |
* Implemented a UTF8Insert() and UTF8Delete() procedures
* Fixed up TfpgEdit to now use the UTF-8 versions of Insert() and Delete()
which fixes some of the keyboard input issue.
* Removed stacks of compiler warnings all over the place.
* Fixed up the TfpgMemo to now use the UTF-8 versions of Insert() and Delete()
which fixes some of the keyboard input issues.
Diffstat (limited to 'src/corelib/x11')
| -rw-r--r-- | src/corelib/x11/_netlayer.pas | 6 | ||||
| -rw-r--r-- | src/corelib/x11/gfx_x11.pas | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/corelib/x11/_netlayer.pas b/src/corelib/x11/_netlayer.pas index 724b6e4b..3eb5f326 100644 --- a/src/corelib/x11/_netlayer.pas +++ b/src/corelib/x11/_netlayer.pas @@ -284,7 +284,6 @@ procedure TNETWindowLayer.UpdateSupportedAtoms; var AtomCount: Integer; Atoms: PNetAtom; - Data: Pointer; I: Integer; NetAtom: TNetAtomEnum; begin @@ -306,6 +305,7 @@ end; function TNETWindowLayer.WindowSetName(const AWindow: TWindow; AName: PChar ): Boolean; begin + Result := True; //???? WindowSetPropertyUTF8(AWindow, FNetAtoms[naWM_NAME], Length(AName), AName); end; @@ -623,7 +623,7 @@ end; function TNETWindowLayer.ManagerIsValid: Boolean; begin - + Result := False; // ????? Todo end; procedure TNETWindowLayer.SendRootWindowMessage(AMessage: PXEvent); @@ -791,9 +791,7 @@ function TNETWindowLayer.WindowGetState(const AWindow: TWindow; out var AtomCount: Integer; StateAtoms: PAtom; - Data: Pointer; I: Integer; - State: TNetWindowState; begin Result := FAtomSupported[naWM_STATE]; if Result = False then Exit; diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas index 23df9cbb..a03523b6 100644 --- a/src/corelib/x11/gfx_x11.pas +++ b/src/corelib/x11/gfx_x11.pas @@ -230,6 +230,7 @@ procedure XRenderSetPictureClipRectangles(disp: PXDisplay; pic: TPicture; xorigi // redefines: function XmbLookupString(p1: PXIC; ev: PXKeyPressedEvent; str: PChar; len: longword; ks: PKeySym; stat: PStatus): longint; cdecl; external; +function Xutf8LookupString(p1: PXIC; ev: PXKeyPressedEvent; str: PChar; len: longword; ks: PKeySym; stat: PStatus): longint; cdecl; external; // Double buffer functions function XdbeQueryExtension(ADisplay: PXDisplay; AMajor, AMinor: PInt): PStatus; cdecl; external; @@ -539,13 +540,13 @@ begin DefaultColorMap := XDefaultColorMap(FDisplay, DefaultScreen); // Initialize atoms - xia_clipboard := XInternAtom(FDisplay, 'CLIPBOARD', longbool(0)); - xia_targets := XInternAtom(FDisplay, 'TARGETS', longbool(0)); - xia_motif_wm_hints := XInternAtom(FDisplay, '_MOTIF_WM_HINTS', longbool(0)); - xia_wm_protocols := XInternAtom(FDisplay, 'WM_PROTOCOLS', longbool(0)); - xia_wm_delete_window := XInternAtom(FDisplay, 'WM_DELETE_WINDOW', longbool(0)); - xia_wm_state := XInternAtom(FDisplay, '_NET_WM_STATE', longbool(0)); - xia_wm_state_modal := XInternAtom(FDisplay, '_NET_WM_STATE_MODAL', longbool(0)); + xia_clipboard := XInternAtom(FDisplay, 'CLIPBOARD', longbool(0)); + xia_targets := XInternAtom(FDisplay, 'TARGETS', longbool(0)); + xia_motif_wm_hints := XInternAtom(FDisplay, '_MOTIF_WM_HINTS', longbool(0)); + xia_wm_protocols := XInternAtom(FDisplay, 'WM_PROTOCOLS', longbool(0)); + xia_wm_delete_window := XInternAtom(FDisplay, 'WM_DELETE_WINDOW', longbool(0)); + xia_wm_state := XInternAtom(FDisplay, '_NET_WM_STATE', longbool(0)); + xia_wm_state_modal := XInternAtom(FDisplay, '_NET_WM_STATE_MODAL', longbool(0)); // for correct keyboard handling InputMethod := XOpenIM(FDisplay, nil, nil, nil); |