X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-callbacks.c;h=2fa9d7c869fbedfc0d26ee1ed2793f7d95994c57;hb=2e5ff0bff41fa53d4941b6f0fe49c8914bf29cbc;hp=f2e6e3f72094128d14c76b14d3d52fa42fefba62;hpb=7d08b1657c217fdf035809033e79d5df53fae3af;p=xournal.git diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c index f2e6e3f..2fa9d7c 100644 --- a/src/xo-callbacks.c +++ b/src/xo-callbacks.c @@ -23,9 +23,11 @@ void on_fileNew_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); if (close_journal()) { new_journal(); - ui.zoom = DEFAULT_ZOOM; + ui.zoom = ui.startup_zoom; update_page_stuff(); gtk_adjustment_set_value(gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)), 0); gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); @@ -43,11 +45,13 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, int file_domain; gboolean success; + end_text(); + reset_focus(); if (!ok_to_close()) return; // user aborted on save confirmation dialog = gtk_file_chooser_dialog_new("Open PDF", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); @@ -55,14 +59,17 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, filt_pdf = gtk_file_filter_new(); gtk_file_filter_set_name(filt_pdf, "PDF files"); gtk_file_filter_add_pattern(filt_pdf, "*.pdf"); + gtk_file_filter_add_pattern(filt_pdf, "*.PDF"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); + if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path); + attach_opt = gtk_check_button_new_with_label("Attach file to the journal"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -81,7 +88,7 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, gtk_main_iteration(); } new_journal(); - ui.zoom = DEFAULT_ZOOM; + ui.zoom = ui.startup_zoom; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); update_page_stuff(); success = init_bgpdf(filename, TRUE, file_domain); @@ -109,11 +116,13 @@ on_fileOpen_activate (GtkMenuItem *menuitem, char *filename; gboolean success; + end_text(); + reset_focus(); if (!ok_to_close()) return; // user aborted on save confirmation dialog = gtk_file_chooser_dialog_new("Open Journal", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); @@ -123,8 +132,10 @@ on_fileOpen_activate (GtkMenuItem *menuitem, gtk_file_filter_add_pattern(filt_xoj, "*.xoj"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_xoj); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); - - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + + if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path); + + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -134,7 +145,7 @@ on_fileOpen_activate (GtkMenuItem *menuitem, set_cursor_busy(TRUE); success = open_journal(filename); set_cursor_busy(FALSE); - if (success) return; + if (success) { g_free(filename); return; } /* open failed */ dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -152,6 +163,8 @@ on_fileSave_activate (GtkMenuItem *menuitem, { GtkWidget *dialog; + end_text(); + reset_focus(); if (ui.filename == NULL) { on_fileSaveAs_activate(menuitem, user_data); return; @@ -183,18 +196,29 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, gboolean warn; struct stat stat_buf; + end_text(); + reset_focus(); dialog = gtk_file_chooser_dialog_new("Save Journal", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); if (ui.filename!=NULL) { - if (ui.filename[0] == '/') - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.filename); - else - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), ui.filename); - } else { + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.filename); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), g_basename(ui.filename)); + } + else + if (bgpdf.status!=STATUS_NOT_INIT && bgpdf.file_domain == DOMAIN_ABSOLUTE + && bgpdf.filename != NULL) { + filename = g_strdup_printf("%s.xoj", bgpdf.filename->s); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), filename); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), g_basename(filename)); + g_free(filename); + } + else { curtime = time(NULL); strftime(stime, 30, "%F-Note-%H-%M.xoj", localtime(&curtime)); + if (ui.default_path!=NULL) + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path); gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), stime); } @@ -208,10 +232,10 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); // somehow this doesn't seem to be set by default - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); do { - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -274,6 +298,8 @@ on_filePrint_activate (GtkMenuItem *menuitem, guchar *s; GnomePrintConfig *config = gnome_print_config_default(); + end_text(); + reset_focus(); if (ui.filename!=NULL) { if (g_str_has_suffix(ui.filename, ".xoj")) { in_fn = g_strdup(ui.filename); @@ -329,6 +355,8 @@ on_filePrint_activate (GtkMenuItem *menuitem, switch(gnome_print_dialog_get_range(GNOME_PRINT_DIALOG(printDialog))) { case GNOME_PRINT_RANGE_RANGE: gnome_print_dialog_get_range_page(GNOME_PRINT_DIALOG(printDialog), &fromPage, &toPage); + fromPage--; + toPage--; break; default: fromPage = 0; @@ -346,18 +374,19 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *dialog; + GtkWidget *dialog, *warning_dialog; GtkFileFilter *filt_all, *filt_pdf; char *filename, *in_fn; char stime[30]; time_t curtime; - GnomePrintJob *gpj; - GnomePrintConfig *config; - + int response; + gboolean warn; - dialog = gtk_file_chooser_dialog_new("Print to PDF", GTK_WINDOW (winMain), + end_text(); + reset_focus(); + dialog = gtk_file_chooser_dialog_new("Export to PDF", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); if (ui.filename!=NULL) { if (g_str_has_suffix(ui.filename, ".xoj")) { @@ -366,12 +395,13 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, } else in_fn = g_strdup_printf("%s.pdf", ui.filename); - if (in_fn[0] == '/') - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), in_fn); - gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), in_fn); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), in_fn); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), g_basename(in_fn)); } else { curtime = time(NULL); strftime(stime, 30, "%F-Note-%H-%M.pdf", localtime(&curtime)); + if (ui.default_path!=NULL) + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path); gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), stime); in_fn = NULL; } @@ -382,29 +412,40 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, filt_pdf = gtk_file_filter_new(); gtk_file_filter_set_name(filt_pdf, "PDF files"); gtk_file_filter_add_pattern(filt_pdf, "*.pdf"); + gtk_file_filter_add_pattern(filt_pdf, "*.PDF"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); + g_free(in_fn); - // somehow this doesn't seem to be set by default - gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); + do { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { + gtk_widget_destroy(dialog); + return; + } + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + warn = g_file_test(filename, G_FILE_TEST_EXISTS); + if (warn) { + warning_dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), + GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, + "Should the file %s be overwritten?", filename); + if (gtk_dialog_run(GTK_DIALOG(warning_dialog)) == GTK_RESPONSE_YES) + warn = FALSE; + gtk_widget_destroy(warning_dialog); + } + } while(warn); + + gtk_widget_destroy(dialog); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { - g_free(in_fn); + set_cursor_busy(TRUE); + if (!print_to_pdf(filename)) { + set_cursor_busy(FALSE); + dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error creating file '%s'", filename); + gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); - return; } - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - g_free(in_fn); - gtk_widget_destroy(dialog); - - config = gnome_print_config_default(); - gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"PDF"); - gpj = gnome_print_job_new(config); - gnome_print_job_print_to_file(gpj, filename); - - print_job_render(gpj, 0, journal.npages-1); - gnome_print_config_unref(config); - + set_cursor_busy(FALSE); g_free(filename); } @@ -413,6 +454,8 @@ void on_fileQuit_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); if (ok_to_close()) gtk_main_quit (); } @@ -425,12 +468,16 @@ on_editUndo_activate (GtkMenuItem *menuitem, GList *list, *itemlist; struct UndoErasureData *erasure; struct Item *it; + struct Brush tmp_brush; struct Background *tmp_bg; double tmp_x, tmp_y; + gchar *tmpstr; + end_text(); + reset_focus(); if (undo == NULL) return; // nothing to undo! reset_selection(); // safer - if (undo->type == ITEM_STROKE) { + if (undo->type == ITEM_STROKE || undo->type == ITEM_TEXT) { // we're keeping the stroke info, but deleting the canvas item gtk_object_destroy(GTK_OBJECT(undo->item->canvas_item)); undo->item->canvas_item = NULL; @@ -450,11 +497,8 @@ on_editUndo_activate (GtkMenuItem *menuitem, undo->layer->nitems--; } // recreate the deleted one - erasure->item->canvas_item = gnome_canvas_item_new(undo->layer->group, - gnome_canvas_line_get_type(), "points", erasure->item->path, - "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND, - "fill-color-rgba", erasure->item->brush.color_rgba, - "width-units", erasure->item->brush.thickness, NULL); + make_canvas_item_one(undo->layer->group, erasure->item); + undo->layer->items = g_list_insert(undo->layer->items, erasure->item, erasure->npos); if (erasure->npos == 0) @@ -485,7 +529,7 @@ on_editUndo_activate (GtkMenuItem *menuitem, make_page_clipbox(undo->page); } update_canvas_bg(undo->page); - do_switch_page(g_list_index(journal.pages, undo->page), TRUE); + do_switch_page(g_list_index(journal.pages, undo->page), TRUE, TRUE); } else if (undo->type == ITEM_NEW_DEFAULT_BG) { tmp_bg = ui.default_page.bg; @@ -510,21 +554,25 @@ on_editUndo_activate (GtkMenuItem *menuitem, // so do_switch_page() won't try to remap the layers of the defunct page if (ui.pageno >= undo->val) ui.pageno--; if (ui.pageno < 0) ui.pageno = 0; - do_switch_page(ui.pageno, TRUE); + do_switch_page(ui.pageno, TRUE, TRUE); } else if (undo->type == ITEM_DELETE_PAGE) { journal.pages = g_list_insert(journal.pages, undo->page, undo->val); journal.npages++; make_canvas_items(); // re-create the canvas items - do_switch_page(undo->val, TRUE); + do_switch_page(undo->val, TRUE, TRUE); } else if (undo->type == ITEM_MOVESEL) { for (itemlist = undo->itemlist; itemlist != NULL; itemlist = itemlist->next) { it = (struct Item *)itemlist->data; - if (it->canvas_item != NULL) + if (it->canvas_item != NULL) { + if (undo->layer != undo->layer2) + gnome_canvas_item_reparent(it->canvas_item, undo->layer->group); gnome_canvas_item_move(it->canvas_item, -undo->val_x, -undo->val_y); + } } - move_journal_items_by(undo->itemlist, -undo->val_x, -undo->val_y); + move_journal_items_by(undo->itemlist, -undo->val_x, -undo->val_y, + undo->layer2, undo->layer, undo->auxlist); } else if (undo->type == ITEM_PASTE) { for (itemlist = undo->itemlist; itemlist != NULL; itemlist = itemlist->next) { @@ -541,7 +589,7 @@ on_editUndo_activate (GtkMenuItem *menuitem, undo->layer->group = NULL; undo->page->layers = g_list_remove(undo->page->layers, undo->layer); undo->page->nlayers--; - do_switch_page(ui.pageno, FALSE); // don't stay with bad cur_layer info + do_switch_page(ui.pageno, FALSE, FALSE); // don't stay with bad cur_layer info } else if (undo->type == ITEM_DELETE_LAYER) { // special case of -1: deleted the last layer, created a new one @@ -562,17 +610,48 @@ on_editUndo_activate (GtkMenuItem *menuitem, (undo->val >= 0) ? undo->val:0); undo->page->nlayers++; - for (itemlist = undo->layer->items; itemlist!=NULL; itemlist = itemlist->next) { + for (itemlist = undo->layer->items; itemlist!=NULL; itemlist = itemlist->next) + make_canvas_item_one(undo->layer->group, (struct Item *)itemlist->data); + + do_switch_page(ui.pageno, FALSE, FALSE); // show the restored layer & others... + } + else if (undo->type == ITEM_REPAINTSEL) { + for (itemlist = undo->itemlist, list = undo->auxlist; itemlist!=NULL; + itemlist = itemlist->next, list = list->next) { it = (struct Item *)itemlist->data; - if (it->type == ITEM_STROKE) { - it->canvas_item = gnome_canvas_item_new(undo->layer->group, - gnome_canvas_line_get_type(), "points", it->path, - "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND, - "fill-color-rgba", it->brush.color_rgba, - "width-units", it->brush.thickness, NULL); - } + g_memmove(&tmp_brush, &(it->brush), sizeof(struct Brush)); + g_memmove(&(it->brush), list->data, sizeof(struct Brush)); + g_memmove(list->data, &tmp_brush, sizeof(struct Brush)); + if (it->type == ITEM_STROKE && it->canvas_item != NULL) + gnome_canvas_item_set(it->canvas_item, + "fill-color-rgba", it->brush.color_rgba, + "width-units", it->brush.thickness, NULL); + if (it->type == ITEM_TEXT && it->canvas_item != NULL) + gnome_canvas_item_set(it->canvas_item, + "fill-color-rgba", it->brush.color_rgba, NULL); } - do_switch_page(ui.pageno, FALSE); // show the restored layer & others... + } + else if (undo->type == ITEM_TEXT_EDIT) { + tmpstr = undo->str; + undo->str = undo->item->text; + undo->item->text = tmpstr; + gnome_canvas_item_set(undo->item->canvas_item, "text", tmpstr, NULL); + update_item_bbox(undo->item); + } + else if (undo->type == ITEM_TEXT_ATTRIB) { + tmpstr = undo->str; + undo->str = undo->item->font_name; + undo->item->font_name = tmpstr; + tmp_x = undo->val_x; + undo->val_x = undo->item->font_size; + undo->item->font_size = tmp_x; + g_memmove(&tmp_brush, undo->brush, sizeof(struct Brush)); + g_memmove(undo->brush, &(undo->item->brush), sizeof(struct Brush)); + g_memmove(&(undo->item->brush), &tmp_brush, sizeof(struct Brush)); + gnome_canvas_item_set(undo->item->canvas_item, + "fill-color-rgba", undo->item->brush.color_rgba, NULL); + update_text_item_displayfont(undo->item); + update_item_bbox(undo->item); } // move item from undo to redo stack @@ -594,19 +673,19 @@ on_editRedo_activate (GtkMenuItem *menuitem, GList *list, *itemlist, *target; struct UndoErasureData *erasure; struct Item *it; + struct Brush tmp_brush; struct Background *tmp_bg; struct Layer *l; double tmp_x, tmp_y; + gchar *tmpstr; + end_text(); + reset_focus(); if (redo == NULL) return; // nothing to redo! reset_selection(); // safer - if (redo->type == ITEM_STROKE) { + if (redo->type == ITEM_STROKE || redo->type == ITEM_TEXT) { // re-create the canvas_item - redo->item->canvas_item = gnome_canvas_item_new(redo->layer->group, - gnome_canvas_line_get_type(), "points", redo->item->path, - "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND, - "fill-color-rgba", redo->item->brush.color_rgba, - "width-units", redo->item->brush.thickness, NULL); + make_canvas_item_one(redo->layer->group, redo->item); // reinsert the item on its layer redo->layer->items = g_list_append(redo->layer->items, redo->item); redo->layer->nitems++; @@ -618,11 +697,7 @@ on_editRedo_activate (GtkMenuItem *menuitem, // re-create all the created items for (itemlist = erasure->replacement_items; itemlist!=NULL; itemlist = itemlist->next) { it = (struct Item *)itemlist->data; - it->canvas_item = gnome_canvas_item_new(redo->layer->group, - gnome_canvas_line_get_type(), "points", it->path, - "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND, - "fill-color-rgba", it->brush.color_rgba, - "width-units", it->brush.thickness, NULL); + make_canvas_item_one(redo->layer->group, it); redo->layer->items = g_list_insert_before(redo->layer->items, target, it); redo->layer->nitems++; lower_canvas_item_to(redo->layer->group, it->canvas_item, erasure->item->canvas_item); @@ -654,7 +729,7 @@ on_editRedo_activate (GtkMenuItem *menuitem, make_page_clipbox(redo->page); } update_canvas_bg(redo->page); - do_switch_page(g_list_index(journal.pages, redo->page), TRUE); + do_switch_page(g_list_index(journal.pages, redo->page), TRUE, TRUE); } else if (redo->type == ITEM_NEW_DEFAULT_BG) { tmp_bg = ui.default_page.bg; @@ -680,7 +755,7 @@ on_editRedo_activate (GtkMenuItem *menuitem, journal.pages = g_list_insert(journal.pages, redo->page, redo->val); journal.npages++; - do_switch_page(redo->val, TRUE); + do_switch_page(redo->val, TRUE, TRUE); } else if (redo->type == ITEM_DELETE_PAGE) { // unmap all the canvas items @@ -698,24 +773,24 @@ on_editRedo_activate (GtkMenuItem *menuitem, if (ui.pageno > undo->val || ui.pageno == journal.npages) ui.pageno--; ui.cur_page = NULL; // so do_switch_page() won't try to remap the layers of the defunct page - do_switch_page(ui.pageno, TRUE); + do_switch_page(ui.pageno, TRUE, TRUE); } else if (redo->type == ITEM_MOVESEL) { for (itemlist = redo->itemlist; itemlist != NULL; itemlist = itemlist->next) { it = (struct Item *)itemlist->data; - if (it->canvas_item != NULL) + if (it->canvas_item != NULL) { + if (redo->layer != redo->layer2) + gnome_canvas_item_reparent(it->canvas_item, redo->layer2->group); gnome_canvas_item_move(it->canvas_item, redo->val_x, redo->val_y); + } } - move_journal_items_by(redo->itemlist, redo->val_x, redo->val_y); + move_journal_items_by(redo->itemlist, redo->val_x, redo->val_y, + redo->layer, redo->layer2, NULL); } else if (redo->type == ITEM_PASTE) { for (itemlist = redo->itemlist; itemlist != NULL; itemlist = itemlist->next) { it = (struct Item *)itemlist->data; - it->canvas_item = gnome_canvas_item_new(redo->layer->group, - gnome_canvas_line_get_type(), "points", it->path, - "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND, - "fill-color-rgba", it->brush.color_rgba, - "width-units", it->brush.thickness, NULL); + make_canvas_item_one(redo->layer->group, it); redo->layer->items = g_list_append(redo->layer->items, it); redo->layer->nitems++; } @@ -729,7 +804,7 @@ on_editRedo_activate (GtkMenuItem *menuitem, redo->page->bg->canvas_item); redo->page->layers = g_list_insert(redo->page->layers, redo->layer, redo->val); redo->page->nlayers++; - do_switch_page(ui.pageno, FALSE); + do_switch_page(ui.pageno, FALSE, FALSE); } else if (redo->type == ITEM_DELETE_LAYER) { gtk_object_destroy(GTK_OBJECT(redo->layer->group)); @@ -744,7 +819,45 @@ on_editRedo_activate (GtkMenuItem *menuitem, redo->page->layers = g_list_append(redo->page->layers, redo->layer2); redo->page->nlayers++; } - do_switch_page(ui.pageno, FALSE); + do_switch_page(ui.pageno, FALSE, FALSE); + } + else if (redo->type == ITEM_REPAINTSEL) { + for (itemlist = redo->itemlist, list = redo->auxlist; itemlist!=NULL; + itemlist = itemlist->next, list = list->next) { + it = (struct Item *)itemlist->data; + g_memmove(&tmp_brush, &(it->brush), sizeof(struct Brush)); + g_memmove(&(it->brush), list->data, sizeof(struct Brush)); + g_memmove(list->data, &tmp_brush, sizeof(struct Brush)); + if (it->type == ITEM_STROKE && it->canvas_item != NULL) + gnome_canvas_item_set(it->canvas_item, + "fill-color-rgba", it->brush.color_rgba, + "width-units", it->brush.thickness, NULL); + if (it->type == ITEM_TEXT && it->canvas_item != NULL) + gnome_canvas_item_set(it->canvas_item, + "fill-color-rgba", it->brush.color_rgba, NULL); + } + } + else if (redo->type == ITEM_TEXT_EDIT) { + tmpstr = redo->str; + redo->str = redo->item->text; + redo->item->text = tmpstr; + gnome_canvas_item_set(redo->item->canvas_item, "text", tmpstr, NULL); + update_item_bbox(redo->item); + } + else if (redo->type == ITEM_TEXT_ATTRIB) { + tmpstr = redo->str; + redo->str = redo->item->font_name; + redo->item->font_name = tmpstr; + tmp_x = redo->val_x; + redo->val_x = redo->item->font_size; + redo->item->font_size = tmp_x; + g_memmove(&tmp_brush, redo->brush, sizeof(struct Brush)); + g_memmove(redo->brush, &(redo->item->brush), sizeof(struct Brush)); + g_memmove(&(redo->item->brush), &tmp_brush, sizeof(struct Brush)); + gnome_canvas_item_set(redo->item->canvas_item, + "fill-color-rgba", redo->item->brush.color_rgba, NULL); + update_text_item_displayfont(redo->item); + update_item_bbox(redo->item); } // move item from redo to undo stack @@ -762,6 +875,8 @@ void on_editCut_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); selection_to_clip(); selection_delete(); } @@ -771,6 +886,8 @@ void on_editCopy_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); selection_to_clip(); } @@ -779,6 +896,8 @@ void on_editPaste_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); clipboard_paste(); } @@ -787,6 +906,8 @@ void on_editDelete_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); selection_delete(); } @@ -797,14 +918,17 @@ on_viewContinuous_activate (GtkMenuItem *menuitem, { GtkAdjustment *v_adj; double yscroll; + struct Page *pg; + reset_focus(); if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return; if (ui.view_continuous) return; ui.view_continuous = TRUE; v_adj = gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)); - yscroll = gtk_adjustment_get_value(v_adj) - ui.cur_page->voffset*ui.zoom; + pg = ui.cur_page; + yscroll = gtk_adjustment_get_value(v_adj) - pg->voffset*ui.zoom; update_page_stuff(); - gtk_adjustment_set_value(v_adj, yscroll + ui.cur_page->voffset*ui.zoom); + gtk_adjustment_set_value(v_adj, yscroll + pg->voffset*ui.zoom); // force a refresh gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); } @@ -817,6 +941,7 @@ on_viewOnePage_activate (GtkMenuItem *menuitem, GtkAdjustment *v_adj; double yscroll; + reset_focus(); if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return; if (!ui.view_continuous) return; ui.view_continuous = FALSE; @@ -833,9 +958,11 @@ void on_viewZoomIn_activate (GtkMenuItem *menuitem, gpointer user_data) { + reset_focus(); if (ui.zoom > MAX_ZOOM) return; - ui.zoom *= 1.5; + ui.zoom *= ui.zoom_step_factor; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); rescale_bg_pixmaps(); } @@ -844,9 +971,11 @@ void on_viewZoomOut_activate (GtkMenuItem *menuitem, gpointer user_data) { + reset_focus(); if (ui.zoom < MIN_ZOOM) return; - ui.zoom /= 1.5; + ui.zoom /= ui.zoom_step_factor; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); rescale_bg_pixmaps(); } @@ -855,8 +984,10 @@ void on_viewNormalSize_activate (GtkMenuItem *menuitem, gpointer user_data) { + reset_focus(); ui.zoom = DEFAULT_ZOOM; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); rescale_bg_pixmaps(); } @@ -865,8 +996,10 @@ void on_viewPageWidth_activate (GtkMenuItem *menuitem, gpointer user_data) { + reset_focus(); ui.zoom = (GTK_WIDGET(canvas))->allocation.width/ui.cur_page->width; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); rescale_bg_pixmaps(); } @@ -875,7 +1008,9 @@ void on_viewFirstPage_activate (GtkMenuItem *menuitem, gpointer user_data) { - do_switch_page(0, TRUE); + end_text(); + reset_focus(); + do_switch_page(0, TRUE, FALSE); } @@ -883,8 +1018,10 @@ void on_viewPreviousPage_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); if (ui.pageno == 0) return; - do_switch_page(ui.pageno-1, TRUE); + do_switch_page(ui.pageno-1, TRUE, FALSE); } @@ -892,12 +1029,14 @@ void on_viewNextPage_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); if (ui.pageno == journal.npages-1) { // create a page at end if (page_ops_forbidden()) return; on_journalNewPageEnd_activate(menuitem, user_data); return; } - do_switch_page(ui.pageno+1, TRUE); + do_switch_page(ui.pageno+1, TRUE, FALSE); } @@ -905,7 +1044,9 @@ void on_viewLastPage_activate (GtkMenuItem *menuitem, gpointer user_data) { - do_switch_page(journal.npages-1, TRUE); + end_text(); + reset_focus(); + do_switch_page(journal.npages-1, TRUE, FALSE); } @@ -913,6 +1054,8 @@ void on_viewShowLayer_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); if (ui.layerno == ui.cur_page->nlayers-1) return; reset_selection(); ui.layerno++; @@ -926,6 +1069,8 @@ void on_viewHideLayer_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); if (ui.layerno == -1) return; reset_selection(); gnome_canvas_item_hide(GNOME_CANVAS_ITEM(ui.cur_layer->group)); @@ -942,12 +1087,14 @@ on_journalNewPageBefore_activate (GtkMenuItem *menuitem, { struct Page *pg; + end_text(); + reset_focus(); if (page_ops_forbidden()) return; reset_selection(); pg = new_page(ui.cur_page); journal.pages = g_list_insert(journal.pages, pg, ui.pageno); journal.npages++; - do_switch_page(ui.pageno, TRUE); + do_switch_page(ui.pageno, TRUE, TRUE); prepare_new_undo(); undo->type = ITEM_NEW_PAGE; @@ -962,12 +1109,14 @@ on_journalNewPageAfter_activate (GtkMenuItem *menuitem, { struct Page *pg; + end_text(); + reset_focus(); if (page_ops_forbidden()) return; reset_selection(); pg = new_page(ui.cur_page); journal.pages = g_list_insert(journal.pages, pg, ui.pageno+1); journal.npages++; - do_switch_page(ui.pageno+1, TRUE); + do_switch_page(ui.pageno+1, TRUE, TRUE); prepare_new_undo(); undo->type = ITEM_NEW_PAGE; @@ -982,12 +1131,14 @@ on_journalNewPageEnd_activate (GtkMenuItem *menuitem, { struct Page *pg; + end_text(); + reset_focus(); if (page_ops_forbidden()) return; reset_selection(); pg = new_page((struct Page *)g_list_last(journal.pages)->data); journal.pages = g_list_append(journal.pages, pg); journal.npages++; - do_switch_page(journal.npages-1, TRUE); + do_switch_page(journal.npages-1, TRUE, TRUE); prepare_new_undo(); undo->type = ITEM_NEW_PAGE; @@ -1003,6 +1154,8 @@ on_journalDeletePage_activate (GtkMenuItem *menuitem, GList *layerlist, *itemlist; struct Layer *l; + end_text(); + reset_focus(); if (page_ops_forbidden()) return; if (journal.npages == 1) return; reset_selection(); @@ -1027,7 +1180,7 @@ on_journalDeletePage_activate (GtkMenuItem *menuitem, if (ui.pageno == journal.npages) ui.pageno--; ui.cur_page = NULL; // so do_switch_page() won't try to remap the layers of the defunct page - do_switch_page(ui.pageno, TRUE); + do_switch_page(ui.pageno, TRUE, TRUE); } @@ -1037,6 +1190,8 @@ on_journalNewLayer_activate (GtkMenuItem *menuitem, { struct Layer *l; + end_text(); + reset_focus(); reset_selection(); l = g_new(struct Layer, 1); l->items = NULL; @@ -1065,6 +1220,8 @@ on_journalDeleteLayer_activate (GtkMenuItem *menuitem, { GList *list; + end_text(); + reset_focus(); if (ui.cur_layer == NULL) return; reset_selection(); prepare_new_undo(); @@ -1123,12 +1280,7 @@ gboolean papersize_need_init, papersize_width_valid, papersize_height_valid; #define STD_SIZE_LETTER_R 3 #define STD_SIZE_CUSTOM 4 -#define UNIT_CM 0 -#define UNIT_IN 1 -#define UNIT_PX 2 -#define UNIT_PT 3 - -double unit_sizes[4] = {28.346, 72., 1/DEFAULT_ZOOM, 1.}; +double unit_sizes[4] = {28.346, 72., 72./DISPLAY_DPI_DEFAULT, 1.}; double std_widths[STD_SIZE_CUSTOM] = {595.27, 841.89, 612., 792.}; double std_heights[STD_SIZE_CUSTOM] = {841.89, 595.27, 792., 612.}; double std_units[STD_SIZE_CUSTOM] = {UNIT_CM, UNIT_CM, UNIT_IN, UNIT_IN}; @@ -1138,11 +1290,16 @@ on_journalPaperSize_activate (GtkMenuItem *menuitem, gpointer user_data) { int i, response; + struct Page *pg; + GList *pglist; + end_text(); + reset_focus(); papersize_dialog = create_papersizeDialog(); papersize_width = ui.cur_page->width; papersize_height = ui.cur_page->height; - papersize_unit = UNIT_CM; + papersize_unit = ui.default_unit; + unit_sizes[UNIT_PX] = 1./DEFAULT_ZOOM; // if (ui.cur_page->bg->type == BG_PIXMAP) papersize_unit = UNIT_PX; papersize_std = STD_SIZE_CUSTOM; for (i=0;itype = ITEM_PAPER_RESIZE; - undo->page = ui.cur_page; - undo->val_x = ui.cur_page->width; - undo->val_y = ui.cur_page->height; - - if (papersize_width_valid) ui.cur_page->width = papersize_width; - if (papersize_height_valid) ui.cur_page->height = papersize_height; - make_page_clipbox(ui.cur_page); - update_canvas_bg(ui.cur_page); - do_switch_page(ui.pageno, TRUE); + pg = ui.cur_page; + for (pglist = journal.pages; pglist!=NULL; pglist = pglist->next) { + if (ui.bg_apply_all_pages) pg = (struct Page *)pglist->data; + prepare_new_undo(); + if (ui.bg_apply_all_pages) { + if (pglist->next!=NULL) undo->multiop |= MULTIOP_CONT_REDO; + if (pglist->prev!=NULL) undo->multiop |= MULTIOP_CONT_UNDO; + } + undo->type = ITEM_PAPER_RESIZE; + undo->page = pg; + undo->val_x = pg->width; + undo->val_y = pg->height; + if (papersize_width_valid) pg->width = papersize_width; + if (papersize_height_valid) pg->height = papersize_height; + make_page_clipbox(pg); + update_canvas_bg(pg); + if (!ui.bg_apply_all_pages) break; + } + do_switch_page(ui.pageno, TRUE, TRUE); } @@ -1180,6 +1344,8 @@ void on_papercolorWhite_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_papercolor_activate(menuitem, COLOR_WHITE); } @@ -1188,6 +1354,8 @@ void on_papercolorYellow_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_papercolor_activate(menuitem, COLOR_YELLOW); } @@ -1196,6 +1364,8 @@ void on_papercolorPink_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_papercolor_activate(menuitem, COLOR_RED); } @@ -1204,6 +1374,8 @@ void on_papercolorOrange_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_papercolor_activate(menuitem, COLOR_ORANGE); } @@ -1212,6 +1384,8 @@ void on_papercolorBlue_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_papercolor_activate(menuitem, COLOR_BLUE); } @@ -1220,6 +1394,8 @@ void on_papercolorGreen_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_papercolor_activate(menuitem, COLOR_GREEN); } @@ -1236,6 +1412,8 @@ void on_paperstylePlain_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_paperstyle_activate(menuitem, RULING_NONE); } @@ -1244,6 +1422,8 @@ void on_paperstyleLined_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_paperstyle_activate(menuitem, RULING_LINED); } @@ -1252,6 +1432,8 @@ void on_paperstyleRuled_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_paperstyle_activate(menuitem, RULING_RULED); } @@ -1260,6 +1442,8 @@ void on_paperstyleGraph_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); process_paperstyle_activate(menuitem, RULING_GRAPH); } @@ -1277,10 +1461,12 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, char *filename; gboolean attach; + end_text(); + reset_focus(); dialog = gtk_file_chooser_dialog_new("Open Background", GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); - + GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); + filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, "All files"); gtk_file_filter_add_pattern(filt_all, "*"); @@ -1300,14 +1486,18 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, filt_pspdf = gtk_file_filter_new(); gtk_file_filter_set_name(filt_pspdf, "PS/PDF files (as bitmaps)"); gtk_file_filter_add_pattern(filt_pspdf, "*.ps"); + gtk_file_filter_add_pattern(filt_pspdf, "*.PS"); gtk_file_filter_add_pattern(filt_pspdf, "*.pdf"); + gtk_file_filter_add_pattern(filt_pspdf, "*.PDF"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pspdf); attach_opt = gtk_check_button_new_with_label("Attach file to the journal"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt); + + if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path); - if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) { + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { gtk_widget_destroy(dialog); return; } @@ -1374,9 +1564,10 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, if (ui.zoom != DEFAULT_ZOOM) { ui.zoom = DEFAULT_ZOOM; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); rescale_bg_pixmaps(); } - do_switch_page(ui.pageno, TRUE); + do_switch_page(ui.pageno, TRUE, TRUE); } void @@ -1385,6 +1576,8 @@ on_journalScreenshot_activate (GtkMenuItem *menuitem, { struct Background *bg; + end_text(); + reset_focus(); reset_selection(); gtk_window_iconify(GTK_WINDOW(winMain)); // hide ourselves gdk_display_sync(gdk_display_get_default()); @@ -1418,9 +1611,10 @@ on_journalScreenshot_activate (GtkMenuItem *menuitem, if (ui.zoom != DEFAULT_ZOOM) { ui.zoom = DEFAULT_ZOOM; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); rescale_bg_pixmaps(); } - do_switch_page(ui.pageno, TRUE); + do_switch_page(ui.pageno, TRUE, TRUE); } @@ -1428,6 +1622,42 @@ void on_journalApplyAllPages_activate (GtkMenuItem *menuitem, gpointer user_data) { + gboolean active; + + end_text(); + reset_focus(); + active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); + if (active == ui.bg_apply_all_pages) return; + ui.bg_apply_all_pages = active; + update_page_stuff(); + +/* THIS IS THE OLD VERSION OF THE FEATURE -- APPLIED CURRENT BG TO ALL + struct Page *page; + GList *pglist; + + if (ui.cur_page->bg->type != BG_SOLID) return; + reset_selection(); + for (pglist = journal.pages; pglist!=NULL; pglist = pglist->next) { + page = (struct Page *)pglist->data; + prepare_new_undo(); + undo->type = ITEM_NEW_BG_RESIZE; + undo->page = page; + undo->bg = page->bg; + undo->val_x = page->width; + undo->val_y = page->height; + if (pglist->next!=NULL) undo->multiop |= MULTIOP_CONT_REDO; + if (pglist->prev!=NULL) undo->multiop |= MULTIOP_CONT_UNDO; + page->bg = (struct Background *)g_memdup(ui.cur_page->bg, sizeof(struct Background)); + page->width = ui.cur_page->width; + page->height = ui.cur_page->height; + page->bg->canvas_item = undo->bg->canvas_item; + undo->bg->canvas_item = NULL; + + make_page_clipbox(page); + update_canvas_bg(page); + } + do_switch_page(ui.pageno, TRUE, TRUE); +*/ } @@ -1444,12 +1674,16 @@ on_toolsPen_activate (GtkMenuItem *menuitem, return; } - if (ui.toolno == TOOL_PEN) return; - + if (ui.cur_mapping != 0) return; + if (ui.toolno[0] == TOOL_PEN) return; + + end_text(); + reset_focus(); reset_selection(); - ui.toolno = TOOL_PEN; - ui.ruler = FALSE; - ui.cur_brush = ui.brushes+TOOL_PEN; + ui.toolno[0] = TOOL_PEN; + ui.ruler[0] = FALSE; + ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + update_mapping_linkings(TOOL_PEN); update_tool_buttons(); update_tool_menu(); update_color_menu(); @@ -1469,12 +1703,16 @@ on_toolsEraser_activate (GtkMenuItem *menuitem, return; } - if (ui.toolno == TOOL_ERASER) return; + if (ui.cur_mapping != 0) return; + if (ui.toolno[0] == TOOL_ERASER) return; + end_text(); + reset_focus(); reset_selection(); - ui.toolno = TOOL_ERASER; - ui.ruler = FALSE; - ui.cur_brush = ui.brushes+TOOL_ERASER; + ui.toolno[0] = TOOL_ERASER; + ui.ruler[0] = FALSE; + ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]); + update_mapping_linkings(TOOL_ERASER); update_tool_buttons(); update_tool_menu(); update_color_menu(); @@ -1494,12 +1732,16 @@ on_toolsHighlighter_activate (GtkMenuItem *menuitem, return; } - if (ui.toolno == TOOL_HIGHLIGHTER) return; + if (ui.cur_mapping != 0) return; // not user-generated + if (ui.toolno[0] == TOOL_HIGHLIGHTER) return; + end_text(); + reset_focus(); reset_selection(); - ui.toolno = TOOL_HIGHLIGHTER; - ui.ruler = FALSE; - ui.cur_brush = ui.brushes+TOOL_HIGHLIGHTER; + ui.toolno[0] = TOOL_HIGHLIGHTER; + ui.ruler[0] = FALSE; + ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]); + update_mapping_linkings(TOOL_HIGHLIGHTER); update_tool_buttons(); update_tool_menu(); update_color_menu(); @@ -1511,7 +1753,27 @@ void on_toolsText_activate (GtkMenuItem *menuitem, gpointer user_data) { - + if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) { + if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) + return; + } else { + if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem))) + return; + } + + if (ui.cur_mapping != 0) return; // not user-generated + if (ui.toolno[0] == TOOL_TEXT) return; + + reset_focus(); + reset_selection(); + ui.toolno[0] = TOOL_TEXT; + ui.ruler[0] = FALSE; + ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + update_mapping_linkings(-1); + update_tool_buttons(); + update_tool_menu(); + update_color_menu(); + update_cursor(); } @@ -1535,10 +1797,14 @@ on_toolsSelectRectangle_activate (GtkMenuItem *menuitem, return; } - if (ui.toolno == TOOL_SELECTRECT) return; + if (ui.cur_mapping != 0) return; // not user-generated + if (ui.toolno[0] == TOOL_SELECTRECT) return; - ui.toolno = TOOL_SELECTRECT; - ui.ruler = FALSE; + end_text(); + reset_focus(); + ui.toolno[0] = TOOL_SELECTRECT; + ui.ruler[0] = FALSE; + update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); update_color_menu(); @@ -1558,11 +1824,15 @@ on_toolsVerticalSpace_activate (GtkMenuItem *menuitem, return; } - if (ui.toolno == TOOL_VERTSPACE) return; + if (ui.cur_mapping != 0) return; // not user-generated + if (ui.toolno[0] == TOOL_VERTSPACE) return; + end_text(); + reset_focus(); reset_selection(); - ui.toolno = TOOL_VERTSPACE; - ui.ruler = FALSE; + ui.toolno[0] = TOOL_VERTSPACE; + ui.ruler[0] = FALSE; + update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); update_color_menu(); @@ -1736,7 +2006,10 @@ on_eraserStandard_activate (GtkMenuItem *menuitem, gpointer user_data) { if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return; - ui.brushes[TOOL_ERASER].tool_options = TOOLOPT_ERASER_STANDARD; + end_text(); + reset_focus(); + ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_STANDARD; + update_mapping_linkings(TOOL_ERASER); } @@ -1745,7 +2018,10 @@ on_eraserWhiteout_activate (GtkMenuItem *menuitem, gpointer user_data) { if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return; - ui.brushes[TOOL_ERASER].tool_options = TOOLOPT_ERASER_WHITEOUT; + end_text(); + reset_focus(); + ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_WHITEOUT; + update_mapping_linkings(TOOL_ERASER); } @@ -1754,7 +2030,10 @@ on_eraserDeleteStrokes_activate (GtkMenuItem *menuitem, gpointer user_data) { if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return; - ui.brushes[TOOL_ERASER].tool_options = TOOLOPT_ERASER_STROKES; + end_text(); + reset_focus(); + ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_STROKES; + update_mapping_linkings(TOOL_ERASER); } @@ -1786,18 +2065,36 @@ void on_toolsTextFont_activate (GtkMenuItem *menuitem, gpointer user_data) { - -} - + GtkWidget *dialog; + gchar *str; + + dialog = gtk_font_selection_dialog_new("Select Font"); + str = make_cur_font_name(); + gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(dialog), str); + g_free(str); + if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) { + gtk_widget_destroy(dialog); + reset_focus(); + return; + } + str = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(dialog)); + gtk_widget_destroy(dialog); + process_font_sel(str); +} void on_toolsDefaultPen_activate (GtkMenuItem *menuitem, gpointer user_data) { + switch_mapping(0); + end_text(); + reset_focus(); reset_selection(); - g_memmove(ui.brushes+TOOL_PEN, ui.default_brushes+TOOL_PEN, sizeof(struct Brush)); - ui.toolno = TOOL_PEN; - ui.cur_brush = ui.brushes+TOOL_PEN; + g_memmove(&(ui.brushes[0][TOOL_PEN]), ui.default_brushes+TOOL_PEN, sizeof(struct Brush)); + ui.toolno[0] = TOOL_PEN; + ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.ruler[0] = FALSE; + update_mapping_linkings(TOOL_PEN); update_tool_buttons(); update_tool_menu(); update_pen_props_menu(); @@ -1810,10 +2107,15 @@ void on_toolsDefaultEraser_activate (GtkMenuItem *menuitem, gpointer user_data) { + switch_mapping(0); + end_text(); + reset_focus(); reset_selection(); - g_memmove(ui.brushes+TOOL_ERASER, ui.default_brushes+TOOL_ERASER, sizeof(struct Brush)); - ui.toolno = TOOL_ERASER; - ui.cur_brush = ui.brushes+TOOL_ERASER; + g_memmove(&(ui.brushes[0][TOOL_ERASER]), ui.default_brushes+TOOL_ERASER, sizeof(struct Brush)); + ui.toolno[0] = TOOL_ERASER; + ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]); + ui.ruler[0] = FALSE; + update_mapping_linkings(TOOL_ERASER); update_tool_buttons(); update_tool_menu(); update_eraser_props_menu(); @@ -1826,10 +2128,15 @@ void on_toolsDefaultHighlighter_activate (GtkMenuItem *menuitem, gpointer user_data) { + switch_mapping(0); + end_text(); + reset_focus(); reset_selection(); - g_memmove(ui.brushes+TOOL_HIGHLIGHTER, ui.default_brushes+TOOL_HIGHLIGHTER, sizeof(struct Brush)); - ui.toolno = TOOL_HIGHLIGHTER; - ui.cur_brush = ui.brushes+TOOL_HIGHLIGHTER; + g_memmove(&(ui.brushes[0][TOOL_HIGHLIGHTER]), ui.default_brushes+TOOL_HIGHLIGHTER, sizeof(struct Brush)); + ui.toolno[0] = TOOL_HIGHLIGHTER; + ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]); + ui.ruler[0] = FALSE; + update_mapping_linkings(TOOL_HIGHLIGHTER); update_tool_buttons(); update_tool_menu(); update_highlighter_props_menu(); @@ -1841,7 +2148,27 @@ void on_toolsDefaultText_activate (GtkMenuItem *menuitem, gpointer user_data) { - + switch_mapping(0); + if (ui.toolno[0]!=TOOL_TEXT) end_text(); + reset_focus(); + reset_selection(); + ui.toolno[0] = TOOL_TEXT; + ui.ruler[0] = FALSE; + ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.cur_brush->color_no = ui.default_brushes[TOOL_PEN].color_no; + ui.cur_brush->color_rgba = ui.default_brushes[TOOL_PEN].color_rgba; + g_free(ui.font_name); + ui.font_name = g_strdup(ui.default_font_name); + ui.font_size = ui.default_font_size; + if (ui.cur_item_type == ITEM_TEXT) { + refont_text_item(ui.cur_item, ui.font_name, ui.font_size); + } + update_font_button(); + update_mapping_linkings(-1); + update_tool_buttons(); + update_tool_menu(); + update_color_menu(); + update_cursor(); } @@ -1849,8 +2176,30 @@ void on_toolsSetAsDefault_activate (GtkMenuItem *menuitem, gpointer user_data) { - if (ui.toolno < NUM_STROKE_TOOLS) - g_memmove(ui.default_brushes+ui.toolno, ui.brushes+ui.toolno, sizeof(struct Brush)); + struct Item *it; + + if (ui.cur_mapping!=0) return; + if (ui.toolno[0] < NUM_STROKE_TOOLS) + g_memmove(ui.default_brushes+ui.toolno[0], &(ui.brushes[0][ui.toolno[0]]), sizeof(struct Brush)); + if (ui.toolno[0] == TOOL_TEXT) { + if (ui.cur_item_type == ITEM_TEXT) { + g_free(ui.font_name); + ui.font_name = g_strdup(ui.cur_item->font_name); + ui.font_size = ui.cur_item->font_size; + } + else if (ui.selection!=NULL && ui.selection->items!=NULL && + ui.selection->items->next==NULL && + (it=(struct Item*)ui.selection->items->data)->type == ITEM_TEXT) { + g_free(ui.font_name); + ui.font_name = g_strdup(it->font_name); + ui.font_size = it->font_size; + } + g_free(ui.default_font_name); + ui.default_font_name = g_strdup(ui.font_name); + ui.default_font_size = ui.font_size; + } + end_text(); + reset_focus(); } @@ -1865,19 +2214,23 @@ on_toolsRuler_activate (GtkMenuItem *menuitem, else active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); - if (active == ui.ruler) return; + if (ui.cur_mapping != 0) return; + if (active == ui.ruler[0]) return; - if (active && (ui.toolno!=TOOL_PEN && ui.toolno!=TOOL_HIGHLIGHTER)) { + end_text(); + reset_focus(); + if (active && (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER)) { reset_selection(); - ui.toolno = TOOL_PEN; - ui.cur_brush = ui.brushes+TOOL_PEN; + ui.toolno[0] = TOOL_PEN; + ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); update_color_menu(); update_tool_buttons(); update_tool_menu(); update_cursor(); } - ui.ruler = active; + ui.ruler[0] = active; + update_mapping_linkings(ui.toolno[0]); update_ruler_indicator(); } @@ -1886,7 +2239,9 @@ void on_optionsSavePreferences_activate (GtkMenuItem *menuitem, gpointer user_data) { - + end_text(); + reset_focus(); + save_config_to_file(); } @@ -1905,6 +2260,8 @@ on_helpAbout_activate (GtkMenuItem *menuitem, GtkWidget *aboutDialog; GtkLabel *labelTitle; + end_text(); + reset_focus(); aboutDialog = create_aboutDialog (); labelTitle = GTK_LABEL(g_object_get_data(G_OBJECT(aboutDialog), "labelTitle")); gtk_label_set_markup(labelTitle, @@ -1918,14 +2275,23 @@ void on_buttonToolDefault_clicked (GtkToolButton *toolbutton, gpointer user_data) { - if (ui.toolno < NUM_STROKE_TOOLS) { - g_memmove(ui.brushes+ui.toolno, ui.default_brushes+ui.toolno, sizeof(struct Brush)); + if (ui.toolno[0]==TOOL_TEXT) { + on_toolsDefaultText_activate(NULL, NULL); + return; + } + end_text(); + reset_focus(); + switch_mapping(0); + if (ui.toolno[0] < NUM_STROKE_TOOLS) { + g_memmove(&(ui.brushes[0][ui.toolno[0]]), ui.default_brushes+ui.toolno[0], sizeof(struct Brush)); + ui.ruler[0] = FALSE; + update_mapping_linkings(ui.toolno[0]); update_thickness_buttons(); update_color_buttons(); update_color_menu(); - if (ui.toolno == TOOL_PEN) update_pen_props_menu(); - if (ui.toolno == TOOL_ERASER) update_eraser_props_menu(); - if (ui.toolno == TOOL_HIGHLIGHTER) update_highlighter_props_menu(); + if (ui.toolno[0] == TOOL_PEN) update_pen_props_menu(); + if (ui.toolno[0] == TOOL_ERASER) update_eraser_props_menu(); + if (ui.toolno[0] == TOOL_HIGHLIGHTER) update_highlighter_props_menu(); update_cursor(); } } @@ -1935,7 +2301,8 @@ void on_buttonFine_clicked (GtkToolButton *toolbutton, gpointer user_data) { - process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno, THICKNESS_FINE); + if (ui.cur_mapping != 0) return; + process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_FINE); } @@ -1943,7 +2310,8 @@ void on_buttonMedium_clicked (GtkToolButton *toolbutton, gpointer user_data) { - process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno, THICKNESS_MEDIUM); + if (ui.cur_mapping != 0) return; + process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_MEDIUM); } @@ -1951,7 +2319,8 @@ void on_buttonThick_clicked (GtkToolButton *toolbutton, gpointer user_data) { - process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno, THICKNESS_THICK); + if (ui.cur_mapping != 0) return; + process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_THICK); } @@ -1964,31 +2333,29 @@ on_canvas_button_press_event (GtkWidget *widget, gboolean page_change; struct Page *tmppage; GtkWidget *dialog; - - if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something - if (event->button > 3) return FALSE; // no painting with the mouse wheel! + int mapping; + gboolean is_core; + struct Item *item; - if (ui.use_xinput) { - if (event->device->source == GDK_SOURCE_MOUSE) return FALSE; + is_core = (event->device == gdk_device_get_core_pointer()); + if (!ui.use_xinput && !is_core) return FALSE; + if (ui.use_xinput && is_core && ui.discard_corepointer) return FALSE; + if (event->button > 3) return FALSE; // no painting with the mouse wheel! + if (!is_core) { // re-get the axis values since Synaptics sends bogus ones gdk_device_get_state(event->device, event->window, event->axes, NULL); fix_xinput_coords((GdkEvent *)event); } - else if (event->device->source != GDK_SOURCE_MOUSE) return FALSE; - if ((ui.use_xinput && event->device->source == GDK_SOURCE_ERASER) || - (ui.emulate_eraser && event->button >= 2)) { - ui.saved_toolno = ui.toolno; - ui.saved_ruler = ui.ruler; - reset_selection(); - ui.toolno = TOOL_ERASER; - ui.ruler = FALSE; - ui.cur_brush = ui.brushes + TOOL_ERASER; - update_tool_buttons(); - update_tool_menu(); - update_color_menu(); - update_cursor(); - } + if (ui.cur_item_type == ITEM_TEXT && !is_event_within_textview(event)) + end_text(); + if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something + + ui.is_corestroke = is_core; + + if (ui.use_erasertip && event->device->source == GDK_SOURCE_ERASER) + mapping = NUM_BUTTONS; + else mapping = event->button-1; // check whether we're in a page page_change = FALSE; @@ -2008,21 +2375,11 @@ on_canvas_button_press_event (GtkWidget *widget, ui.pageno++; tmppage = g_list_nth_data(journal.pages, ui.pageno); } - if (page_change) do_switch_page(ui.pageno, FALSE); + if (page_change) do_switch_page(ui.pageno, FALSE, FALSE); // can't paint on the background... if (ui.cur_layer == NULL) { - if (ui.saved_toolno >=0) { - ui.toolno = ui.saved_toolno; - ui.ruler = ui.saved_ruler; - ui.saved_toolno = -1; - if (ui.toolno < NUM_STROKE_TOOLS) ui.cur_brush = ui.brushes + ui.toolno; - update_tool_buttons(); - update_tool_menu(); - update_color_menu(); - update_cursor(); - } /* warn */ dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "Drawing is not allowed on the " @@ -2032,26 +2389,52 @@ on_canvas_button_press_event (GtkWidget *widget, on_viewShowLayer_activate(NULL, NULL); return; } + + // switch mappings if needed - // process the event ui.which_mouse_button = event->button; + switch_mapping(mapping); + + // in text tool, clicking in a text area edits it + if (ui.toolno[mapping] == TOOL_TEXT) { + item = click_is_in_text(ui.cur_layer, pt[0], pt[1]); + if (item!=NULL) { + reset_selection(); + start_text((GdkEvent *)event, item); + return FALSE; + } + } + + // if this can be a selection move, then it takes precedence over anything else + if (start_movesel((GdkEvent *)event)) return FALSE; - if (ui.toolno == TOOL_PEN || ui.toolno == TOOL_HIGHLIGHTER || - (ui.toolno == TOOL_ERASER && ui.cur_brush->tool_options == TOOLOPT_ERASER_WHITEOUT)) { + if (ui.toolno[mapping] != TOOL_SELECTREGION && ui.toolno[mapping] != TOOL_SELECTRECT) + reset_selection(); + + // process the event + + if (ui.toolno[mapping] == TOOL_HAND) { + ui.cur_item_type = ITEM_HAND; + get_pointer_coords((GdkEvent *)event, ui.hand_refpt); + } + else if (ui.toolno[mapping] == TOOL_PEN || ui.toolno[mapping] == TOOL_HIGHLIGHTER || + (ui.toolno[mapping] == TOOL_ERASER && ui.cur_brush->tool_options == TOOLOPT_ERASER_WHITEOUT)) { create_new_stroke((GdkEvent *)event); } - else if (ui.toolno == TOOL_ERASER) { + else if (ui.toolno[mapping] == TOOL_ERASER) { ui.cur_item_type = ITEM_ERASURE; do_eraser((GdkEvent *)event, ui.cur_brush->thickness/2, ui.cur_brush->tool_options == TOOLOPT_ERASER_STROKES); } - else if (ui.toolno == TOOL_SELECTRECT) { - if (!start_movesel((GdkEvent *)event)) - start_selectrect((GdkEvent *)event); + else if (ui.toolno[mapping] == TOOL_SELECTRECT) { + start_selectrect((GdkEvent *)event); } - else if (ui.toolno == TOOL_VERTSPACE) { + else if (ui.toolno[mapping] == TOOL_VERTSPACE) { start_vertspace((GdkEvent *)event); } + else if (ui.toolno[mapping] == TOOL_TEXT) { + start_text((GdkEvent *)event, NULL); + } return FALSE; } @@ -2061,27 +2444,17 @@ on_canvas_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { + gboolean is_core; + if (ui.cur_item_type == ITEM_NONE) return FALSE; // not doing anything if (event->button != ui.which_mouse_button) return FALSE; // ignore - if (ui.use_xinput) { - if (event->device->source == GDK_SOURCE_MOUSE) return FALSE; - fix_xinput_coords((GdkEvent *)event); - } - else if (event->device->source != GDK_SOURCE_MOUSE) return FALSE; + is_core = (event->device == gdk_device_get_core_pointer()); + if (!ui.use_xinput && !is_core) return FALSE; + if (ui.use_xinput && is_core && !ui.is_corestroke) return FALSE; + if (!is_core) fix_xinput_coords((GdkEvent *)event); - if (ui.saved_toolno >= 0) { - ui.toolno = ui.saved_toolno; - ui.ruler = ui.saved_ruler; - ui.saved_toolno = -1; - if (ui.toolno < NUM_STROKE_TOOLS) ui.cur_brush = ui.brushes + ui.toolno; - update_tool_buttons(); - update_tool_menu(); - update_color_menu(); - update_cursor(); - } - if (ui.cur_item_type == ITEM_STROKE) { finalize_stroke(); } @@ -2091,10 +2464,14 @@ on_canvas_button_release_event (GtkWidget *widget, else if (ui.cur_item_type == ITEM_SELECTRECT) { finalize_selectrect(); } - else if (ui.cur_item_type == ITEM_MOVESEL) { + else if (ui.cur_item_type == ITEM_MOVESEL || ui.cur_item_type == ITEM_MOVESEL_VERT) { finalize_movesel(); } - + else if (ui.cur_item_type == ITEM_HAND) { + ui.cur_item_type = ITEM_NONE; + } + + switch_mapping(0); return FALSE; } @@ -2114,7 +2491,7 @@ on_canvas_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { - + if (ui.view_continuous && ui.progressive_bg) rescale_bg_pixmaps(); return FALSE; } @@ -2124,7 +2501,6 @@ on_canvas_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - return FALSE; } @@ -2134,16 +2510,15 @@ on_canvas_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, gpointer user_data) { - gboolean looks_wrong; + gboolean looks_wrong, is_core; double pt[2]; if (ui.cur_item_type == ITEM_NONE) return FALSE; // we don't care - if (ui.use_xinput) { - if (event->device->source == GDK_SOURCE_MOUSE) return FALSE; - fix_xinput_coords((GdkEvent *)event); - } - else if (event->device->source != GDK_SOURCE_MOUSE) return FALSE; + is_core = (event->device == gdk_device_get_core_pointer()); + if (!ui.use_xinput && !is_core) return FALSE; + if (ui.use_xinput && is_core && !ui.is_corestroke) return FALSE; + if (!is_core) fix_xinput_coords((GdkEvent *)event); looks_wrong = !(event->state & (1<<(7+ui.which_mouse_button))); @@ -2157,9 +2532,10 @@ on_canvas_motion_notify_event (GtkWidget *widget, else if (ui.cur_item_type == ITEM_SELECTRECT) { finalize_selectrect(); } - else if (ui.cur_item_type == ITEM_MOVESEL) { + else if (ui.cur_item_type == ITEM_MOVESEL || ui.cur_item_type == ITEM_MOVESEL_VERT) { finalize_movesel(); } + switch_mapping(0); return FALSE; } @@ -2177,14 +2553,16 @@ on_canvas_motion_notify_event (GtkWidget *widget, gnome_canvas_item_set(ui.selection->canvas_item, "x2", pt[0], "y2", pt[1], NULL); } - else if (ui.cur_item_type == ITEM_MOVESEL) { + else if (ui.cur_item_type == ITEM_MOVESEL || ui.cur_item_type == ITEM_MOVESEL_VERT) { continue_movesel((GdkEvent *)event); } + else if (ui.cur_item_type == ITEM_HAND) { + do_hand((GdkEvent *)event); + } return FALSE; } - void on_comboLayer_changed (GtkComboBox *combobox, gpointer user_data) @@ -2193,7 +2571,8 @@ on_comboLayer_changed (GtkComboBox *combobox, if (ui.in_update_page_stuff) return; // avoid a bad retroaction - gtk_widget_grab_focus(GTK_WIDGET(canvas)); // stop focus on us + end_text(); + reset_focus(); val = gtk_combo_box_get_active(combobox); if (val == -1) return; @@ -2221,6 +2600,8 @@ on_winMain_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) { + end_text(); + reset_focus(); if (ok_to_close()) gtk_main_quit(); return TRUE; } @@ -2230,8 +2611,13 @@ void on_optionsUseXInput_activate (GtkMenuItem *menuitem, gpointer user_data) { + end_text(); + reset_focus(); ui.allow_xinput = ui.use_xinput = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); + gtk_widget_set_extension_events(GTK_WIDGET (canvas), + ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE); + update_mappings_menu(); } void @@ -2261,7 +2647,11 @@ on_vscroll_changed (GtkAdjustment *adjustment, ui.pageno--; tmppage = g_list_nth_data(journal.pages, ui.pageno); } - if (need_update) do_switch_page(ui.pageno, FALSE); + if (need_update) { + end_text(); + do_switch_page(ui.pageno, FALSE, FALSE); + } + reset_focus(); return; } @@ -2272,8 +2662,9 @@ on_spinPageNo_value_changed (GtkSpinButton *spinbutton, int val; if (ui.in_update_page_stuff) return; // avoid a bad retroaction - - gtk_widget_grab_focus(GTK_WIDGET(canvas)); // stop blink-blink text cursor + + end_text(); + reset_focus(); val = gtk_spin_button_get_value_as_int(spinbutton) - 1; @@ -2286,7 +2677,7 @@ on_spinPageNo_value_changed (GtkSpinButton *spinbutton, if (val == ui.pageno) return; if (val < 0) val = 0; if (val > journal.npages-1) val = journal.npages-1; - do_switch_page(val, TRUE); + do_switch_page(val, TRUE, FALSE); } @@ -2294,23 +2685,37 @@ void on_journalDefaultBackground_activate (GtkMenuItem *menuitem, gpointer user_data) { + struct Page *pg; + GList *pglist; + + end_text(); + reset_focus(); reset_selection(); - prepare_new_undo(); - undo->type = ITEM_NEW_BG_RESIZE; - undo->page = ui.cur_page; - undo->bg = ui.cur_page->bg; - undo->val_x = ui.cur_page->width; - undo->val_y = ui.cur_page->height; - ui.cur_page->bg = (struct Background *)g_memdup(ui.default_page.bg, sizeof(struct Background)); - ui.cur_page->width = ui.default_page.width; - ui.cur_page->height = ui.default_page.height; - ui.cur_page->bg->canvas_item = undo->bg->canvas_item; - undo->bg->canvas_item = NULL; + pg = ui.cur_page; + for (pglist = journal.pages; pglist!=NULL; pglist = pglist->next) { + if (ui.bg_apply_all_pages) pg = (struct Page *)pglist->data; + prepare_new_undo(); + if (ui.bg_apply_all_pages) { + if (pglist->next!=NULL) undo->multiop |= MULTIOP_CONT_REDO; + if (pglist->prev!=NULL) undo->multiop |= MULTIOP_CONT_UNDO; + } + undo->type = ITEM_NEW_BG_RESIZE; + undo->page = pg; + undo->bg = pg->bg; + undo->val_x = pg->width; + undo->val_y = pg->height; + pg->bg = (struct Background *)g_memdup(ui.default_page.bg, sizeof(struct Background)); + pg->width = ui.default_page.width; + pg->height = ui.default_page.height; + pg->bg->canvas_item = undo->bg->canvas_item; + undo->bg->canvas_item = NULL; - make_page_clipbox(ui.cur_page); - update_canvas_bg(ui.cur_page); - do_switch_page(ui.pageno, TRUE); + make_page_clipbox(pg); + update_canvas_bg(pg); + if (!ui.bg_apply_all_pages) break; + } + do_switch_page(ui.pageno, TRUE, TRUE); } @@ -2320,6 +2725,8 @@ on_journalSetAsDefault_activate (GtkMenuItem *menuitem, { if (ui.cur_page->bg->type != BG_SOLID) return; + end_text(); + reset_focus(); prepare_new_undo(); undo->type = ITEM_NEW_DEFAULT_BG; undo->val_x = ui.default_page.width; @@ -2453,27 +2860,30 @@ on_viewFullscreen_activate (GtkMenuItem *menuitem, active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); if (active == ui.fullscreen) return; + end_text(); + reset_focus(); ui.fullscreen = active; + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("viewFullscreen")), ui.fullscreen); + gtk_toggle_tool_button_set_active( + GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), ui.fullscreen); - if (ui.fullscreen) { - gtk_window_fullscreen(GTK_WINDOW(winMain)); - gtk_widget_hide(GET_COMPONENT("menubar")); - gtk_widget_hide(GET_COMPONENT("hbox1")); - } - else { - gtk_window_unfullscreen(GTK_WINDOW(winMain)); - gtk_widget_show(GET_COMPONENT("menubar")); - gtk_widget_show(GET_COMPONENT("hbox1")); - } + if (ui.fullscreen) gtk_window_fullscreen(GTK_WINDOW(winMain)); + else gtk_window_unfullscreen(GTK_WINDOW(winMain)); + + update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]); } void -on_optionsEmulateEraser_activate (GtkMenuItem *menuitem, +on_optionsButtonMappings_activate (GtkMenuItem *menuitem, gpointer user_data) { - ui.emulate_eraser = + end_text(); + reset_focus(); + ui.use_erasertip = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); + update_mappings_menu(); } @@ -2485,6 +2895,8 @@ on_optionsAntialiasBG_activate (GtkMenuItem *menuitem, active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); if (ui.antialias_bg == active) return; + end_text(); + reset_focus(); ui.antialias_bg = active; rescale_bg_pixmaps(); } @@ -2498,7 +2910,402 @@ on_optionsProgressiveBG_activate (GtkMenuItem *menuitem, active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); if (ui.progressive_bg == active) return; + end_text(); + reset_focus(); ui.progressive_bg = active; if (!ui.progressive_bg) rescale_bg_pixmaps(); } + +void +on_mru_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + int which; + gboolean success; + GtkWidget *dialog; + + end_text(); + reset_focus(); + if (!ok_to_close()) return; // user aborted on save confirmation + + for (which = 0 ; which < MRU_SIZE; which++) { + if (ui.mrumenu[which] == GTK_WIDGET(menuitem)) break; + } + if (which == MRU_SIZE || ui.mru[which] == NULL) return; // not found... + + set_cursor_busy(TRUE); + success = open_journal(ui.mru[which]); + set_cursor_busy(FALSE); + if (success) return; + + /* open failed */ + dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", ui.mru[which]); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + delete_mru_entry(which); +} + + +void +on_button2Pen_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_PEN); +} + + +void +on_button2Eraser_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_ERASER); +} + + +void +on_button2Highlighter_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_HIGHLIGHTER); +} + + +void +on_button2Text_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_TEXT); +} + + +void +on_button2SelectRegion_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_SELECTREGION); +} + + +void +on_button2SelectRectangle_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_SELECTRECT); +} + + +void +on_button2VerticalSpace_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_VERTSPACE); +} + + +void +on_button2LinkBrush_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + int i; + + if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))) return; + end_text(); + reset_focus(); + ui.linked_brush[1] = BRUSH_LINKED; + for (i=0;i= NUM_STROKE_TOOLS) { + ui.linked_brush[1] = BRUSH_STATIC; + update_mappings_menu_linkings(); + return; + } + ui.linked_brush[1] = BRUSH_COPIED; + g_memmove(&(ui.brushes[1][ui.toolno[1]]), &(ui.brushes[0][ui.toolno[1]]), sizeof(struct Brush)); + ui.ruler[1] = ui.ruler[0]; + if (ui.toolno[1]!=TOOL_PEN && ui.toolno[1]!=TOOL_HIGHLIGHTER) + ui.ruler[1] = FALSE; +} + + +void +on_button3Pen_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_PEN); +} + + +void +on_button3Eraser_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_ERASER); +} + + +void +on_button3Highlighter_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_HIGHLIGHTER); +} + + +void +on_button3Text_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_TEXT); +} + + +void +on_button3SelectRegion_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_SELECTREGION); +} + + +void +on_button3SelectRectangle_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_SELECTRECT); +} + + +void +on_button3VerticalSpace_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_VERTSPACE); +} + + +void +on_button3LinkBrush_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + int i; + + if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))) return; + end_text(); + reset_focus(); + ui.linked_brush[2] = BRUSH_LINKED; + for (i=0;i= NUM_STROKE_TOOLS) { + ui.linked_brush[2] = BRUSH_STATIC; + update_mappings_menu_linkings(); + return; + } + ui.linked_brush[2] = BRUSH_COPIED; + g_memmove(&(ui.brushes[2][ui.toolno[2]]), &(ui.brushes[0][ui.toolno[2]]), sizeof(struct Brush)); + ui.ruler[2] = ui.ruler[0]; + if (ui.toolno[2]!=TOOL_PEN && ui.toolno[2]!=TOOL_HIGHLIGHTER) + ui.ruler[2] = FALSE; +} + +// the set zoom dialog + +GtkWidget *zoom_dialog; +double zoom_percent; + +void +on_viewSetZoom_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + int response; + double test_w, test_h; + GtkSpinButton *spinZoom; + + end_text(); + reset_focus(); + zoom_dialog = create_zoomDialog(); + zoom_percent = 100*ui.zoom / DEFAULT_ZOOM; + spinZoom = GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(zoom_dialog), "spinZoom")); + gtk_spin_button_set_increments(spinZoom, ui.zoom_step_increment, 5*ui.zoom_step_increment); + gtk_spin_button_set_value(spinZoom, zoom_percent); + test_w = 100*(GTK_WIDGET(canvas))->allocation.width/ui.cur_page->width/DEFAULT_ZOOM; + test_h = 100*(GTK_WIDGET(canvas))->allocation.height/ui.cur_page->height/DEFAULT_ZOOM; + if (zoom_percent > 99.9 && zoom_percent < 100.1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "radioZoom100")), TRUE); + else if (zoom_percent > test_w-0.1 && zoom_percent < test_w+0.1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "radioZoomWidth")), TRUE); + else if (zoom_percent > test_h-0.1 && zoom_percent < test_h+0.1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "radioZoomHeight")), TRUE); + else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "radioZoom")), TRUE); + gtk_widget_show(zoom_dialog); + + do { + response = gtk_dialog_run(GTK_DIALOG(zoom_dialog)); + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { + ui.zoom = DEFAULT_ZOOM*zoom_percent/100; + gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); + rescale_text_items(); + rescale_bg_pixmaps(); + } + } while (response == GTK_RESPONSE_APPLY); + + gtk_widget_destroy(zoom_dialog); +} + + +void +on_spinZoom_value_changed (GtkSpinButton *spinbutton, + gpointer user_data) +{ + double val; + + val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "spinZoom"))); + if (val<1) return; + if (val<10) val=10.; + if (val>1500) val=1500.; + if (valzoom_percent+1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "radioZoom")), TRUE); + zoom_percent = val; +} + + +void +on_radioZoom_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + // nothing to do +} + + +void +on_radioZoom100_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + if (!gtk_toggle_button_get_active(togglebutton)) return; + zoom_percent = 100.; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "spinZoom")), zoom_percent); +} + + +void +on_radioZoomWidth_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + if (!gtk_toggle_button_get_active(togglebutton)) return; + zoom_percent = 100*(GTK_WIDGET(canvas))->allocation.width/ui.cur_page->width/DEFAULT_ZOOM; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "spinZoom")), zoom_percent); +} + + +void +on_radioZoomHeight_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + if (!gtk_toggle_button_get_active(togglebutton)) return; + zoom_percent = 100*(GTK_WIDGET(canvas))->allocation.height/ui.cur_page->height/DEFAULT_ZOOM; + gtk_spin_button_set_value(GTK_SPIN_BUTTON(g_object_get_data( + G_OBJECT(zoom_dialog), "spinZoom")), zoom_percent); +} + + +void +on_toolsHand_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) { + if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) + return; + } else { + if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem))) + return; + } + + if (ui.cur_mapping != 0) return; + if (ui.toolno[0] == TOOL_HAND) return; + + end_text(); + reset_focus(); + reset_selection(); + ui.toolno[0] = TOOL_HAND; + ui.ruler[0] = FALSE; + update_mapping_linkings(-1); + update_tool_buttons(); + update_tool_menu(); + update_color_menu(); + update_cursor(); +} + + +void +on_button2Hand_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 1, TOOL_HAND); +} + + +void +on_button3Hand_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + process_mapping_activate(menuitem, 2, TOOL_HAND); +} + + +void +on_optionsPrintRuling_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + end_text(); + reset_focus(); + ui.print_ruling = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); +} + +void +on_optionsDiscardCore_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + end_text(); + reset_focus(); + ui.discard_corepointer = + gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); + update_mappings_menu(); +} + +void +on_fontButton_font_set (GtkFontButton *fontbutton, + gpointer user_data) +{ + gchar *str; + + str = g_strdup(gtk_font_button_get_font_name(fontbutton)); + process_font_sel(str); +} +