+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <gtk/gtk.h>
#include <libgnomecanvas/libgnomecanvas.h>
-#include <libart_lgpl/art_vpath_dash.h>
-
#include "xournal.h"
#include "xo-callbacks.h"
#include "xo-interface.h"
/************** drawing nice cursors *********/
-static char cursor_pen_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-static char cursor_eraser_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x08, 0x08, 0x08, 0x08,
- 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0xf8, 0x0f,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-static char cursor_eraser_mask[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0xf8, 0x0f, 0xf8, 0x0f,
- 0xf8, 0x0f, 0xf8, 0x0f, 0xf8, 0x0f, 0xf8, 0x0f, 0xf8, 0x0f, 0xf8, 0x0f,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-
void set_cursor_busy(gboolean busy)
{
GdkCursor *cursor;
gdk_display_sync(gdk_display_get_default());
}
+#define PEN_CURSOR_RADIUS 1
+#define HILITER_CURSOR_RADIUS 3
+#define HILITER_BORDER_RADIUS 4
+
+GdkCursor *make_pen_cursor(guint color_rgba)
+{
+ int rowstride, x, y;
+ guchar col[4], *pixels;
+
+ if (ui.pen_cursor_pix == NULL) {
+ ui.pen_cursor_pix = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 16, 16);
+ if (ui.pen_cursor_pix == NULL) return NULL; // couldn't create pixbuf
+ gdk_pixbuf_fill(ui.pen_cursor_pix, 0xffffff00); // transparent white
+ }
+ rowstride = gdk_pixbuf_get_rowstride(ui.pen_cursor_pix);
+ pixels = gdk_pixbuf_get_pixels(ui.pen_cursor_pix);
+
+ col[0] = (color_rgba >> 24) & 0xff;
+ col[1] = (color_rgba >> 16) & 0xff;
+ col[2] = (color_rgba >> 8) & 0xff;
+ col[3] = 0xff; // solid
+ for (x = 8-PEN_CURSOR_RADIUS; x <= 8+PEN_CURSOR_RADIUS; x++)
+ for (y = 8-PEN_CURSOR_RADIUS; y <= 8+PEN_CURSOR_RADIUS; y++)
+ g_memmove(pixels + y*rowstride + x*4, col, 4);
+
+ return gdk_cursor_new_from_pixbuf(gdk_display_get_default(), ui.pen_cursor_pix, 7, 7);
+}
+
+GdkCursor *make_hiliter_cursor(guint color_rgba)
+{
+ int rowstride, x, y;
+ guchar col[4], *pixels;
+
+ if (ui.hiliter_cursor_pix == NULL) {
+ ui.hiliter_cursor_pix = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 16, 16);
+ if (ui.hiliter_cursor_pix == NULL) return NULL; // couldn't create pixbuf
+ gdk_pixbuf_fill(ui.hiliter_cursor_pix, 0xffffff00); // transparent white
+ }
+ rowstride = gdk_pixbuf_get_rowstride(ui.hiliter_cursor_pix);
+ pixels = gdk_pixbuf_get_pixels(ui.hiliter_cursor_pix);
+
+ col[0] = col[1] = col[2] = 0; // black
+ col[3] = 0xff; // solid
+ for (x = 8-HILITER_BORDER_RADIUS; x <= 8+HILITER_BORDER_RADIUS; x++)
+ for (y = 8-HILITER_BORDER_RADIUS; y <= 8+HILITER_BORDER_RADIUS; y++)
+ g_memmove(pixels + y*rowstride + x*4, col, 4);
+
+ col[0] = (color_rgba >> 24) & 0xff;
+ col[1] = (color_rgba >> 16) & 0xff;
+ col[2] = (color_rgba >> 8) & 0xff;
+ col[3] = 0xff; // solid
+ for (x = 8-HILITER_CURSOR_RADIUS; x <= 8+HILITER_CURSOR_RADIUS; x++)
+ for (y = 8-HILITER_CURSOR_RADIUS; y <= 8+HILITER_CURSOR_RADIUS; y++)
+ g_memmove(pixels + y*rowstride + x*4, col, 4);
+
+ return gdk_cursor_new_from_pixbuf(gdk_display_get_default(), ui.hiliter_cursor_pix, 7, 7);
+}
+
void update_cursor(void)
{
GdkPixmap *source, *mask;
GdkColor fg = {0, 0, 0, 0}, bg = {0, 65535, 65535, 65535};
+ ui.is_sel_cursor = FALSE;
if (GTK_WIDGET(canvas)->window == NULL) return;
if (ui.cursor!=NULL) {
gdk_cursor_unref(ui.cursor);
ui.cursor = NULL;
}
- if (ui.toolno == TOOL_PEN) {
- fg.red = (ui.cur_brush->color_rgba >> 16) & 0xff00;
- fg.green = (ui.cur_brush->color_rgba >> 8) & 0xff00;
- fg.blue = (ui.cur_brush->color_rgba >> 0) & 0xff00;
- source = gdk_bitmap_create_from_data(NULL, cursor_pen_bits, 16, 16);
- ui.cursor = gdk_cursor_new_from_pixmap(source, source, &fg, &bg, 7, 7);
- gdk_bitmap_unref(source);
- }
- else if (ui.toolno == TOOL_ERASER) {
- source = gdk_bitmap_create_from_data(NULL, cursor_eraser_bits, 16, 16);
- mask = gdk_bitmap_create_from_data(NULL, cursor_eraser_mask, 16, 16);
- ui.cursor = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg, 7, 7);
- gdk_bitmap_unref(source);
- gdk_bitmap_unref(mask);
- }
- else if (ui.toolno == TOOL_HIGHLIGHTER) {
- source = gdk_bitmap_create_from_data(NULL, cursor_eraser_bits, 16, 16);
- mask = gdk_bitmap_create_from_data(NULL, cursor_eraser_mask, 16, 16);
- bg.red = (ui.cur_brush->color_rgba >> 16) & 0xff00;
- bg.green = (ui.cur_brush->color_rgba >> 8) & 0xff00;
- bg.blue = (ui.cur_brush->color_rgba >> 0) & 0xff00;
- ui.cursor = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg, 7, 7);
- gdk_bitmap_unref(source);
- gdk_bitmap_unref(mask);
- }
- else if (ui.cur_item_type == ITEM_MOVESEL) {
- if (ui.toolno == TOOL_VERTSPACE)
- ui.cursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW);
- else
- ui.cursor = gdk_cursor_new(GDK_FLEUR);
+ if (ui.cur_item_type == ITEM_MOVESEL_VERT)
+ ui.cursor = gdk_cursor_new(GDK_SB_V_DOUBLE_ARROW);
+ else if (ui.cur_item_type == ITEM_MOVESEL)
+ ui.cursor = gdk_cursor_new(GDK_FLEUR);
+ else if (ui.toolno[ui.cur_mapping] == TOOL_PEN) {
+ ui.cursor = make_pen_cursor(ui.cur_brush->color_rgba);
+ }
+ else if (ui.toolno[ui.cur_mapping] == TOOL_ERASER) {
+ ui.cursor = make_hiliter_cursor(0xffffffff);
+ }
+ else if (ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) {
+ ui.cursor = make_hiliter_cursor(ui.cur_brush->color_rgba);
}
else if (ui.cur_item_type == ITEM_SELECTRECT) {
ui.cursor = gdk_cursor_new(GDK_TCROSS);
}
+ else if (ui.toolno[ui.cur_mapping] == TOOL_HAND) {
+ ui.cursor = gdk_cursor_new(GDK_HAND1);
+ }
+ else if (ui.toolno[ui.cur_mapping] == TOOL_TEXT) {
+ ui.cursor = gdk_cursor_new(GDK_XTERM);
+ }
gdk_window_set_cursor(GTK_WIDGET(canvas)->window, ui.cursor);
}
+/* adjust the cursor shape if it hovers near a selection box */
+
+void update_cursor_for_resize(double *pt)
+{
+ gboolean in_range_x, in_range_y;
+ gboolean can_resize_left, can_resize_right, can_resize_bottom, can_resize_top;
+ gdouble resize_margin;
+ GdkCursorType newcursor;
+
+ // if we're not even close to the box in some direction, return immediately
+ resize_margin = RESIZE_MARGIN / ui.zoom;
+ if (pt[0]<ui.selection->bbox.left-resize_margin || pt[0]>ui.selection->bbox.right+resize_margin
+ || pt[1]<ui.selection->bbox.top-resize_margin || pt[1]>ui.selection->bbox.bottom+resize_margin)
+ {
+ if (ui.is_sel_cursor) update_cursor();
+ return;
+ }
+
+ ui.is_sel_cursor = TRUE;
+ can_resize_left = (pt[0] < ui.selection->bbox.left+resize_margin);
+ can_resize_right = (pt[0] > ui.selection->bbox.right-resize_margin);
+ can_resize_top = (pt[1] < ui.selection->bbox.top+resize_margin);
+ can_resize_bottom = (pt[1] > ui.selection->bbox.bottom-resize_margin);
+
+ if (can_resize_left) {
+ if (can_resize_top) newcursor = GDK_TOP_LEFT_CORNER;
+ else if (can_resize_bottom) newcursor = GDK_BOTTOM_LEFT_CORNER;
+ else newcursor = GDK_LEFT_SIDE;
+ }
+ else if (can_resize_right) {
+ if (can_resize_top) newcursor = GDK_TOP_RIGHT_CORNER;
+ else if (can_resize_bottom) newcursor = GDK_BOTTOM_RIGHT_CORNER;
+ else newcursor = GDK_RIGHT_SIDE;
+ }
+ else if (can_resize_top) newcursor = GDK_TOP_SIDE;
+ else if (can_resize_bottom) newcursor = GDK_BOTTOM_SIDE;
+ else newcursor = GDK_FLEUR;
+
+ if (ui.cursor!=NULL && ui.cursor->type == newcursor) return;
+ if (ui.cursor!=NULL) gdk_cursor_unref(ui.cursor);
+ ui.cursor = gdk_cursor_new(newcursor);
+ gdk_window_set_cursor(GTK_WIDGET(canvas)->window, ui.cursor);
+}
/************** painting strokes *************/
ui.cur_path.num_points = 1;
get_pointer_coords(event, ui.cur_path.coords);
- if (ui.ruler)
+ if (ui.cur_brush->ruler) {
ui.cur_item->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
gnome_canvas_line_get_type(),
"cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
"fill-color-rgba", ui.cur_item->brush.color_rgba,
"width-units", ui.cur_item->brush.thickness, NULL);
- else
+ ui.cur_item->brush.variable_width = FALSE;
+ } else
ui.cur_item->canvas_item = gnome_canvas_item_new(
ui.cur_layer->group, gnome_canvas_group_get_type(), NULL);
}
void continue_stroke(GdkEvent *event)
{
GnomeCanvasPoints seg;
- double *pt;
+ double *pt, current_width;
- if (ui.ruler) {
+ if (ui.cur_brush->ruler) {
pt = ui.cur_path.coords;
} else {
realloc_cur_path(ui.cur_path.num_points+1);
get_pointer_coords(event, pt+2);
- if (ui.ruler)
+ if (ui.cur_item->brush.variable_width) {
+ realloc_cur_widths(ui.cur_path.num_points);
+ current_width = ui.cur_item->brush.thickness*get_pressure_multiplier(event);
+ ui.cur_widths[ui.cur_path.num_points-1] = current_width;
+ }
+ else current_width = ui.cur_item->brush.thickness;
+
+ if (ui.cur_brush->ruler)
ui.cur_path.num_points = 2;
else {
if (hypot(pt[0]-pt[2], pt[1]-pt[3]) < PIXEL_MOTION_THRESHOLD/ui.zoom)
upon creation the line just copies the contents of the GnomeCanvasPoints
into an internal structure */
- if (ui.ruler)
+ if (ui.cur_brush->ruler)
gnome_canvas_item_set(ui.cur_item->canvas_item, "points", &seg, NULL);
else
gnome_canvas_item_new((GnomeCanvasGroup *)ui.cur_item->canvas_item,
gnome_canvas_line_get_type(), "points", &seg,
"cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
"fill-color-rgba", ui.cur_item->brush.color_rgba,
- "width-units", ui.cur_item->brush.thickness, NULL);
+ "width-units", current_width, NULL);
}
void finalize_stroke(void)
ui.cur_path.coords[2] = ui.cur_path.coords[0]+0.1;
ui.cur_path.coords[3] = ui.cur_path.coords[1];
ui.cur_path.num_points = 2;
+ ui.cur_item->brush.variable_width = FALSE;
}
- subdivide_cur_path(); // split the segment so eraser will work
+ if (!ui.cur_item->brush.variable_width)
+ subdivide_cur_path(); // split the segment so eraser will work
ui.cur_item->path = gnome_canvas_points_new(ui.cur_path.num_points);
g_memmove(ui.cur_item->path->coords, ui.cur_path.coords,
2*ui.cur_path.num_points*sizeof(double));
+ if (ui.cur_item->brush.variable_width)
+ ui.cur_item->widths = (gdouble *)g_memdup(ui.cur_widths,
+ (ui.cur_path.num_points-1)*sizeof(gdouble));
+ else ui.cur_item->widths = NULL;
update_item_bbox(ui.cur_item);
ui.cur_path.num_points = 0;
- // destroy the entire group of temporary line segments
- gtk_object_destroy(GTK_OBJECT(ui.cur_item->canvas_item));
- // make a new line item to replace it
- ui.cur_item->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_line_get_type(), "points", ui.cur_item->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", ui.cur_item->brush.color_rgba,
- "width-units", ui.cur_item->brush.thickness, NULL);
+ if (!ui.cur_item->brush.variable_width) {
+ // destroy the entire group of temporary line segments
+ gtk_object_destroy(GTK_OBJECT(ui.cur_item->canvas_item));
+ // make a new line item to replace it
+ make_canvas_item_one(ui.cur_layer->group, ui.cur_item);
+ }
// add undo information
prepare_new_undo();
g_memmove(&newhead->brush, &item->brush, sizeof(struct Brush));
newhead->path = gnome_canvas_points_new(i);
g_memmove(newhead->path->coords, item->path->coords, 2*i*sizeof(double));
+ if (newhead->brush.variable_width)
+ newhead->widths = (gdouble *)g_memdup(item->widths, (i-1)*sizeof(gdouble));
+ else newhead->widths = NULL;
}
while (++i < item->path->num_points) {
pt+=2;
newtail->path = gnome_canvas_points_new(item->path->num_points-i);
g_memmove(newtail->path->coords, item->path->coords+2*i,
2*(item->path->num_points-i)*sizeof(double));
+ if (newtail->brush.variable_width)
+ newtail->widths = (gdouble *)g_memdup(item->widths+i,
+ (item->path->num_points-i-1)*sizeof(gdouble));
+ else newtail->widths = NULL;
newtail->canvas_item = NULL;
}
}
if (item->type == ITEM_STROKE) {
// it's inside an erasure list - we destroy it
gnome_canvas_points_free(item->path);
+ if (item->brush.variable_width) g_free(item->widths);
if (item->canvas_item != NULL)
gtk_object_destroy(GTK_OBJECT(item->canvas_item));
erasure->nrepl--;
// add the new head
if (newhead != NULL) {
update_item_bbox(newhead);
- newhead->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_line_get_type(), "points", newhead->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", newhead->brush.color_rgba,
- "width-units", newhead->brush.thickness, NULL);
+ make_canvas_item_one(ui.cur_layer->group, newhead);
lower_canvas_item_to(ui.cur_layer->group,
newhead->canvas_item, erasure->item->canvas_item);
erasure->replacement_items = g_list_prepend(erasure->replacement_items, newhead);
// add the tail if needed
if (!need_recalc) return;
update_item_bbox(item);
- item->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_line_get_type(), "points", item->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", item->brush.color_rgba,
- "width-units", item->brush.thickness, NULL);
+ make_canvas_item_one(ui.cur_layer->group, item);
lower_canvas_item_to(ui.cur_layer->group, item->canvas_item,
erasure->item->canvas_item);
}
void finalize_erasure(void)
{
GList *itemlist, *partlist;
- struct Item *item, *part;
+ struct Item *item;
prepare_new_undo();
undo->type = ITEM_ERASURE;
is traversed in the forward direction */
}
-/************ selection tools ***********/
-void make_dashed(GnomeCanvasItem *item)
+gboolean do_hand_scrollto(gpointer data)
{
- double dashlen[2];
- ArtVpathDash dash;
-
- dash.n_dash = 2;
- dash.offset = 3.0;
- dash.dash = dashlen;
- dashlen[0] = dashlen[1] = 6.0;
- gnome_canvas_item_set(item, "dash", &dash, NULL);
+ ui.hand_scrollto_pending = FALSE;
+ gnome_canvas_scroll_to(canvas, ui.hand_scrollto_cx, ui.hand_scrollto_cy);
+ return FALSE;
}
-
-void start_selectrect(GdkEvent *event)
+void do_hand(GdkEvent *event)
{
double pt[2];
- reset_selection();
+ int cx, cy;
- ui.cur_item_type = ITEM_SELECTRECT;
- ui.selection = g_new(struct Selection, 1);
- ui.selection->type = ITEM_SELECTRECT;
- ui.selection->items = NULL;
- ui.selection->layer = ui.cur_layer;
-
get_pointer_coords(event, pt);
- ui.selection->bbox.left = ui.selection->bbox.right = pt[0];
- ui.selection->bbox.top = ui.selection->bbox.bottom = pt[1];
-
- ui.selection->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_rect_get_type(), "width-pixels", 1,
- "outline-color-rgba", 0x000000ff,
- "fill-color-rgba", 0x80808040,
- "x1", pt[0], "x2", pt[0], "y1", pt[1], "y2", pt[1], NULL);
- update_cursor();
+ pt[0] += ui.cur_page->hoffset;
+ pt[1] += ui.cur_page->voffset;
+ gnome_canvas_get_scroll_offsets(canvas, &cx, &cy);
+ ui.hand_scrollto_cx = cx - (pt[0]-ui.hand_refpt[0])*ui.zoom;
+ ui.hand_scrollto_cy = cy - (pt[1]-ui.hand_refpt[1])*ui.zoom;
+ if (!ui.hand_scrollto_pending) g_idle_add(do_hand_scrollto, NULL);
+ ui.hand_scrollto_pending = TRUE;
}
-void finalize_selectrect(void)
-{
- double x1, x2, y1, y2;
- GList *itemlist;
- struct Item *item;
-
-
- ui.cur_item_type = ITEM_NONE;
+/************ TEXT FUNCTIONS **************/
- if (ui.selection->bbox.left > ui.selection->bbox.right) {
- x1 = ui.selection->bbox.right; x2 = ui.selection->bbox.left;
- ui.selection->bbox.left = x1; ui.selection->bbox.right = x2;
- } else {
- x1 = ui.selection->bbox.left; x2 = ui.selection->bbox.right;
- }
+// to make it easier to copy/paste at end of text box
+#define WIDGET_RIGHT_MARGIN 10
- if (ui.selection->bbox.top > ui.selection->bbox.bottom) {
- y1 = ui.selection->bbox.bottom; y2 = ui.selection->bbox.top;
- ui.selection->bbox.top = y1; ui.selection->bbox.bottom = y2;
- } else {
- y1 = ui.selection->bbox.top; y2 = ui.selection->bbox.bottom;
- }
-
- for (itemlist = ui.selection->layer->items; itemlist!=NULL; itemlist = itemlist->next) {
- item = (struct Item *)itemlist->data;
- if (item->bbox.left >= x1 && item->bbox.right <= x2 &&
- item->bbox.top >= y1 && item->bbox.bottom <= y2) {
- ui.selection->items = g_list_append(ui.selection->items, item);
- }
- }
-
- if (ui.selection->items == NULL) reset_selection();
- else make_dashed(ui.selection->canvas_item);
- update_cursor();
- update_copy_paste_enabled();
+void resize_textview(gpointer *toplevel, gpointer *data)
+{
+ GtkTextView *w;
+ int width, height;
+
+ /* when the text changes, resize the GtkTextView accordingly */
+ if (ui.cur_item_type!=ITEM_TEXT) return;
+ w = GTK_TEXT_VIEW(ui.cur_item->widget);
+ width = w->width + WIDGET_RIGHT_MARGIN;
+ height = w->height;
+ gnome_canvas_item_set(ui.cur_item->canvas_item,
+ "size-pixels", TRUE,
+ "width", (gdouble)width, "height", (gdouble)height, NULL);
+ ui.cur_item->bbox.right = ui.cur_item->bbox.left + width/ui.zoom;
+ ui.cur_item->bbox.bottom = ui.cur_item->bbox.top + height/ui.zoom;
}
-gboolean start_movesel(GdkEvent *event)
+void start_text(GdkEvent *event, struct Item *item)
{
double pt[2];
-
- if (ui.selection==NULL) return FALSE;
- if (ui.cur_layer != ui.selection->layer) return FALSE;
-
+ GtkTextBuffer *buffer;
+ GnomeCanvasItem *canvas_item;
+ PangoFontDescription *font_desc;
+ GdkColor color;
+
get_pointer_coords(event, pt);
- if (ui.selection->type == ITEM_SELECTRECT) {
- if (pt[0]<ui.selection->bbox.left || pt[0]>ui.selection->bbox.right ||
- pt[1]<ui.selection->bbox.top || pt[1]>ui.selection->bbox.bottom)
- return FALSE;
- ui.cur_item_type = ITEM_MOVESEL;
- ui.selection->anchor_x = ui.selection->last_x = pt[0];
- ui.selection->anchor_y = ui.selection->last_y = pt[1];
- gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
- update_cursor();
- return TRUE;
+
+ ui.cur_item_type = ITEM_TEXT;
+
+ if (item==NULL) {
+ item = g_new(struct Item, 1);
+ item->text = NULL;
+ item->canvas_item = NULL;
+ item->bbox.left = pt[0];
+ item->bbox.top = pt[1];
+ item->bbox.right = ui.cur_page->width;
+ item->bbox.bottom = pt[1]+100.;
+ item->font_name = g_strdup(ui.font_name);
+ item->font_size = ui.font_size;
+ g_memmove(&(item->brush), ui.cur_brush, sizeof(struct Brush));
+ ui.cur_layer->items = g_list_append(ui.cur_layer->items, item);
+ ui.cur_layer->nitems++;
}
- return FALSE;
+
+ item->type = ITEM_TEMP_TEXT;
+ ui.cur_item = item;
+
+ font_desc = pango_font_description_from_string(item->font_name);
+ pango_font_description_set_absolute_size(font_desc,
+ item->font_size*ui.zoom*PANGO_SCALE);
+ item->widget = gtk_text_view_new();
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(item->widget));
+ if (item->text!=NULL)
+ gtk_text_buffer_set_text(buffer, item->text, -1);
+ gtk_widget_modify_font(item->widget, font_desc);
+ rgb_to_gdkcolor(item->brush.color_rgba, &color);
+ gtk_widget_modify_text(item->widget, GTK_STATE_NORMAL, &color);
+ pango_font_description_free(font_desc);
+
+ canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
+ gnome_canvas_widget_get_type(),
+ "x", item->bbox.left, "y", item->bbox.top,
+ "width", item->bbox.right-item->bbox.left,
+ "height", item->bbox.bottom-item->bbox.top,
+ "widget", item->widget, NULL);
+ // TODO: width/height?
+ if (item->canvas_item!=NULL) {
+ lower_canvas_item_to(ui.cur_layer->group, canvas_item, item->canvas_item);
+ gtk_object_destroy(GTK_OBJECT(item->canvas_item));
+ }
+ item->canvas_item = canvas_item;
+
+ gtk_widget_show(item->widget);
+ ui.resize_signal_handler =
+ g_signal_connect((gpointer) winMain, "check_resize",
+ G_CALLBACK(resize_textview), NULL);
+ update_font_button();
+ gtk_widget_set_sensitive(GET_COMPONENT("editPaste"), FALSE);
+ gtk_widget_set_sensitive(GET_COMPONENT("buttonPaste"), FALSE);
+ gtk_widget_grab_focus(item->widget);
}
-void start_vertspace(GdkEvent *event)
+void end_text(void)
{
- double pt[2];
- GList *itemlist;
- struct Item *item;
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
+ gchar *new_text;
+ struct UndoErasureData *erasure;
+ GnomeCanvasItem *tmpitem;
- reset_selection();
- ui.cur_item_type = ITEM_MOVESEL;
- ui.selection = g_new(struct Selection, 1);
- ui.selection->type = ITEM_MOVESEL;
- ui.selection->items = NULL;
- ui.selection->layer = ui.cur_layer;
+ if (ui.cur_item_type!=ITEM_TEXT) return; // nothing for us to do!
- get_pointer_coords(event, pt);
- for (itemlist = ui.cur_layer->items; itemlist!=NULL; itemlist = itemlist->next) {
- item = (struct Item *)itemlist->data;
- if (item->bbox.top >= pt[1]) {
- ui.selection->items = g_list_append(ui.selection->items, item);
+ // finalize the text that's been edited...
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(ui.cur_item->widget));
+ gtk_text_buffer_get_bounds(buffer, &start, &end);
+ ui.cur_item->type = ITEM_TEXT;
+ new_text = gtk_text_buffer_get_text(buffer, &start, &end, TRUE);
+ ui.cur_item_type = ITEM_NONE;
+ gtk_widget_set_sensitive(GET_COMPONENT("editPaste"), TRUE);
+ gtk_widget_set_sensitive(GET_COMPONENT("buttonPaste"), TRUE);
+
+ if (strlen(new_text)==0) { // erase object and cancel
+ g_free(new_text);
+ g_signal_handler_disconnect(winMain, ui.resize_signal_handler);
+ gtk_object_destroy(GTK_OBJECT(ui.cur_item->canvas_item));
+ ui.cur_item->canvas_item = NULL;
+ if (ui.cur_item->text == NULL) // nothing happened
+ g_free(ui.cur_item->font_name);
+ else { // treat this as an erasure
+ prepare_new_undo();
+ undo->type = ITEM_ERASURE;
+ undo->layer = ui.cur_layer;
+ erasure = (struct UndoErasureData *)g_malloc(sizeof(struct UndoErasureData));
+ erasure->item = ui.cur_item;
+ erasure->npos = g_list_index(ui.cur_layer->items, ui.cur_item);
+ erasure->nrepl = 0;
+ erasure->replacement_items = NULL;
+ undo->erasurelist = g_list_append(NULL, erasure);
}
+ ui.cur_layer->items = g_list_remove(ui.cur_layer->items, ui.cur_item);
+ ui.cur_layer->nitems--;
+ ui.cur_item = NULL;
+ return;
}
- ui.selection->anchor_x = ui.selection->last_x = 0;
- ui.selection->anchor_y = ui.selection->last_y = pt[1];
- ui.selection->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_rect_get_type(), "width-pixels", 1,
- "outline-color-rgba", 0x000000ff,
- "fill-color-rgba", 0x80808040,
- "x1", -100.0, "x2", ui.cur_page->width+100, "y1", pt[1], "y2", pt[1], NULL);
- update_cursor();
-}
-
-void continue_movesel(GdkEvent *event)
-{
- double pt[2], dx, dy;
- GList *list;
- struct Item *item;
-
- get_pointer_coords(event, pt);
- if (ui.toolno == TOOL_VERTSPACE) pt[0] = 0;
- dx = pt[0] - ui.selection->last_x;
- dy = pt[1] - ui.selection->last_y;
-
- if (hypot(dx,dy) < 1) return; // don't move subpixel
- ui.selection->last_x = pt[0];
- ui.selection->last_y = pt[1];
-
- // move the canvas items
- if (ui.toolno == TOOL_VERTSPACE)
- gnome_canvas_item_set(ui.selection->canvas_item, "y2", pt[1], NULL);
- else
- gnome_canvas_item_move(ui.selection->canvas_item, dx, dy);
-
- for (list = ui.selection->items; list != NULL; list = list->next) {
- item = (struct Item *)list->data;
- if (item->canvas_item != NULL)
- gnome_canvas_item_move(item->canvas_item, dx, dy);
+ // store undo data
+ if (ui.cur_item->text==NULL || strcmp(ui.cur_item->text, new_text)) {
+ prepare_new_undo();
+ if (ui.cur_item->text == NULL) undo->type = ITEM_TEXT;
+ else undo->type = ITEM_TEXT_EDIT;
+ undo->layer = ui.cur_layer;
+ undo->item = ui.cur_item;
+ undo->str = ui.cur_item->text;
}
-
- /* consider: if view_continuous, move items to a different page if
- y value gets out of range (same algo as in button_down event
- processing); then need to reparent the canvas items, delete the
- Items from the old Layer, insert them on the new Layer, ...
- and make an undo-event, probably cut-and-paste style... */
+ else g_free(ui.cur_item->text);
+
+ ui.cur_item->text = new_text;
+ ui.cur_item->widget = NULL;
+ // replace the canvas item
+ tmpitem = ui.cur_item->canvas_item;
+ make_canvas_item_one(ui.cur_layer->group, ui.cur_item);
+ update_item_bbox(ui.cur_item);
+ lower_canvas_item_to(ui.cur_layer->group, ui.cur_item->canvas_item, tmpitem);
+ gtk_object_destroy(GTK_OBJECT(tmpitem));
}
-void finalize_movesel(void)
-{
- if (ui.selection->items != NULL) {
- prepare_new_undo();
- undo->type = ITEM_MOVESEL;
- undo->itemlist = g_list_copy(ui.selection->items);
- undo->val_x = ui.selection->last_x - ui.selection->anchor_x;
- undo->val_y = ui.selection->last_y - ui.selection->anchor_y;
- move_journal_items_by(undo->itemlist, undo->val_x, undo->val_y);
- }
+/* update the items in the canvas so they're of the right font size */
- if (ui.toolno == TOOL_VERTSPACE)
- reset_selection();
+void update_text_item_displayfont(struct Item *item)
+{
+ PangoFontDescription *font_desc;
+
+ if (item->type != ITEM_TEXT && item->type != ITEM_TEMP_TEXT) return;
+ if (item->canvas_item==NULL) return;
+ font_desc = pango_font_description_from_string(item->font_name);
+ pango_font_description_set_absolute_size(font_desc,
+ item->font_size*ui.zoom*PANGO_SCALE);
+ if (item->type == ITEM_TEMP_TEXT)
+ gtk_widget_modify_font(item->widget, font_desc);
else {
- ui.selection->bbox.left += undo->val_x;
- ui.selection->bbox.right += undo->val_x;
- ui.selection->bbox.top += undo->val_y;
- ui.selection->bbox.bottom += undo->val_y;
- make_dashed(ui.selection->canvas_item);
+ gnome_canvas_item_set(item->canvas_item, "font-desc", font_desc, NULL);
+ update_item_bbox(item);
}
- ui.cur_item_type = ITEM_NONE;
- update_cursor();
+ pango_font_description_free(font_desc);
}
-
-void selection_delete(void)
+void rescale_text_items(void)
{
- struct UndoErasureData *erasure;
- GList *itemlist;
- struct Item *item;
+ GList *pagelist, *layerlist, *itemlist;
- if (ui.selection == NULL) return;
- prepare_new_undo();
- undo->type = ITEM_ERASURE;
- undo->layer = ui.selection->layer;
- undo->erasurelist = NULL;
- for (itemlist = ui.selection->items; itemlist!=NULL; itemlist = itemlist->next) {
- item = (struct Item *)itemlist->data;
- if (item->canvas_item!=NULL)
- gtk_object_destroy(GTK_OBJECT(item->canvas_item));
- erasure = g_new(struct UndoErasureData, 1);
- erasure->item = item;
- erasure->npos = g_list_index(ui.selection->layer->items, item);
- erasure->nrepl = 0;
- erasure->replacement_items = NULL;
- ui.selection->layer->items = g_list_remove(ui.selection->layer->items, item);
- ui.selection->layer->nitems--;
- undo->erasurelist = g_list_prepend(undo->erasurelist, erasure);
- }
- reset_selection();
-
- /* NOTE: the erasurelist is built backwards; this guarantees that,
- upon undo, the erasure->npos fields give the correct position
- where each item should be reinserted as the list is traversed in
- the forward direction */
+ for (pagelist = journal.pages; pagelist!=NULL; pagelist = pagelist->next)
+ for (layerlist = ((struct Page *)pagelist->data)->layers; layerlist!=NULL; layerlist = layerlist->next)
+ for (itemlist = ((struct Layer *)layerlist->data)->items; itemlist!=NULL; itemlist = itemlist->next)
+ update_text_item_displayfont((struct Item *)itemlist->data);
}
-void callback_clipboard_get(GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- guint info, gpointer user_data)
+struct Item *click_is_in_text(struct Layer *layer, double x, double y)
{
- int length;
+ GList *itemlist;
+ struct Item *item, *val;
- g_memmove(&length, user_data, sizeof(int));
- gtk_selection_data_set(selection_data,
- gdk_atom_intern("_XOURNAL", FALSE), 8, user_data, length);
+ val = NULL;
+ for (itemlist = layer->items; itemlist!=NULL; itemlist = itemlist->next) {
+ item = (struct Item *)itemlist->data;
+ if (item->type != ITEM_TEXT) continue;
+ if (x<item->bbox.left || x>item->bbox.right) continue;
+ if (y<item->bbox.top || y>item->bbox.bottom) continue;
+ val = item;
+ }
+ return val;
}
-void callback_clipboard_clear(GtkClipboard *clipboard, gpointer user_data)
+struct Item *click_is_in_text_or_image(struct Layer *layer, double x, double y)
{
- g_free(user_data);
+ GList *itemlist;
+ struct Item *item, *val;
+
+ val = NULL;
+ for (itemlist = layer->items; itemlist!=NULL; itemlist = itemlist->next) {
+ item = (struct Item *)itemlist->data;
+ if (item->type != ITEM_TEXT && item->type != ITEM_IMAGE) continue;
+ if (x<item->bbox.left || x>item->bbox.right) continue;
+ if (y<item->bbox.top || y>item->bbox.bottom) continue;
+ val = item;
+ }
+ return val;
}
-void selection_to_clip(void)
+void refont_text_item(struct Item *item, gchar *font_name, double font_size)
{
- int bufsz, nitems;
- char *buf, *p;
- GList *list;
- struct Item *item;
- GtkTargetEntry target;
-
- if (ui.selection == NULL) return;
- bufsz = 2*sizeof(int) // bufsz, nitems
- + sizeof(struct BBox); // bbox
- nitems = 0;
- for (list = ui.selection->items; list != NULL; list = list->next) {
- item = (struct Item *)list->data;
- nitems++;
- if (item->type == ITEM_STROKE) {
- bufsz+= sizeof(int) // type
- + sizeof(struct Brush) // brush
- + sizeof(int) // num_points
- + 2*item->path->num_points*sizeof(double); // the points
- }
- else bufsz+= sizeof(int); // type
- }
- p = buf = g_malloc(bufsz);
- g_memmove(p, &bufsz, sizeof(int)); p+= sizeof(int);
- g_memmove(p, &nitems, sizeof(int)); p+= sizeof(int);
- g_memmove(p, &ui.selection->bbox, sizeof(struct BBox)); p+= sizeof(struct BBox);
- for (list = ui.selection->items; list != NULL; list = list->next) {
- item = (struct Item *)list->data;
- g_memmove(p, &item->type, sizeof(int)); p+= sizeof(int);
- if (item->type == ITEM_STROKE) {
- g_memmove(p, &item->brush, sizeof(struct Brush)); p+= sizeof(struct Brush);
- g_memmove(p, &item->path->num_points, sizeof(int)); p+= sizeof(int);
- g_memmove(p, item->path->coords, 2*item->path->num_points*sizeof(double));
- p+= 2*item->path->num_points*sizeof(double);
- }
+ if (!strcmp(font_name, item->font_name) && font_size==item->font_size) return;
+ if (item->text!=NULL) {
+ prepare_new_undo();
+ undo->type = ITEM_TEXT_ATTRIB;
+ undo->item = item;
+ undo->str = item->font_name;
+ undo->val_x = item->font_size;
+ undo->brush = (struct Brush *)g_memdup(&(item->brush), sizeof(struct Brush));
}
-
- target.target = "_XOURNAL";
- target.flags = 0;
- target.info = 0;
-
- gtk_clipboard_set_with_data(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
- &target, 1,
- callback_clipboard_get, callback_clipboard_clear, buf);
+ else g_free(item->font_name);
+ item->font_name = g_strdup(font_name);
+ if (font_size>0.) item->font_size = font_size;
+ update_text_item_displayfont(item);
}
-
-void clipboard_paste(void)
+void process_font_sel(gchar *str)
{
- GtkSelectionData *sel_data;
- unsigned char *p;
- int nitems, npts, i;
+ gchar *p, *q;
+ struct Item *it;
+ gdouble size;
GList *list;
- struct Item *item;
- double hoffset, voffset, cx, cy;
- double *pf;
- int sx, sy, wx, wy;
-
- if (ui.cur_layer == NULL) return;
-
- ui.cur_item_type = ITEM_PASTE;
- sel_data = gtk_clipboard_wait_for_contents(
- gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
- gdk_atom_intern("_XOURNAL", FALSE));
- ui.cur_item_type = ITEM_NONE;
- if (sel_data == NULL) return; // paste failed
-
- reset_selection();
- ui.toolno = TOOL_SELECTRECT;
- ui.ruler = FALSE;
- update_tool_buttons();
- update_tool_menu();
- update_color_menu();
- update_cursor();
-
- ui.selection = g_new(struct Selection, 1);
- p = sel_data->data + sizeof(int);
- g_memmove(&nitems, p, sizeof(int)); p+= sizeof(int);
- ui.selection->type = ITEM_SELECTRECT;
- ui.selection->layer = ui.cur_layer;
- g_memmove(&ui.selection->bbox, p, sizeof(struct BBox)); p+= sizeof(struct BBox);
- ui.selection->items = NULL;
-
- // find by how much we translate the pasted selection
- gnome_canvas_get_scroll_offsets(canvas, &sx, &sy);
- gdk_window_get_geometry(GTK_WIDGET(canvas)->window, NULL, NULL, &wx, &wy, NULL);
- gnome_canvas_window_to_world(canvas, sx + wx/2, sy + wy/2, &cx, &cy);
- cx -= ui.cur_page->hoffset;
- cy -= ui.cur_page->voffset;
- if (cx + (ui.selection->bbox.right-ui.selection->bbox.left)/2 > ui.cur_page->width)
- cx = ui.cur_page->width - (ui.selection->bbox.right-ui.selection->bbox.left)/2;
- if (cx - (ui.selection->bbox.right-ui.selection->bbox.left)/2 < 0)
- cx = (ui.selection->bbox.right-ui.selection->bbox.left)/2;
- if (cy + (ui.selection->bbox.bottom-ui.selection->bbox.top)/2 > ui.cur_page->height)
- cy = ui.cur_page->height - (ui.selection->bbox.bottom-ui.selection->bbox.top)/2;
- if (cy - (ui.selection->bbox.bottom-ui.selection->bbox.top)/2 < 0)
- cy = (ui.selection->bbox.bottom-ui.selection->bbox.top)/2;
- hoffset = cx - (ui.selection->bbox.right+ui.selection->bbox.left)/2;
- voffset = cy - (ui.selection->bbox.top+ui.selection->bbox.bottom)/2;
- ui.selection->bbox.left += hoffset;
- ui.selection->bbox.right += hoffset;
- ui.selection->bbox.top += voffset;
- ui.selection->bbox.bottom += voffset;
-
- ui.selection->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_rect_get_type(), "width-pixels", 1,
- "outline-color-rgba", 0x000000ff,
- "fill-color-rgba", 0x80808040,
- "x1", ui.selection->bbox.left, "x2", ui.selection->bbox.right,
- "y1", ui.selection->bbox.top, "y2", ui.selection->bbox.bottom, NULL);
- make_dashed(ui.selection->canvas_item);
-
- while (nitems-- > 0) {
- item = g_new(struct Item, 1);
- ui.selection->items = g_list_append(ui.selection->items, item);
- ui.cur_layer->items = g_list_append(ui.cur_layer->items, item);
- ui.cur_layer->nitems++;
- g_memmove(&item->type, p, sizeof(int)); p+= sizeof(int);
- if (item->type == ITEM_STROKE) {
- g_memmove(&item->brush, p, sizeof(struct Brush)); p+= sizeof(struct Brush);
- g_memmove(&npts, p, sizeof(int)); p+= sizeof(int);
- item->path = gnome_canvas_points_new(npts);
- pf = (double *)p;
- for (i=0; i<npts; i++) {
- item->path->coords[2*i] = pf[2*i] + hoffset;
- item->path->coords[2*i+1] = pf[2*i+1] + voffset;
- }
- p+= 2*item->path->num_points*sizeof(double);
- update_item_bbox(item);
- item->canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
- gnome_canvas_line_get_type(), "points", item->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", item->brush.color_rgba,
- "width-units", item->brush.thickness, NULL);
- }
- }
+ gboolean undo_cont;
- prepare_new_undo();
- undo->type = ITEM_PASTE;
- undo->layer = ui.cur_layer;
- undo->itemlist = g_list_copy(ui.selection->items);
-
- gtk_selection_data_free(sel_data);
- update_copy_paste_enabled();
+ p = strrchr(str, ' ');
+ if (p!=NULL) {
+ size = g_strtod(p+1, &q);
+ if (*q!=0 || size<1.) size=0.;
+ else *p=0;
+ }
+ else size=0.;
+ g_free(ui.font_name);
+ ui.font_name = str;
+ if (size>0.) ui.font_size = size;
+ undo_cont = FALSE;
+ // if there's a current text item, re-font it
+ if (ui.cur_item_type == ITEM_TEXT) {
+ refont_text_item(ui.cur_item, str, size);
+ undo_cont = (ui.cur_item->text!=NULL);
+ }
+ // if there's a current selection, re-font it
+ if (ui.selection!=NULL)
+ for (list=ui.selection->items; list!=NULL; list=list->next) {
+ it = (struct Item *)list->data;
+ if (it->type == ITEM_TEXT) {
+ if (undo_cont) undo->multiop |= MULTIOP_CONT_REDO;
+ refont_text_item(it, str, size);
+ if (undo_cont) undo->multiop |= MULTIOP_CONT_UNDO;
+ undo_cont = TRUE;
+ }
+ }
+ update_font_button();
}
projects / xournal.git / blobdiff