void realloc_cur_path(int n)
{
if (n <= ui.cur_path_storage_alloc) return;
- ui.cur_path_storage_alloc = n+10;
- ui.cur_path.coords = g_realloc(ui.cur_path.coords, 2*(n+10)*sizeof(double));
+ ui.cur_path_storage_alloc = n+100;
+ ui.cur_path.coords = g_realloc(ui.cur_path.coords, 2*(n+100)*sizeof(double));
}
void realloc_cur_widths(int n)
{
if (n <= ui.cur_widths_storage_alloc) return;
- ui.cur_widths_storage_alloc = n+10;
- ui.cur_widths = g_realloc(ui.cur_widths, (n+10)*sizeof(double));
+ ui.cur_widths_storage_alloc = n+100;
+ ui.cur_widths = g_realloc(ui.cur_widths, (n+100)*sizeof(double));
}
// undo utility functions
*py = iy + sy;
}
else {
- *px += sx;
- *py += sy;
+ /* with GTK+ 2.16 or earlier, the event comes from the parent gdkwindow
+ and so needs to be adjusted for scrolling */
+ if (gtk_major_version == 2 && gtk_minor_version <= 16) {
+ *px += sx;
+ *py += sy;
+ }
/* with GTK+ 2.17, events come improperly translated, and the event's
GdkWindow isn't even the same for ButtonDown as for MotionNotify... */
- if (!gtk_check_version(2,17,0)) { // GTK+ 2.17 issues !!
+ if (gtk_major_version == 2 && gtk_minor_version == 17) { // GTK+ 2.17 issues !!
gdk_window_get_position(GTK_WIDGET(canvas)->window, &wx, &wy);
- *px -= wx;
- *py -= wy;
+ *px += sx - wx;
+ *py += sy - wy;
}
}
#endif
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)
}
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];
}
// 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
/* NOTE ABOUT BUTTON MAPPINGS: ui.cur_mapping is 0 except while a canvas
click event is being processed ... or if ui.button_switch_mapping is
- enabled and mappings are switched! */
+ enabled and mappings are switched (but even then, canvas should have
+ a pointer grab from the initial click that switched the mapping) */
void switch_mapping(int m)
{
ui.cur_brush = &(ui.brushes[m][ui.toolno[m]]);
if (ui.toolno[m] == TOOL_TEXT)
ui.cur_brush = &(ui.brushes[m][TOOL_PEN]);
+ if (m==0) ui.which_unswitch_button = 0;
+
update_tool_buttons();
update_color_menu();
update_cursor();
if (ui.toolno[m] == tool) return;
switch_mapping(0);
end_text();
- reset_focus();
ui.toolno[m] = tool;
if (ui.linked_brush[m] == BRUSH_COPIED) {
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);
gboolean is_shown;
g_object_get(G_OBJECT(widget), "popup-shown", &is_shown, NULL);
- 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 && !is_shown)?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
+ gtk_widget_set_extension_events(GTK_WIDGET (canvas),
+ (ui.use_xinput && !is_shown)?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
}
+/* When enter is pressed into page spinbox, send focus back to canvas. */
+gboolean handle_activate_signal(GtkWidget *widget, gpointer user_data)
+{
+ 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);
+}
projects / xournal.git / blobdiff