#include <gtk/gtk.h>
#include <libgnomecanvas/libgnomecanvas.h>
#include <gdk/gdkkeysyms.h>
-#include <X11/Xlib.h>
#include "xournal.h"
#include "xo-interface.h"
double get_pressure_multiplier(GdkEvent *event)
{
+ double *axes;
double rawpressure;
+ GdkDevice *device;
+
+ if (event->type == GDK_MOTION_NOTIFY) {
+ axes = event->motion.axes;
+ device = event->motion.device;
+ }
+ else {
+ axes = event->button.axes;
+ device = event->button.device;
+ }
- if (event->button.device == gdk_device_get_core_pointer()
- || event->button.device->num_axes <= 2) return 1.0;
+ if (device == gdk_device_get_core_pointer()
+ || device->num_axes <= 2) return 1.0;
- rawpressure = event->button.axes[2]/(event->button.device->axes[2].max - event->button.device->axes[2].min);
+ rawpressure = axes[2]/(device->axes[2].max - device->axes[2].min);
+ if (!finite(rawpressure)) return 1.0;
return ((1-rawpressure)*ui.width_minimum_multiplier + rawpressure*ui.width_maximum_multiplier);
}
// in progressive mode we scale only visible pages
if (ui.progressive_bg && !is_visible(pg)) continue;
- if (pg->bg->type == BG_PIXMAP && pg->bg->canvas_item!=NULL) { // do the rescaling ourselves
+ if (pg->bg->type == BG_PIXMAP && pg->bg->canvas_item!=NULL) {
g_object_get(G_OBJECT(pg->bg->canvas_item), "pixbuf", &pix, NULL);
if (pix!=pg->bg->pixbuf)
gnome_canvas_item_set(pg->bg->canvas_item, "pixbuf", pg->bg->pixbuf, NULL);
// request an asynchronous update to a better pixmap if needed
zoom_to_request = MIN(ui.zoom, MAX_SAFE_RENDER_DPI/72.0);
if (pg->bg->pixbuf_scale == zoom_to_request) continue;
- add_bgpdf_request(pg->bg->file_page_seq, zoom_to_request);
- pg->bg->pixbuf_scale = zoom_to_request;
+ if (add_bgpdf_request(pg->bg->file_page_seq, zoom_to_request))
+ pg->bg->pixbuf_scale = zoom_to_request;
}
}
}
void update_mappings_menu(void)
{
gtk_widget_set_sensitive(GET_COMPONENT("optionsButtonMappings"), ui.use_xinput);
- gtk_widget_set_sensitive(GET_COMPONENT("optionsDiscardCoreEvents"), ui.use_xinput);
gtk_widget_set_sensitive(GET_COMPONENT("optionsPressureSensitive"), ui.use_xinput);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsButtonMappings")), ui.use_erasertip);
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsDiscardCoreEvents")), ui.discard_corepointer);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsPressureSensitive")), ui.pressure_sensitivity);
gtk_combo_box_set_active(layerbox, ui.cur_page->nlayers-1-ui.layerno);
ui.in_update_page_stuff = FALSE;
+ gtk_container_forall(GTK_CONTAINER(layerbox), unset_flags, (gpointer)GTK_CAN_FOCUS);
+
// update the paper-style menu radio buttons
if (ui.view_continuous)
break;
default:
gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(GET_COMPONENT("papercolorOther")), TRUE);
+ GTK_CHECK_MENU_ITEM(GET_COMPONENT("papercolorNA")), TRUE);
break;
}
switch (ui.cur_page->bg->ruling) {
}
if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
- reset_focus();
if (ui.cur_item_type == ITEM_TEXT)
recolor_temp_text(color_no, color_rgba);
if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
if (ui.selection != NULL && GTK_OBJECT_TYPE(menuitem) != GTK_TYPE_RADIO_MENU_ITEM) {
- reset_focus();
rethicken_selection(val);
update_thickness_buttons();
}
which_mapping = ui.cur_mapping;
else which_mapping = 0;
if (ui.brushes[which_mapping][tool].thickness_no == val) return;
- reset_focus();
end_text();
ui.brushes[which_mapping][tool].thickness_no = val;
ui.brushes[which_mapping][tool].thickness = predef_thickness[tool][val];
update_cursor();
}
-void process_papercolor_activate(GtkMenuItem *menuitem, int color)
+void process_papercolor_activate(GtkMenuItem *menuitem, int color, guint rgba)
{
struct Page *pg;
GList *pglist;
gboolean hasdone;
- if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
- return;
+ if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) {
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
+ return;
+ }
- if ((ui.cur_page->bg->type != BG_SOLID) || ui.bg_apply_all_pages)
+ if ((ui.cur_page->bg->type != BG_SOLID) || ui.bg_apply_all_pages || color == COLOR_OTHER)
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("papercolorNA")), TRUE);
hasdone = FALSE;
for (pglist = journal.pages; pglist!=NULL; pglist = pglist->next) {
if (ui.bg_apply_all_pages) pg = (struct Page *)pglist->data;
- if (pg->bg->type == BG_SOLID && pg->bg->color_no != color) {
+ if (pg->bg->type == BG_SOLID && pg->bg->color_rgba != rgba) {
prepare_new_undo();
if (hasdone) undo->multiop |= MULTIOP_CONT_UNDO;
undo->multiop |= MULTIOP_CONT_REDO;
undo->bg->canvas_item = NULL;
pg->bg->color_no = color;
- pg->bg->color_rgba = predef_bgcolors_rgba[color];
+ pg->bg->color_rgba = rgba;
update_canvas_bg(pg);
}
if (!ui.bg_apply_all_pages) break;
}
// send the focus back to the appropriate widget
+
void reset_focus(void)
{
if (ui.cur_item_type == ITEM_TEXT)
gtk_widget_grab_focus(ui.cur_item->widget);
else
gtk_widget_grab_focus(GTK_WIDGET(canvas));
- reset_recognizer();
}
// selection / clipboard stuff
if (ui.toolno[m] == tool) return;
switch_mapping(0);
end_text();
- reset_focus();
ui.toolno[m] = tool;
if (ui.linked_brush[m] == BRUSH_COPIED) {
{
gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
gtk_widget_hide(GET_COMPONENT("journalFlatten"));
- gtk_widget_hide(GET_COMPONENT("papercolorOther"));
gtk_widget_hide(GET_COMPONENT("toolsSelectRegion"));
gtk_widget_hide(GET_COMPONENT("buttonSelectRegion"));
gtk_widget_hide(GET_COMPONENT("button2SelectRegion"));
if (gtk_check_version(2, 10, 0)) {
gtk_widget_hide(GET_COMPONENT("filePrint"));
}
+
+ /* screenshot feature doesn't work yet in Win32 */
+#ifdef WIN32
+ gtk_widget_hide(GET_COMPONENT("journalScreenshot"));
+#endif
}
// toggle fullscreen mode
void do_fullscreen(gboolean active)
{
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));
-
+ if (ui.fullscreen) {
+#ifdef WIN32
+ gtk_window_get_size(GTK_WINDOW(winMain), &ui.pre_fullscreen_width, &ui.pre_fullscreen_height);
+ gtk_widget_set_size_request(GTK_WIDGET(winMain), gdk_screen_width(),
+ gdk_screen_height());
+#endif
+ gtk_window_fullscreen(GTK_WINDOW(winMain));
+ }
+ else {
+#ifdef WIN32
+ gtk_widget_set_size_request(GTK_WIDGET(winMain), -1, -1);
+ gtk_window_resize(GTK_WINDOW(winMain), ui.pre_fullscreen_width,
+ ui.pre_fullscreen_height);
+#endif
+ gtk_window_unfullscreen(GTK_WINDOW(winMain));
+ }
+
update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]);
}
}
*/
-// disable xinput when layer combo box is popped up, to avoid GTK+ 2.17 crash
-gboolean combobox_popup_disable_xinput (GtkWidget *widget, GdkEvent *event,
- gpointer user_data)
+/* When enter is pressed into page spinbox, send focus back to canvas. */
+
+gboolean handle_activate_signal(GtkWidget *widget, gpointer user_data)
{
- gboolean is_shown;
-
- g_object_get(G_OBJECT(widget), "popup-shown", &is_shown, NULL);
- gtk_widget_set_extension_events(GTK_WIDGET (canvas),
- (ui.use_xinput && !is_shown)?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
+ reset_focus();
+ return FALSE;
+}
+
+/* recursively unset widget flags */
+
+void unset_flags(GtkWidget *w, gpointer flag)
+{
+ GTK_WIDGET_UNSET_FLAGS(w, (GtkWidgetFlags)flag);
+ if(GTK_IS_CONTAINER(w))
+ gtk_container_forall(GTK_CONTAINER(w), unset_flags, flag);
+}
+
+/* reset focus when a key or button press event reaches someone, or when the
+ page-number spin button should relinquish control... */
+
+gboolean intercept_activate_events(GtkWidget *w, GdkEvent *ev, gpointer data)
+{
+ if (w == GET_COMPONENT("hbox1")) {
+ /* the event won't be processed since the hbox1 doesn't know what to do with it,
+ so we might as well kill it and avoid confusing ourselves when it gets
+ propagated further ... */
+ return TRUE;
+ }
+ if (w == GET_COMPONENT("spinPageNo")) {
+ /* we let the spin button take care of itself, and don't steal its focus,
+ unless the user presses Esc or Tab (in those cases we intervene) */
+ if (ev->type != GDK_KEY_PRESS) return FALSE;
+ if (ev->key.keyval == GDK_Escape)
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), ui.pageno+1); // abort
+ else if (ev->key.keyval != GDK_Tab && ev->key.keyval != GDK_ISO_Left_Tab)
+ return FALSE; // let the spin button process it
+ }
+
+ // otherwise, we want to make sure the canvas or text item gets focus back...
+ reset_focus();
+ return FALSE;
+}
+
+void install_focus_hooks(GtkWidget *w, gpointer data)
+{
+ if (w == NULL) return;
+ g_signal_connect(w, "key-press-event", G_CALLBACK(intercept_activate_events), data);
+ g_signal_connect(w, "button-press-event", G_CALLBACK(intercept_activate_events), data);
+ if (GTK_IS_MENU_ITEM(w)) {
+ g_signal_connect(w, "activate", G_CALLBACK(intercept_activate_events), data);
+ install_focus_hooks(gtk_menu_item_get_submenu(GTK_MENU_ITEM(w)), data);
+ }
+ if(GTK_IS_CONTAINER(w))
+ gtk_container_forall(GTK_CONTAINER(w), install_focus_hooks, data);
}