+/*
+ * 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 <time.h>
-#include <libgnomeprintui/gnome-print-dialog.h>
#include <glib/gstdio.h>
#include <gdk/gdkkeysyms.h>
gpointer user_data)
{
end_text();
- reset_focus();
if (close_journal()) {
new_journal();
ui.zoom = ui.startup_zoom;
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_OK, NULL);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
filt_all = gtk_file_filter_new();
gtk_file_filter_set_name(filt_all, _("All files"));
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_OK, NULL);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
filt_all = gtk_file_filter_new();
gtk_file_filter_set_name(filt_all, _("All files"));
GtkWidget *dialog;
end_text();
- reset_focus();
if (ui.filename == NULL) {
on_fileSaveAs_activate(menuitem, user_data);
return;
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_OK, NULL);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
if (ui.filename!=NULL) {
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.filename);
}
else {
curtime = time(NULL);
- strftime(stime, 30, "%F-Note-%H-%M.xoj", localtime(&curtime));
+ strftime(stime, 30, "%Y-%m-%d-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);
}
-
void
on_filePrint_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkWidget *printDialog;
- GnomePrintJob *gpj;
+#if GTK_CHECK_VERSION(2, 10, 0)
+ GtkPrintOperation *print;
+ GtkPrintOperationResult res;
+
int fromPage, toPage;
int response;
- char *in_fn;
- guchar *s;
- GnomePrintConfig *config = gnome_print_config_default();
+ char *in_fn, *p;
end_text();
- reset_focus();
- if (ui.filename!=NULL) {
- if (g_str_has_suffix(ui.filename, ".xoj")) {
- in_fn = g_strdup(ui.filename);
- g_strlcpy(g_strrstr(in_fn, "xoj"), "pdf", 4);
- }
- else
- in_fn = g_strdup_printf("%s.pdf", ui.filename);
- gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"PDF");
- gnome_print_config_set(config, (guchar *)GNOME_PRINT_KEY_OUTPUT_FILENAME, (guchar *)in_fn);
- gnome_print_config_set(config, (guchar *)"Settings.Transport.Backend.FileName", (guchar *)in_fn);
- g_strlcpy(g_strrstr(in_fn, "pdf"), "ps", 3);
- gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"GENERIC");
- gnome_print_config_set (config, (guchar *)GNOME_PRINT_KEY_OUTPUT_FILENAME, (guchar *)in_fn);
- s = gnome_print_config_get(config, (guchar *)"Settings.Transport.Backend.FileName");
- if (s != NULL) {
- g_free(s);
- gnome_print_config_set(config, (guchar *)"Settings.Transport.Backend.FileName", (guchar *)in_fn);
- }
- g_free(in_fn);
- }
-
- gpj = gnome_print_job_new(config); /* was NULL */
- gnome_print_config_unref(config);
-/* end */
- printDialog = gnome_print_dialog_new(gpj, (guchar *) _("Print"), GNOME_PRINT_DIALOG_RANGE);
- gnome_print_dialog_construct_range_page(GNOME_PRINT_DIALOG(printDialog),
- GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_RANGE,
- 1, journal.npages, (guchar *) _("Current page"), (guchar *) _("Pages"));
- /* don't have "Current page" as option, else it becomes the default!! */
-
- gtk_dialog_set_response_sensitive(GTK_DIALOG(printDialog),
- GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, FALSE);
- /* the print-job-preview "feature" is completely, hopelessly broken */
-
- response = gtk_dialog_run(GTK_DIALOG(printDialog));
- if (response <= 0) {
- gtk_widget_destroy(printDialog);
- return;
- }
-
+ if (!gtk_check_version(2, 10, 0)) {
+ print = gtk_print_operation_new();
/*
- if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW) {
- print_job_render(gpj, 0, journal.npages-1);
- gtk_widget_destroy(printDialog);
- preview = gnome_print_job_preview_new(gpj, (guchar *)"Preview");
- try_fix_print_preview_ui(preview);
- gtk_window_set_modal(GTK_WINDOW(preview), TRUE);
- gtk_widget_show_all(preview);
- }
+ if (!ui.print_settings)
+ ui.print_settings = gtk_print_settings_new();
+ if (ui.filename!=NULL) {
+ if (g_str_has_suffix(ui.filename, ".xoj")) {
+ in_fn = g_strdup(ui.filename);
+ g_strlcpy(g_strrstr(in_fn, "xoj"), "pdf", 4);
+ }
+ else in_fn = g_strdup_printf("%s.pdf", ui.filename);
+ gtk_print_settings_set(ui.print_settings, GTK_PRINT_SETTINGS_OUTPUT_URI,
+ g_filename_to_uri(in_fn, NULL, NULL));
+ g_free(in_fn);
+ }
*/
-
- if (response == GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
- 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;
- toPage = journal.npages-1;
+ if (ui.print_settings!=NULL)
+ gtk_print_operation_set_print_settings (print, ui.print_settings);
+ gtk_print_operation_set_n_pages(print, journal.npages);
+ gtk_print_operation_set_current_page(print, ui.pageno);
+ gtk_print_operation_set_show_progress(print, TRUE);
+ if (ui.filename!=NULL) {
+ p = g_utf8_strrchr(ui.filename, -1, '/');
+ if (p==NULL) p = ui.filename;
+ else p++;
+ gtk_print_operation_set_job_name(print, p);
}
-
- gtk_widget_destroy(printDialog);
- print_job_render(gpj, fromPage, toPage);
+ g_signal_connect (print, "draw_page", G_CALLBACK (print_job_render_page), NULL);
+ res = gtk_print_operation_run(print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+ GTK_WINDOW(winMain), NULL);
+ if (res == GTK_PRINT_OPERATION_RESULT_APPLY) {
+ if (ui.print_settings!=NULL) g_object_unref(ui.print_settings);
+ ui.print_settings = g_object_ref(gtk_print_operation_get_print_settings(print));
+ }
+ g_object_unref(print);
}
+#endif
}
gboolean warn;
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_OK, NULL);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
if (ui.filename!=NULL) {
if (g_str_has_suffix(ui.filename, ".xoj")) {
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));
+ strftime(stime, 30, "%Y-%m-%d-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);
gpointer user_data)
{
end_text();
- reset_focus();
if (ok_to_close()) gtk_main_quit ();
}
GnomeCanvasGroup *group;
end_text();
- reset_focus();
if (undo == NULL) return; // nothing to undo!
reset_selection(); // safer
- if (undo->type == ITEM_STROKE || undo->type == ITEM_TEXT) {
+ reset_recognizer(); // safer
+ if (undo->type == ITEM_STROKE || undo->type == ITEM_TEXT || undo->type == ITEM_IMAGE) {
// 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;
GnomeCanvasGroup *group;
end_text();
- reset_focus();
if (redo == NULL) return; // nothing to redo!
reset_selection(); // safer
- if (redo->type == ITEM_STROKE || redo->type == ITEM_TEXT) {
+ reset_recognizer(); // safer
+ if (redo->type == ITEM_STROKE || redo->type == ITEM_TEXT || redo->type == ITEM_IMAGE) {
// re-create the canvas_item
make_canvas_item_one(redo->layer->group, redo->item);
// reinsert the item on its layer
if (it->type == ITEM_TEXT && it->canvas_item != NULL)
gnome_canvas_item_set(it->canvas_item,
"fill-color-rgba", it->brush.color_rgba, NULL);
+ if (it->type == ITEM_IMAGE && it->canvas_item != NULL) {
+ // remark: a variable-width item might have lost its variable-width
+ group = (GnomeCanvasGroup *) it->canvas_item->parent;
+ gtk_object_destroy(GTK_OBJECT(it->canvas_item));
+ make_canvas_item_one(group, it);
+ }
}
}
else if (redo->type == ITEM_TEXT_EDIT) {
gpointer user_data)
{
end_text();
- reset_focus();
selection_to_clip();
selection_delete();
}
gpointer user_data)
{
end_text();
- reset_focus();
selection_to_clip();
}
gpointer user_data)
{
end_text();
- reset_focus();
clipboard_paste();
}
gpointer user_data)
{
end_text();
- reset_focus();
selection_delete();
}
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;
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;
on_viewZoomIn_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- reset_focus();
if (ui.zoom > MAX_ZOOM) return;
ui.zoom *= ui.zoom_step_factor;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
on_viewZoomOut_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- reset_focus();
if (ui.zoom < MIN_ZOOM) return;
ui.zoom /= ui.zoom_step_factor;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
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();
+ rescale_images();
}
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();
+ rescale_images();
}
gpointer user_data)
{
end_text();
- reset_focus();
do_switch_page(0, TRUE, FALSE);
}
gpointer user_data)
{
end_text();
- reset_focus();
if (ui.pageno == 0) return;
do_switch_page(ui.pageno-1, TRUE, FALSE);
}
gpointer user_data)
{
end_text();
- reset_focus();
if (ui.pageno == journal.npages-1) { // create a page at end
on_journalNewPageEnd_activate(menuitem, user_data);
return;
gpointer user_data)
{
end_text();
- reset_focus();
do_switch_page(journal.npages-1, TRUE, FALSE);
}
gpointer user_data)
{
end_text();
- reset_focus();
if (ui.layerno == ui.cur_page->nlayers-1) return;
reset_selection();
ui.layerno++;
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));
struct Page *pg;
end_text();
- reset_focus();
reset_selection();
pg = new_page(ui.cur_page);
journal.pages = g_list_insert(journal.pages, pg, ui.pageno);
struct Page *pg;
end_text();
- reset_focus();
reset_selection();
pg = new_page(ui.cur_page);
journal.pages = g_list_insert(journal.pages, pg, ui.pageno+1);
struct Page *pg;
end_text();
- reset_focus();
reset_selection();
pg = new_page((struct Page *)g_list_last(journal.pages)->data);
journal.pages = g_list_append(journal.pages, pg);
struct Layer *l;
end_text();
- reset_focus();
if (journal.npages == 1) return;
reset_selection();
+ reset_recognizer(); // safer
prepare_new_undo();
undo->type = ITEM_DELETE_PAGE;
undo->val = ui.pageno;
struct Layer *l;
end_text();
- reset_focus();
reset_selection();
l = g_new(struct Layer, 1);
l->items = NULL;
GList *list;
end_text();
- reset_focus();
if (ui.cur_layer == NULL) return;
reset_selection();
+ reset_recognizer(); // safer
prepare_new_undo();
undo->type = ITEM_DELETE_LAYER;
undo->val = ui.layerno;
GList *pglist;
end_text();
- reset_focus();
papersize_dialog = create_papersizeDialog();
papersize_width = ui.cur_page->width;
papersize_height = ui.cur_page->height;
gpointer user_data)
{
end_text();
- reset_focus();
- process_papercolor_activate(menuitem, COLOR_WHITE);
+ process_papercolor_activate(menuitem, COLOR_WHITE, predef_bgcolors_rgba[COLOR_WHITE]);
}
gpointer user_data)
{
end_text();
- reset_focus();
- process_papercolor_activate(menuitem, COLOR_YELLOW);
+ process_papercolor_activate(menuitem, COLOR_YELLOW, predef_bgcolors_rgba[COLOR_YELLOW]);
}
gpointer user_data)
{
end_text();
- reset_focus();
- process_papercolor_activate(menuitem, COLOR_RED);
+ process_papercolor_activate(menuitem, COLOR_RED, predef_bgcolors_rgba[COLOR_RED]);
}
gpointer user_data)
{
end_text();
- reset_focus();
- process_papercolor_activate(menuitem, COLOR_ORANGE);
+ process_papercolor_activate(menuitem, COLOR_ORANGE, predef_bgcolors_rgba[COLOR_ORANGE]);
}
gpointer user_data)
{
end_text();
- reset_focus();
- process_papercolor_activate(menuitem, COLOR_BLUE);
+ process_papercolor_activate(menuitem, COLOR_BLUE, predef_bgcolors_rgba[COLOR_BLUE]);
}
gpointer user_data)
{
end_text();
- reset_focus();
- process_papercolor_activate(menuitem, COLOR_GREEN);
+ process_papercolor_activate(menuitem, COLOR_GREEN, predef_bgcolors_rgba[COLOR_GREEN]);
}
on_papercolorOther_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
+ GtkWidget *dialog;
+ GtkColorSelection *colorsel;
+ gint result;
+ guint rgba;
+ GdkColor gdkcolor;
+
+ end_text();
+ dialog = gtk_color_selection_dialog_new(_("Pick a Paper Color"));
+ colorsel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
+ if (ui.cur_page->bg->type == BG_SOLID) rgba = ui.cur_page->bg->color_rgba;
+ else rgba = ui.default_page.bg->color_rgba;
+ rgb_to_gdkcolor(rgba, &gdkcolor);
+ gtk_color_selection_set_current_color(colorsel, &gdkcolor);
+
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+ gtk_color_selection_get_current_color(colorsel, &gdkcolor);
+ process_papercolor_activate(menuitem, COLOR_OTHER, gdkcolor_to_rgba(gdkcolor, 0xffff));
+ }
+ gtk_widget_destroy(dialog);
}
gpointer user_data)
{
end_text();
- reset_focus();
process_paperstyle_activate(menuitem, RULING_NONE);
}
gpointer user_data)
{
end_text();
- reset_focus();
process_paperstyle_activate(menuitem, RULING_LINED);
}
gpointer user_data)
{
end_text();
- reset_focus();
process_paperstyle_activate(menuitem, RULING_RULED);
}
gpointer user_data)
{
end_text();
- reset_focus();
process_paperstyle_activate(menuitem, RULING_GRAPH);
}
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_OK, NULL);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
filt_all = gtk_file_filter_new();
gtk_file_filter_set_name(filt_all, _("All files"));
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
do_switch_page(ui.pageno, TRUE, TRUE);
}
struct Background *bg;
end_text();
- reset_focus();
reset_selection();
gtk_window_iconify(GTK_WINDOW(winMain)); // hide ourselves
gdk_display_sync(gdk_display_get_default());
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
do_switch_page(ui.pageno, TRUE, TRUE);
}
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;
return;
}
- if (ui.cur_mapping != 0) return;
- if (ui.toolno[0] == TOOL_PEN) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_PEN) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
end_text();
- reset_focus();
reset_selection();
- ui.toolno[0] = TOOL_PEN;
- ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
+ ui.toolno[ui.cur_mapping] = TOOL_PEN;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
ui.cur_brush->ruler = ui.default_brushes[TOOL_PEN].ruler;
ui.cur_brush->recognizer = ui.default_brushes[TOOL_PEN].recognizer;
update_mapping_linkings(TOOL_PEN);
return;
}
- if (ui.cur_mapping != 0) return;
- if (ui.toolno[0] == TOOL_ERASER) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_ERASER) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
end_text();
- reset_focus();
reset_selection();
- ui.toolno[0] = TOOL_ERASER;
- ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]);
+ ui.toolno[ui.cur_mapping] = TOOL_ERASER;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_ERASER]);
update_mapping_linkings(TOOL_ERASER);
update_tool_buttons();
update_tool_menu();
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_HIGHLIGHTER) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
end_text();
- reset_focus();
reset_selection();
- ui.toolno[0] = TOOL_HIGHLIGHTER;
- ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]);
+ ui.toolno[ui.cur_mapping] = TOOL_HIGHLIGHTER;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_HIGHLIGHTER]);
ui.cur_brush->ruler = ui.default_brushes[TOOL_HIGHLIGHTER].ruler;
ui.cur_brush->recognizer = ui.default_brushes[TOOL_HIGHLIGHTER].recognizer;
update_mapping_linkings(TOOL_HIGHLIGHTER);
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_TEXT) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_TEXT) return;
- reset_focus();
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
reset_selection();
- ui.toolno[0] = TOOL_TEXT;
- ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
+ ui.toolno[ui.cur_mapping] = TOOL_TEXT;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
+ update_mapping_linkings(-1);
+ update_tool_buttons();
+ update_tool_menu();
+ update_color_menu();
+ update_cursor();
+}
+
+
+void
+on_toolsImage_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 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_IMAGE) return;
+
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
+ reset_selection();
+ ui.toolno[ui.cur_mapping] = TOOL_IMAGE;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_SELECTRECT) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_SELECTRECT) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
end_text();
- reset_focus();
- ui.toolno[0] = TOOL_SELECTRECT;
+ ui.toolno[ui.cur_mapping] = TOOL_SELECTRECT;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_VERTSPACE) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_VERTSPACE) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
end_text();
- reset_focus();
reset_selection();
- ui.toolno[0] = TOOL_VERTSPACE;
+ ui.toolno[ui.cur_mapping] = TOOL_VERTSPACE;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
on_colorBlack_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_BLACK);
+ process_color_activate(menuitem, COLOR_BLACK, predef_colors_rgba[COLOR_BLACK]);
}
on_colorBlue_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_BLUE);
-
+ process_color_activate(menuitem, COLOR_BLUE, predef_colors_rgba[COLOR_BLUE]);
}
on_colorRed_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_RED);
+ process_color_activate(menuitem, COLOR_RED, predef_colors_rgba[COLOR_RED]);
}
on_colorGreen_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_GREEN);
+ process_color_activate(menuitem, COLOR_GREEN, predef_colors_rgba[COLOR_GREEN]);
}
on_colorGray_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_GRAY);
+ process_color_activate(menuitem, COLOR_GRAY, predef_colors_rgba[COLOR_GRAY]);
}
on_colorLightBlue_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_LIGHTBLUE);
+ process_color_activate(menuitem, COLOR_LIGHTBLUE, predef_colors_rgba[COLOR_LIGHTBLUE]);
}
on_colorLightGreen_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_LIGHTGREEN);
+ process_color_activate(menuitem, COLOR_LIGHTGREEN, predef_colors_rgba[COLOR_LIGHTGREEN]);
}
on_colorMagenta_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_MAGENTA);
+ process_color_activate(menuitem, COLOR_MAGENTA, predef_colors_rgba[COLOR_MAGENTA]);
}
on_colorOrange_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_ORANGE);
+ process_color_activate(menuitem, COLOR_ORANGE, predef_colors_rgba[COLOR_ORANGE]);
}
on_colorYellow_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_YELLOW);
+ process_color_activate(menuitem, COLOR_YELLOW, predef_colors_rgba[COLOR_YELLOW]);
}
on_colorWhite_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_WHITE);
+ process_color_activate(menuitem, COLOR_WHITE, predef_colors_rgba[COLOR_WHITE]);
}
on_colorOther_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
+ gtk_button_clicked(GTK_BUTTON(GET_COMPONENT("buttonColorChooser")));
}
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return;
end_text();
- reset_focus();
ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_STANDARD;
update_mapping_linkings(TOOL_ERASER);
}
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return;
end_text();
- reset_focus();
ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_WHITEOUT;
update_mapping_linkings(TOOL_ERASER);
}
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return;
end_text();
- reset_focus();
ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_STROKES;
update_mapping_linkings(TOOL_ERASER);
}
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));
{
switch_mapping(0);
end_text();
- reset_focus();
reset_selection();
g_memmove(&(ui.brushes[0][TOOL_PEN]), ui.default_brushes+TOOL_PEN, sizeof(struct Brush));
ui.toolno[0] = TOOL_PEN;
{
switch_mapping(0);
end_text();
- reset_focus();
reset_selection();
g_memmove(&(ui.brushes[0][TOOL_ERASER]), ui.default_brushes+TOOL_ERASER, sizeof(struct Brush));
ui.toolno[0] = TOOL_ERASER;
{
switch_mapping(0);
end_text();
- reset_focus();
reset_selection();
g_memmove(&(ui.brushes[0][TOOL_HIGHLIGHTER]), ui.default_brushes+TOOL_HIGHLIGHTER, sizeof(struct Brush));
ui.toolno[0] = TOOL_HIGHLIGHTER;
{
switch_mapping(0);
if (ui.toolno[0]!=TOOL_TEXT) end_text();
- reset_focus();
reset_selection();
ui.toolno[0] = TOOL_TEXT;
ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
{
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_mapping!=0 && !ui.button_switch_mapping) return;
+ if (ui.toolno[ui.cur_mapping] < NUM_STROKE_TOOLS)
+ g_memmove(ui.default_brushes+ui.toolno[ui.cur_mapping],
+ &(ui.brushes[ui.cur_mapping][ui.toolno[ui.cur_mapping]]), sizeof(struct Brush));
+ if (ui.toolno[ui.cur_mapping] == 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.default_font_size = ui.font_size;
}
end_text();
- reset_focus();
}
else
active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem));
- if (ui.cur_mapping != 0) return;
- current = (ui.toolno[0] == TOOL_PEN || ui.toolno[0] == TOOL_HIGHLIGHTER) && ui.cur_brush->ruler;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ current = (ui.toolno[ui.cur_mapping] == TOOL_PEN || ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) && ui.cur_brush->ruler;
if (active == current) return;
-
+
+ ui.cur_mapping = 0;
end_text();
- reset_focus();
- if (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER) {
+ if (ui.toolno[ui.cur_mapping]!=TOOL_PEN && ui.toolno[ui.cur_mapping]!=TOOL_HIGHLIGHTER) {
reset_selection();
- ui.toolno[0] = TOOL_PEN;
- ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
+ ui.toolno[ui.cur_mapping] = TOOL_PEN;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
update_color_menu();
update_tool_buttons();
update_tool_menu();
ui.cur_brush->ruler = active;
if (active) ui.cur_brush->recognizer = FALSE;
- update_mapping_linkings(ui.toolno[0]);
+ update_mapping_linkings(ui.toolno[ui.cur_mapping]);
update_ruler_indicator();
}
else
active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem));
- if (ui.cur_mapping != 0) return;
- current = (ui.toolno[0] == TOOL_PEN || ui.toolno[0] == TOOL_HIGHLIGHTER) && ui.cur_brush->recognizer;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ current = (ui.toolno[ui.cur_mapping] == TOOL_PEN || ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) && ui.cur_brush->recognizer;
if (active == current) return;
+ ui.cur_mapping = 0;
end_text();
- reset_focus();
- if (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER) {
+ if (ui.toolno[ui.cur_mapping]!=TOOL_PEN && ui.toolno[ui.cur_mapping]!=TOOL_HIGHLIGHTER) {
reset_selection();
- ui.toolno[0] = TOOL_PEN;
- ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
+ ui.toolno[ui.cur_mapping] = TOOL_PEN;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
update_color_menu();
update_tool_buttons();
update_tool_menu();
ui.cur_brush->ruler = FALSE;
reset_recognizer();
}
- update_mapping_linkings(ui.toolno[0]);
+ update_mapping_linkings(ui.toolno[ui.cur_mapping]);
update_ruler_indicator();
}
gpointer user_data)
{
end_text();
- reset_focus();
save_config_to_file();
}
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,
- "<span size=\"xx-large\" weight=\"bold\">Xournal " VERSION "</span>");
+ "<span size=\"xx-large\" weight=\"bold\">Xournal " VERSION_STRING "</span>");
gtk_dialog_run (GTK_DIALOG(aboutDialog));
gtk_widget_destroy(aboutDialog);
}
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));
on_buttonFine_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- if (ui.cur_mapping != 0) return;
- process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_FINE);
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_FINE);
}
on_buttonMedium_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- if (ui.cur_mapping != 0) return;
- process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_MEDIUM);
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_MEDIUM);
}
on_buttonThick_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- if (ui.cur_mapping != 0) return;
- process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_THICK);
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_THICK);
}
gpointer user_data)
{
double pt[2];
- gboolean page_change;
- struct Page *tmppage;
GtkWidget *dialog;
int mapping;
gboolean is_core;
struct Item *item;
+ GdkEvent scroll_event;
+#ifdef INPUT_DEBUG
+ printf("DEBUG: ButtonPress (%s) (x,y)=(%.2f,%.2f), button %d, modifier %x\n",
+ event->device->name, event->x, event->y, event->button, event->state);
+#endif
+
+ // abort any page changes pending in the spin button, and take the focus
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(GET_COMPONENT("spinPageNo")), ui.pageno+1);
+ reset_focus();
+
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 (event->type != GDK_BUTTON_PRESS) return FALSE;
// double-clicks may have broken axes member (free'd) due to a bug in GDK
+
+ if (event->button > 3) { // scroll wheel events! don't paint...
+ if (ui.use_xinput && !gtk_check_version(2, 17, 0) && event->button <= 7) {
+ /* with GTK+ 2.17 and later, the entire widget hierarchy is xinput-aware,
+ so the core button event gets discarded and the scroll event never
+ gets processed by the main window. This is arguably a GTK+ bug.
+ We work around it. */
+ scroll_event.scroll.type = GDK_SCROLL;
+ scroll_event.scroll.window = event->window;
+ scroll_event.scroll.send_event = event->send_event;
+ scroll_event.scroll.time = event->time;
+ scroll_event.scroll.x = event->x;
+ scroll_event.scroll.y = event->y;
+ scroll_event.scroll.state = event->state;
+ scroll_event.scroll.device = event->device;
+ scroll_event.scroll.x_root = event->x_root;
+ scroll_event.scroll.y_root = event->y_root;
+ if (event->button == 4) scroll_event.scroll.direction = GDK_SCROLL_UP;
+ else if (event->button == 5) scroll_event.scroll.direction = GDK_SCROLL_DOWN;
+ else if (event->button == 6) scroll_event.scroll.direction = GDK_SCROLL_LEFT;
+ else scroll_event.scroll.direction = GDK_SCROLL_RIGHT;
+ gtk_widget_event(GET_COMPONENT("scrolledwindowMain"), &scroll_event);
+ }
+ return FALSE;
+ }
+ if ((event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK)) != 0) return FALSE;
+ // no control-clicking or alt-clicking
+ if (!is_core) gdk_device_get_state(event->device, event->window, event->axes, NULL);
+ // synaptics touchpads send bogus axis values with ButtonDown
if (!is_core)
fix_xinput_coords((GdkEvent *)event);
-#ifdef INPUT_DEBUG
- printf("DEBUG: ButtonDown (%s) (x,y)=(%.2f,%.2f)\n",
- is_core?"core":"xinput", event->x, event->y);
-#endif
- if (!finite(event->x) || !finite(event->y)) return FALSE; // Xorg 7.3 bug
+ if (!finite_sized(event->x) || !finite_sized(event->y)) return FALSE; // Xorg 7.3 bug
if (ui.cur_item_type == ITEM_TEXT) {
if (!is_event_within_textview(event)) end_text();
-/* // bugfix for GTK+ 2.17, no longer needed as XInput is disabled during text edition
- else fix_extended_events(ui.cur_item->widget, (GdkEvent *)event,
- gtk_text_view_get_window(GTK_TEXT_VIEW(ui.cur_item->widget), GTK_TEXT_WINDOW_TEXT));
-*/
+ else return FALSE;
}
if (ui.cur_item_type == ITEM_STROKE && ui.is_corestroke && !is_core &&
ui.cur_path.num_points == 1) {
}
if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something
+ // if button_switch_mapping enabled, button 2 or 3 clicks only switch mapping
+ if (ui.button_switch_mapping && event->button > 1) {
+ ui.which_unswitch_button = event->button;
+ switch_mapping(event->button-1);
+ return FALSE;
+ }
+
ui.is_corestroke = is_core;
+ ui.stroke_device = event->device;
if (ui.use_erasertip && event->device->source == GDK_SOURCE_ERASER)
- mapping = NUM_BUTTONS;
+ mapping = NUM_BUTTONS;
+ else if (ui.button_switch_mapping) {
+ mapping = ui.cur_mapping;
+ if (!mapping && (event->state & GDK_BUTTON2_MASK)) mapping = 1;
+ if (!mapping && (event->state & GDK_BUTTON3_MASK)) mapping = 2;
+ }
else mapping = event->button-1;
// check whether we're in a page
- page_change = FALSE;
- tmppage = ui.cur_page;
get_pointer_coords((GdkEvent *)event, pt);
- while (ui.view_continuous && (pt[1] < - VIEW_CONTINUOUS_SKIP)) {
- if (ui.pageno == 0) break;
- page_change = TRUE;
- ui.pageno--;
- tmppage = g_list_nth_data(journal.pages, ui.pageno);
- pt[1] += tmppage->height + VIEW_CONTINUOUS_SKIP;
- }
- while (ui.view_continuous && (pt[1] > tmppage->height + VIEW_CONTINUOUS_SKIP)) {
- if (ui.pageno == journal.npages-1) break;
- pt[1] -= tmppage->height + VIEW_CONTINUOUS_SKIP;
- page_change = TRUE;
- ui.pageno++;
- tmppage = g_list_nth_data(journal.pages, ui.pageno);
- }
- if (page_change) do_switch_page(ui.pageno, FALSE, FALSE);
+ set_current_page(pt);
// can't paint on the background...
ui.which_mouse_button = event->button;
switch_mapping(mapping);
+#ifdef WIN32
+ update_cursor();
+#endif
// in text tool, clicking in a text area edits it
if (ui.toolno[mapping] == TOOL_TEXT) {
else if (ui.toolno[mapping] == TOOL_TEXT) {
start_text((GdkEvent *)event, NULL);
}
+ else if (ui.toolno[mapping] == TOOL_IMAGE) {
+ insert_image((GdkEvent *)event);
+ }
return FALSE;
}
{
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
+#ifdef INPUT_DEBUG
+ printf("DEBUG: ButtonRelease (%s) (x,y)=(%.2f,%.2f), button %d, modifier %x\n",
+ event->device->name, event->x, event->y, event->button, event->state);
+#endif
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 (event->button != ui.which_mouse_button &&
+ event->button != ui.which_unswitch_button)
+ return FALSE;
+
if (ui.cur_item_type == ITEM_STROKE) {
finalize_stroke();
if (ui.cur_brush->recognizer) recognize_patterns();
else if (ui.cur_item_type == ITEM_HAND) {
ui.cur_item_type = ITEM_NONE;
}
+
+ if (!ui.which_unswitch_button || event->button == ui.which_unswitch_button)
+ switch_mapping(0); // will reset ui.which_unswitch_button
- switch_mapping(0);
return FALSE;
}
GdkEventCrossing *event,
gpointer user_data)
{
+ GList *dev_list;
+ GdkDevice *dev;
+#ifdef INPUT_DEBUG
+ printf("DEBUG: enter notify\n");
+#endif
+ /* re-enable input devices after they've been emergency-disabled
+ by leave_notify */
+ if (!gtk_check_version(2, 17, 0)) {
+ gdk_flush();
+ gdk_error_trap_push();
+ for (dev_list = gdk_devices_list(); dev_list != NULL; dev_list = dev_list->next) {
+ dev = GDK_DEVICE(dev_list->data);
+ gdk_device_set_mode(dev, GDK_MODE_SCREEN);
+ }
+ ui.is_corestroke = ui.saved_is_corestroke;
+ gdk_flush();
+ gdk_error_trap_pop();
+ }
return FALSE;
}
GdkEventCrossing *event,
gpointer user_data)
{
+ GList *dev_list;
+ GdkDevice *dev;
+
#ifdef INPUT_DEBUG
- printf("DEBUG: leave notify\n");
+ printf("DEBUG: leave notify (mode=%d, details=%d)\n", event->mode, event->detail);
#endif
- if (ui.need_emergency_disable_xinput) {
- gtk_widget_set_extension_events(GTK_WIDGET (canvas), GDK_EXTENSION_EVENTS_NONE);
- ui.need_emergency_disable_xinput = FALSE;
+ /* emergency disable XInput to avoid segfaults (GTK+ 2.17) or
+ interface non-responsiveness (GTK+ 2.18) */
+ if (!gtk_check_version(2, 17, 0)) {
+ gdk_flush();
+ gdk_error_trap_push();
+ for (dev_list = gdk_devices_list(); dev_list != NULL; dev_list = dev_list->next) {
+ dev = GDK_DEVICE(dev_list->data);
+ gdk_device_set_mode(dev, GDK_MODE_DISABLED);
+ }
+ ui.saved_is_corestroke = ui.is_corestroke;
+ ui.is_corestroke = TRUE;
+ gdk_flush();
+ gdk_error_trap_pop();
}
return FALSE;
}
GdkEventKey *event,
gpointer user_data)
{
- // If zoomed-out and in single page mode, switch pages with PgUp/PgDn.
- if (!ui.view_continuous &&
- (0.96 * ui.zoom * ui.cur_page->height <
- GTK_WIDGET(canvas)->allocation.height)) {
- if (event->keyval == GDK_Page_Down) {
+ GtkAdjustment *adj;
+ gint pgheight;
+
+ // Esc leaves text edition, or leaves fullscreen mode
+ if (event->keyval == GDK_Escape) {
+ if (ui.cur_item_type == ITEM_TEXT) {
+ end_text();
+ return TRUE;
+ }
+ else if (ui.fullscreen) {
+ do_fullscreen(FALSE);
+ return TRUE;
+ }
+ else return FALSE;
+ }
+
+ /* In single page mode, switch pages with PgUp/PgDn (or Up/Dn)
+ when there's nowhere else to go. */
+ pgheight = GTK_WIDGET(canvas)->allocation.height;
+ adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(GET_COMPONENT("scrolledwindowMain")));
+
+ if (event->keyval == GDK_Page_Down || event->keyval == GDK_Down) {
+ if (!ui.view_continuous &&
+ (0.96 * ui.zoom * ui.cur_page->height < pgheight ||
+ adj->value == adj->upper-pgheight))
+ {
end_text();
- reset_focus();
- if (ui.pageno == journal.npages-1) { return FALSE; }
- do_switch_page(ui.pageno+1, TRUE, FALSE);
+ if (ui.pageno < journal.npages-1)
+ do_switch_page(ui.pageno+1, TRUE, FALSE);
+ return TRUE;
}
- if (event->keyval == GDK_Page_Up) {
+ if (adj->value == adj->upper-pgheight) return TRUE; // don't send focus away
+ }
+
+ if (event->keyval == GDK_Page_Up || event->keyval == GDK_Up) {
+ if (!ui.view_continuous &&
+ (0.96 * ui.zoom * ui.cur_page->height < pgheight ||
+ adj->value == adj->lower))
+ {
end_text();
- reset_focus();
- if (ui.pageno == 0) { return FALSE; }
- do_switch_page(ui.pageno-1, TRUE, FALSE);
+ if (ui.pageno != 0) {
+ do_switch_page(ui.pageno-1, TRUE, FALSE);
+ gtk_adjustment_set_value(adj, adj->upper-pgheight);
+ }
+ return TRUE;
}
+ if (adj->value == adj->lower) return TRUE; // don't send focus away
}
return FALSE;
{
gboolean looks_wrong, is_core;
double pt[2];
+ GdkModifierType mask;
/* we don't care about this event unless some operation is in progress;
or if there's a selection (then we might want to change the mouse
cursor to indicate the possibility of resizing) */
if (ui.cur_item_type == ITEM_NONE && ui.selection==NULL) return FALSE;
+ if (ui.cur_item_type == ITEM_TEXT || ui.cur_item_type == ITEM_IMAGE) return FALSE;
is_core = (event->device == gdk_device_get_core_pointer());
if (!ui.use_xinput && !is_core) return FALSE;
if (!is_core) fix_xinput_coords((GdkEvent *)event);
- if (!finite(event->x) || !finite(event->y)) return FALSE; // Xorg 7.3 bug
+ if (!finite_sized(event->x) || !finite_sized(event->y)) return FALSE; // Xorg 7.3 bug
if (ui.selection!=NULL && ui.cur_item_type == ITEM_NONE) {
get_pointer_coords((GdkEvent *)event, pt);
if (!is_core) ui.is_corestroke = FALSE;
#ifdef INPUT_DEBUG
- printf("DEBUG: MotionNotify (%s) (x,y)=(%.2f,%.2f)\n",
- is_core?"core":"xinput", event->x, event->y);
+ printf("DEBUG: MotionNotify (%s) (x,y)=(%.2f,%.2f), modifier %x\n",
+ is_core?"core":"xinput", event->x, event->y, event->state);
#endif
looks_wrong = !(event->state & (1<<(7+ui.which_mouse_button)));
+ if (looks_wrong) {
+ gdk_device_get_state(ui.stroke_device, event->window, NULL, &mask);
+ looks_wrong = !(mask & (1<<(7+ui.which_mouse_button)));
+ }
if (looks_wrong) { /* mouse button shouldn't be up... give up */
if (ui.cur_item_type == ITEM_STROKE) {
else if (ui.cur_item_type == ITEM_RESIZESEL) {
finalize_resizesel();
}
+ else if (ui.cur_item_type == ITEM_HAND) {
+ ui.cur_item_type = ITEM_NONE;
+ }
switch_mapping(0);
return FALSE;
}
if (ui.in_update_page_stuff) return; // avoid a bad retroaction
end_text();
- reset_focus();
val = gtk_combo_box_get_active(combobox);
if (val == -1) return;
gpointer user_data)
{
end_text();
- reset_focus();
if (ok_to_close()) gtk_main_quit();
return TRUE;
}
gpointer user_data)
{
end_text();
- reset_focus();
ui.allow_xinput = ui.use_xinput =
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
/* HOW THINGS USED TO BE:
- We'd like ONLY the canvas window itself to receive
- XInput events, while its child window in the GDK hierarchy (also
- associated to the canvas widget) receives the core events.
- This way on_canvas_... will get both types of events -- otherwise,
- the proximity detection code in GDK is broken and we'll lose core
- events.
+ We'd like on_canvas_... to get BOTH core and xinput events. Up to
+ GTK+ 2.16 this is achieved by making only the canvas's parent
+ GdkWindow xinput-aware, rather than the entire hierarchy.
+ Otherwise, the proximity detection code in GDK is broken and
+ we'll lose core events.
Up to GTK+ 2.10, gtk_widget_set_extension_events() only sets
extension events for the widget's main window itself; in GTK+ 2.11
non-responsive).
*/
- // this causes core events to be discarded... unwanted!
-/*
- gtk_widget_set_extension_events(GTK_WIDGET (canvas),
+#ifndef WIN32
+ if (!gtk_check_version(2, 17, 0)) {
+#endif
+ /* GTK+ 2.17 and later: everybody shares a single native window,
+ so we'll never get any core events, and we might as well set
+ extension events the way we're supposed to. Doing so helps solve
+ crasher bugs in 2.17, and prevents us from losing two-button
+ events in 2.18 */
+ gtk_widget_set_extension_events(GTK_WIDGET (canvas),
+ ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
+#ifndef WIN32
+ } else {
+#endif
+ /* GTK+ 2.16 and earlier: we only activate extension events on the
+ canvas's parent GdkWindow. This allows us to keep receiving core
+ events. */
+ gdk_input_set_extension_events(GTK_WIDGET(canvas)->window,
+ GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK,
ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
-*/
-
- // this version only activates extension events on the canvas's parent GdkWindow
- gdk_input_set_extension_events(GTK_WIDGET(canvas)->window,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK,
- ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
-
+#ifndef WIN32
+ }
+#endif
+
update_mappings_menu();
}
end_text();
do_switch_page(ui.pageno, FALSE, FALSE);
}
- reset_focus();
return;
}
int val;
if (ui.in_update_page_stuff) return; // avoid a bad retroaction
-
+
+ /* in preparation for end_text(), send focus to the canvas if it's not ours.
+ (avoid issues with Gtk trying to send focus to the dead text widget) */
+
+ if (!GTK_WIDGET_HAS_FOCUS(spinbutton))
+ gtk_widget_grab_focus(GTK_WIDGET(canvas));
end_text();
- reset_focus();
val = gtk_spin_button_get_value_as_int(spinbutton) - 1;
GList *pglist;
end_text();
- reset_focus();
reset_selection();
pg = ui.cur_page;
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;
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));
- else gtk_window_unfullscreen(GTK_WINDOW(winMain));
-
- update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]);
+ do_fullscreen(active);
}
gpointer user_data)
{
end_text();
- reset_focus();
ui.use_erasertip =
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
update_mappings_menu();
}
-void
-on_optionsAntialiasBG_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- gboolean active;
-
- 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();
-}
-
-
void
on_optionsProgressiveBG_activate (GtkMenuItem *menuitem,
gpointer user_data)
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();
}
GtkWidget *dialog;
end_text();
- reset_focus();
if (!ok_to_close()) return; // user aborted on save confirmation
for (which = 0 ; which < MRU_SIZE; which++) {
}
+void
+on_button2Image_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ process_mapping_activate(menuitem, 1, TOOL_IMAGE);
+}
+
+
void
on_button2SelectRegion_activate (GtkMenuItem *menuitem,
gpointer user_data)
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;i++) update_mapping_linkings(i);
}
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))) return;
end_text();
- reset_focus();
if (ui.toolno[1] >= NUM_STROKE_TOOLS) {
ui.linked_brush[1] = BRUSH_STATIC;
update_mappings_menu_linkings();
}
+void
+on_button3Image_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ process_mapping_activate(menuitem, 2, TOOL_IMAGE);
+}
+
+
void
on_button3SelectRegion_activate (GtkMenuItem *menuitem,
gpointer user_data)
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;i++) update_mapping_linkings(i);
}
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))) return;
end_text();
- reset_focus();
if (ui.toolno[2] >= NUM_STROKE_TOOLS) {
ui.linked_brush[2] = BRUSH_STATIC;
update_mappings_menu_linkings();
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"));
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
} while (response == GTK_RESPONSE_APPLY);
return;
}
- if (ui.cur_mapping != 0) return;
- if (ui.toolno[0] == TOOL_HAND) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ if (ui.toolno[ui.cur_mapping] == TOOL_HAND) return;
+ ui.cur_mapping = 0;
end_text();
- reset_focus();
reset_selection();
- ui.toolno[0] = TOOL_HAND;
+ ui.toolno[ui.cur_mapping] = TOOL_HAND;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
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,
+on_optionsAutoloadPdfXoj_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();
+ ui.autoload_pdf_xoj = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
}
void
gpointer user_data)
{
end_text();
- reset_focus();
ui.left_handed = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(GET_COMPONENT("scrolledwindowMain")),
ui.left_handed?GTK_CORNER_TOP_RIGHT:GTK_CORNER_TOP_LEFT);
GtkWidget *w;
end_text();
- reset_focus();
ui.shorten_menus = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
/* go over the item list */
gpointer user_data)
{
end_text();
- reset_focus();
ui.auto_save_prefs = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
}
{
int i;
end_text();
- reset_focus();
ui.pressure_sensitivity =
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
for (i=0; i<=NUM_BUTTONS; i++)
update_mappings_menu();
}
+
+void
+on_buttonColorChooser_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ GdkColor gdkcolor;
+ guint16 alpha;
+
+ gtk_color_button_get_color(colorbutton, &gdkcolor);
+ alpha = gtk_color_button_get_alpha(colorbutton);
+ process_color_activate((GtkMenuItem*)colorbutton, COLOR_OTHER, gdkcolor_to_rgba(gdkcolor, alpha));
+}
+
+
+void
+on_optionsButtonsSwitchMappings_activate(GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ end_text();
+ switch_mapping(0);
+ ui.button_switch_mapping = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+}
+
+
projects / xournal.git / blobdiff