From e44130b51afa8b9d7b51d70b7b3e68986bea98fa Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Mon, 22 May 2000 03:24:40 +0000
Subject: [PATCH] few changes to WPrefs/appearance to accomote igradient

---
 ChangeLog                           |  7 +++++
 NEWS                                | 23 +++++++++++++++
 WPrefs.app/Appearance.c             | 57 +++++++++++++++++++++++++++++++++++--
 WPrefs.app/Makefile.am              |  1 +
 WindowMaker/Defaults/WindowMaker.in |  4 +--
 5 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7358794f..e62a2609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes since version 0.62.1:
+.............................
+- added blackbox style igradient (interwoven)
+- added wmagnify utility
+
 Changes since version 0.62.0:
 .............................
 - made shortcuts available during alt+tab
@@ -17,6 +22,8 @@ Changes since version 0.62.0:
   if GNOME hints dont exist
 - updated kwm hint support (maximize hint)
 - added memory usage in info panel
+- fixed sticky hint handling in GNOME
+- fixed saving of maximized state for restart
 
 Changes since version 0.61.1:
 .............................
diff --git a/NEWS b/NEWS
index 83a4c4b4..38c27d8a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,29 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
+--- 0.62.1
+
+
+Interwoven Gradient
+-------------------
+
+interwoven gradients rip^Winspired on blackbox. Will render a texture that
+interweaves 2 different ones.
+
+(igradient, from1, to1, thickness1, from2, to2, thickness2)
+
+Will render a interwoven texture with the 2 specified gradients,
+with each section having the specified thickness.
+
+wmagnify
+--------
+
+The wmagnify utility will magnify the area on teh screen where
+your mouse pointer is located, updating it in real-time.
+
+tip: maximize it horizontally, make it Omnipresent and Always at Bottom.
+Then leave it in the bottom of the screen.
+
 --- 0.62.0
 
 
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index 0932759f..ccf4a0d3 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -82,6 +82,14 @@ typedef struct _Panel {
     WMFrame *taliF;
     WMButton *taliB[3];
 
+    /* root bg */
+    WMFrame *bgF;
+    
+    WMLabel *bgprevL;
+    WMButton *selbgB;
+
+    WMPopUpButton *modeB[3];
+    
     /* */
 
     int textureIndex[8];
@@ -531,6 +539,25 @@ renderTexture(WMScreen *scr, proplist_t texture, int width, int height,
 
 	image = RCreateImage(width, height, False);
 	RClearImage(image, &rcolor);
+    } else if (strcasecmp(type, "igradient")==0) {
+	int t1, t2;
+	RColor c1[2], c2[2];
+
+	str = PLGetString(PLGetArrayElement(texture, 1));
+	str2rcolor(rc, str, &c1[0]);
+	str = PLGetString(PLGetArrayElement(texture, 2));
+	str2rcolor(rc, str, &c1[1]);
+	str = PLGetString(PLGetArrayElement(texture, 3));
+	t1 = atoi(str);
+
+	str = PLGetString(PLGetArrayElement(texture, 4));
+	str2rcolor(rc, str, &c2[0]);
+	str = PLGetString(PLGetArrayElement(texture, 5));
+	str2rcolor(rc, str, &c2[1]);
+	str = PLGetString(PLGetArrayElement(texture, 6));
+	t2 = atoi(str);
+
+	image = RRenderInterwovenGradient(width, height, c1, t1, c2, t2);
     } else if (strcasecmp(&type[1], "gradient")==0) {
 	int style;
 	RColor rcolor2;
@@ -1599,7 +1626,7 @@ changedTabItem(struct WMTabViewDelegate *self, WMTabView *tabView,
 	}
 	changeColorPage(panel->colP, panel);
 	break;
-     case 2:
+     case 3:
 	switch (panel->oldTabItem) {
 	 case 0:
 	    changePage(NULL, panel);
@@ -1867,12 +1894,38 @@ createPanel(Panel *p)
     }
 
     WMMapSubwidgets(panel->colF);
+    
+    /*** root bg ***/
+    
+    panel->bgF = WMCreateFrame(panel->frame);
+    WMSetFrameRelief(panel->bgF, WRFlat);
+    
+    item = WMCreateTabViewItemWithIdentifier(2);
+    WMSetTabViewItemView(item, WMWidgetView(panel->bgF));
+    WMSetTabViewItemLabel(item, _("Background"));
+
+    WMAddItemInTabView(panel->tabv, item);
+
+    panel->bgprevL = WMCreateLabel(panel->bgF);
+    WMResizeWidget(panel->bgprevL, 230, 155);
+    WMMoveWidget(panel->bgprevL, 5, 5);
+    WMSetLabelRelief(panel->bgprevL, WRSunken);
+
+    panel->selbgB = WMCreateCommandButton(panel->bgF);
+    WMMoveWidget(panel->selbgB, 5, 165);
+    WMResizeWidget(panel->selbgB, 100, 24);
+    WMSetButtonText(panel->selbgB, _("Browse..."));
+    
+    
+    
+    
+    WMMapSubwidgets(panel->bgF);
 
     /*** options ***/
     panel->optF = WMCreateFrame(panel->frame);
     WMSetFrameRelief(panel->optF, WRFlat);
 
-    item = WMCreateTabViewItemWithIdentifier(2);
+    item = WMCreateTabViewItemWithIdentifier(3);
     WMSetTabViewItemView(item, WMWidgetView(panel->optF));
     WMSetTabViewItemLabel(item, _("Options"));
 
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 1c6cdad9..b79ceee2 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -39,6 +39,7 @@ WPrefs_SOURCES = \
 	double.h \
 	editmenu.c \
 	editmenu.h \
+	imagebrowser.c \
 	MenuGuru.c \
 	xmodifier.c
 
diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index 13058ed4..de30d6ba 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -1,7 +1,7 @@
 {
   MultiByteText = NO;
   SmoothWorkspaceBack = NO;
-  WindozeCycling = NO;
+  WindozeCycling = YES;
   PopupSwitchMenu = NO;
   MenuStyle = normal;
   DisableMiniwindows = NO;
@@ -39,7 +39,7 @@
   NewStyle = YES;
   DisableDock = NO;
   DisableClip = NO;
-  Superfluous = NO;
+  Superfluous = YES;
   StickyIcons = NO;
   SaveSessionOnExit = NO;
   ColormapMode = auto;
-- 
2.11.4.GIT