summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2006-10-19 22:09:37 +0000
committerTavis Ormandy <taviso@gentoo.org>2006-10-19 22:09:37 +0000
commit19fc5ce1d7668eac9cb68d4118c0366e6b222317 (patch)
tree7676965cd0aca3638a657f3f0eae7d4686ce249a /x11-wm/fvwm
parentVersion bump thanks to Jory A. Pratt for the ebuild modifications (diff)
downloadhistorical-19fc5ce1d7668eac9cb68d4118c0366e6b222317.tar.gz
historical-19fc5ce1d7668eac9cb68d4118c0366e6b222317.tar.bz2
historical-19fc5ce1d7668eac9cb68d4118c0366e6b222317.zip
remove stale patches
Package-Manager: portage-2.0.51.22-r3
Diffstat (limited to 'x11-wm/fvwm')
-rw-r--r--x11-wm/fvwm/Manifest5
-rw-r--r--x11-wm/fvwm/files/centerplacement-2.5.10.diff67
-rw-r--r--x11-wm/fvwm/files/disable-debug-statements.diff11
-rw-r--r--x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff10
-rw-r--r--x11-wm/fvwm/files/fvwm-translucent-menus.diff409
-rw-r--r--x11-wm/fvwm/files/mini.happy.xpm22
6 files changed, 0 insertions, 524 deletions
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index f2f583756de7..858503d85389 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -5,9 +5,4 @@ MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
MD5 293a9b01b3bbdfc741ac4a6fe86d3a21 files/digest-fvwm-2.5.16 527
MD5 822d2bf81d188a9312b3646d388e978f files/digest-fvwm-2.5.18 146
-MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
-MD5 086986f68eeafe8c662ced762dc17fe9 files/fvwm-translucent-menus.diff 12238
-MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
MD5 9e8e5c601353e0933820fc4f2f543c13 files/README.transluceny 8910
-MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
-MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
diff --git a/x11-wm/fvwm/files/centerplacement-2.5.10.diff b/x11-wm/fvwm/files/centerplacement-2.5.10.diff
deleted file mode 100644
index c24d6fbbd795..000000000000
--- a/x11-wm/fvwm/files/centerplacement-2.5.10.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -ru fvwm-2.5.10/fvwm/fvwm.h fvwm-2.5.10.new/fvwm/fvwm.h
---- fvwm-2.5.10/fvwm/fvwm.h 2004-02-16 13:45:59.000000000 +0000
-+++ fvwm-2.5.10.new/fvwm/fvwm.h 2004-06-20 14:39:58.216434336 +0100
-@@ -467,8 +467,9 @@
- #define PLACE_TILECASCADE 0x5
- #define PLACE_CASCADE_B 0x6
- #define PLACE_MINOVERLAP 0x7
--#define PLACE_MASK 0x7
-- unsigned placement_mode : 3;
-+#define PLACE_CENTER 0x8
-+#define PLACE_MASK 0xF
-+ unsigned placement_mode : 4;
- unsigned ewmh_placement_mode : 2; /* see ewmh.h */
- #define WS_CR_MOTION_METHOD_AUTO CR_MOTION_METHOD_AUTO
- #define WS_CR_MOTION_METHOD_USE_GRAV CR_MOTION_METHOD_USE_GRAV
-diff -ru fvwm-2.5.10/fvwm/placement.c fvwm-2.5.10.new/fvwm/placement.c
---- fvwm-2.5.10/fvwm/placement.c 2004-03-17 16:57:50.000000000 +0000
-+++ fvwm-2.5.10.new/fvwm/placement.c 2004-06-20 14:50:54.759624600 +0100
-@@ -898,6 +898,20 @@
- reason->pos.algo = placement_mode;
- switch (placement_mode)
- {
-+ case PLACE_CENTER:
-+ attr_g->x = (screen_g.width - fw->frame_g.width) / 2;
-+ attr_g->y = ((screen_g.height - fw->frame_g.height) / 2) + fw->title_thickness;
-+
-+ /* Don't let the upper left corner be offscreen. */
-+ if (attr_g->x < PageLeft)
-+ {
-+ attr_g->x = PageLeft;
-+ }
-+ if (attr_g->y < PageTop)
-+ {
-+ attr_g->y = PageTop;
-+ }
-+ break;
- case PLACE_TILEMANUAL:
- flags.is_smartly_placed = SmartPlacement(
- fw, &screen_g, fw->frame_g.width, fw->frame_g.height,
-@@ -1785,6 +1799,9 @@
-
- switch (reason->pos.algo)
- {
-+ case PLACE_CENTER:
-+ a = "Center";
-+ break;
- case PLACE_TILEMANUAL:
- a = "TileManual";
- break;
-diff -ru fvwm-2.5.10/fvwm/style.c fvwm-2.5.10.new/fvwm/style.c
---- fvwm-2.5.10/fvwm/style.c 2004-02-16 13:45:59.000000000 +0000
-+++ fvwm-2.5.10.new/fvwm/style.c 2004-06-20 14:41:07.428912440 +0100
-@@ -2096,7 +2096,13 @@
- break;
-
- case 'c':
-- if (StrEquals(token, "CascadePlacement"))
-+ if (StrEquals(token, "CenterPlacement"))
-+ {
-+ ps->flags.placement_mode = PLACE_CENTER;
-+ ps->flag_mask.placement_mode = PLACE_MASK;
-+ ps->change_mask.placement_mode = PLACE_MASK;
-+ }
-+ else if (StrEquals(token, "CascadePlacement"))
- {
- ps->flags.placement_mode = PLACE_CASCADE;
- ps->flag_mask.placement_mode = PLACE_MASK;
diff --git a/x11-wm/fvwm/files/disable-debug-statements.diff b/x11-wm/fvwm/files/disable-debug-statements.diff
deleted file mode 100644
index 9b8a3bd9648e..000000000000
--- a/x11-wm/fvwm/files/disable-debug-statements.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fvwm/events.c 2003-08-28 21:26:14.000000000 +0100
-+++ fvwm/events.c.new 2003-11-01 11:02:59.000000000 +0000
-@@ -512,7 +512,7 @@
- return;
- }
-
--#define CR_DETECT_MOTION_METHOD_DEBUG
-+/* #define CR_DETECT_MOTION_METHOD_DEBUG */
- /* Try to detect whether the application uses the ICCCM way of moving its
- * window or the traditional way, always assuming StaticGravity. */
- static inline void __cr_detect_icccm_move(
diff --git a/x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff b/x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff
deleted file mode 100644
index 005987332a46..000000000000
--- a/x11-wm/fvwm/files/fvwm-noxbell-grab-fail.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- fvwm/functions.c.orig 2005-07-19 13:08:00.453734288 +0100
-+++ fvwm/functions.c 2005-07-19 13:08:25.055994176 +0100
-@@ -993,7 +993,6 @@
- if (!GrabEm(CRS_NONE, GRAB_NORMAL))
- {
- func->use_depth--;
-- XBell(dpy, 0);
- __cf_cleanup(&depth, arguments, cond_rc);
- return;
- }
diff --git a/x11-wm/fvwm/files/fvwm-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-translucent-menus.diff
deleted file mode 100644
index f53397441760..000000000000
--- a/x11-wm/fvwm/files/fvwm-translucent-menus.diff
+++ /dev/null
@@ -1,409 +0,0 @@
-Index: fvwm/colorset.c
-===================================================================
-RCS file: /home/cvs/fvwm/fvwm/fvwm/colorset.c,v
-retrieving revision 1.45
-diff -u -r1.45 colorset.c
---- fvwm/colorset.c 25 Aug 2003 06:47:08 -0000 1.45
-+++ fvwm/colorset.c 31 Aug 2003 19:48:14 -0000
-@@ -159,7 +159,9 @@
- "IconTint",
- "NoIconTint",
- "IconAlpha",
--
-+
-+ "Translucent",
-+ "NoTranslucent",
- NULL
- };
-
-@@ -616,6 +618,7 @@
- char *fg_tint = NULL;
- char *bg_tint = NULL;
- char *icon_tint = NULL;
-+ char *translucent_tint = NULL;
- Bool have_pixels_changed = False;
- Bool has_icon_pixels_changed = False;
- Bool has_fg_changed = False;
-@@ -628,6 +631,7 @@
- Bool has_fg_tint_changed = False;
- Bool has_bg_tint_changed = False;
- Bool has_icon_tint_changed = False;
-+ Bool has_translucent_tint_changed = False;
- Bool has_pixmap_changed = False;
- Bool has_shape_changed = False;
- Bool has_image_alpha_changed = False;
-@@ -754,6 +758,10 @@
- case 21: /* Plain */
- has_pixmap_changed = True;
- free_colorset_background(cs, True);
-+ cs->is_translucent = False;
-+ cs->translucent_tint_percent = 0;
-+ cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
-+ has_translucent_tint_changed = True;
- break;
- case 22: /* NoShape */
- has_shape_changed = True;
-@@ -920,6 +928,24 @@
- cs->icon_alpha_percent = tmp;
- }
- break;
-+ case 42: /* Translucent */
-+ cs->is_translucent = True;
-+ parse_simple_tint(
-+ cs, args, &translucent_tint,
-+ TRANSLUCENT_TINT_SUPPLIED,
-+ &has_translucent_tint_changed, &percent,
-+ "Translucent");
-+ if (has_translucent_tint_changed)
-+ {
-+ cs->translucent_tint_percent = percent;
-+ }
-+ break;
-+ case 43: /* NoTranslucent */
-+ cs->is_translucent = False;
-+ cs->translucent_tint_percent = 0;
-+ cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED;
-+ has_translucent_tint_changed = True;
-+ break;
- default:
- /* test for ?Gradient */
- if (option[0] && StrEquals(&option[1], "Gradient"))
-@@ -1602,6 +1628,27 @@
- }
- }
-
-+ /*
-+ * ---------- change the translucent tint colour ----------
-+ */
-+ if (has_translucent_tint_changed)
-+ {
-+ /* user specified colour */
-+ if (translucent_tint != NULL)
-+ {
-+ PictureFreeColors(
-+ dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
-+ cs->translucent_tint = GetColor(translucent_tint);
-+ }
-+ else
-+ {
-+ /* default */
-+ PictureFreeColors(
-+ dpy, Pcmap, &cs->translucent_tint, 1, 0, True);
-+ cs->translucent_tint = GetColor(black);
-+ }
-+ }
-+
- /*
- * ---------- send new colorset to fvwm and clean up ----------
- */
-@@ -1698,6 +1745,7 @@
- ncs->fgsh = GetColor(white);
- ncs->tint = GetColor(black);
- ncs->icon_tint = GetColor(black);
-+ ncs->translucent_tint = GetColor(black);
- ncs->pixmap = XCreatePixmapFromBitmapData(
- dpy, Scr.NoFocusWin,
- &g_bits[4 * (nColorsets % 3)], 4, 4,
-@@ -1715,6 +1763,7 @@
- ncs->fgsh = GetForeShadow(ncs->fg, ncs->bg);
- ncs->tint = GetColor(black);
- ncs->icon_tint = GetColor(black);
-+ ncs->translucent_tint = GetColor(black);
- }
- ncs->fg_tint = ncs->bg_tint = GetColor(black);
- /* set flags for fg contrast, bg average */
-@@ -1726,6 +1775,7 @@
- ncs->icon_alpha_percent = 100;
- ncs->tint_percent = 0;
- ncs->icon_tint_percent = 0;
-+ ncs->translucent_tint_percent = 0;
- ncs->fg_tint_percent = ncs->bg_tint_percent = 0;
- ncs->dither = (PictureDitherByDefault())? True:False;
- nColorsets++;
-Index: fvwm/menus.c
-===================================================================
-RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.c,v
-retrieving revision 1.372
-diff -u -r1.372 menus.c
---- fvwm/menus.c 28 Aug 2003 20:26:13 -0000 1.372
-+++ fvwm/menus.c 31 Aug 2003 19:48:39 -0000
-@@ -65,6 +65,11 @@
-
- /* ---------------------------- local macros ------------------------------- */
-
-+#define MENU_IS_TRANSLUCENT(mr,cs) \
-+ (!MR_IS_TEAR_OFF_MENU(mr) && CSET_IS_TRANSLUCENT(cs))
-+#define MENU_IS_TRANSPARENT(mr,cs) \
-+ (MENU_IS_TRANSLUCENT(mr,cs) || CSET_IS_TRANSPARENT(cs))
-+
- /* ---------------------------- imports ------------------------------------ */
-
- /* This external is safe. It's written only during startup. */
-@@ -405,7 +410,7 @@
-
- /* move it back */
- if (ST_HAS_MENU_CSET(MR_STYLE(mr)) &&
-- CSET_IS_TRANSPARENT(ST_CSET_MENU(MR_STYLE(mr))))
-+ MENU_IS_TRANSPARENT(mr,ST_CSET_MENU(MR_STYLE(mr))))
- {
- transparent_bg = True;
- get_menu_repaint_transparent_parameters(
-@@ -2419,6 +2424,7 @@
- /* Doh. Use the standard display instead. */
- MR_CREATE_DPY(mr) = dpy;
- }
-+ MR_IS_TEAR_OFF_MENU(mr) = 1;
- }
- else
- {
-@@ -3202,7 +3208,38 @@
- }
- MR_IS_PAINTED(mr) = 1;
- /* paint the menu background */
-- if (ms && ST_HAS_MENU_CSET(ms))
-+ if (ms && ST_HAS_MENU_CSET(ms) &&
-+ MENU_IS_TRANSLUCENT(mr,ST_CSET_MENU(ms)))
-+ {
-+ Pixmap trans = None;
-+ FvwmRenderAttributes fra;
-+ colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
-+
-+ fra.mask = 0;
-+ if (colorset->translucent_tint_percent > 0)
-+ {
-+ fra.mask = FRAM_HAVE_TINT;
-+ fra.tint = colorset->translucent_tint;
-+ fra.tint_percent = colorset->translucent_tint_percent;
-+ }
-+ if (MR_IS_BACKGROUND_SET(mr) == False)
-+ {
-+ trans = PGraphicsCreateTranslucent(
-+ dpy, MR_WINDOW(mr), &fra,
-+ BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
-+ MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr));
-+ XMapRaised(dpy, MR_WINDOW(mr));
-+ if (trans != None)
-+ {
-+ XSetWindowBackgroundPixmap(
-+ dpy, MR_WINDOW(mr), trans);
-+ MR_IS_BACKGROUND_SET(mr) = True;
-+ clear_expose_menu_area(MR_WINDOW(mr), pevent);
-+ XFreePixmap(dpy, trans);
-+ }
-+ }
-+ }
-+ else if (ms && ST_HAS_MENU_CSET(ms))
- {
- if (MR_IS_BACKGROUND_SET(mr) == False)
- {
-@@ -3996,8 +4033,8 @@
- }
- MR_XANIMATION(parent_menu) += end_x - prev_x;
- if (ST_HAS_MENU_CSET(MR_STYLE(parent_menu)) &&
-- CSET_IS_TRANSPARENT(
-- ST_CSET_MENU(MR_STYLE(mr))))
-+ MENU_IS_TRANSPARENT(
-+ mr,ST_CSET_MENU(MR_STYLE(mr))))
- {
- transparent_bg = True;
- get_menu_repaint_transparent_parameters(
-@@ -4172,10 +4209,22 @@
- */
-
- XMoveWindow(dpy, MR_WINDOW(mr), x, y);
-+ MR_X(mr) = x;
-+ MR_Y(mr) = y;
- XSelectInput(dpy, MR_WINDOW(mr), event_mask);
-- XMapRaised(dpy, MR_WINDOW(mr));
-- if (popdown_window)
-- XUnmapWindow(dpy, popdown_window);
-+ if (MR_STYLE(mr) && ST_HAS_MENU_CSET(MR_STYLE(mr)) &&
-+ MENU_IS_TRANSLUCENT(mr,ST_CSET_MENU(MR_STYLE(mr))))
-+ {
-+ if (popdown_window)
-+ XUnmapWindow(dpy, popdown_window);
-+ paint_menu(mr, NULL, fw);
-+ }
-+ else
-+ {
-+ XMapRaised(dpy, MR_WINDOW(mr));
-+ if (popdown_window)
-+ XUnmapWindow(dpy, popdown_window);
-+ }
- XFlush(dpy);
- MR_MAPPED_COPIES(mr)++;
- MST_USAGE_COUNT(mr)++;
-@@ -6589,15 +6638,45 @@
- {
- last = True;
- }
-- if (!last && CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)))
-+ if (!last &&
-+ (CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)) ||
-+ MENU_IS_TRANSLUCENT(mr,ST_CSET_MENU(ms))))
- {
- /* too slow ... */
- return;
- }
-- SetWindowBackground(
-- dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr),
-- &Colorset[ST_CSET_MENU(ms)], Pdepth,
-- FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
-+ if (MENU_IS_TRANSLUCENT(mr,ST_CSET_MENU(ms)))
-+ {
-+ Pixmap trans;
-+ FvwmRenderAttributes fra;
-+ colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)];
-+
-+ fra.mask = 0;
-+ if (colorset->translucent_tint_percent > 0)
-+ {
-+ fra.mask = FRAM_HAVE_TINT;
-+ fra.tint = colorset->translucent_tint;
-+ fra.tint_percent = colorset->translucent_tint_percent;
-+ }
-+ XUnmapWindow(dpy, MR_WINDOW(mr));
-+ MR_X(mr) = x;
-+ MR_Y(mr) = y;
-+ trans = PGraphicsCreateTranslucent(
-+ dpy, MR_WINDOW(mr), &fra,
-+ BACK_GC(ST_MENU_INACTIVE_GCS(ms)),
-+ MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr));
-+ XMapRaised(dpy, MR_WINDOW(mr));
-+ XSetWindowBackgroundPixmap(
-+ dpy, MR_WINDOW(mr), trans);
-+ XFreePixmap(dpy, trans);
-+ }
-+ else
-+ {
-+ SetWindowBackground(
-+ dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr),
-+ &Colorset[ST_CSET_MENU(ms)], Pdepth,
-+ FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False);
-+ }
- /* redraw the background of non active item */
- for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi))
- {
-@@ -7213,7 +7292,6 @@
- }
- }
-
--
- for (t = Scr.FvwmRoot.next; t != NULL; t = t->next)
- {
- MenuRoot *mr = NULL;
-@@ -7230,10 +7308,12 @@
- SetWindowBackground(
- dpy, MR_WINDOW(mr), MR_WIDTH(mr),
- MR_HEIGHT(mr),
-- &Colorset[ST_CSET_MENU(ms)],
-- Pdepth,
-+ &Colorset[ST_CSET_MENU(ms)], Pdepth,
- FORE_GC(MST_MENU_INACTIVE_GCS(mr)),
-- True);
-+ False);
-+ XClearArea(
-+ dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr),
-+ MR_HEIGHT(mr), True);
- }
- else if ((ST_HAS_ACTIVE_CSET(ms) &&
- ST_CSET_ACTIVE(ms) == cset) ||
-Index: fvwm/menus.h
-===================================================================
-RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.h,v
-retrieving revision 1.103
-diff -u -r1.103 menus.h
---- fvwm/menus.h 28 Aug 2003 20:26:14 -0000 1.103
-+++ fvwm/menus.h 31 Aug 2003 19:48:41 -0000
-@@ -141,6 +141,9 @@
- MenuItem *submenu_item;
- /* x distance window was moved by animation */
- int xanimation;
-+ /* x,y XMapRaise */
-+ int x;
-+ int y;
- /* dynamic temp flags */
- struct
- {
-@@ -182,6 +185,8 @@
- #define MR_SELECTED_ITEM(m) ((m)->d->selected_item)
- #define MR_SUBMENU_ITEM(m) ((m)->d->submenu_item)
- #define MR_XANIMATION(m) ((m)->d->xanimation)
-+#define MR_X(m) ((m)->d->x)
-+#define MR_Y(m) ((m)->d->y)
- #define MR_STORED_ITEM(m) ((m)->d->stored_item)
- #define MR_STORED_PIXELS(m) ((m)->d->stored_pixels)
- /* flags */
-Index: libs/Colorset.h
-===================================================================
-RCS file: /home/cvs/fvwm/fvwm/libs/Colorset.h,v
-retrieving revision 1.36
-diff -u -r1.36 Colorset.h
---- libs/Colorset.h 29 Jun 2003 19:53:23 -0000 1.36
-+++ libs/Colorset.h 31 Aug 2003 19:48:43 -0000
-@@ -51,6 +51,10 @@
- Bool dither;
- Bool allows_buffered_transparency;
- Bool is_maybe_root_transparent;
-+ /* only use by fvwm menu (non tear-off) */
-+ Bool is_translucent;
-+ Pixel translucent_tint;
-+ unsigned int translucent_tint_percent : 7;
- #endif
- } colorset_t;
-
-@@ -78,6 +82,7 @@
- #define FG_TINT_SUPPLIED 0x100
- #define BG_TINT_SUPPLIED 0x200
- #define ICON_TINT_SUPPLIED 0x400
-+#define TRANSLUCENT_TINT_SUPPLIED 0x800
- #endif
-
- /* colorsets are stored as an array of structs to permit fast dereferencing */
-@@ -152,6 +157,11 @@
- #define CSETS_IS_TRANSPARENT_PR_TINT(cset) \
- (cset >= 0 && cset->pixmap == ParentRelative && \
- cset->tint_percent > 0)
-+
-+#define CSET_IS_TRANSLUCENT(cset) \
-+ (cset >= 0 && Colorset[cset].is_translucent)
-+#define CSETS_IS_TRANSLUCENT(cset) \
-+ (cset && cset->is_translucent)
-
- #ifndef FVWM_COLORSET_PRIVATE
- /* Create n new colorsets, fvwm/colorset.c does its own thing (different size)
-Index: libs/PictureGraphics.c
-===================================================================
-RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.c,v
-retrieving revision 1.25
-diff -u -r1.25 PictureGraphics.c
---- libs/PictureGraphics.c 27 Aug 2003 13:37:04 -0000 1.25
-+++ libs/PictureGraphics.c 31 Aug 2003 19:48:50 -0000
-@@ -1338,7 +1338,7 @@
- }
- }
-
--#if 0 /* humm... maybe usefull one day with menus */
-+#if 1 /* humm... maybe usefull one day with menus */
- Pixmap PGraphicsCreateTranslucent(
- Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
- int x, int y, int width, int height)
-Index: libs/PictureGraphics.h
-===================================================================
-RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.h,v
-retrieving revision 1.12
-diff -u -r1.12 PictureGraphics.h
---- libs/PictureGraphics.h 29 Jun 2003 19:53:24 -0000 1.12
-+++ libs/PictureGraphics.h 31 Aug 2003 19:48:50 -0000
-@@ -122,7 +122,9 @@
- Display *dpy, Window win, Pixel tint, int tint_percent,
- Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc,
- int dest_x, int dest_y, int dest_w, int dest_h);
--
-+Pixmap PGraphicsCreateTranslucent(
-+ Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc,
-+ int x, int y, int width, int height);
- /* never used ! */
- Pixmap PGraphicsCreateDitherPixmap(
- Display *dpy, Window win, Drawable src, Pixmap mask, int depth, GC gc,
-
diff --git a/x11-wm/fvwm/files/mini.happy.xpm b/x11-wm/fvwm/files/mini.happy.xpm
deleted file mode 100644
index 63ec60588217..000000000000
--- a/x11-wm/fvwm/files/mini.happy.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * mini-happy_xpm[] = {
-"16 16 3 1",
-" c None s None",
-". c black",
-"X c yellow",
-" ",
-" ..... ",
-" ..XXXXX.. ",
-" .XXXXXXXXX. ",
-" .XX..X..XX. ",
-" .XXX..X..XXX. ",
-" .XXX..X..XXX. ",
-" .XXXXXXXXXXX. ",
-" .XXXXXXXXXXX. ",
-" .XX.XXXXX.XX. ",
-" .XX.....XX. ",
-" .XXX...XXX. ",
-" ..XXXXX.. ",
-" ..... ",
-" ",
-" "};