diff options
| author | Alexander Larsson <alla@lysator.liu.se> | 2000-11-20 10:12:40 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2000-11-20 10:12:40 +0000 |
| commit | 2999f465b4db274a9d2301c7d3653d134bd79adb (patch) | |
| tree | 50eefca3e476356c116ab34f2276bcee98703826 /gdk/linux-fb/gdkdrawable-fb2.c | |
| parent | c9e39436b9cae1c03fb15242116798550a44b66e (diff) | |
| download | gtk+-2999f465b4db274a9d2301c7d3653d134bd79adb.tar.gz | |
Removed unused arguments from gdk_fb_drawable_get_pixel().
2000-11-20 Alexander Larsson <alla@lysator.liu.se>
* gdk/linux-fb/gdkdrawable-fb2.c:
Removed unused arguments from gdk_fb_drawable_get_pixel().
* gdk/linux-fb/gdkinput-ps2.c (handle_input_ps2):
Renamed fidur specific mouse packet data in MouseDevice to
generic. Used it in ps2 mouse handling code to avoid blocking
reads.
Diffstat (limited to 'gdk/linux-fb/gdkdrawable-fb2.c')
| -rw-r--r-- | gdk/linux-fb/gdkdrawable-fb2.c | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c index 4c7b6626ad..986274c2e8 100644 --- a/gdk/linux-fb/gdkdrawable-fb2.c +++ b/gdk/linux-fb/gdkdrawable-fb2.c @@ -14,10 +14,7 @@ static GetPixelRet gdk_fb_drawable_get_pixel (GdkDrawable *drawable, GdkGC *gc, int x, int y, - GdkColor *spot, - gboolean abs_coords, - GdkDrawable *bg_relto, - GdkDrawable *bgpm); + GdkColor *spot); void gdk_fb_draw_rectangle (GdkDrawable *drawable, GdkGC *gc, gint filled, @@ -798,22 +795,13 @@ gdk_fb_drawable_get_pixel (GdkDrawable *drawable, GdkGC *gc, int x, int y, - GdkColor *spot, - gboolean abs_coords, - GdkDrawable *bg_relto, - GdkDrawable *bgpm) + GdkColor *spot) { GetPixelRet retval = GPR_NONE; GdkDrawableFBData *private = GDK_DRAWABLE_FBDATA (drawable); guchar *mem = private->mem; guint rowstride = private->rowstride; - if (!abs_coords) - { - x += private->abs_x; - y += private->abs_y; - } - switch (private->depth) { case 1: @@ -824,21 +812,7 @@ gdk_fb_drawable_get_pixel (GdkDrawable *drawable, else { retval = GPR_USED_BG; - - if (bgpm) - { - int bgx, bgy; - - bgx = (x - GDK_DRAWABLE_IMPL_FBDATA (bg_relto)->abs_x) % GDK_DRAWABLE_IMPL_FBDATA (bgpm)->width; - bgy = (y - GDK_DRAWABLE_IMPL_FBDATA (bg_relto)->abs_y) % GDK_DRAWABLE_IMPL_FBDATA (bgpm)->height; - - gdk_fb_drawable_get_pixel (bgpm, gc, bgx, bgy, spot, FALSE, NULL, NULL); - retval = GPR_USED_BG; - } - else - { - *spot = GDK_GC_FBDATA (gc)->values.background; - } + *spot = GDK_GC_FBDATA (gc)->values.background; } } break; @@ -1242,7 +1216,7 @@ gdk_fb_draw_drawable_generic (GdkDrawable *drawable, continue; } - switch (gdk_fb_drawable_get_pixel (src, gc, cur_x + src_x_off, cur_y + src_y_off, &spot, TRUE, NULL, NULL)) + switch (gdk_fb_drawable_get_pixel (src, gc, cur_x + src_x_off, cur_y + src_y_off, &spot)) { case GPR_AA_GRAYVAL: { @@ -1279,9 +1253,9 @@ gdk_fb_draw_drawable_generic (GdkDrawable *drawable, { int bgx, bgy; - bgx = (cur_x - GDK_DRAWABLE_IMPL_FBDATA (dc->bg_relto)->abs_x) % GDK_DRAWABLE_IMPL_FBDATA (dc->bgpm)->width; - bgy = (cur_y - GDK_DRAWABLE_IMPL_FBDATA (dc->bg_relto)->abs_y) % GDK_DRAWABLE_IMPL_FBDATA (dc->bgpm)->height; - gdk_fb_drawable_get_pixel (dc->bgpm, gc, bgx, bgy, &realspot, FALSE, NULL, NULL); + bgx = (cur_x - GDK_DRAWABLE_IMPL_FBDATA (dc->bg_relto)->abs_x) % GDK_DRAWABLE_IMPL_FBDATA (dc->bgpm)->width + private->abs_x; + bgy = (cur_y - GDK_DRAWABLE_IMPL_FBDATA (dc->bg_relto)->abs_y) % GDK_DRAWABLE_IMPL_FBDATA (dc->bgpm)->height + private->abs_y; + gdk_fb_drawable_get_pixel (dc->bgpm, gc, bgx, bgy, &realspot); } break; case GPR_NONE: |