patches from http://abdn.ac.uk/~u15dm4/fvwm/

Warnaud · 27 May 2007 00:31

Ok, that’s the 02-ResizeOutlineThin.patch which is broken, the other applied well (in a cumulative way). Those in the extra directory don’t work too.

Here is the output of patch -p 0 < …/patchset/02-ResizeOutlineThin.patch

patching file fvwm/fvwm.h Hunk #1 succeeded at 217 (offset 1 line). patching file fvwm/move_resize.c Hunk #1 succeeded at 102 (offset 1 line). Hunk #2 FAILED at 2186. Hunk #3 succeeded at 2284 (offset 9 lines). Hunk #4 succeeded at 2604 (offset 1 line). Hunk #5 succeeded at 2683 (offset 9 lines). Hunk #6 succeeded at 3208 (offset 1 line). Hunk #7 succeeded at 3339 (offset 8 lines). Hunk #8 succeeded at 3392 (offset 1 line). Hunk #9 succeeded at 3680 (offset 8 lines). Hunk #10 succeeded at 3858 (offset 1 line). Hunk #11 succeeded at 3917 (offset 8 lines). Hunk #12 succeeded at 3963 (offset 1 line). 1 out of 12 hunks FAILED -- saving rejects to file fvwm/move_resize.c.rej

the fvwm/move_resize.c.rej

[code]***************
*** 2170,2189 ****
int orig_icon_x = 0;
int orig_icon_y = 0;
Bool do_snap = True;
Bool was_snapped = False;
/* if Alt is initially pressed don’t enable no-snap until Alt is
* released /
Bool nosnap_enabled = False;
/ Must not set placed by button if the event is a modified KeyEvent */
Bool is_fake_event;
FvwmWindow *fw = exc->w.fw;
unsigned int draw_parts = PART_NONE;
XEvent e;

    if (!GrabEm(cursor, GRAB_NORMAL))
    {
            XBell(dpy, 0);
            return False;
    }
    if (!IS_MAPPED(fw) && !IS_ICONIFIED(fw))
    {

— 2186,2206 ----
int orig_icon_x = 0;
int orig_icon_y = 0;
Bool do_snap = True;
Bool was_snapped = False;
/* if Alt is initially pressed don’t enable no-snap until Alt is
* released /
Bool nosnap_enabled = False;
/ Must not set placed by button if the event is a modified KeyEvent */
Bool is_fake_event;
FvwmWindow *fw = exc->w.fw;

  Bool do_outline_thin = DO_RESIZE_OUTLINE_THIN(fw);
  unsigned int draw_parts = PART_NONE;
  XEvent e;

  if (!GrabEm(cursor, GRAB_NORMAL))
  {
          XBell(dpy, 0);
          return False;
  }
  if (!IS_MAPPED(fw) && !IS_ICONIFIED(fw))
  {

[/code]

Looking at the patch it seems that this part is the cause :

[code]@@ -2188,20 +2204,21 @@ Bool __move_loop(
int orig_icon_x = 0;
int orig_icon_y = 0;
Bool do_snap = True;
Bool was_snapped = False;
/* if Alt is initially pressed don’t enable no-snap until Alt is
* released /
Bool nosnap_enabled = False;
/ Must not set placed by button if the event is a modified KeyEvent */
Bool is_fake_event;
FvwmWindow *fw = exc->w.fw;

  Bool do_outline_thin = DO_RESIZE_OUTLINE_THIN(fw);
  unsigned int draw_parts = PART_NONE;
  XEvent e;
                  
  if (!GrabEm(cursor, GRAB_NORMAL))
  {               
          XBell(dpy, 0);
          return False;
  }               
  if (!IS_MAPPED(fw) && !IS_ICONIFIED(fw))
  {[/code]

Compilation went well \o/
Thx 6thpink for black magic

6thpink · 29 May 2007 21:15

Hello,

It took me a bit to respond here cause I had some trouble with my forum account.

I am now hosting a new patchset, it is basically the same, with some fixes to apply cleanly again. I changed something in 08, and don’t remember if any other patch. I just erased the ones in the extras dir, I never used them, and don’t have the motivation to fix them. I don’t even know if they do have much sense at all at the current state of the things.

I left alive the default charset one, since it seems to be the only way that non-us users can get a correct spelling on the menus and such. That patch works just fine.

There’s also an ebuild available, oh, and note that those patches are against current cvs (this post’s date) so, don’t worry if they fail against any older snapshot

EDIT, I spoke too soon. It seems that patch08 was still broken, and, ironically, due to my “More…” localization patch :lol: that was integrated in CVS some weeks ago.

It now is working again, new patchset and ebuild here:
jesgue.homelinux.org/fvwm-files/ … 529.tar.gz
jesgue.homelinux.org/fvwm-files/ … ay.tar.bz2

6thpink · 3 June 2007 14:10

For those interested, today, 02 broke again. I re-did the 02 patch, the new patchset is this one:

jesgue.homelinux.org/fvwm-files/ … 03.tar.bz2

Thomas Adam, or someone more knowledgeable than me, please, I can’t find info anywhere, so, I don’t know if theere has been any real disccussion about the inclussion of any of these in CVS, if so, could you point me to the place where I should be looking at?

Some of the patches seem a good addition, and they are simple enough not to cause any trouble, I am willing to test and work a bit on those that would have any possibility of getting into the CVS if there is a need to. I just want to make sure that this is not a recurrent discussion in the mailing lists before I post it in fvwm-workers. I think that rounded corners and Fluxbox Handles would be two nice additions. and they are not heavy patches.

If there is something evident I overlooked, please, forgive me. I did not find info about this concrete subject.

thomasadam · 3 June 2007 14:16

Yes, there has been discussions before – they need cleaning up if they’re going to be included.

– Thomas Adam

6thpink · 3 June 2007 14:55

Ok, thanks for the fast response. I will dig a bit more on the mailing lists and see if I can do anything when I get some spare time.

6thpink · 8 June 2007 03:05

Hello, I completely rebuilt the patchset:
jesgue.homelinux.org/fvwm-files/ … 08.tar.bz2

It now includes the new patch for coloured borders from Thomas Adam, you can read about it, and get the original patch from here:
viewtopic.php?f=39&t=1771&hilit=

[color=#BF0040]Some warnings:[/color]

1.- Please, [color=#0000FF]never ever think about bothering Thomas Adam about the 01-ColourBorders.patch included in my tarball[/color]. While all the code is from him (I didn’t code a single line of it), I “adapted” it to fit into the puzzle, so, if something breaks, bother me, or better, fix it and send me a better patch

2.- The patchset has suffered many changes, mainly, structural ones. If you used previous versions, you might find that now it is shipped with a few more patches, that previously were stored in the files/ subdirectory of the fvwm cvs ebuild directory. So, into patchset you will find the patches from here:

abdn.ac.uk/~u15dm4/fvwm/

And under patchset/extras/, you will find:
a) Taviso’s menu translucency patch
b) Default charset fix patch
c) xlockmore compatibility patch
d) new test conditions patch (this is the only patch completely made by me)

3.- Specially, the patch number 11 has been modified to allow co-existance with the new coloured borders patch. I don’t use number 11, so, while it patches and compiles fine, I have no idea if it really works, of if I introduced any bug. This patch is not useful for me at all, so, if you find anything wrong with it, better fix it, or it will be soon removed if it bothers me too much.

4.- For all the above, this patchset might be specially unstable or exhibit any unwanted behaviour, or maybe not…: remember that the only guilty one if something explodes is you. No complains accepted

[color=#8000FF]For all the Gentoo users, new ebuild[/color]:
jesgue.homelinux.org/fvwm-files/ … ay.tar.bz2

All the stuff under files/ has been removed, I suggest moving the x11-wm/fvwm directory into any other place (as a backup, just in case). Then you can extract the tarball in your overlay and emerge fvwm to compile with the new patch (you need USE=“extras”).

Cheers.

chojin · 12 June 2007 15:47

Used the overlay and multiborder still works with my config, so I guess it is ok. 8)

6thpink · 14 June 2007 13:20

@chojin, thanks for that information.

Now, some news about the patchset.

I merged 07 and 08 (FluxboxHandles and RoundedBorders) patches into a single one, called 07-FluxRoundedCorners.patch. The reason is simple enough: those patches need some cooperation to work together in a sane manner. When you use the RoundedBorders or RoundedCornersBottom styles, you probably don’t want a Flux style handle on that window, the opposite is surely true as well.

So, now, the FluxboxHandles Style disables rounded corners in the bottom when applied. It should still allow you to use the top ones (with RoundedCorners or RoundedCornersTop). In turn, and for the sake of correctness and consistence with the rest of Style options, the last Style applied takes relevance over the rest. So, RoundedBorders and RoundedCornersBottom both override FluxboxHandles. So, if you want a Fluxbox style with rounded corners at the top, you do:

Style * FluxboxHandles, RoundedCornersTop
#or
Style * RoundedCorners, FluxboxHandles
#or even
Style * FluxboxHandles, RoundedCorners

This last way is possible due to the fact that the patched code for RoundedCorners looks if the FluxboxHandles are active in the same style line, so, it will work regardless. But if you do this:

Style * FluxboxHandles
....
Style * RoundedCorners

The FluxboxHandles will be disabled. If you do it the other way around, you will still get RoundedCornersTop, but the Bottom ones will be disabled.

I hope you get the idea. It seems the most logical way for me.

So far, it seems to work ok, here is the patchset:
jesgue.homelinux.org/fvwm-files/ … 14.tar.bz2
And the gentoo overlay:
jesgue.homelinux.org/fvwm-files/ … ay.tar.bz2

Regards.

fogman · 29 June 2007 07:35

thanks for your share,but I seemly can’t download the file from you pased links,and anybody can send to me this file,fvwm-cvs-overlay.tar.bz2
any help is wellcom,my email:hhdslb@gmail.com

6thpink · 29 June 2007 11:24

The file is readable by everyone, and the server is up. Maybe there was some temporal issue with name resolution or something. Anyway, I sent you a mail with the file attached.

– Jesús Guerrero

fogman · 1 July 2007 11:50

yeah,I got it through a proxy,thank’s

fogman · 1 July 2007 13:04

sorry,mybe I am so foolish.I want to know how to use the patchset ?
Isn’t the file that from jesgue.homelinux.org/fvwm-files/ … 14.tar.bz2
is prepared for patch the file from ftp://ftp.fvwm.org/pub/fvwm/devel/snaps … ar.gz,then why when I run the command:bzip2 -dc …/fvwm-patchset-20070614.tar.bz2 | patch -p0 --dry-ru,
I get many fail message?
please help me ,my english is pool,thank’s

fogman · 1 July 2007 13:05

I get the error message is :

missing header for unified diff at line 3 of patch
patching file libs/FlocaleCharset.c
Hunk #1 succeeded at 521 (offset -1 lines).
patching file fvwm/colorset.c
Hunk #6 succeeded at 1645 (offset 4 lines).
Hunk #7 succeeded at 1761 (offset 4 lines).
Hunk #8 succeeded at 1779 (offset 4 lines).
Hunk #9 succeeded at 1791 (offset 4 lines).
patching file fvwm/menuroot.h
patching file fvwm/menus.c
Hunk #1 succeeded at 76 (offset 1 line).
Hunk #2 succeeded at 202 (offset 1 line).
Hunk #3 succeeded at 369 (offset 1 line).
Hunk #4 succeeded at 1805 (offset 1 line).
Hunk #5 succeeded at 2621 (offset 1 line).
Hunk #6 succeeded at 3458 (offset 1 line).
Hunk #7 succeeded at 3637 (offset 1 line).
Hunk #8 succeeded at 6188 (offset 1 line).
Hunk #9 succeeded at 6344 (offset 1 line).
Hunk #10 succeeded at 6981 (offset 1 line).
patching file fvwm/menus.h
patching file libs/Colorset.h
patching file libs/PictureGraphics.c
patching file libs/PictureGraphics.h
patching file fvwm/conditional.c
patching file fvwm/fvwm.1.in
Hunk #1 succeeded at 11088 (offset 6 lines).
Hunk #2 succeeded at 11137 (offset 6 lines).
can’t find file to patch at input line 810
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:

|patchset/fvwm-menu-xlock-xlockmore-compat.patch0000644000175000017500000000104610560275014022102 0ustar i92guboji92gubojdiff -urN fvwm-2.5.10.orig/bin/fvwm-menu-xlock.in fvwm-2.5.10/bin/fvwm-menu-xlock.in
|— fvwm-2.5.10.orig/bin/fvwm-menu-xlock.in 2003-03-22 02:01:24.000000000 +0000

+++ fvwm-2.5.10/bin/fvwm-menu-xlock.in 2004-05-24 12:26:14.641330208 +0100

File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file fvwm/frame.c
patching file fvwm/screen.h
patching file fvwm/builtins.c
Hunk #1 succeeded at 492 (offset 7 lines).
patching file fvwm/menuitem.c
Hunk #2 succeeded at 390 with fuzz 2 (offset 56 lines).
Hunk #3 succeeded at 607 (offset 62 lines).
Hunk #4 succeeded at 629 (offset 62 lines).
Hunk #5 succeeded at 671 (offset 62 lines).
Hunk #6 succeeded at 685 (offset 62 lines).
patching file fvwm/menustyle.c
Hunk #1 succeeded at 405 (offset 7 lines).
Hunk #2 succeeded at 880 (offset 38 lines).
Hunk #3 succeeded at 1568 (offset 38 lines).
Hunk #4 succeeded at 1824 (offset 38 lines).
patching file fvwm/menus.c
Hunk #1 succeeded at 1488 (offset -875 lines).
patching file fvwm/menustyle.h
patching file fvwm/borders.c
Hunk #1 succeeded at 1281 (offset -373 lines).
Hunk #2 FAILED at 1474.
Hunk #3 succeeded at 1539 (offset -422 lines).
Hunk #4 succeeded at 1563 (offset -422 lines).
Hunk #5 FAILED at 1577.
Hunk #6 FAILED at 1641.
Hunk #7 FAILED at 1751.
Hunk #8 succeeded at 1789 with fuzz 1 (offset -439 lines).
Hunk #9 FAILED at 3416.
Hunk #10 FAILED at 3866.
6 out of 10 hunks FAILED – saving rejects to file fvwm/borders.c.rej
patching file fvwm/builtins.c
Hunk #1 succeeded at 762 (offset -22 lines).
Hunk #2 succeeded at 1515 (offset -22 lines).
Hunk #3 succeeded at 1892 (offset -22 lines).
patching file fvwm/menus.c
Hunk #1 succeeded at 2479 (offset -5 lines).
Hunk #2 succeeded at 2618 (offset -5 lines).
Hunk #3 succeeded at 2666 (offset -5 lines).
Hunk #4 succeeded at 2681 (offset -5 lines).
patching file fvwm/menustyle.c
patching file fvwm/menustyle.h
Hunk #1 succeeded at 183 (offset -6 lines).
Hunk #2 succeeded at 233 (offset -6 lines).
patching file fvwm/screen.h
patching file fvwm/fvwm.h
patching file fvwm/move_resize.c
patching file fvwm/style.c
patching file fvwm/style.h
patching file fvwm/window_flags.h
patching file fvwm/add_window.c
Hunk #1 succeeded at 1632 (offset -12 lines).
Hunk #2 succeeded at 1644 (offset -12 lines).
Hunk #3 succeeded at 2549 (offset -31 lines).
patching file fvwm/borders.c
Hunk #1 succeeded at 1386 (offset -368 lines).
Hunk #2 succeeded at 1619 (offset -397 lines).
Hunk #3 succeeded at 4161 (offset -401 lines).
Hunk #4 succeeded at 4201 (offset -401 lines).
Hunk #5 succeeded at 4262 (offset -401 lines).
Hunk #6 succeeded at 4272 (offset -401 lines).
Hunk #7 succeeded at 4285 (offset -401 lines).
Hunk #8 succeeded at 4295 (offset -401 lines).
Hunk #9 succeeded at 4637 with fuzz 2 (offset -402 lines).
Hunk #10 succeeded at 4655 (offset -402 lines).
Hunk #11 succeeded at 4693 (offset -402 lines).
patching file fvwm/frame.c
patching file fvwm/frame.h
patching file fvwm/fvwm.h
Hunk #1 FAILED at 271.
Hunk #2 succeeded at 542 (offset -5 lines).
Hunk #3 succeeded at 648 (offset -38 lines).
1 out of 3 hunks FAILED – saving rejects to file fvwm/fvwm.h.rej
patching file fvwm/geometry.c
Hunk #1 FAILED at 480.
Hunk #2 succeeded at 502 (offset -19 lines).
1 out of 2 hunks FAILED – saving rejects to file fvwm/geometry.c.rej
patching file fvwm/menus.c
Hunk #2 succeeded at 3008 (offset -4 lines).
Hunk #3 succeeded at 3591 (offset -4 lines).
patching file fvwm/menustyle.c
Hunk #1 FAILED at 406.
Hunk #2 succeeded at 1568 with fuzz 2 (offset -4 lines).
1 out of 2 hunks FAILED – saving rejects to file fvwm/menustyle.c.rej
patching file fvwm/menustyle.h
Hunk #1 FAILED at 25.
Hunk #2 FAILED at 282.
2 out of 2 hunks FAILED – saving rejects to file fvwm/menustyle.h.rej
patching file fvwm/style.c
Hunk #1 succeeded at 513 (offset -16 lines).
Hunk #2 succeeded at 2286 (offset -220 lines).
Hunk #3 succeeded at 2516 (offset -220 lines).
Hunk #4 succeeded at 3548 (offset -345 lines).
Hunk #5 succeeded at 3726 (offset -345 lines).
Hunk #6 FAILED at 4585.
Hunk #7 succeeded at 4845 (offset -356 lines).
1 out of 7 hunks FAILED – saving rejects to file fvwm/style.c.rej
patching file fvwm/style.h
Hunk #2 FAILED at 381.
Hunk #3 succeeded at 507 (offset -112 lines).
1 out of 3 hunks FAILED – saving rejects to file fvwm/style.h.rej
patching file fvwm/window_flags.h
Hunk #1 succeeded at 314 (offset -2 lines).
Hunk #2 FAILED at 332.
1 out of 2 hunks FAILED – saving rejects to file fvwm/window_flags.h.rej
patching file fvwm/windowshade.c
patching file fvwm/borders.c
patching file fvwm/fvwm.c
patching file fvwm/fvwm.h
patching file fvwm/screen.h
patching file fvwm/style.c
patching file fvwm/style.h
patching file fvwm/style.c
Hunk #1 succeeded at 2078 (offset 23 lines).
Hunk #2 succeeded at 4513 (offset 111 lines).
patching file fvwm/style.h
Hunk #1 succeeded at 335 (offset 12 lines).
patching file fvwm/geometry.c
Hunk #2 succeeded at 346 (offset 1 line).
Hunk #3 succeeded at 473 (offset 1 line).
patching file fvwm/geometry.h
patching file fvwm/fvwm.h
Hunk #1 succeeded at 268 (offset 3 lines).
patching file fvwm/window_flags.h
Hunk #1 succeeded at 326 (offset 16 lines).
patching file fvwm/borders.c
Hunk #1 succeeded at 4599 (offset 17 lines).
Hunk #2 succeeded at 4670 (offset 17 lines).
patching file fvwm/borders.h
patching file fvwm/conditional.c
Hunk #1 succeeded at 600 (offset 19 lines).
patching file fvwm/style.c
Hunk #1 succeeded at 415 (offset 6 lines).
Hunk #2 succeeded at 778 (offset 27 lines).
Hunk #3 succeeded at 2872 (offset 18 lines).
Hunk #4 succeeded at 4557 with fuzz 2 (offset 100 lines).
patching file fvwm/style.h
Hunk #1 succeeded at 259 (offset 12 lines).
Hunk #2 succeeded at 455 (offset 8 lines).
patching file fvwm/fvwm.h
Hunk #2 succeeded at 360 (offset 2 lines).
Hunk #3 succeeded at 632 with fuzz 1 (offset 22 lines).
Hunk #4 succeeded at 763 (offset 40 lines).
patching file fvwm/add_window.c
Hunk #1 succeeded at 638 (offset 6 lines).
Hunk #2 succeeded at 1691 (offset 6 lines).
patching file fvwm/window_flags.h
Hunk #1 succeeded at 572 (offset 10 lines).
Hunk #2 succeeded at 620 (offset 10 lines).
patching file fvwm/borders.c
Hunk #1 succeeded at 3525 (offset 15 lines).
Hunk #2 succeeded at 3535 (offset 15 lines).
Hunk #3 succeeded at 3600 (offset 15 lines).
Hunk #4 succeeded at 3622 (offset 15 lines).
Hunk #5 succeeded at 3646 (offset 15 lines).
Hunk #6 succeeded at 3685 (offset 15 lines).
Hunk #7 succeeded at 3693 (offset 15 lines).
Hunk #8 succeeded at 3761 (offset 15 lines).
Hunk #9 succeeded at 3774 (offset 15 lines).
Hunk #10 succeeded at 3792 (offset 15 lines).
Hunk #11 succeeded at 4281 (offset 17 lines).
Hunk #12 succeeded at 4389 (offset 17 lines).
patching file fvwm/events.c
Hunk #1 succeeded at 164 with fuzz 1 (offset 6 lines).
Hunk #2 succeeded at 1693 (offset 20 lines).
Hunk #3 succeeded at 1915 (offset 20 lines).
Hunk #4 succeeded at 2579 (offset 43 lines).
patching file fvwm/fvwm.h
Hunk #1 succeeded at 735 (offset 29 lines).
patching file fvwm/screen.h
Hunk #1 succeeded at 198 (offset -4 lines).
Hunk #2 succeeded at 220 (offset -4 lines).
Hunk #3 succeeded at 512 (offset -5 lines).
patching file fvwm/builtins.c
Hunk #1 succeeded at 100 (offset 7 lines).
Hunk #2 succeeded at 120 (offset 7 lines).
patching file fvwm/borders.c
Hunk #1 succeeded at 67 (offset 2 lines).
Hunk #2 succeeded at 188 (offset 2 lines).
Hunk #3 succeeded at 294 (offset 2 lines).
Hunk #4 succeeded at 597 (offset 2 lines).
Hunk #5 succeeded at 621 (offset 2 lines).
Hunk #6 succeeded at 3843 (offset -157 lines).
Hunk #7 succeeded at 4112 (offset -155 lines).
Hunk #8 succeeded at 4385 (offset -155 lines).
Hunk #9 succeeded at 4437 (offset -155 lines).
Hunk #10 succeeded at 4528 (offset -155 lines).
Hunk #11 succeeded at 4546 (offset -155 lines).
Hunk #12 succeeded at 4974 (offset -190 lines).
Hunk #13 succeeded at 4996 (offset -190 lines).
Hunk #14 succeeded at 5010 (offset -190 lines).
patching file modules/FvwmIconMan/readconfig.c
Hunk #1 succeeded at 2023 (offset -5 lines).
patching file modules/FvwmIconMan/xmanager.c
Hunk #1 succeeded at 1365 (offset -31 lines).
Hunk #2 succeeded at 1639 (offset -31 lines).
Hunk #3 succeeded at 1854 (offset -31 lines).
patching file modules/FvwmIconMan/FvwmIconMan.h
Hunk #1 succeeded at 314 (offset -1 lines).
patching file libs/FTips.c
patching file modules/FvwmButtons/FvwmButtons.c
Hunk #3 succeeded at 1085 (offset -2 lines).
Hunk #4 succeeded at 1213 (offset -2 lines).
Hunk #5 succeeded at 1259 (offset -2 lines).
Hunk #6 succeeded at 1298 (offset -2 lines).
Hunk #7 succeeded at 1326 (offset -2 lines).
Hunk #8 succeeded at 1369 (offset -2 lines).
patching file modules/FvwmButtons/FvwmButtons.h
patching file modules/FvwmButtons/parse.c
patching file fvwm/style.c
Hunk #1 succeeded at 3899 (offset 31 lines).
Hunk #2 succeeded at 4514 with fuzz 1 (offset 6 lines).
patching file fvwm/style.h
Hunk #1 FAILED at 349.
1 out of 1 hunk FAILED – saving rejects to file fvwm/style.h.rej
patching file fvwm/geometry.c
Hunk #1 FAILED at 479.
Hunk #2 FAILED at 497.
Hunk #3 succeeded at 512 with fuzz 2 (offset -24 lines).
2 out of 3 hunks FAILED – saving rejects to file fvwm/geometry.c.rej
patching file fvwm/fvwm.h
Hunk #1 FAILED at 271.
1 out of 1 hunk FAILED – saving rejects to file fvwm/fvwm.h.rej
patching file fvwm/window_flags.h
Hunk #1 FAILED at 340.
patch unexpectedly ends in middle of line
1 out of 1 hunk FAILED – saving rejects to file fvwm/window_flags.h.rej
patch unexpectedly ends in middle of line

6thpink · 1 July 2007 13:37

The patch is only tested against the latest CVS (latest as in “the last time that I had time to fix them”).

To get the current CVS:

$ cvs -q -f -z1 -d ":pserver:anonymous:guest@cvs.fvwm.org:/home/cvs/fvwm" login
$ cvs -q -f -z1 -d ":pserver:anonymous@cvs.fvwm.org:/home/cvs/fvwm" checkout  fvwm

The patches in the main directory, should be totally independent. The ones in the extras directory, might depend on each other, so, you need to apply them incrementally, which is why they are numbered. So, if you want, let’s say, patch 07, you need all the patches from 01 to 07, and you MUST apply them in that same order. Or they might not apply at all.

If you are in the fvwm dir, some of them need -p0, some -p1. This is because I use them from the Gentoo ebuild, and don’t care at all about the path level. If someone wants to clean up the paths, do it. If not, I will someday, when I have the time.

I just downloaded a clean CVS shot, applied ALL the patches, and it works. Apply first the patches in the patchset/ dir, and then the ones in the patchset/extras/ dir. Though, as I said, the ones in the patchset/ dir should be totally independent from the rest, and vice-versa.

I don’t even use this patches for my daily FVWM, just the DefaultLocale and the new-test one.

fogman · 3 July 2007 01:14

You are responsible, follow your said, all thingh be fine, thk’s for your help, the effect is so cool now^_^

Chris_Cornell · 8 July 2007 15:48

can’t get really to a final result. neither fvwm nor theming.

using version 2.5.21 and patches from 01.07.2007

using cat to test if the patch applies correctly and -p1/-p0 should be used

$ cat .../name-of-the-patch.patch | patch -p1/-p0 --dry-run

came until patch 07 FluxRoundedCorners…got some failures…should be patched with -p0

all others should be patched with -p0, except menu-xlock-xlockmore…this should patched with -p1.

wanted now to patch…

$ cat .../name-of-the-patch.patch | patch -p0

came only to 01-ColourBorders

all others I have to check the failures

thx

6thpink · 11 May 2008 19:38

Warnaud updated the patchset this time, so, thanks to him.

I will be hosting it here:

jesgue.homelinux.org/fvwm-files/ … et.tar.bz2

The recently added VerticalMargins menu style is possibly the responsible for some of those patches breaking.

Enjoy

Slackman · 12 May 2008 09:36

Hi,
first of all, thx for the new patchset!
I`ve tried out the new set and something goes wrong here.
It seems as the RoundedCorner-Patch collides with the new VerticalMargins menu style or something else.
With this Patch included the mousepointer is jumping directly to the next submenu if there is one.
And MenuStyle RoundedCorners takes no effect.
Without the RoundedCorner-Patch everything works well.
How are your Experiences?
Unfortunately my knowledge in this things is very limited.
Greetings

Edit:
Hmmm, using the All-In-One-Patch from abdn.ac.uk/~u15dm4/fvwm/ (for fvwm-2.5.23) gives me only 2 rej`s
in the menustyle.c. After changing the lines reported in the rej-File everthing is working well.
For interested Users:

menustyle.c.rej

*** 405,411 ****
“MouseWheel”, “ScrollOffPage”,
“TrianglesUseFore”,
“TitleColorset”, “HilightTitleBack”,
  "TitleFont",
  NULL
};
— 459,466 ----
“MouseWheel”, “ScrollOffPage”,
“TrianglesUseFore”,
“TitleColorset”, “HilightTitleBack”,
  "TitleFont", "FlatSeparators",
  "RoundedCorners", "SlightlyRoundedCorners",
  NULL
};
*** 1589,1596 ****
}
has_gc_changed = True;
break;

#if 0
case 99: /* PositionHints /
/ to be implemented */
— 1645,1660 ----
}
has_gc_changed = True;
break;
  case 62: /* FlatSeparators */
  	ST_DO_FLAT_SEPARATOR(tmpms) = on;
  	break;
  case 63: /* RoundedCorners */
  	ST_HAS_ROUNDED_CORNERS(tmpms) = on;
  	break;
  case 64: /* SlightlyRoundedCorners */
  	ST_HAS_SLIGHTLY_ROUNDED_CORNERS(tmpms) = on;
  	break;
#if 0
case 99: /* PositionHints /
/ to be implemented */

Maybe this evening I`ll take all my not existing knowledge and try to change the lines in the Patch.

6thpink · 12 May 2008 15:11

Well, as I said, the patch was kindly arranged by Warnaud. I don’t even use this patchset anymore, though I still maintain a fvwm cvs ebuild for gentoo that uses it.

I haven’t done any testing at all, I just checked that it applies cleanly. But I will do some testing as soon as I can.

Thanks for reporting.

Warnaud · 12 May 2008 18:46

This is due to the patch “FirstItemUnderPointer” sadly, there’s no way to avoid this behavior except not using this patch

Yes for me it works weird, not as clean as before, the corners are more “square”]http://arnaud.fortier.free.fr/fvwm/RoundedCornersTrouble.png[/img]
before --------------> after

Mine too I’ve just add some lines in the patches to reflect the Fvwm’s code

Slackman:

Edit:
Hmmm, using the All-In-One-Patch from abdn.ac.uk/~u15dm4/fvwm/ (for fvwm-2.5.23) gives me only 2 rej`s
in the menustyle.c. After changing the lines reported in the rej-File everthing is working well.
For interested Users:
menustyle.c.rej

*** 405,411 ****
“MouseWheel”, “ScrollOffPage”,
“TrianglesUseFore”,
“TitleColorset”, “HilightTitleBack”,
  "TitleFont",
  NULL
};
— 459,466 ----
“MouseWheel”, “ScrollOffPage”,
“TrianglesUseFore”,
“TitleColorset”, “HilightTitleBack”,
  "TitleFont", "FlatSeparators",
  "RoundedCorners", "SlightlyRoundedCorners",
  NULL
};
*** 1589,1596 ****
}
has_gc_changed = True;
break;

#if 0
case 99: /* PositionHints /
/ to be implemented */
— 1645,1660 ----
}
has_gc_changed = True;
break;
  case 62: /* FlatSeparators */
  	ST_DO_FLAT_SEPARATOR(tmpms) = on;
  	break;
  case 63: /* RoundedCorners */
  	ST_HAS_ROUNDED_CORNERS(tmpms) = on;
  	break;
  case 64: /* SlightlyRoundedCorners */
  	ST_HAS_SLIGHTLY_ROUNDED_CORNERS(tmpms) = on;
  	break;
#if 0
case 99: /* PositionHints /
/ to be implemented */
Maybe this evening I`ll take all my not existing knowledge and try to change the lines in the Patch.

I’ll look at it too, the 3 patches impacted are : FlatSeparators.patch / FluxRoundedCorners.patch / FvwmButtonsTips.patch and the All-inOne lacks the Conditional patch from 6thpink and also the MultiColorBorder from thomas_adam.
I’ll look into it now, to see if I can fix it.