callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made the tooltip show up in the correct place and configuration when using

Browse Source 
2000-04-24  Christopher James Lahey  <clahey@helixcode.com>

	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
	place and configuration when using the "max_lines", "anchor"
	(untested), or "justification" arguments.

From a patch by Iain Holmes <ih@csd.abdn.ac.uk>

	* widgets/e-text/e-text-event-processor-emacs-like.c,
	widget/e-text/e-text-event-processor-types.h,
	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
	C-y to control the X clipboard.  Added double and triple click
	events.

From widgets/e-table/:

2000-04-24  Christopher James Lahey  <clahey@helixcode.com>

	* e-table.c: Fixed some warnings.

svn path=/trunk/; revision=2581
This commit is contained in:
Christopher James Lahey
2000-04-24 13:36:11 +00:00
committed by Chris Lahey
parent 60f56fbbff
commit ef9238e9cc
14 changed files with 441 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2000-04-24 Christopher James Lahey <clahey@helixcode.com>
* widgets/e-text/e-text.c: Made the tooltip show up in the correct
place and configuration when using the "max_lines", "anchor"
(untested), or "justification" arguments.
From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
* widgets/e-text/e-text-event-processor-emacs-like.c,
widget/e-text/e-text-event-processor-types.h,
widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
C-y to control the X clipboard. Added double and triple click
events.
2000-04-24 Fatih Demir <kabalak@gmx.net>
* configure.in : Added tr to ALL_LINGUAS .

21
e-util/e-text-event-processor-emacs-like.c
View File

@ -56,9 +56,9 @@ static const ETextEventProcessorCommand control_keys[26] =
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }, /* t */
{ E_TEP_START_OF_LINE, E_TEP_DELETE, 0, "" }, /* u */
{ E_TEP_SELECTION, E_TEP_PASTE, 0, "" }, /* v */
{ E_TEP_BACKWARD_WORD, E_TEP_DELETE, 0, "" }, /* w */
{ E_TEP_SELECTION, E_TEP_DELETE, 0, "" }, /* w */
{ E_TEP_SELECTION, E_TEP_DELETE, 0, "" }, /* x */
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }, /* y */
{ E_TEP_SELECTION, E_TEP_PASTE, 0, "" }, /* y */
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" } /* z */
};
@ -159,6 +159,20 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
tep_el->mouse_down = TRUE;
}
break;
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
command.action = E_TEP_SELECT;
command.position = E_TEP_SELECT_WORD;
command.time = event->button.time;
}
break;
case GDK_3BUTTON_PRESS:
if (event->button.button == 1) {
command.action = E_TEP_SELECT;
command.position = E_TEP_SELECT_ALL;
command.time = event->button.time;
}
break;
case GDK_BUTTON_RELEASE:
if (event->button.button == 1) {
command.action = E_TEP_UNGRAB;
@ -166,6 +180,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
command.time = event->button.time;
tep_el->mouse_down = FALSE;
command.action = E_TEP_NOP;
} else if (event->button.button == 2) {
command.action = E_TEP_MOVE;
command.position = E_TEP_VALUE;
@ -299,7 +314,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
command.string = control_keys[(int) (key.keyval - 'a')].string;
}
if (key.keyval == 'x') {
if (key.keyval == 'x' || key.keyval == 'w') {
command.action = E_TEP_COPY;
command.position = E_TEP_SELECTION;
gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);

6
e-util/e-text-event-processor-types.h
View File

@ -68,7 +68,11 @@ enum _ETextEventProcessorCommandPosition {
E_TEP_BACKWARD_PARAGRAPH,
E_TEP_FORWARD_PAGE,
E_TEP_BACKWARD_PAGE
E_TEP_BACKWARD_PAGE,
E_TEP_SELECT_WORD,
E_TEP_SELECT_ALL
};
enum _ETextEventProcessorCommandAction {

4
widgets/e-table/ChangeLog
View File

@ -1,3 +1,7 @@
2000-04-24 Christopher James Lahey <clahey@helixcode.com>
* e-table.c: Fixed some warnings.
2000-04-23 Iain Holmes <ih@csd.abdn.ac.uk>
* e-table-item.c (eti_bounds): Calculate the width of the table from the

3
widgets/e-table/e-table.c
View File

@ -770,7 +770,6 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
xmlNode *xmlGrouping;
GtkWidget *scrolledwindow;
GtkWidget *vbox;
e_table->full_header = full_header;
gtk_object_ref (GTK_OBJECT (full_header));
@ -803,7 +802,7 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (scrolledwindow), e_table->table_canvas);
gtk_container_add (GTK_CONTAINER (scrolledwindow), GTK_WIDGET(e_table->table_canvas));
gtk_widget_show (scrolledwindow);
/*

21
widgets/e-text/e-text-event-processor-emacs-like.c
View File

@ -56,9 +56,9 @@ static const ETextEventProcessorCommand control_keys[26] =
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }, /* t */
{ E_TEP_START_OF_LINE, E_TEP_DELETE, 0, "" }, /* u */
{ E_TEP_SELECTION, E_TEP_PASTE, 0, "" }, /* v */
{ E_TEP_BACKWARD_WORD, E_TEP_DELETE, 0, "" }, /* w */
{ E_TEP_SELECTION, E_TEP_DELETE, 0, "" }, /* w */
{ E_TEP_SELECTION, E_TEP_DELETE, 0, "" }, /* x */
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }, /* y */
{ E_TEP_SELECTION, E_TEP_PASTE, 0, "" }, /* y */
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" } /* z */
};
@ -159,6 +159,20 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
tep_el->mouse_down = TRUE;
}
break;
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
command.action = E_TEP_SELECT;
command.position = E_TEP_SELECT_WORD;
command.time = event->button.time;
}
break;
case GDK_3BUTTON_PRESS:
if (event->button.button == 1) {
command.action = E_TEP_SELECT;
command.position = E_TEP_SELECT_ALL;
command.time = event->button.time;
}
break;
case GDK_BUTTON_RELEASE:
if (event->button.button == 1) {
command.action = E_TEP_UNGRAB;
@ -166,6 +180,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
command.time = event->button.time;
tep_el->mouse_down = FALSE;
command.action = E_TEP_NOP;
} else if (event->button.button == 2) {
command.action = E_TEP_MOVE;
command.position = E_TEP_VALUE;
@ -299,7 +314,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
command.string = control_keys[(int) (key.keyval - 'a')].string;
}
if (key.keyval == 'x') {
if (key.keyval == 'x' || key.keyval == 'w') {
command.action = E_TEP_COPY;
command.position = E_TEP_SELECTION;
gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);

6
widgets/e-text/e-text-event-processor-types.h
View File

@ -68,7 +68,11 @@ enum _ETextEventProcessorCommandPosition {
E_TEP_BACKWARD_PARAGRAPH,
E_TEP_FORWARD_PAGE,
E_TEP_BACKWARD_PAGE
E_TEP_BACKWARD_PAGE,
E_TEP_SELECT_WORD,
E_TEP_SELECT_ALL
};
enum _ETextEventProcessorCommandAction {

197
widgets/e-text/e-text.c
View File

@ -352,6 +352,9 @@ e_text_init (EText *text)
text->tooltip_timeout = 0;
text->tooltip_count = 0;
text->dbl_timeout = 0;
text->tpl_timeout = 0;
e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
}
@ -2176,6 +2179,14 @@ _do_tooltip (gpointer data)
ArtPoint pixel_origin;
int canvas_x, canvas_y;
GnomeCanvasItem *tooltip_text;
double tooltip_width;
double tooltip_height;
double tooltip_x;
double tooltip_y;
#if 0
double x1, x2, y1, y2;
#endif
GnomeCanvasItem *rect;
text->tooltip_count = 0;
@ -2212,10 +2223,7 @@ _do_tooltip (gpointer data)
canvas = e_canvas_new ();
gtk_container_add (GTK_CONTAINER (text->tooltip_window), canvas);
/* Ensure valid height field */
calc_height (text);
/* Get the longest line length */
max_width = 0.0;
for (lines = text->lines, i = 0; i < text->num_lines; lines++, i++) {
@ -2225,14 +2233,14 @@ _do_tooltip (gpointer data)
max_width = MAX (max_width, line_width);
}
gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
gnome_canvas_rect_get_type (),
"x1", (double) 0,
"y1", (double) 0,
"x2", (double) max_width + 4,
"y2", (double) text->height + 4,
"fill_color", "yellow",
NULL);
rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
gnome_canvas_rect_get_type (),
"x1", (double) 0,
"y1", (double) 0,
"x2", (double) max_width + 4,
"y2", (double) text->height + 4,
"fill_color", "yellow",
NULL);
tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
e_text_get_type (),
@ -2240,31 +2248,118 @@ _do_tooltip (gpointer data)
"font_gdk", text->font,
"text", text->text,
"editable", FALSE,
"clip_width", max_width,
"clip_height", (double)text->height,
"clip_width", text->max_lines != 1 ? text->clip_width : max_width,
"clip_height", text->max_lines != 1 ? -1 : (double)text->height,
"clip", TRUE,
"line_wrap", text->line_wrap,
"max_lines", text->max_lines,
"justification", text->justification,
NULL);
e_canvas_item_move_absolute(tooltip_text, 1, 1);
calc_height(E_TEXT(tooltip_text));
calc_line_widths(E_TEXT(tooltip_text));
gnome_canvas_item_set (tooltip_text,
"clip_height", (double) E_TEXT(tooltip_text)->height,
"clip_width", (double) E_TEXT(tooltip_text)->max_width,
NULL);
tooltip_width = E_TEXT(tooltip_text)->max_width;
tooltip_height = E_TEXT(tooltip_text)->height;
tooltip_x = 0;
tooltip_y = 0;
switch(E_TEXT(tooltip_text)->justification) {
case GTK_JUSTIFY_CENTER:
tooltip_x = - tooltip_width / 2;
break;
case GTK_JUSTIFY_RIGHT:
tooltip_x = tooltip_width / 2;
break;
case GTK_JUSTIFY_FILL:
case GTK_JUSTIFY_LEFT:
tooltip_x = 0;
break;
}
switch(E_TEXT(tooltip_text)->anchor) {
case GTK_ANCHOR_NW:
case GTK_ANCHOR_N:
case GTK_ANCHOR_NE:
break;
case GTK_ANCHOR_W:
case GTK_ANCHOR_CENTER:
case GTK_ANCHOR_E:
tooltip_y -= tooltip_height / 2.0;
break;
case GTK_ANCHOR_SW:
case GTK_ANCHOR_S:
case GTK_ANCHOR_SE:
tooltip_y -= tooltip_height;
break;
}
switch(E_TEXT(tooltip_text)->anchor) {
case GTK_ANCHOR_NW:
case GTK_ANCHOR_W:
case GTK_ANCHOR_SW:
break;
case GTK_ANCHOR_N:
case GTK_ANCHOR_CENTER:
case GTK_ANCHOR_S:
tooltip_x -= tooltip_width / 2.0;
break;
case GTK_ANCHOR_NE:
case GTK_ANCHOR_E:
case GTK_ANCHOR_SE:
tooltip_x -= tooltip_width;
break;
}
#if 0
get_bounds(text, &x1, &y1, &x2, &y2);
if ( x1 < tooltip_x ) {
gnome_canvas_item_move(tooltip_text, tooltip_x - x1, 0);
tooltip_x = x1;
}
if ( y1 < tooltip_y ) {
gnome_canvas_item_move(tooltip_text, 0, tooltip_y - y1);
tooltip_y = y1;
}
if ( x2 > tooltip_x + tooltip_width )
tooltip_width = x2 - tooltip_x;
if ( y2 > tooltip_y + tooltip_height )
tooltip_height = y2 - tooltip_y;
#endif
gnome_canvas_item_set(rect,
"x2", (double) tooltip_width + 4,
"y2", (double) tooltip_height + 4,
NULL);
gtk_widget_set_usize (text->tooltip_window,
(int)max_width + 4,
text->height + 4);
tooltip_width + 4,
tooltip_height + 4);
gnome_canvas_set_scroll_region (GNOME_CANVAS(canvas), 0.0, 0.0,
max_width, (double)text->height);
tooltip_width, (double)tooltip_height);
gtk_widget_show (canvas);
gtk_widget_realize (text->tooltip_window);
gtk_signal_connect (GTK_OBJECT(text->tooltip_window), "event",
GTK_SIGNAL_FUNC(tooltip_event), text);
gtk_widget_popup (text->tooltip_window, pixel_origin.x - 2, pixel_origin.y - 2);
gtk_widget_popup (text->tooltip_window, pixel_origin.x - 2 + tooltip_x, pixel_origin.y - 2 + tooltip_y);
text->tooltip_timeout = 0;
return FALSE;
}
static gboolean
_click (gpointer data)
{
*(gint *)data = 0;
return FALSE;
}
static gint
e_text_event (GnomeCanvasItem *item, GdkEvent *event)
{
@ -2370,10 +2465,29 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
#else
if ((!text->editing)
&& text->editable
&& event->button.button == 1) {
&& (event->button.button == 1 ||
event->button.button == 2)) {
e_canvas_item_grab_focus (item);
}
#endif
/* Create our own double and triple click events,
as gnome-canvas doesn't forward them to us */
if (event->type == GDK_BUTTON_PRESS) {
if (text->dbl_timeout == 0 &&
text->tpl_timeout == 0) {
text->dbl_timeout = gtk_timeout_add (200,
_click,
&(text->dbl_timeout));
} else {
if (text->tpl_timeout == 0) {
e_tep_event.type = GDK_2BUTTON_PRESS;
text->tpl_timeout = gtk_timeout_add (200, _click, &(text->tpl_timeout));
} else {
e_tep_event.type = GDK_3BUTTON_PRESS;
}
}
}
if (text->editing) {
GdkEventButton button = event->button;
e_tep_event.button.time = button.time;
@ -2409,11 +2523,21 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
}
break;
case GDK_ENTER_NOTIFY:
if ( text->tooltip_count == 0 && text->clip) {
if (!text->tooltip_timeout)
text->tooltip_timeout = gtk_timeout_add (1000, _do_tooltip, text);
{
GdkEventCrossing *crossing = (GdkEventCrossing *) event;
double x1, y1, x2, y2;
get_bounds (text, &x1, &y1, &x2, &y2);
if (crossing->x >= x1 &&
crossing->y >= y1 &&
crossing->x <= x2 &&
crossing->y <= y2) {
if ( text->tooltip_count == 0 && text->clip) {
if (!text->tooltip_timeout)
text->tooltip_timeout = gtk_timeout_add (1000, _do_tooltip, text);
}
text->tooltip_count ++;
}
}
text->tooltip_count ++;
text->pointer_in = TRUE;
if (text->editing) {
@ -2529,6 +2653,31 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
y -= text->font->ascent + text->font->descent;
return _get_position_from_xy(text, x, y);
case E_TEP_SELECT_WORD:
for (i = text->selection_end - 2; i > 0; i--)
if (isspace (text->text[i])) {
i++;
break;
}
if (i < 0)
text->selection_start = 0;
else
text->selection_start = i;
length = strlen (text->text);
for (i = text->selection_end + 1; i < length; i++)
if (isspace (text->text[i])) {
break;
}
if (i > length)
i = length;
return i;
case E_TEP_SELECT_ALL:
text->selection_start = 0;
length = strlen (text->text);
return length;
case E_TEP_FORWARD_PARAGRAPH:
case E_TEP_BACKWARD_PARAGRAPH:

3
widgets/e-text/e-text.h
View File

@ -193,6 +193,9 @@ struct _EText {
guint needs_calc_height : 1; /* Need calc_height */
guint needs_calc_line_widths : 1; /* Needs calc_line_widths */
guint needs_split_into_lines : 1; /* Needs split_into_lines */
gint dbl_timeout; /* Double click timeout */
gint tpl_timeout; /* Triple click timeout */
};
struct _ETextClass {

3
widgets/table/e-table.c
View File

@ -770,7 +770,6 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
xmlNode *xmlGrouping;
GtkWidget *scrolledwindow;
GtkWidget *vbox;
e_table->full_header = full_header;
gtk_object_ref (GTK_OBJECT (full_header));
@ -803,7 +802,7 @@ et_real_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (scrolledwindow), e_table->table_canvas);
gtk_container_add (GTK_CONTAINER (scrolledwindow), GTK_WIDGET(e_table->table_canvas));
gtk_widget_show (scrolledwindow);
/*

21
widgets/text/e-text-event-processor-emacs-like.c
View File

@ -56,9 +56,9 @@ static const ETextEventProcessorCommand control_keys[26] =
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }, /* t */
{ E_TEP_START_OF_LINE, E_TEP_DELETE, 0, "" }, /* u */
{ E_TEP_SELECTION, E_TEP_PASTE, 0, "" }, /* v */
{ E_TEP_BACKWARD_WORD, E_TEP_DELETE, 0, "" }, /* w */
{ E_TEP_SELECTION, E_TEP_DELETE, 0, "" }, /* w */
{ E_TEP_SELECTION, E_TEP_DELETE, 0, "" }, /* x */
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }, /* y */
{ E_TEP_SELECTION, E_TEP_PASTE, 0, "" }, /* y */
{ E_TEP_SELECTION, E_TEP_NOP, 0, "" } /* z */
};
@ -159,6 +159,20 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
tep_el->mouse_down = TRUE;
}
break;
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
command.action = E_TEP_SELECT;
command.position = E_TEP_SELECT_WORD;
command.time = event->button.time;
}
break;
case GDK_3BUTTON_PRESS:
if (event->button.button == 1) {
command.action = E_TEP_SELECT;
command.position = E_TEP_SELECT_ALL;
command.time = event->button.time;
}
break;
case GDK_BUTTON_RELEASE:
if (event->button.button == 1) {
command.action = E_TEP_UNGRAB;
@ -166,6 +180,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);
command.time = event->button.time;
tep_el->mouse_down = FALSE;
command.action = E_TEP_NOP;
} else if (event->button.button == 2) {
command.action = E_TEP_MOVE;
command.position = E_TEP_VALUE;
@ -299,7 +314,7 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro
command.string = control_keys[(int) (key.keyval - 'a')].string;
}
if (key.keyval == 'x') {
if (key.keyval == 'x' || key.keyval == 'w') {
command.action = E_TEP_COPY;
command.position = E_TEP_SELECTION;
gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &command);

6
widgets/text/e-text-event-processor-types.h
View File

@ -68,7 +68,11 @@ enum _ETextEventProcessorCommandPosition {
E_TEP_BACKWARD_PARAGRAPH,
E_TEP_FORWARD_PAGE,
E_TEP_BACKWARD_PAGE
E_TEP_BACKWARD_PAGE,
E_TEP_SELECT_WORD,
E_TEP_SELECT_ALL
};
enum _ETextEventProcessorCommandAction {

197
widgets/text/e-text.c
View File

@ -352,6 +352,9 @@ e_text_init (EText *text)
text->tooltip_timeout = 0;
text->tooltip_count = 0;
text->dbl_timeout = 0;
text->tpl_timeout = 0;
e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
}
@ -2176,6 +2179,14 @@ _do_tooltip (gpointer data)
ArtPoint pixel_origin;
int canvas_x, canvas_y;
GnomeCanvasItem *tooltip_text;
double tooltip_width;
double tooltip_height;
double tooltip_x;
double tooltip_y;
#if 0
double x1, x2, y1, y2;
#endif
GnomeCanvasItem *rect;
text->tooltip_count = 0;
@ -2212,10 +2223,7 @@ _do_tooltip (gpointer data)
canvas = e_canvas_new ();
gtk_container_add (GTK_CONTAINER (text->tooltip_window), canvas);
/* Ensure valid height field */
calc_height (text);
/* Get the longest line length */
max_width = 0.0;
for (lines = text->lines, i = 0; i < text->num_lines; lines++, i++) {
@ -2225,14 +2233,14 @@ _do_tooltip (gpointer data)
max_width = MAX (max_width, line_width);
}
gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
gnome_canvas_rect_get_type (),
"x1", (double) 0,
"y1", (double) 0,
"x2", (double) max_width + 4,
"y2", (double) text->height + 4,
"fill_color", "yellow",
NULL);
rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
gnome_canvas_rect_get_type (),
"x1", (double) 0,
"y1", (double) 0,
"x2", (double) max_width + 4,
"y2", (double) text->height + 4,
"fill_color", "yellow",
NULL);
tooltip_text = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
e_text_get_type (),
@ -2240,31 +2248,118 @@ _do_tooltip (gpointer data)
"font_gdk", text->font,
"text", text->text,
"editable", FALSE,
"clip_width", max_width,
"clip_height", (double)text->height,
"clip_width", text->max_lines != 1 ? text->clip_width : max_width,
"clip_height", text->max_lines != 1 ? -1 : (double)text->height,
"clip", TRUE,
"line_wrap", text->line_wrap,
"max_lines", text->max_lines,
"justification", text->justification,
NULL);
e_canvas_item_move_absolute(tooltip_text, 1, 1);
calc_height(E_TEXT(tooltip_text));
calc_line_widths(E_TEXT(tooltip_text));
gnome_canvas_item_set (tooltip_text,
"clip_height", (double) E_TEXT(tooltip_text)->height,
"clip_width", (double) E_TEXT(tooltip_text)->max_width,
NULL);
tooltip_width = E_TEXT(tooltip_text)->max_width;
tooltip_height = E_TEXT(tooltip_text)->height;
tooltip_x = 0;
tooltip_y = 0;
switch(E_TEXT(tooltip_text)->justification) {
case GTK_JUSTIFY_CENTER:
tooltip_x = - tooltip_width / 2;
break;
case GTK_JUSTIFY_RIGHT:
tooltip_x = tooltip_width / 2;
break;
case GTK_JUSTIFY_FILL:
case GTK_JUSTIFY_LEFT:
tooltip_x = 0;
break;
}
switch(E_TEXT(tooltip_text)->anchor) {
case GTK_ANCHOR_NW:
case GTK_ANCHOR_N:
case GTK_ANCHOR_NE:
break;
case GTK_ANCHOR_W:
case GTK_ANCHOR_CENTER:
case GTK_ANCHOR_E:
tooltip_y -= tooltip_height / 2.0;
break;
case GTK_ANCHOR_SW:
case GTK_ANCHOR_S:
case GTK_ANCHOR_SE:
tooltip_y -= tooltip_height;
break;
}
switch(E_TEXT(tooltip_text)->anchor) {
case GTK_ANCHOR_NW:
case GTK_ANCHOR_W:
case GTK_ANCHOR_SW:
break;
case GTK_ANCHOR_N:
case GTK_ANCHOR_CENTER:
case GTK_ANCHOR_S:
tooltip_x -= tooltip_width / 2.0;
break;
case GTK_ANCHOR_NE:
case GTK_ANCHOR_E:
case GTK_ANCHOR_SE:
tooltip_x -= tooltip_width;
break;
}
#if 0
get_bounds(text, &x1, &y1, &x2, &y2);
if ( x1 < tooltip_x ) {
gnome_canvas_item_move(tooltip_text, tooltip_x - x1, 0);
tooltip_x = x1;
}
if ( y1 < tooltip_y ) {
gnome_canvas_item_move(tooltip_text, 0, tooltip_y - y1);
tooltip_y = y1;
}
if ( x2 > tooltip_x + tooltip_width )
tooltip_width = x2 - tooltip_x;
if ( y2 > tooltip_y + tooltip_height )
tooltip_height = y2 - tooltip_y;
#endif
gnome_canvas_item_set(rect,
"x2", (double) tooltip_width + 4,
"y2", (double) tooltip_height + 4,
NULL);
gtk_widget_set_usize (text->tooltip_window,
(int)max_width + 4,
text->height + 4);
tooltip_width + 4,
tooltip_height + 4);
gnome_canvas_set_scroll_region (GNOME_CANVAS(canvas), 0.0, 0.0,
max_width, (double)text->height);
tooltip_width, (double)tooltip_height);
gtk_widget_show (canvas);
gtk_widget_realize (text->tooltip_window);
gtk_signal_connect (GTK_OBJECT(text->tooltip_window), "event",
GTK_SIGNAL_FUNC(tooltip_event), text);
gtk_widget_popup (text->tooltip_window, pixel_origin.x - 2, pixel_origin.y - 2);
gtk_widget_popup (text->tooltip_window, pixel_origin.x - 2 + tooltip_x, pixel_origin.y - 2 + tooltip_y);
text->tooltip_timeout = 0;
return FALSE;
}
static gboolean
_click (gpointer data)
{
*(gint *)data = 0;
return FALSE;
}
static gint
e_text_event (GnomeCanvasItem *item, GdkEvent *event)
{
@ -2370,10 +2465,29 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
#else
if ((!text->editing)
&& text->editable
&& event->button.button == 1) {
&& (event->button.button == 1 ||
event->button.button == 2)) {
e_canvas_item_grab_focus (item);
}
#endif
/* Create our own double and triple click events,
as gnome-canvas doesn't forward them to us */
if (event->type == GDK_BUTTON_PRESS) {
if (text->dbl_timeout == 0 &&
text->tpl_timeout == 0) {
text->dbl_timeout = gtk_timeout_add (200,
_click,
&(text->dbl_timeout));
} else {
if (text->tpl_timeout == 0) {
e_tep_event.type = GDK_2BUTTON_PRESS;
text->tpl_timeout = gtk_timeout_add (200, _click, &(text->tpl_timeout));
} else {
e_tep_event.type = GDK_3BUTTON_PRESS;
}
}
}
if (text->editing) {
GdkEventButton button = event->button;
e_tep_event.button.time = button.time;
@ -2409,11 +2523,21 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
}
break;
case GDK_ENTER_NOTIFY:
if ( text->tooltip_count == 0 && text->clip) {
if (!text->tooltip_timeout)
text->tooltip_timeout = gtk_timeout_add (1000, _do_tooltip, text);
{
GdkEventCrossing *crossing = (GdkEventCrossing *) event;
double x1, y1, x2, y2;
get_bounds (text, &x1, &y1, &x2, &y2);
if (crossing->x >= x1 &&
crossing->y >= y1 &&
crossing->x <= x2 &&
crossing->y <= y2) {
if ( text->tooltip_count == 0 && text->clip) {
if (!text->tooltip_timeout)
text->tooltip_timeout = gtk_timeout_add (1000, _do_tooltip, text);
}
text->tooltip_count ++;
}
}
text->tooltip_count ++;
text->pointer_in = TRUE;
if (text->editing) {
@ -2529,6 +2653,31 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
y -= text->font->ascent + text->font->descent;
return _get_position_from_xy(text, x, y);
case E_TEP_SELECT_WORD:
for (i = text->selection_end - 2; i > 0; i--)
if (isspace (text->text[i])) {
i++;
break;
}
if (i < 0)
text->selection_start = 0;
else
text->selection_start = i;
length = strlen (text->text);
for (i = text->selection_end + 1; i < length; i++)
if (isspace (text->text[i])) {
break;
}
if (i > length)
i = length;
return i;
case E_TEP_SELECT_ALL:
text->selection_start = 0;
length = strlen (text->text);
return length;
case E_TEP_FORWARD_PARAGRAPH:
case E_TEP_BACKWARD_PARAGRAPH:

3
widgets/text/e-text.h
View File

@ -193,6 +193,9 @@ struct _EText {
guint needs_calc_height : 1; /* Need calc_height */
guint needs_calc_line_widths : 1; /* Needs calc_line_widths */
guint needs_split_into_lines : 1; /* Needs split_into_lines */
gint dbl_timeout; /* Double click timeout */
gint tpl_timeout; /* Triple click timeout */
};
struct _ETextClass {