2003-05-13 Chris Toshok <toshok@ximian.com>
[ fixes several utf8/pango related problems, including bugs
#41288, #42596, #42604 ]
* configure.in (GAL_CURRENT): bump to 3, per mkestner.
(GAL_REVISION): drop to 0, per mkestner.
* gal/e-text/e-text.c (reset_layout_attrs): we need to convert the
start/end bounds of the object to byte indices for the attribute.
(reset_layout): in the layout == NULL case don't create the layout
then immediately set it again with the same text. also, we need
to convert selection_start to a byte index before calling
pango_layout_get_cursor_pos.
(e_text_draw): remove some #ifdef 0'd code, move the calculation
of our initial clip_rect below the xpos/ypos assignments so we
don't duplicate the expression. Fix the selection drawing in the
multiline case so that it actually works, instead of assuming that
all ETexts only have 1 line *boggle*.
(get_position_from_xy): this needs to return a utf8 offset.
(e_text_copy_clipboard): convert sel_start/sel_end to byte indices
before copying.
(primary_get_cb): same.
(paste_received): validate the input here, and drop the length
parameter from e_text_insert.
(next_word): convert from an utf8 offset on entry to this
function, and return a utf8 offset when we're done. also, remove
the call the g_unichar_validate. we validate at all points where
text is inserted.
(find_offset_into_line): new function used in the backward/forward
line code. find the utf8 offset into a line (the number of utf8
characters from a prior \n or beginning of the string.)
(_get_position): in general there are lots of changes here because
text->selection_start/text->selection_end are utf8 offsets, not
byte offsets. fix E_TEP_START_OF_LINE so that hitting Ctrl-a when
you're at the beginning of a line doesn't take you to the
beginning of the previous line. fix E_TEP_END_OF_LINE in an
analogous fashion. for E_TEP_FORWARD_CHARACTER we just increment
by 1. for E_TEP_BACKWARD_CHARACTER we just decrement by 1. for
E_TEP_BACKWARD_WORD we drop the g_unichar_validate call and
simplify things a bit. reimplement
E_TEP_FORWARD_LINE/E_TEP_BACKWARD_LINE so they find the current
offset into the line, then scan forward/backward for the next/prev
line, and put us at the right offset on that line. fix
E_TEP_SELECT_WORD so double clicking in the space between words
doesn't select both words - if you double click on the trailing
edge of the space, it selects the next word. leading edge selects
the previous one. for E_TEP_SELECT_ALL use g_utf8_strlen.
(e_text_insert): everything that calls this passes a \0 terminated
string, so we assume it's \0 terminated (the old code did as well,
with calls to strlen) and drop the length parameter. also make
sure this is all utf8 happy.
(capitalize): use g_utf8_offset_to_pointer instead of just adding
text->text and start/end, and remove the validate call. also fix
the call to e_text_model_delete and use e_text_model_insert_length
instead of e_text_model_insert.
(e_text_command): for E_TEP_INSERT, validate the input. for
E_TEP_CAPS just use MAX instead of the neat little hack. also,
fix the scrolling so that it scrolls properly in both X and Y
directions (there are still some hiccups but it's much much better
than previously).
(e_text_commit_cb): validate the input here.
* gal/e-text/e-text-model.c (struct _ETextModelPrivate): just use
a GString here and get rid of MAX_LENGTH.
(e_text_model_dispose): free GString.
(e_text_model_real_validate_position): clean this up a bit.
(e_text_model_real_get_text): return the contents of the GString.
(e_text_model_real_get_text_length): use g_utf8_strlen here.
(e_text_model_real_set_text): convert to GString
(e_text_model_real_insert): just call e_text_model_insert_length
here instead of duplicating the function.
(e_text_model_real_insert_length): convert to utf8/gstring.
i.e. convert @position and @length to a bytes and use
g_string_insert_len.
(e_text_model_real_delete): same, with g_string_erase.
(e_text_model_get_text_length): use g_utf8_strlen
(e_text_model_strdup_nth_object): convert the length of the object
to bytes before copying.
(e_text_model_get_nth_object_bounds): calculate start/end properly
for u
svn path=/trunk/; revision=21163
2003-04-03 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-entry.c (e_entry_init): set handle_popup to TRUE on
the EText.
* gal/e-text/e-text.c (e_text_set_property): add setter for
handle_popup.
(e_text_get_property): add getter for handle_popup.
(e_text_event): only do our special popup handling if handle_popup
is true. otherwise, pass the event along.
(e_text_class_init): install the handle_popup property.
(e_text_init): init handle_popup to FALSE, so we get default
behavior in most cases.
* gal/e-text/e-text.h: add "handle_popup" field, so the user of an
EText can decide whether to handle popups themselves.
svn path=/trunk/; revision=20664
2003-04-03 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c (e_text_commit_cb): emit a keypress signal.
yes, i know this might not correspond to a single keypress, but..
svn path=/trunk/; revision=20659
2003-04-02 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c (e_text_copy_clipboard): ifdef
gtk_widget_get_clipboard since we need to build against gtk 2.0.
(e_text_update_primary_selection): same.
(e_text_paste): same.
(e_text_do_popup): same.
svn path=/trunk/; revision=20657
2003-04-02 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c (e_text_dispose): just disconnect based on
DATA, so we only need 1 call.
(e_text_event): same.
svn path=/trunk/; revision=20655
2003-04-02 Chris Toshok <toshok@ximian.com>
[ either fixes#39702 or comes damn, damn close. also, fixes EText
to not suck *nearly* as much. ]
* gal/util/e-marshal.list: add NONE:POINTER,INT,OBJECT.
* gal/e-text/e-entry.h: (struct _EEntryClass): popup ->
populate_popup.
* gal/e-text/e-entry.c (proxy_changed): rename, the old name was
too damn long.
(proxy_activate): same.
(proxy_populate_popup): same, and change from popup to
populate_popup.
(e_entry_init): track change to cb names, and populate_popup.
also, pass the ECanvas's im_context to the EText.
(e_entry_class_init): POPUP -> POPULATE_POPUP.
* gal/e-text/e-text.h (struct _EText): remove the old selection
stuff, and add im_context/reset_im_context fields.
(struct _ETextClass): popup -> populate_popup.
* gal/e-text/e-text.c (e_text_dispose): remove all the
GtkInvisible based selection stuff, and disconnect from/unref the
im_context.
(e_text_set_property): add "im_context" handling.
(e_text_get_property): same.
(e_text_event): connect/disconnect from the IM context's signals
in the FOCUS_CHANGE handler. in the KEY_PRESS/RELEASE handler,
use gtk_im_context_filter_keypress if we have an im_context.
also, use e_text_do_popup now instead of just emitting the "popup"
signal.
(e_text_copy_clipboard): new function.
(e_text_delete_selection): new function.
(e_text_cut_clipboard): new function.
(e_text_paste_clipboard): new function.
(e_text_select_all): new function.
(primary_get_cb): new function, handle requests for the primary
selection when we're the owner.
(primary_clear_cb): new function, unfinished.
(e_text_update_primary_selection): new function.
(paste_received): new function, insert pasted text.
(e_text_paste): new function,
(popup_menu_detach): new function, not needed really.
(popup_targets_received): new function, pop up the popup once we
have the selection information necessary to sensitize the c/c/p
buttons.
(e_text_do_popup): new function, request the selection.
(e_text_reset_im_context): new function.
(e_text_command): for E_TEP_SELECT, call
e_text_update_primary_selection. for E_TEP_DELETE/INSERT,
_delete_selection -> e_text_delete_selection. for E_TEP_COPY,
call e_text_copy_clipboard. for E_TEP_PASTE/E_TEP_GET_SELECTION
call e_text_paste.
(e_text_class_init): change the "popup" signal to
"populate_popup". Also, add the "im_context" property.
(e_text_commit_cb): new function. IM context callback.
(e_text_retrieve_surrounding_cb): new function. IM context
callback.
(e_text_delete_surrounding_cb): new function. IM context
callback. unfinished.
svn path=/trunk/; revision=20653
2003-04-01 Chris Toshok <toshok@ximian.com>
[ fixes bug #39508 ]
* gal/e-text/e-text.c (e_text_command): add back in some suitably
pango-ized code to get EText's scrolling horizontally as you move
the cursor.
svn path=/trunk/; revision=20625
2003-03-07 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c (e_text_draw): fix drawing bugs, and disable
the stupid looking focus rect, since I can't find a theme that
uses them.
(e_text_event): force redraw in the focus-out case if the cursor
is shown (so we can erase it), and also trick ourselves into
drawing it immediately (by setting it to FALSE) in the focus-in
case.
svn path=/trunk/; revision=20223
2003-02-09 Chris Toshok <toshok@ximian.com>
* tests/.cvsignore: ignore test-completion.
* tests/test-completion.c: new program, completion test.
* tests/Makefile.am (noinst_PROGRAMS): add test-completion.
* gal/e-text/Makefile.am: remove e-completion-test from the build
here, moving it to ../../tests.
* gal/e-text/e-completion.c (e_completion_class_init): we've
removed the restart, cancel, clear, and lost signals. Also, we've
renamed some so it's easier to tell from the name which it is
(virtual func or signal.)
(e_completion_dispose): remove call to clear_search_stack, as we
don't do auto-refinement anymore.
(e_completion_clear): gone.
(e_completion_push_search): gone.
(e_completion_pop_search): gone.
(e_completion_clear_search_stack): gone.
(e_completion_refine_search): gone.
(e_completion_unrefine_search): gone.
(e_completion_begin_search): substantially clear this up, since we
don't have the refinement stuff anymore. Also, the call to
request_completion is a virtual function call, not a signal.
(e_completion_match_count): always return matches->len here, never
match_count, which is gone (with the refinement stuff)
(e_completion_foreach_match): remove the hit_count stuff.
(e_completion_restart): gone.
(e_completion_lost_match): gone.
(e_completion_end_search): remove the sorting stuff from here (and
the call to restart.) the etable sorting stuff will have to take
up the slack, but for now there's no reason to restart the search
here.
* gal/e-text/e-completion.h (struct _ECompletionClass): straighten
out what's a virtual function and what's a signal, instead of
using signals for both. Also, remove the auto_refine stuff, as
it's not used.
* gal/e-text/e-completion-view.c (e_completion_view_size_request):
make the damn drop down window bigger (100 pixels, or the
requisition height, whichever is bigger.)
(e_completion_view_disconnect): remove handling for signals that
are gone.
(restart_completion_cb): gone.
(cancel_completion_cb): gone.
(clear_completion_cb): gone.
(lost_completion_cb): gone.
(e_completion_view_construct): track new names of ECompletion
signals.
* gal/e-text/e-completion-view.h (struct _ECompletionView): remove
restart_signal_id, cancel_signal_id, clear_signal_id, and
lost_signal_id.
* gal/e-text/e-entry.c (get_borders): new function, ala gtkentry.
(canvas_size_request): use get_borders instead of computing it
here.
(e_entry_init): remove duplicate assignment of
emulate_label_resize.
(e_entry_show_popup): remove some ifdef'ed crap.
(e_entry_start_completion): don't cancel the completion before
starting again. This keeps the popup from disappearing.
* gal/e-text/e-completion-match.c (e_completion_match_construct):
no more hit_count.
* gal/e-text/e-completion-match.h (struct _ECompletionMatch):
remove hit_count.
* gal/e-text/e-completion-callbacks.[ch]: new class so we can use
callbacks instead of subclassing.
svn path=/trunk/; revision=19859
e_text_destroy; chain up to ::dispose instead of ::destroy.
(e_text_dispose, e_text_class_init): Override ::dispose, not
::destroy.
svn path=/trunk/; revision=19577
2003-01-17 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c (show_pango_rectangle): reverse part of the
patch from 1/15.
svn path=/trunk/; revision=19510
2003-01-15 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c (show_pango_rectangle): apply the patch
NotZed and I came up with to fix the height of the evolution
composer entries.
svn path=/trunk/; revision=19486
2002-12-08 Chris Toshok <toshok@ximian.com>
* tests/test-text.c: lots of stuff, add 2 e-text widgets, 1
readonly, the other writable (that uses the uri model..)
* gal/e-text/e-text.[ch]: lots of pango changes. we don't do
*anything* with gdk/e fonts now. everything is pango. There are
still some issues while editting but display should more or less
work properly now, and without all the performance problems.
* gal/e-text/e-completion-view.c (e_completion_view_expose_event):
use gtk_widget_send_expose instead of gtk_widget_event so we don't
get the annoying gtk warning.
* gal/e-text/e-entry.c (e_entry_dispose): make sure both the gdk
and gtk grabs are removed.
(e_entry_class_init): fill_color_gdk is a boxed type, not pointer.
* gal/e-text/e-text-model-uri.h (E_TYPE_TEXT_MODEL_URI): oops,
this should be e_text_model_uri_get_type, not
e_text_model_get_type.
svn path=/trunk/; revision=19054
2002-11-29 Chris Toshok <toshok@ximian.com>
* gal/e-text/e-text.c: rework this from the gal-2 branch, clahey's
patch, and the stuff i'd done since. it's working *MUCH* better
now.
svn path=/trunk/; revision=18957
2002-09-10 JP Rosevear <jpr@ximian.com>
* gal/e-text/e-text.c (line_splitter): take a clip_height and use
it to set the maximum number of lines if necessary
(split_into_lines): pass clip_height arg
svn path=/trunk/; revision=18032
2002-06-05 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c: Added debugging printfs.
(e_text_request_paste): Fixed the order of setting
last_type_request before calling gtk_selection_convert due to a
reentrancy bug.
svn path=/trunk/; revision=17119
2002-06-03 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_style_set):
Reflow and redraw when the style gets set.
svn path=/trunk/; revision=17086
2002-05-09 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c: Switch from gnome_canvas_item_grab to
e_canvas_item_grab.
* gal/widgets/e-canvas.c, gal/widgets/e-canvas.h
(e_canvas_item_grab, e_canvas_item_ungrab): Added these functions.
From gal/e-table/ChangeLog:
2002-05-09 Christopher James Lahey <clahey@ximian.com>
* e-table-item.c, e-table-item.h: Switched from
gnome_canvas_item_grab to e_canvas_item_grab.
svn path=/trunk/; revision=16738
2002-05-02 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (e_text_draw): Make the style here match the
proper widget style to emulate a label or an entry.
svn path=/trunk/; revision=16670
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* configure.in: Bumped the version number to 0.19.99.5.
* gal/Makefile.am (libgal_la_LIBADD): Added
menus/gal-view-instance-save-as-dialog.lo.
* gal/e-text/e-text.c (next_word): Contains refactored code from
the E_TEP_FORWARD_WORD case of e_text_command.
(e_text_command): Implemented E_TEP_CAPS.
From gal/menus/ChangeLog:
2002-02-07 Christopher James Lahey <clahey@ximian.com>
* Makefile.am (glade_DATA): Added
gal-view-instance-save-as-dialog.glade.
(libgalmenus_la_SOURCES): Added
gal-view-instance-save-as-dialog.c.
(libgalmenusinclude_HEADERS): Added
gal-view-instance-save-as-dialog.h.
* gal-view-collection.c, gal-view-collection.h
(gal_view_collection_append_with_title): Added this new version of
the append function that sets the title and returns the new id as
well.
(gal_view_collection_set_nth_view): Added this function to save
over another view.
(gal_view_collection_get_default_view,
gal_view_collection_set_default_view): Added the concept of a
default view for GalViewCollections.
* gal-view-etable.c, gal-view-etable.h
(gal_view_etable_attach_table, gal_view_etable_attach_tree,
gal_view_etable_detach): Added functions to set the state of a
table or tree and then send GalView "changed" signals whenever
that state changes.
(gal_view_etable_set_state): New function to set the ETableState
of a GalViewETable.
* gal-view-instance-save-as-dialog.c,
gal-view-instance-save-as-dialog.glade,
gal-view-instance-save-as-dialog.h: New dialog to save the current
custom view as a named view.
* gal-view-instance.c, gal-view-instance.h
(gal_view_instance_set_custom_view): New function to set the state
of an instance to custom view and set the custom view to a
particular GalView.
(gal_view_instance_exists): New function to check if this
particular instance has ever been opened before. Use before
gal_view_instance_load.
(gal_view_instance_save_as): New function to open a save as
dialog.
(gal_view_instance_load): Added this function which used to be
part of _construct. This function can be called multiple times,
and those extra times will be ignored. This is so you can set a
default view before loading.
(gal_view_instance_get_default_view,
gal_view_instance_set_default_view): Set the default view for this
instance. If unset, this falls back to the default view for the
corresponding GalViewCollection.
svn path=/trunk/; revision=15590
2002-01-20 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (e_text_text_model_changed): Request a
reflow and an update when the text model changes. Fixes Ximian
bug #16459.
(e_text_set_arg): (ARG_TEXT) Don't set the number of lines to one
here.
svn path=/trunk/; revision=15411
2002-01-14 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (line_splitter): Handle the case of a 0
length string properly here.
svn path=/trunk/; revision=15323
2001-12-27 Jon Trowbridge <trow@ximian.com>
* gal/e-text/e-text.c (split_into_lines): Reworked to fix bugs
related to breaking text on newlines. Some fairly substantial
code duplication was removed in the process.
svn path=/trunk/; revision=15219
2001-12-10 Jon Trowbridge <trow@ximian.com>
* gal/e-text/e-text.c (text_width_with_objects): Don't crash if
the text string is NULL.
(text_draw_with_objects): Don't crash if the text string is NULL.
(Fixes#16359)
svn path=/trunk/; revision=14954
2001-10-30 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (e_text_reflow): Calc height here if we need
it to check the y position of the cursor.
svn path=/trunk/; revision=14443
2001-10-29 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (e_text_stop_editing): Set text->revert =
NULL here.
(e_text_cancel_editing): Only revert if text->revert is non-null.
svn path=/trunk/; revision=14334
2001-10-29 Christopher James Lahey <clahey@ximian.com>
* configure.in: Bumped version number here to 0.15.99.7.
* gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_stop_editing):
Exported this function.
(e_text_cancel_editing): New function. Allows you to revert
edits.
svn path=/trunk/; revision=14332
2001-10-25 <NotZed@Ximian.com>
* configure.in: Bumped version to 0.15.99.4 for e-iconv changes.
* gal/widgets/e-unicode.c (e_utf8_from_iconv_string_sized): "
(e_utf8_to_iconv_string_sized): "
(e_utf8_from_gtk_string_sized): "
(e_utf8_to_gtk_string_sized): "
* gal/widgets/e-font.c (e_font_to_native): s/iconv/e_iconv/
* gal/util/e-iconv.c (e_iconv): Implement a wrapper for iconv() to
make sure we link with and execute the right iconv to match the
right iconv_open. (BLAH!)
svn path=/trunk/; revision=14111
2001-10-23 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (e_text_draw): Use the widget's style's
text_gc for drawing text if either draw_background or draw_button
is on.
svn path=/trunk/; revision=13937
2001-10-23 Christopher James Lahey <clahey@ximian.com>
* configure.in: Bumped version to 0.15.99.3 for EText's
"draw_button" argument.
* gal/e-text/e-entry.c: Forward the "draw_button" argument to the
contained EText.
* gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_draw): Added
new "draw_button" argument. If this is turned on and the first
widget that's a parent of the containing canvas with GTK_NO_WINDOW
turned off above the current one is a button, EText draws a button
underneath itself to match the containing button.
From gal/shortcut-bar/ChangeLog:
2001-10-23 Christopher James Lahey <clahey@ximian.com>
* e-shortcut-bar.c (e_shortcut_bar_add_group): Turn on
"draw_button" argument to EEntry.
svn path=/trunk/; revision=13934
2001-10-22 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c, gal/e-text/e-text.h (e_text_get_selection):
Accept UTF8_STRING, UTF-8, and STRING targets when getting the
selection.
svn path=/trunk/; revision=13864
2001-10-21 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c (e_text_get_invisible): Offer UTF8_STRING,
UTF-8, COMPOUND_TEXT, STRING, and TEXT targets when we offer the
selection.
svn path=/trunk/; revision=13847
2001-10-18 Jon Trowbridge <trow@ximian.com>
* gal/e-text/e-entry.c (e_entry_enable_completion_full): Connect
keys before we show the widget.
svn path=/trunk/; revision=13756
2001-10-10 Christopher James Lahey <clahey@ximian.com>
Based on patches from Dan Nguyen <dnn@austin.ibm.com>.
* gal/Makefile.am (libgal_la_LDFLAGS): Added $(GTK_LIBS).
* gal/e-text/e-text.c (e_text_event): Changed this from a C++
comment to a C comment.
svn path=/trunk/; revision=13549
2001-10-05 Michael Meeks <michael@ximian.com>
* gal/util/e-util.h: add E_OBJECT_CLASS_ADD_SIGNALS and
E_OBJECT_CLASS_TYPE to ease migration to Gnome 2.0 from
a single source base.
* All C files:
s/object_class->type,/E_OBJECT_CLASS_TYPE (object_class),/g;
s/gtk_object_class_add_signals([^\(]*)\(([^,]*),([^,]*),([^\)]*)/
E_OBJECT_CLASS_ADD_SIGNALS\1(\2,\3,\4/;
svn path=/trunk/; revision=13428
2001-09-26 Christopher James Lahey <clahey@ximian.com>
* gal/e-text/e-text.c, gal/e-text/e-text.h (_insert): Made it so
that if allow_newlines is FALSE, pasting into ETexts doesn't
insert carriage returns. Fixes Ximian bug #5761 and Ximian bug
#9067.
svn path=/trunk/; revision=13143
2001-09-17 Larry Ewing <lewing@ximian.com>
* gal/e-text/e-text.c (e_text_supply_selection): remove redundant
NULL checks since g_free handles NULLs.
(e_text_destroy): free the selection. It does appear to be a
guarantee that we get a selection-clear event before we are
destroyed.
svn path=/trunk/; revision=12934
2001-09-09 Jon Trowbridge <trow@ximian.com>
* gal/e-text/e-text.c (e_text_text_model_changed): If our text shrinks,
make sure that the selection doesn't spill off over the end of the
reduced buffer. (Related to bug #8535)
svn path=/trunk/; revision=12717
2001-07-25 Jon Trowbridge <trow@ximian.com>
* gal/e-text/e-text.c (e_text_set_arg): Properly ref the font we
pass in as an ARG_FONT_E.
(_do_tooltip): Removed some crack. We no longer have to manually
ref the font. The ref-counting now happens inside the set_arg
function, as it should.
(e_text_destroy): Set text->font to NULL after unrefing it.
2001-07-25 Jon Trowbridge <trow@ximian.com>
* e-cell-text.c (ect_unrealize): Set text_view->font to NULL
after we unref it.
svn path=/trunk/; revision=11393
