/[classpath]/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
ViewVC logotype

Diff of /classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.28 by fitzsim, Thu Aug 18 01:22:00 2005 UTC revision 1.29 by andreast, Thu Sep 22 20:25:39 2005 UTC
# Line 116  Java_gnu_java_awt_peer_gtk_GdkGraphics_c Line 116  Java_gnu_java_awt_peer_gtk_GdkGraphics_c
116    gdk_gc_copy (g->gc, g_old->gc);    gdk_gc_copy (g->gc, g_old->gc);
117    
118    if (GDK_STABLE_IS_PIXMAP (g->drawable))    if (GDK_STABLE_IS_PIXMAP (g->drawable))
119      gdk_pixmap_ref (g->drawable);      g_object_ref (g->drawable);
120    else /* GDK_IS_WINDOW (g->drawable) */    else /* GDK_IS_WINDOW (g->drawable) */
121      gdk_window_ref (g->drawable);      g_object_ref (g->drawable);
122    
123    gdk_colormap_ref (g->cm);    g_object_ref (g->cm);
124    
125    NSA_SET_G_PTR (env, obj, g);    NSA_SET_G_PTR (env, obj, g);
126    
# Line 140  Java_gnu_java_awt_peer_gtk_GdkGraphics_i Line 140  Java_gnu_java_awt_peer_gtk_GdkGraphics_i
140    
141    g->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height,    g->drawable = (GdkDrawable *) gdk_pixmap_new (NULL, width, height,
142                                                  gdk_rgb_get_visual ()->depth);                                                  gdk_rgb_get_visual ()->depth);
143    g->cm = gdk_rgb_get_cmap ();    g->cm = gdk_rgb_get_colormap ();
144    gdk_colormap_ref (g->cm);    g_object_ref (g->cm);
145    g->gc = gdk_gc_new (g->drawable);    g->gc = gdk_gc_new (g->drawable);
146    
147    NSA_SET_G_PTR (env, obj, g);    NSA_SET_G_PTR (env, obj, g);
# Line 160  Java_gnu_java_awt_peer_gtk_GdkGraphics_i Line 160  Java_gnu_java_awt_peer_gtk_GdkGraphics_i
160    
161    pixmap = cp_gtk_image_get_pixmap (env, source);    pixmap = cp_gtk_image_get_pixmap (env, source);
162    g_assert(pixmap != NULL);    g_assert(pixmap != NULL);
163    gdk_pixmap_ref (pixmap);    g_object_ref (pixmap);
164    
165    g = (struct graphics *) g_malloc (sizeof (struct graphics));    g = (struct graphics *) g_malloc (sizeof (struct graphics));
166    g->x_offset = g->y_offset = 0;    g->x_offset = g->y_offset = 0;
# Line 168  Java_gnu_java_awt_peer_gtk_GdkGraphics_i Line 168  Java_gnu_java_awt_peer_gtk_GdkGraphics_i
168    g->drawable = (GdkDrawable *)pixmap;    g->drawable = (GdkDrawable *)pixmap;
169    
170    g->cm = gdk_drawable_get_colormap (g->drawable);    g->cm = gdk_drawable_get_colormap (g->drawable);
171    gdk_colormap_ref (g->cm);    g_object_ref (g->cm);
172    g->gc = gdk_gc_new (g->drawable);    g->gc = gdk_gc_new (g->drawable);
173    
174    NSA_SET_G_PTR (env, obj, g);    NSA_SET_G_PTR (env, obj, g);
# Line 193  Java_gnu_java_awt_peer_gtk_GdkGraphics_i Line 193  Java_gnu_java_awt_peer_gtk_GdkGraphics_i
193    widget = GTK_WIDGET (ptr);    widget = GTK_WIDGET (ptr);
194    g->drawable = (GdkDrawable *) widget->window;    g->drawable = (GdkDrawable *) widget->window;
195    
196    gdk_window_ref (g->drawable);    g_object_ref (g->drawable);
197    g->cm = gtk_widget_get_colormap (widget);    g->cm = gtk_widget_get_colormap (widget);
198    gdk_colormap_ref (g->cm);    g_object_ref (g->cm);
199    g->gc = gdk_gc_new (g->drawable);    g->gc = gdk_gc_new (g->drawable);
200    gdk_gc_copy (g->gc, widget->style->fg_gc[GTK_STATE_NORMAL]);    gdk_gc_copy (g->gc, widget->style->fg_gc[GTK_STATE_NORMAL]);
201    color = widget->style->fg[GTK_STATE_NORMAL];    color = widget->style->fg[GTK_STATE_NORMAL];
# Line 254  Java_gnu_java_awt_peer_gtk_GdkGraphics_d Line 254  Java_gnu_java_awt_peer_gtk_GdkGraphics_d
254    
255    XFlush (GDK_DISPLAY ());    XFlush (GDK_DISPLAY ());
256    
257    gdk_gc_destroy (g->gc);    g_object_unref (g->gc);
258    
259    if (GDK_STABLE_IS_PIXMAP (g->drawable))    if (GDK_STABLE_IS_PIXMAP (g->drawable))
260      gdk_pixmap_unref (g->drawable);      g_object_unref (g->drawable);
261    else /* GDK_IS_WINDOW (g->drawable) */    else /* GDK_IS_WINDOW (g->drawable) */
262      gdk_window_unref (g->drawable);      g_object_unref (g->drawable);
263    
264    gdk_colormap_unref (g->cm);    g_object_unref (g->cm);
265    
266    g_free (g);    g_free (g);
267    
# Line 388  Java_gnu_java_awt_peer_gtk_GdkGraphics_c Line 388  Java_gnu_java_awt_peer_gtk_GdkGraphics_c
388    
389    g = (struct graphics *) NSA_GET_G_PTR (env, obj);    g = (struct graphics *) NSA_GET_G_PTR (env, obj);
390    
391    gdk_window_copy_area ((GdkWindow *)g->drawable,    gdk_draw_drawable ((GdkWindow *)g->drawable,
392                          g->gc,                       g->gc,
393                          x + g->x_offset + dx, y + g->y_offset + dy,                       (GdkWindow *)g->drawable,
394                          (GdkWindow *)g->drawable,                       x + g->x_offset, y + g->y_offset,
395                          x + g->x_offset, y + g->y_offset,                       x + g->x_offset + dx, y + g->y_offset + dy,
396                          width, height);                       width, height);
397    gdk_flush ();    gdk_flush ();
398    
399    gdk_threads_leave ();    gdk_threads_leave ();
# Line 471  Java_gnu_java_awt_peer_gtk_GdkGraphics_s Line 471  Java_gnu_java_awt_peer_gtk_GdkGraphics_s
471    color.blue = blue << 8;    color.blue = blue << 8;
472    
473    g = (struct graphics *) NSA_GET_G_PTR (env, obj);    g = (struct graphics *) NSA_GET_G_PTR (env, obj);
474      
475    gdk_color_alloc (g->cm, &color);    gdk_colormap_alloc_color (g->cm, &color, TRUE, TRUE);
476    gdk_gc_set_foreground (g->gc, &color);    gdk_gc_set_foreground (g->gc, &color);
477    
478    gdk_threads_leave ();    gdk_threads_leave ();

Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26