From: Jan Rękorajski Date: Thu, 28 Oct 2004 12:26:18 +0000 (+0000) Subject: - updated to 0.90.0 X-Git-Tag: auto/ac/WindowMaker-0_91_0-1~11 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=6a57ca2816086d574befd45e19c564f2003d5168;p=packages%2FWindowMaker.git - updated to 0.90.0 Changed files: WindowMaker-IconPosition.patch -> 1.2 WindowMaker-pixmaps.patch -> 1.2 WindowMaker-shared.patch -> 1.16 WindowMaker-singleclick.patch -> 1.11 --- diff --git a/WindowMaker-IconPosition.patch b/WindowMaker-IconPosition.patch index a081633..4a06143 100644 --- a/WindowMaker-IconPosition.patch +++ b/WindowMaker-IconPosition.patch @@ -6,7 +6,7 @@ diff -rU 2 WindowMaker-0.62.1/WindowMaker/Defaults/WindowMaker.in WindowMaker-0. DisableDock = NO; - DisableClip = NO; + DisableClip = YES; - Superfluous = NO; + Superfluous = YES; StickyIcons = NO; @@ -52,5 +52,5 @@ DisableAnimations = NO; diff --git a/WindowMaker-pixmaps.patch b/WindowMaker-pixmaps.patch index c42caae..63f808b 100644 --- a/WindowMaker-pixmaps.patch +++ b/WindowMaker-pixmaps.patch @@ -1,8 +1,8 @@ --- WindowMaker-0.51.2/WindowMaker/Defaults/WindowMaker.in.old Tue Feb 16 20:21:45 1999 +++ WindowMaker-0.51.2/WindowMaker/Defaults/WindowMaker.in Fri Mar 12 22:56:38 1999 @@ -9,7 +9,8 @@ - "/usr/X11R6/include/X11/pixmaps", "~/GNUstep/Library/WindowMaker/Pixmaps", + "/usr/share/icons", "/usr/local/share/pixmaps", - "/usr/share/pixmaps" + "/usr/share/pixmaps", diff --git a/WindowMaker-shared.patch b/WindowMaker-shared.patch index ac570bc..6d292dd 100644 --- a/WindowMaker-shared.patch +++ b/WindowMaker-shared.patch @@ -1,11 +1,11 @@ --- WindowMaker-0.80.0/WINGs/Examples/Makefile.am.orig Thu Oct 11 11:59:54 2001 +++ WindowMaker-0.80.0/WINGs/Examples/Makefile.am Thu Jan 3 06:09:41 2002 -@@ -2,30 +2,18 @@ +@@ -2,31 +2,18 @@ AUTOMAKE_OPTIONS = no-dependencies - - noinst_PROGRAMS = connect server fontl puzzle + noinst_PROGRAMS = connect server fontl puzzle colorpick +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(XFTLIBS) $(INTLIBS) @@ -13,6 +13,7 @@ -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ - @XFTLIBS@ @INTLIBS@ - +-colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - @@ -40,7 +41,7 @@ --- WindowMaker-0.80.0/WINGs/Extras/Makefile.am.orig Thu Oct 11 11:59:54 2001 +++ WindowMaker-0.80.0/WINGs/Extras/Makefile.am Thu Jan 3 06:12:10 2002 -@@ -2,32 +2,26 @@ +@@ -2,33 +2,28 @@ AUTOMAKE_OPTIONS = no-dependencies @@ -67,7 +68,8 @@ wtableview.h \ wtabledelegates.h -- + AM_CFLAGS = @NOSTRICTALIASING@ + INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ - -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG + -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH) @@ -192,11 +194,11 @@ diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makef -pkgdatadir = $(datadir)/@PACKAGE@ - - bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify + bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle convertfonts \ + seticons geticonset wmsetbg wmsetup wmagnify - bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\ -@@ -12,41 +10,41 @@ - wkdemenu.pl wmchlocale.in wcopy wpaste +@@ -12,49 +10,49 @@ + EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \ - @HEADER_SEARCH_PATH@ \ @@ -222,12 +224,21 @@ diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makef -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) + getstyle_SOURCES = getstyle.c fontconv.c + setstyle_LDADD = \ - $(top_builddir)/WINGs/libWUtil.a \ - @XLFLAGS@ @XLIBS@ $(liblist) + $(top_builddir)/WINGs/libWUtil.la \ + $(XLFLAGS) $(XLIBS) $(liblist) + setstyle_SOURCES = setstyle.c fontconv.c + +-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) ++convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) + + convertfonts_SOURCES = convertfonts.c fontconv.c + -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) diff --git a/WindowMaker-singleclick.patch b/WindowMaker-singleclick.patch index ce039c1..9f0a671 100644 --- a/WindowMaker-singleclick.patch +++ b/WindowMaker-singleclick.patch @@ -1,7 +1,7 @@ --- WindowMaker-0.65.1/WPrefs.app/Expert.c.orig Mon Jun 4 19:47:32 2001 +++ WindowMaker-0.65.1/WPrefs.app/Expert.c Thu Jul 26 12:09:03 2001 @@ -33,7 +33,7 @@ - + WMWidget *parent; - WMButton *swi[8]; @@ -10,10 +10,10 @@ } _Panel; @@ -54,6 +54,7 @@ - WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); - if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - WMSetButtonSelected(panel->swi[7], GetBoolForKey("AntialiasedText")); -+ WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch")); + WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill")); + WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); + WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); ++ WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch")); } @@ -21,23 +21,23 @@ panel->box = WMCreateBox(panel->parent); WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); -- for (i=0; i<8; i++) { -+ for (i=0; i<9; i++) { - panel->swi[i] = WMCreateSwitchButton(panel->box); - WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); - WMMoveWidget(panel->swi[i], 20, 20+i*25); +- for (i=0; i<7; i++) { ++ for (i=0; i<8; i++) { + panel->swi[i] = WMCreateSwitchButton(panel->box); + WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); + WMMoveWidget(panel->swi[i], 20, 20+i*25); @@ -79,6 +80,7 @@ - WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command.")); - WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons.")); - WMSetButtonText(panel->swi[7], _("Smooth font edges (needs restart).")); + WMSetButtonText(panel->swi[4], _("Disable confirmation panel for the Kill command.")); + WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons.")); + WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart).")); + WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click")); - if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - WMSetButtonEnabled(panel->swi[7], False); + WMSetButtonEnabled(panel->swi[6], True); + @@ -101,6 +103,7 @@ - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); - if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "AntialiasedText"); + SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); + SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); + SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); + SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch"); } @@ -62,35 +62,35 @@ diff -ur WindowMaker-0.64.0/src/appicon.c WindowMaker-0.64.0.new/src/appicon.c int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0; int ix, iy; int clickButton = event->xbutton.button; -+ Bool hasMoved; ++ Bool hasMoved; Pixmap ghost = None; Window wins[2]; Bool movingSingle = False; @@ -785,6 +786,7 @@ XClearWindow(dpy, scr->dock_shadow); } - + + hasMoved = False; while (!done) { - WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask - |ButtonMotionMask|ExposureMask, &ev); + WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask + |ButtonMotionMask|ExposureMask, &ev); @@ -794,6 +796,7 @@ - break; + break; - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { + case MotionNotify: ++ hasMoved = True; + if (!grabbed) { + if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD + || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -943,6 +946,9 @@ - wArrangeIcons(scr, True); - - done = 1; -+ if (!hasMoved && wPreferences.single_click) { -+ iconDblClick(desc, event); -+ } - break; - } + wArrangeIcons(scr, True); + + done = 1; ++ if (!hasMoved && wPreferences.single_click) { ++ iconDblClick(desc, event); ++ } + break; + } } diff -ur WindowMaker-0.64.0/src/defaults.c WindowMaker-0.64.0.new/src/defaults.c --- WindowMaker-0.64.0/src/defaults.c Thu Jan 18 20:21:57 2001 @@ -129,36 +129,36 @@ diff -ur WindowMaker-0.64.0/src/dock.c WindowMaker-0.64.0.new/src/dock.c - + hasMoved = False; if (wPreferences.flags.noupdates) - return; + return; @@ -3822,6 +3822,7 @@ - break; + break; - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { + case MotionNotify: ++ hasMoved = True; + if (!grabbed) { + if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD + || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -3977,7 +3978,10 @@ #ifdef DEBUG - puts("End icon move"); + puts("End icon move"); #endif -- return; -+ if (!hasMoved) { -+ return 1; -+ } -+ return 0; - } +- return; ++ if (!hasMoved) { ++ return 1; ++ } ++ return 0; + } } } @@ -4117,7 +4121,9 @@ else handleDockMove(dock, aicon, event); } else -- handleIconMove(dock, aicon, event); -+ if (handleIconMove(dock, aicon, event) != 0 && -+ wPreferences.single_click) -+ iconDblClick(desc, event); +- handleIconMove(dock, aicon, event); ++ if (handleIconMove(dock, aicon, event) != 0 && ++ wPreferences.single_click) ++ iconDblClick(desc, event); } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && aicon==scr->clip_icon) { @@ -169,33 +169,33 @@ diff -ur WindowMaker-0.64.0/src/icon.c WindowMaker-0.64.0.new/src/icon.c int dx=event->xbutton.x, dy=event->xbutton.y; int grabbed=0; int clickButton=event->xbutton.button; -+ Bool hasMoved; ++ Bool hasMoved; if (WCHECK_STATE(WSTATE_MODAL)) - return; + return; @@ -916,6 +917,7 @@ - wwarning("pointer grab failed for icon move"); + wwarning("pointer grab failed for icon move"); #endif } -+ hasMoved = False; ++ hasMoved = False; while(1) { - WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask - |ButtonMotionMask|ExposureMask, &ev); + WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask + |ButtonMotionMask|ExposureMask, &ev); @@ -925,6 +927,7 @@ - break; + break; - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { + case MotionNotify: ++ hasMoved = True; + if (!grabbed) { + if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD + || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -962,6 +965,9 @@ - if (wPreferences.auto_arrange_icons) - wArrangeIcons(wwin->screen_ptr, True); -+ if (!hasMoved && wPreferences.single_click) { -+ miniwindowDblClick(desc, event); -+ } - return; - - } + if (wPreferences.auto_arrange_icons) + wArrangeIcons(wwin->screen_ptr, True); ++ if (!hasMoved && wPreferences.single_click) { ++ miniwindowDblClick(desc, event); ++ } + return; + + }