paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-26 23:00:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gtk2: rework cursor_pos update for GtkEntry.Now it works correct and completely fixes #7243

Browse Source 
git-svn-id: trunk@24043 -
This commit is contained in:
zeljko 2010-03-16 15:34:28 +00:00
parent f736a0b704
commit 42ecbc3588
4 changed files with 104 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
lcl/interfaces/gtk/gtkcallback.inc
View File

@ -442,7 +442,11 @@ end;
function gtkchanged_editbox( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var
Mess : TLMessage;
{$IFDEF GTK2}
GStart, GEnd: gint;
Info: PWidgetInfo;
EntryText: PgChar;
{$ENDIF}
begin
Result := CallBackDefaultReturn;
@ -454,21 +458,76 @@ begin
if GTK_IS_ENTRY(Widget) then
begin
{cheat GtkEditable to update cursor pos in gtkEntry. issue #7243}
{$ifdef gtk1}
{$IFDEF GTK1}
{under gtk1 we have not text_width & backspace signal
so we cannot reach our goal like in gtk2 case.
IMHO, better to leave as bug than as partial bug
since pressing bkspace or delete always move
cursor pos to last pos (text width) or positioning
inside text by mouse click and then start typing
also makes a mess.
GStart := PGtkOldEditable(Widget)^.selection_start_pos;
GEnd := PGtkOldEditable(Widget)^.selection_end_pos;
{$else}
gtk_editable_get_selection_bounds(PGtkEditable(Widget), @GStart, @GEnd);
{$endif}
if GStart = GEnd then
if (GStart = GEnd) then
gtk_editable_set_position(PGtkEditable(Widget), -1);
}
{$ELSE}
gtk_editable_get_selection_bounds(PGtkEditable(Widget), @GStart, @GEnd);
EntryText := gtk_entry_get_text(PGtkEntry(Widget));
if (GStart = GEnd) and
(UTF8Length(EntryText) >= PGtkEntry(Widget)^.text_length) then
begin
Info := GetWidgetInfo(Widget, False);
{do not update position if backspace or delete pressed}
if wwiInvalidEvent in Info^.Flags then
exclude(Info^.Flags, wwiInvalidEvent)
else
gtk_editable_set_position(PGtkEditable(Widget), GStart + 1);
end;
{$ENDIF}
end;
FillByte(Mess,SizeOf(Mess),0);
Mess.Msg := CM_TEXTCHANGED;
DeliverMessage(Data, Mess);
end;
{$IFDEF GTK2}
function gtkchanged_editbox_backspace(widget: PGtkWidget;
data: gPointer): GBoolean; cdecl;
var
Mess : TLMessage;
GStart, GEnd: gint;
Info: PWidgetInfo;
EntryText: PgChar;
begin
Result := CallBackDefaultReturn;
if GTK_IS_ENTRY(Widget) then
begin
gtk_editable_get_selection_bounds(PGtkEditable(Widget), @GStart, @GEnd);
EntryText := gtk_entry_get_text(PGtkEntry(Widget));
if (GStart = GEnd) and (GStart > 0) and
(UTF8Length(EntryText) = PGtkEntry(Widget)^.text_length) then
begin
{mark as invalid event for gtkchanged_editbox, so
it doesn't update cursor pos or we have a mess.}
Info := GetWidgetInfo(Widget, False);
include(Info^.Flags, wwiInvalidEvent);
PGtkEntry(Widget)^.current_pos := GStart - 1;
end;
end;
end;
function gtkchanged_editbox_delete(widget: PGtkWidget;
AType: TGtkDeleteType; APos: gint; data: gPointer): GBoolean; cdecl;
var
Info: PWidgetInfo;
begin
Result := CallBackDefaultReturn;
Info := GetWidgetInfo(Widget, False);
include(Info^.Flags, wwiInvalidEvent);
end;
{$ENDIF}
function gtkdaychanged(Widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var
MSG: TLMessage;
@ -2163,9 +2222,19 @@ end;
function gtkCutToClip( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var
Mess : TLMessage;
{$IFDEF GTK2}
Info: PWidgetInfo;
{$ENDIF}
begin
EventTrace('Cut to clip', data);
if (Widget=nil) then ;
{$IFDEF GTK2}
if (Widget <> nil) and (GTK_IS_ENTRY(Widget)) then
begin
Info := GetWidgetInfo(Widget, False);
include(Info^.Flags, wwiInvalidEvent);
end;
{$ENDIF}
Mess.msg := LM_CUT;
Result:= DeliverMessage(Data, Mess) = 0;
end;
@ -2183,9 +2252,19 @@ end;
function gtkPasteFromClip( widget: PGtkWidget; data: gPointer) : GBoolean; cdecl;
var
Mess : TLMessage;
{$IFDEF GTK2}
Info: PWidgetInfo;
{$ENDIF}
begin
EventTrace('Paste from clip', data);
if (Widget=nil) then ;
{$IFDEF GTK2}
if (Widget <> nil) and (GTK_IS_ENTRY(Widget)) then
begin
Info := GetWidgetInfo(Widget, False);
include(Info^.Flags, wwiInvalidEvent);
end;
{$ENDIF}
Mess.msg := LM_PASTE;
Result:= DeliverMessage(Data, Mess) = 0;
end;

5
lcl/interfaces/gtk/gtkdef.pp
View File

@ -445,7 +445,10 @@ type
// see gtkwsmenus.pp: gtkWSPopupMenuDeactivate
wwiDeactivating, // during gtk deactivate
wwiActivating, // during gtk activate
wwiNoEraseBkgnd // erase background is disabled for widget
wwiNoEraseBkgnd, // erase background is disabled for widget
wwiInvalidEvent // special mark for widgetinfo
// see gtkchanged_editbox and
// gtkchanged_editbox_backspace in gtkcallback.inc
);
TWidgetInfoFlags = set of TWidgetInfoFlag;
tGtkStateEnumRange = 0..31;

6
lcl/interfaces/gtk/gtkproc.pp
View File

@ -103,6 +103,12 @@ function gtkHideCB( widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
function gtkactivateCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
function gtkchangedCB( widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
function gtkchanged_editbox( widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
{$IFDEF GTK2}
function gtkchanged_editbox_backspace( widget: PGtkWidget;
data: gPointer): GBoolean; cdecl;
function gtkchanged_editbox_delete(widget: PGtkWidget;
AType: TGtkDeleteType; APos: gint; data: gPointer): GBoolean; cdecl;
{$ENDIF}
function gtkdaychanged(Widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
function gtktoggledCB( widget: PGtkWidget; data: gPointer): GBoolean; cdecl;

9
lcl/interfaces/gtk/gtkwidgetset.inc
View File

@ -3379,11 +3379,20 @@ begin
ConnectSenderSignal(gObject, 'value-changed', @gtkchanged_editbox)
{$ENDIF}
else
begin
{$IFDEF VerboseTWinControlRealText}
ConnectSenderSignalAfter(gObject, 'changed', @gtkchanged_editbox);
{$ELSE}
{$IFDEF gtk2}
if GTK_IS_ENTRY(gObject) then
begin
ConnectSenderSignal(gObject,'backspace', @gtkchanged_editbox_backspace);
ConnectSenderSignal(gObject,'delete-from-cursor', @gtkchanged_editbox_delete);
end;
{$ENDIF}
ConnectSenderSignal(gObject, 'changed', @gtkchanged_editbox);
{$ENDIF}
end;
end;
LM_CLICKED: