From: Philip Chimento Date: Sat, 25 Aug 2012 21:01:23 +0000 (+0200) Subject: Merge branch 'master' into gtk3 X-Git-Tag: v0.9~20 X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=81becb22fdc69e406c685c65b9f55fd514df142b;hp=b071c27096d3c99182a38086e93d1e42f27437c8 Merge branch 'master' into gtk3 --- diff --git a/configure.ac b/configure.ac index 9a3299d..6299c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,8 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE" AC_SUBST(LT_VERSION_INFO) ### REQUIREMENTS ############################################################## -# Recommended GTK version: at least 2.12 -# Recommended Glib version: at least 2.16 -GTK_REQUIRED_VERSION=2.6 -GLIB_REQUIRED_VERSION=2.6 +GTK_REQUIRED_VERSION=3.2 +GLIB_REQUIRED_VERSION=2.16 GTK_DOC_REQUIRED_VERSION=1.12 AC_SUBST(GTK_REQUIRED_VERSION) AC_SUBST(GLIB_REQUIRED_VERSION) @@ -118,7 +116,7 @@ AM_CONDITIONAL(BUILDING_VAPI, $TEST "x$VAPIGEN" != xnotfound) # Libraries needed to build Chimara library PKG_CHECK_MODULES([CHIMARA], [ glib-2.0 >= $GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gthread-2.0 gmodule-2.0 pango @@ -129,14 +127,14 @@ AC_SUBST(CHIMARA_LIBS) # Libraries needed to build Chimara player PKG_CHECK_MODULES([PLAYER], [ glib-2.0 >= $GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 - libgda-4.0 + dnl libgda-4.0 libsoup-2.4 ]) # Libraries needed to build test programs PKG_CHECK_MODULES([TEST], [ - gtk+-2.0 >= $GTK_REQUIRED_VERSION + gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GLIB_REQUIRED_VERSION ]) diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am index 7b02980..ef18a90 100644 --- a/libchimara/Makefile.am +++ b/libchimara/Makefile.am @@ -84,7 +84,7 @@ introspection_sources = \ chimara-if.c chimara-if.h Chimara-1.0.gir: libchimara.la -Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-2.0 +Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0 Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir) Chimara_1_0_gir_LIBS = libchimara.la Chimara_1_0_gir_FILES = $(introspection_sources) @@ -110,7 +110,7 @@ dist_vapi_DATA = chimara.vapi if BUILDING_VAPI chimara.vapi: $(INTROSPECTION_GIRS) - $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir && \ + $(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-3.0 Chimara-1.0.gir && \ touch $@ endif diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c index 6a4c0d3..bb2758a 100644 --- a/libchimara/chimara-glk.c +++ b/libchimara/chimara-glk.c @@ -409,7 +409,9 @@ request_recurse(winid_t win, GtkRequisition *requisition, guint spacing) gtk_widget_size_request(win->frame, requisition); } -/* Overrides gtk_widget_size_request */ +/* Old GTK 2 functionality overriding gtk_widget_size_request(); +get_preferred_width() and get_preferred_height() are implemented in terms of +this function. */ static void chimara_glk_size_request(GtkWidget *widget, GtkRequisition *requisition) { @@ -434,6 +436,36 @@ chimara_glk_size_request(GtkWidget *widget, GtkRequisition *requisition) } } +/* Minimal implementation of width-for-height request, in terms of the old +GTK 2 mechanism. FIXME: make this more efficient. */ +static void +chimara_glk_get_preferred_width(GtkWidget *widget, int *minimal, int *natural) +{ + g_return_if_fail(widget || CHIMARA_IS_GLK(widget)); + g_return_if_fail(minimal); + g_return_if_fail(natural); + + GtkRequisition requisition; + + chimara_glk_size_request(widget, &requisition); + *minimal = *natural = requisition.width; +} + +/* Minimal implementation of height-for-width request, in terms of the old +GTK 2 mechanism. FIXME: make this more efficient. */ +static void +chimara_glk_get_preferred_height(GtkWidget *widget, int *minimal, int *natural) +{ + g_return_if_fail(widget || CHIMARA_IS_GLK(widget)); + g_return_if_fail(minimal); + g_return_if_fail(natural); + + GtkRequisition requisition; + + chimara_glk_size_request(widget, &requisition); + *minimal = *natural = requisition.height; +} + /* Recursively give the Glk windows their allocated space. Returns a window containing all children of this window that must be redrawn, or NULL if there are no children that require redrawing. */ @@ -757,7 +789,8 @@ chimara_glk_class_init(ChimaraGlkClass *klass) object_class->finalize = chimara_glk_finalize; GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); - widget_class->size_request = chimara_glk_size_request; + widget_class->get_preferred_width = chimara_glk_get_preferred_width; + widget_class->get_preferred_height = chimara_glk_get_preferred_height; widget_class->size_allocate = chimara_glk_size_allocate; GtkContainerClass *container_class = GTK_CONTAINER_CLASS(klass); diff --git a/libchimara/graphics.c b/libchimara/graphics.c index 1ab5a35..543ad43 100644 --- a/libchimara/graphics.c +++ b/libchimara/graphics.c @@ -386,24 +386,19 @@ glk_image_draw_scaled(winid_t win, glui32 image, glsi32 val1, glsi32 val2, glui3 return draw_image_common(win, info->pixbuf, val1, val2); } -/* Internal function: draws a pixbuf to a graphics window of text buffer */ +/* Internal function: draws a pixbuf to a graphics window or text buffer */ glui32 draw_image_common(winid_t win, GdkPixbuf *pixbuf, glsi32 val1, glsi32 val2) { switch(win->type) { case wintype_Graphics: { - GdkPixmap *canvas; - gdk_threads_enter(); - gtk_image_get_pixmap( GTK_IMAGE(win->widget), &canvas, NULL ); - if(canvas == NULL) { - WARNING("Could not get pixmap"); - return FALSE; - } - - gdk_draw_pixbuf( GDK_DRAWABLE(canvas), NULL, pixbuf, 0, 0, val1, val2, -1, -1, GDK_RGB_DITHER_NONE, 0, 0 ); + cairo_t *cr = cairo_create(win->backing_store); + gdk_cairo_set_source_pixbuf(cr, pixbuf, val1, val2); + cairo_paint(cr); + cairo_destroy(cr); /* Update the screen */ gtk_widget_queue_draw(win->widget); @@ -483,6 +478,16 @@ glk_window_set_background_color(winid_t win, glui32 color) win->background_color = color; } +static void +glkcairo_set_source_glkcolor(cairo_t *cr, glui32 val) +{ + double r, g, b; + r = ((val & 0xff0000) >> 16) / 256.0; + g = ((val & 0x00ff00) >> 8) / 256.0; + b = (val & 0x0000ff) / 256.0; + cairo_set_source_rgb(cr, r, g, b); +} + /** * glk_window_fill_rect: * @win: A graphics window. @@ -504,16 +509,12 @@ glk_window_fill_rect(winid_t win, glui32 color, glsi32 left, glsi32 top, glui32 gdk_threads_enter(); - GdkPixmap *map; - gtk_image_get_pixmap( GTK_IMAGE(win->widget), &map, NULL ); - - GdkGC *gc = gdk_gc_new(map); - GdkColor gdkcolor; - glkcolor_to_gdkcolor(color, &gdkcolor); - gdk_gc_set_rgb_fg_color(gc, &gdkcolor); - gdk_draw_rectangle( GDK_DRAWABLE(map), gc, TRUE, left, top, width, height); + cairo_t *cr = cairo_create(win->backing_store); + glkcairo_set_source_glkcolor(cr, color); + cairo_rectangle(cr, (double)left, (double)top, (double)width, (double)height); + cairo_fill(cr); gtk_widget_queue_draw(win->widget); - g_object_unref(gc); + cairo_destroy(cr); gdk_threads_leave(); } @@ -579,37 +580,54 @@ void glk_window_flow_break(winid_t win) VALID_WINDOW(win, return); } -/*** Called when the graphics window is resized. Resize the backing pixmap if necessary ***/ -void -on_graphics_size_allocate(GtkWidget *widget, GtkAllocation *allocation, winid_t win) -{ - GdkPixmap *oldmap; - gtk_image_get_pixmap( GTK_IMAGE(widget), &oldmap, NULL ); - gint oldwidth = 0; - gint oldheight = 0; - - /* Determine whether a pixmap exists with the correct size */ +/* Called when the graphics window is resized, restacked, or moved. Resize the +backing store if necessary. */ +gboolean +on_graphics_configure(GtkWidget *widget, GdkEventConfigure *event, winid_t win) +{ + int oldwidth = 0, oldheight = 0; + + /* Determine whether the backing store can stay the same size */ gboolean needs_resize = FALSE; - if(oldmap == NULL) + if(win->backing_store == NULL) needs_resize = TRUE; else { - gdk_drawable_get_size( GDK_DRAWABLE(oldmap), &oldwidth, &oldheight ); - if(oldwidth != allocation->width || oldheight != allocation->height) + oldwidth = cairo_image_surface_get_width(win->backing_store); + oldheight = cairo_image_surface_get_height(win->backing_store); + if(oldwidth != event->width || oldheight != event->height) needs_resize = TRUE; } if(needs_resize) { - /* Create a new pixmap */ - GdkPixmap *newmap = gdk_pixmap_new(widget->window, allocation->width, allocation->height, -1); - gdk_draw_rectangle( GDK_DRAWABLE(newmap), widget->style->white_gc, TRUE, 0, 0, allocation->width, allocation->height); - - /* Copy the contents of the old pixmap */ - if(oldmap != NULL) - gdk_draw_drawable( GDK_DRAWABLE(newmap), widget->style->white_gc, GDK_DRAWABLE(oldmap), 0, 0, 0, 0, oldwidth, oldheight); - - /* Use the new pixmap */ - gtk_image_set_from_pixmap( GTK_IMAGE(widget), newmap, NULL ); - g_object_unref(newmap); + /* Create a new backing store */ + cairo_surface_t *new_backing_store = gdk_window_create_similar_surface( gtk_widget_get_window(widget), CAIRO_CONTENT_COLOR, gtk_widget_get_allocated_width(widget), gtk_widget_get_allocated_height(widget) ); + cairo_t *cr = cairo_create(new_backing_store); + + /* Clear to background color */ + glkcairo_set_source_glkcolor(cr, win->background_color); + cairo_paint(cr); + + if(win->backing_store != NULL) { + /* Copy the contents of the old backing store */ + cairo_set_source_surface(cr, win->backing_store, 0, 0); + cairo_paint(cr); + cairo_surface_destroy(win->backing_store); + } + + cairo_destroy(cr); + /* Use the new backing store */ + win->backing_store = new_backing_store; } + + return TRUE; /* Event handled, stop processing */ } +/* Draw the backing store to the screen. Called whenever the drawing area is +exposed. */ +gboolean +on_graphics_draw(GtkWidget *widget, cairo_t *cr, winid_t win) +{ + cairo_set_source_surface(cr, win->backing_store, 0, 0); + cairo_paint(cr); + return FALSE; +} diff --git a/libchimara/graphics.h b/libchimara/graphics.h index fe39694..5ca8c60 100644 --- a/libchimara/graphics.h +++ b/libchimara/graphics.h @@ -21,7 +21,8 @@ struct image_info { gboolean scaled; }; -void on_graphics_size_allocate(GtkWidget *widget, GtkAllocation *allocation, winid_t win); +gboolean on_graphics_configure(GtkWidget *widget, GdkEventConfigure *event, winid_t win); +gboolean on_graphics_draw(GtkWidget *widget, cairo_t *cr, winid_t win); void clear_image_cache(struct image_info *data, gpointer user_data); #endif diff --git a/libchimara/input.c b/libchimara/input.c index 7f9b693..3a4babf 100644 --- a/libchimara/input.c +++ b/libchimara/input.c @@ -497,7 +497,7 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win gtk_text_buffer_get_selection_bounds(buffer, &selection_start, &selection_end); if(gtk_text_iter_compare(&selection_start, &input_position_iter) < 0) { // Cursor is somewhere else in the text, place it at the end if the user starts typing - if(event->keyval >= GDK_space && event->keyval <= GDK_asciitilde) { + if(event->keyval >= GDK_KEY_space && event->keyval <= GDK_KEY_asciitilde) { gtk_text_buffer_place_cursor(buffer, &end_iter); } else { // User is walking around, let him be. @@ -509,16 +509,16 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win pager_update(win); /* History up/down */ - if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up - || event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if(event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up + || event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) { /* Prevent falling off the end of the history list */ if(win->history == NULL) return TRUE; - if( (event->keyval == GDK_Up || event->keyval == GDK_KP_Up) + if( (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) && win->history_pos && win->history_pos->next == NULL) return TRUE; - if( (event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if( (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) && (win->history_pos == NULL || win->history_pos->prev == NULL) ) return TRUE; @@ -531,7 +531,7 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win gtk_text_buffer_delete(buffer, &input_position_iter, &end_iter); - if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up) + if(event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) { if(win->history_pos) win->history_pos = g_list_next(win->history_pos); @@ -552,20 +552,20 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win } /* Move to beginning/end of input field */ - else if(event->keyval == GDK_Home) { + else if(event->keyval == GDK_KEY_Home) { GtkTextIter input_iter; GtkTextMark *input_position = gtk_text_buffer_get_mark(buffer, "input_position"); gtk_text_buffer_get_iter_at_mark(buffer, &input_iter, input_position); gtk_text_buffer_place_cursor(buffer, &input_iter); return TRUE; } - else if(event->keyval == GDK_End) { + else if(event->keyval == GDK_KEY_End) { gtk_text_buffer_place_cursor(buffer, &end_iter); return TRUE; } /* Handle the line terminators */ - else if(event->keyval == GDK_Return || event->keyval == GDK_KP_Enter + else if(event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter || g_slist_find(win->current_extra_line_terminators, GUINT_TO_POINTER(event->keyval))) { /* Remove signal handlers */ @@ -591,15 +591,15 @@ on_line_input_key_press_event(GtkWidget *widget, GdkEventKey *event, winid_t win /* If this is a text grid window, then redirect the key press to the line input GtkEntry */ case wintype_TextGrid: { - if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up - || event->keyval == GDK_Down || event->keyval == GDK_KP_Down - || event->keyval == GDK_Left || event->keyval == GDK_KP_Left - || event->keyval == GDK_Right || event->keyval == GDK_KP_Right - || event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab - || event->keyval == GDK_Page_Up || event->keyval == GDK_KP_Page_Up - || event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down - || event->keyval == GDK_Home || event->keyval == GDK_KP_Home - || event->keyval == GDK_End || event->keyval == GDK_KP_End) + if(event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up + || event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down + || event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left + || event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right + || event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_KP_Tab + || event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_KP_Page_Up + || event->keyval == GDK_KEY_Page_Down || event->keyval == GDK_KEY_KP_Page_Down + || event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_KP_Home + || event->keyval == GDK_KEY_End || event->keyval == GDK_KEY_KP_End) return FALSE; /* Don't redirect these keys */ gtk_widget_grab_focus(win->input_entry); gtk_editable_set_position(GTK_EDITABLE(win->input_entry), -1); @@ -805,14 +805,14 @@ GtkEntry in a text grid window. */ gboolean on_input_entry_key_press_event(GtkEntry *input_entry, GdkEventKey *event, winid_t win) { - if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up - || event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if(event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up + || event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) { /* Prevent falling off the end of the history list */ - if( (event->keyval == GDK_Up || event->keyval == GDK_KP_Up) + if( (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) && win->history_pos && win->history_pos->next == NULL) return TRUE; - if( (event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if( (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) && (win->history_pos == NULL || win->history_pos->prev == NULL) ) return TRUE; @@ -823,7 +823,7 @@ on_input_entry_key_press_event(GtkEntry *input_entry, GdkEventKey *event, winid_ win->history_pos = win->history; } - if(event->keyval == GDK_Up || event->keyval == GDK_KP_Up) + if(event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) { if(win->history_pos) win->history_pos = g_list_next(win->history_pos); @@ -864,47 +864,47 @@ keyval_to_glk_keycode(guint keyval, gboolean unicode) { glui32 keycode; switch(keyval) { - case GDK_Up: - case GDK_KP_Up: return keycode_Up; - case GDK_Down: - case GDK_KP_Down: return keycode_Down; - case GDK_Left: - case GDK_KP_Left: return keycode_Left; - case GDK_Right: - case GDK_KP_Right: return keycode_Right; - case GDK_Linefeed: - case GDK_Return: - case GDK_KP_Enter: return keycode_Return; - case GDK_Delete: - case GDK_BackSpace: - case GDK_KP_Delete: return keycode_Delete; - case GDK_Escape: return keycode_Escape; - case GDK_Tab: - case GDK_KP_Tab: return keycode_Tab; - case GDK_Page_Up: - case GDK_KP_Page_Up: return keycode_PageUp; - case GDK_Page_Down: - case GDK_KP_Page_Down: return keycode_PageDown; - case GDK_Home: - case GDK_KP_Home: return keycode_Home; - case GDK_End: - case GDK_KP_End: return keycode_End; - case GDK_F1: - case GDK_KP_F1: return keycode_Func1; - case GDK_F2: - case GDK_KP_F2: return keycode_Func2; - case GDK_F3: - case GDK_KP_F3: return keycode_Func3; - case GDK_F4: - case GDK_KP_F4: return keycode_Func4; - case GDK_F5: return keycode_Func5; - case GDK_F6: return keycode_Func6; - case GDK_F7: return keycode_Func7; - case GDK_F8: return keycode_Func8; - case GDK_F9: return keycode_Func9; - case GDK_F10: return keycode_Func10; - case GDK_F11: return keycode_Func11; - case GDK_F12: return keycode_Func12; + case GDK_KEY_Up: + case GDK_KEY_KP_Up: return keycode_Up; + case GDK_KEY_Down: + case GDK_KEY_KP_Down: return keycode_Down; + case GDK_KEY_Left: + case GDK_KEY_KP_Left: return keycode_Left; + case GDK_KEY_Right: + case GDK_KEY_KP_Right: return keycode_Right; + case GDK_KEY_Linefeed: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: return keycode_Return; + case GDK_KEY_Delete: + case GDK_KEY_BackSpace: + case GDK_KEY_KP_Delete: return keycode_Delete; + case GDK_KEY_Escape: return keycode_Escape; + case GDK_KEY_Tab: + case GDK_KEY_KP_Tab: return keycode_Tab; + case GDK_KEY_Page_Up: + case GDK_KEY_KP_Page_Up: return keycode_PageUp; + case GDK_KEY_Page_Down: + case GDK_KEY_KP_Page_Down: return keycode_PageDown; + case GDK_KEY_Home: + case GDK_KEY_KP_Home: return keycode_Home; + case GDK_KEY_End: + case GDK_KEY_KP_End: return keycode_End; + case GDK_KEY_F1: + case GDK_KEY_KP_F1: return keycode_Func1; + case GDK_KEY_F2: + case GDK_KEY_KP_F2: return keycode_Func2; + case GDK_KEY_F3: + case GDK_KEY_KP_F3: return keycode_Func3; + case GDK_KEY_F4: + case GDK_KEY_KP_F4: return keycode_Func4; + case GDK_KEY_F5: return keycode_Func5; + case GDK_KEY_F6: return keycode_Func6; + case GDK_KEY_F7: return keycode_Func7; + case GDK_KEY_F8: return keycode_Func8; + case GDK_KEY_F9: return keycode_Func9; + case GDK_KEY_F10: return keycode_Func10; + case GDK_KEY_F11: return keycode_Func11; + case GDK_KEY_F12: return keycode_Func12; default: keycode = gdk_keyval_to_unicode(keyval); /* If keycode is 0, then keyval was not recognized; also return @@ -1062,55 +1062,55 @@ keycode_to_gdk_keyval(glui32 keycode) switch (keycode) { case keycode_Left: - return GDK_Left; + return GDK_KEY_Left; case keycode_Right: - return GDK_Right; + return GDK_KEY_Right; case keycode_Up: - return GDK_Up; + return GDK_KEY_Up; case keycode_Down: - return GDK_Down; + return GDK_KEY_Down; case keycode_Return: - return GDK_Return; + return GDK_KEY_Return; case keycode_Delete: - return GDK_Delete; + return GDK_KEY_Delete; case keycode_Escape: - return GDK_Escape; + return GDK_KEY_Escape; case keycode_Tab: - return GDK_Tab; + return GDK_KEY_Tab; case keycode_PageUp: - return GDK_Page_Up; + return GDK_KEY_Page_Up; case keycode_PageDown: - return GDK_Page_Down; + return GDK_KEY_Page_Down; case keycode_Home: - return GDK_Home; + return GDK_KEY_Home; case keycode_End: - return GDK_End; + return GDK_KEY_End; case keycode_Func1: - return GDK_F1; + return GDK_KEY_F1; case keycode_Func2: - return GDK_F2; + return GDK_KEY_F2; case keycode_Func3: - return GDK_F3; + return GDK_KEY_F3; case keycode_Func4: - return GDK_F4; + return GDK_KEY_F4; case keycode_Func5: - return GDK_F5; + return GDK_KEY_F5; case keycode_Func6: - return GDK_F6; + return GDK_KEY_F6; case keycode_Func7: - return GDK_F7; + return GDK_KEY_F7; case keycode_Func8: - return GDK_F8; + return GDK_KEY_F8; case keycode_Func9: - return GDK_F9; + return GDK_KEY_F9; case keycode_Func10: - return GDK_F10; + return GDK_KEY_F10; case keycode_Func11: - return GDK_F11; + return GDK_KEY_F11; case keycode_Func12: - return GDK_F12; + return GDK_KEY_F12; case keycode_Erase: - return GDK_BackSpace; + return GDK_KEY_BackSpace; } unsigned keyval = gdk_unicode_to_keyval(keycode); if(keyval < 0x01000000) /* magic number meaning illegal unicode point */ diff --git a/libchimara/pager.c b/libchimara/pager.c index 194a21d..c04553f 100644 --- a/libchimara/pager.c +++ b/libchimara/pager.c @@ -90,12 +90,12 @@ pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win) NULL); switch (event->keyval) { - case GDK_space: case GDK_KP_Space: - case GDK_Page_Down: case GDK_KP_Page_Down: - case GDK_Return: case GDK_KP_Enter: + case GDK_KEY_space: case GDK_KEY_KP_Space: + case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down: + case GDK_KEY_Return: case GDK_KEY_KP_Enter: gtk_adjustment_set_value(adj, CLAMP(value + page_size, lower, upper - page_size)); return TRUE; - case GDK_Page_Up: case GDK_KP_Page_Up: + case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up: gtk_adjustment_set_value(adj, CLAMP(value - page_size, lower, upper - page_size)); return TRUE; /* don't handle "up" and "down", they're used for input history */ @@ -104,24 +104,20 @@ pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win) return FALSE; /* if the key wasn't handled here, pass it to other handlers */ } -/* Draw the "more" prompt on top of the buffer, after the regular expose event has run */ +/* Draw the "more" prompt on top of the buffer, after the regular draw event has run */ gboolean -pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win) +pager_on_draw(GtkTextView *textview, cairo_t *cr, winid_t win) { /* Calculate the position of the 'more' tag */ gint promptwidth, promptheight; pango_layout_get_pixel_size(win->pager_layout, &promptwidth, &promptheight); - gint winx, winy, winwidth, winheight; - gdk_window_get_position(event->window, &winx, &winy); - gdk_drawable_get_size(GDK_DRAWABLE(event->window), &winwidth, &winheight); + int winwidth = gtk_widget_get_allocated_width( GTK_WIDGET(textview) ); + int winheight = gtk_widget_get_allocated_height( GTK_WIDGET(textview) ); /* Draw the 'more' tag */ - GdkGC *context = gdk_gc_new(GDK_DRAWABLE(event->window)); - gdk_draw_layout(event->window, context, - winx + winwidth - promptwidth, - winy + winheight - promptheight, - win->pager_layout); + cairo_move_to(cr, winwidth - promptwidth, winheight - promptheight); + pango_cairo_show_layout(cr, win->pager_layout); return FALSE; /* Propagate event further */ } @@ -129,7 +125,7 @@ pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win) /* Check whether paging should be done. This function is called after the * textview has finished validating text positions. */ void -pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, winid_t win) +pager_after_size_allocate(GtkTextView *textview, GdkRectangle *allocation, winid_t win) { /* Move the pager to the last visible character in the buffer */ gint view_height, scroll_distance; diff --git a/libchimara/pager.h b/libchimara/pager.h index 5918873..9bcbb63 100644 --- a/libchimara/pager.h +++ b/libchimara/pager.h @@ -5,10 +5,10 @@ #include "glk.h" #include "window.h" -G_GNUC_INTERNAL gboolean pager_on_expose(GtkTextView *textview, GdkEventExpose *event, winid_t win); +G_GNUC_INTERNAL gboolean pager_on_draw(GtkTextView *textview, cairo_t *cr, winid_t win); G_GNUC_INTERNAL gboolean pager_on_key_press_event(GtkTextView *textview, GdkEventKey *event, winid_t win); G_GNUC_INTERNAL void pager_after_adjustment_changed(GtkAdjustment *adj, winid_t win); -G_GNUC_INTERNAL void pager_after_size_request(GtkTextView *textview, GtkRequisition *requisition, winid_t win); +G_GNUC_INTERNAL void pager_after_size_allocate(GtkTextView *textview, GdkRectangle *allocation, winid_t win); G_GNUC_INTERNAL void pager_update(winid_t win); #endif diff --git a/libchimara/style.c b/libchimara/style.c index f9b231b..36d6d26 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -186,36 +186,43 @@ GtkTextTag * gtk_text_tag_copy(GtkTextTag *tag) { GtkTextTag *copy; + char *tag_name; + GParamSpec **properties; + unsigned nprops, count; g_return_val_if_fail(tag != NULL, NULL); - copy = gtk_text_tag_new(tag->name); - gtk_text_attributes_copy_values(tag->values, copy->values); - - #define _COPY_FLAG(flag) copy->flag = tag->flag - _COPY_FLAG (bg_color_set); - _COPY_FLAG (bg_color_set); - _COPY_FLAG (bg_stipple_set); - _COPY_FLAG (fg_color_set); - _COPY_FLAG (fg_stipple_set); - _COPY_FLAG (justification_set); - _COPY_FLAG (left_margin_set); - _COPY_FLAG (indent_set); - _COPY_FLAG (rise_set); - _COPY_FLAG (strikethrough_set); - _COPY_FLAG (right_margin_set); - _COPY_FLAG (pixels_above_lines_set); - _COPY_FLAG (pixels_below_lines_set); - _COPY_FLAG (pixels_inside_wrap_set); - _COPY_FLAG (tabs_set); - _COPY_FLAG (underline_set); - _COPY_FLAG (wrap_mode_set); - _COPY_FLAG (bg_full_height_set); - _COPY_FLAG (invisible_set); - _COPY_FLAG (editable_set); - _COPY_FLAG (language_set); - _COPY_FLAG (scale_set); - #undef _COPY_FLAG + g_object_get(tag, "name", &tag_name, NULL); + copy = gtk_text_tag_new(tag_name); + g_free(tag_name); + + /* Copy all the original tag's properties to the new tag */ + properties = g_object_class_list_properties( G_OBJECT_GET_CLASS(tag), &nprops ); + for(count = 0; count < nprops; count++) { + + /* Only copy properties that are readable, writable, not construct-only, + and not deprecated */ + GParamFlags flags = properties[count]->flags; + if(flags & G_PARAM_CONSTRUCT_ONLY + || flags & G_PARAM_DEPRECATED + || !(flags & G_PARAM_READABLE) + || !(flags & G_PARAM_WRITABLE)) + continue; + + const char *prop_name = g_param_spec_get_name(properties[count]); + GValue prop_value = G_VALUE_INIT; + + g_value_init( &prop_value, G_PARAM_SPEC_VALUE_TYPE(properties[count]) ); + g_object_get_property( G_OBJECT(tag), prop_name, &prop_value ); + /* Don't copy the PangoTabArray if it is NULL, that prints a warning */ + if(strcmp(prop_name, "tabs") == 0 && g_value_get_boxed(&prop_value) == NULL) { + g_value_unset(&prop_value); + continue; + } + g_object_set_property( G_OBJECT(copy), prop_name, &prop_value ); + g_value_unset(&prop_value); + } + g_free(properties); /* Copy the data that was added manually */ gpointer reverse_color = g_object_get_data( G_OBJECT(tag), "reverse-color" ); diff --git a/libchimara/window.c b/libchimara/window.c index ef85e3f..85348f5 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -76,6 +76,8 @@ window_close_common(winid_t win, gboolean destroy_node) if(win->pager_layout) g_object_unref(win->pager_layout); + if(win->backing_store) + cairo_surface_destroy(win->backing_store); g_free(win); } @@ -565,8 +567,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, /* Connect signal handlers */ /* Pager */ - g_signal_connect_after( textview, "size-request", G_CALLBACK(pager_after_size_request), win ); - win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win ); + g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), win ); + win->pager_expose_handler = g_signal_connect_after( textview, "draw", G_CALLBACK(pager_on_draw), win ); g_signal_handler_block(textview, win->pager_expose_handler); win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win ); g_signal_handler_block(textview, win->pager_keypress_handler); @@ -603,7 +605,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, case wintype_Graphics: { - GtkWidget *image = gtk_image_new_from_pixmap(NULL, NULL); + GtkWidget *image = gtk_drawing_area_new(); gtk_widget_show(image); win->unit_width = 1; @@ -611,13 +613,15 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, win->widget = image; win->frame = image; win->background_color = 0x00FFFFFF; - + win->backing_store = NULL; + /* Connect signal handlers */ win->button_press_event_handler = g_signal_connect(image, "button-press-event", G_CALLBACK(on_window_button_press), win); g_signal_handler_block(image, win->button_press_event_handler); win->shutdown_keypress_handler = g_signal_connect(image, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win); g_signal_handler_block(image, win->shutdown_keypress_handler); - win->size_allocate_handler = g_signal_connect(image, "size-allocate", G_CALLBACK(on_graphics_size_allocate), win); + g_signal_connect(image, "configure-event", G_CALLBACK(on_graphics_configure), win); + g_signal_connect(image, "draw", G_CALLBACK(on_graphics_draw), win); } break; @@ -1008,13 +1012,19 @@ glk_window_clear(winid_t win) case wintype_Graphics: { + GtkAllocation allocation; + /* Wait for the window's size to be updated */ g_mutex_lock(glk_data->arrange_lock); if(glk_data->needs_rearrange) g_cond_wait(glk_data->rearranged, glk_data->arrange_lock); g_mutex_unlock(glk_data->arrange_lock); - glk_window_erase_rect(win, 0, 0, win->widget->allocation.width, win->widget->allocation.height); + gdk_threads_enter(); + gtk_widget_get_allocation(win->widget, &allocation); + gdk_threads_leave(); + + glk_window_erase_rect(win, 0, 0, allocation.width, allocation.height); } break; @@ -1134,6 +1144,7 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) { VALID_WINDOW(win, return); + GtkAllocation allocation; ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); switch(win->type) @@ -1154,9 +1165,10 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) g_mutex_unlock(glk_data->arrange_lock); gdk_threads_enter(); + gtk_widget_get_allocation(win->widget, &allocation); /* Cache the width and height */ - win->width = (glui32)(win->widget->allocation.width / win->unit_width); - win->height = (glui32)(win->widget->allocation.height / win->unit_height); + win->width = (glui32)(allocation.width / win->unit_width); + win->height = (glui32)(allocation.height / win->unit_height); gdk_threads_leave(); if(widthptr != NULL) @@ -1173,10 +1185,11 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) g_mutex_unlock(glk_data->arrange_lock); gdk_threads_enter(); + gtk_widget_get_allocation(win->widget, &allocation); if(widthptr != NULL) - *widthptr = (glui32)(win->widget->allocation.width / win->unit_width); + *widthptr = (glui32)(allocation.width / win->unit_width); if(heightptr != NULL) - *heightptr = (glui32)(win->widget->allocation.height / win->unit_height); + *heightptr = (glui32)(allocation.height / win->unit_height); gdk_threads_leave(); break; @@ -1188,10 +1201,11 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) g_mutex_unlock(glk_data->arrange_lock); gdk_threads_enter(); + gtk_widget_get_allocation(win->widget, &allocation); if(widthptr != NULL) - *widthptr = (glui32)(win->widget->allocation.width); + *widthptr = (glui32)(allocation.width); if(heightptr != NULL) - *heightptr = (glui32)(win->widget->allocation.height); + *heightptr = (glui32)(allocation.height); gdk_threads_leave(); break; diff --git a/libchimara/window.h b/libchimara/window.h index c67654a..72ee91b 100644 --- a/libchimara/window.h +++ b/libchimara/window.h @@ -95,6 +95,7 @@ struct glk_window_struct gboolean hyperlink_event_requested; /* Graphics */ glui32 background_color; + cairo_surface_t *backing_store; /* Pager (textbuffer only) */ gboolean currently_paging; PangoLayout *pager_layout; diff --git a/tests/glulxercise.c b/tests/glulxercise.c index 54113a4..fc9a9b1 100644 --- a/tests/glulxercise.c +++ b/tests/glulxercise.c @@ -94,7 +94,7 @@ main(int argc, char *argv[]) w->stop = LOAD_WIDGET("stop"); w->interp = chimara_if_new(); gtk_widget_set_size_request(w->interp, 500, 600); - gtk_box_pack_end_defaults(GTK_BOX(vbox), w->interp); + gtk_box_pack_end(GTK_BOX(vbox), w->interp, TRUE, TRUE, 0); chimara_glk_set_css_from_string(CHIMARA_GLK(w->interp), "buffer { font-size: 12; } buffer.input { color: #00a; font-style: italic; }"); chimara_glk_set_spacing(CHIMARA_GLK(w->interp), 1);