-diff -Naur WindowMaker-0.63.1/src/WindowMaker.h WindowMaker-0.63.1-p/src/WindowMaker.h
---- WindowMaker-0.63.1/src/WindowMaker.h Fri Nov 17 03:10:32 2000
-+++ WindowMaker-0.63.1-p/src/WindowMaker.h Mon Jan 8 12:15:41 2001
-@@ -424,6 +424,9 @@
+diff -ur WindowMaker-0.64.0/WPrefs.app/Expert.c WindowMaker-0.64.0.new/WPrefs.app/Expert.c
+--- WindowMaker-0.64.0/WPrefs.app/Expert.c Thu Feb 8 22:54:12 2001
++++ WindowMaker-0.64.0.new/WPrefs.app/Expert.c Wed Mar 21 20:00:55 2001
+@@ -33,7 +33,7 @@
+
+ WMWidget *parent;
+
+- WMButton *swi[8];
++ WMButton *swi[9];
+
+ } _Panel;
+
+@@ -54,6 +54,7 @@
+ WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
+ WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
+ WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
++ WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch"));
+ }
+
+
+@@ -66,7 +67,7 @@
+ panel->box = WMCreateBox(panel->parent);
+ WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
+
+- 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[4], _("Use Windoze style cycling"));
+ WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command"));
+ WMSetButtonText(panel->swi[6], _("Disable cycling color highlighting of icons"));
++ WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click"));
+
+ WMRealizeWidget(panel->box);
+ WMMapSubwidgets(panel->box);
+@@ -101,6 +103,7 @@
+ SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
+ SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
+ SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
++ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch");
+ }
+
+
+diff -ur WindowMaker-0.64.0/src/WindowMaker.h WindowMaker-0.64.0.new/src/WindowMaker.h
+--- WindowMaker-0.64.0/src/WindowMaker.h Fri Feb 9 16:56:53 2001
++++ WindowMaker-0.64.0.new/src/WindowMaker.h Wed Mar 21 19:59:08 2001
+@@ -435,6 +435,9 @@
/* shading animation */
signed char shade_speed;
int edge_resistance;
char attract;
-diff -Naur WindowMaker-0.63.1/src/appicon.c WindowMaker-0.63.1-p/src/appicon.c
---- WindowMaker-0.63.1/src/appicon.c Wed Nov 1 16:40:16 2000
-+++ WindowMaker-0.63.1-p/src/appicon.c Mon Jan 8 12:15:41 2001
+diff -ur WindowMaker-0.64.0/src/appicon.c WindowMaker-0.64.0.new/src/appicon.c
+--- WindowMaker-0.64.0/src/appicon.c Thu Jan 18 20:21:57 2001
++++ WindowMaker-0.64.0.new/src/appicon.c Wed Mar 21 19:59:08 2001
@@ -717,6 +717,7 @@
int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
int ix, iy;
break;
}
}
-diff -Naur WindowMaker-0.63.1/src/defaults.c WindowMaker-0.63.1-p/src/defaults.c
---- WindowMaker-0.63.1/src/defaults.c Sat Jan 6 22:28:02 2001
-+++ WindowMaker-0.63.1-p/src/defaults.c Mon Jan 8 12:15:41 2001
+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
++++ WindowMaker-0.64.0.new/src/defaults.c Wed Mar 21 19:59:08 2001
@@ -547,6 +547,9 @@
{"DisableBlinking", "NO", NULL,
&wPreferences.dont_blink, getBool, NULL
},
+ {"SingleClickLaunch", "NO", NULL,
-+ &wPreferences.single_click, getBool, NULL
++ &wPreferences.single_click, getBool, NULL
+ },
/* style options */
{"MenuStyle", "normal", seMenuStyles,
&wPreferences.menu_style, getEnum, setMenuStyle
-diff -Naur WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1-p/src/dock.c
---- WindowMaker-0.63.1/src/dock.c Wed Nov 1 16:40:16 2000
-+++ WindowMaker-0.63.1-p/src/dock.c Mon Jan 8 12:15:41 2001
+diff -ur WindowMaker-0.64.0/src/dock.c WindowMaker-0.64.0.new/src/dock.c
+--- WindowMaker-0.64.0/src/dock.c Thu Jan 18 02:33:45 2001
++++ WindowMaker-0.64.0.new/src/dock.c Wed Mar 21 19:59:08 2001
@@ -3752,7 +3752,7 @@
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{
WScreen *scr = dock->screen_ptr;
-@@ -3767,11 +3767,12 @@
+@@ -3767,11 +3767,11 @@
int ix = aicon->xindex, iy = aicon->yindex;
int tmp;
Pixmap ghost = None;
int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
int omnipresent = aicon->omnipresent; /* this must be cached!!! */
-
+-
+ hasMoved = False;
if (wPreferences.flags.noupdates)
return;
-@@ -3822,6 +3823,7 @@
+@@ -3822,6 +3822,7 @@
break;
case MotionNotify:
if (!grabbed) {
if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
|| abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -3977,7 +3979,10 @@
+@@ -3977,7 +3978,10 @@
#ifdef DEBUG
puts("End icon move");
#endif
}
}
}
-@@ -4117,7 +4122,9 @@
+@@ -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);
++ 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) {
-diff -Naur WindowMaker-0.63.1/src/icon.c WindowMaker-0.63.1-p/src/icon.c
---- WindowMaker-0.63.1/src/icon.c Sat Jan 6 22:28:02 2001
-+++ WindowMaker-0.63.1-p/src/icon.c Mon Jan 8 12:15:41 2001
+diff -ur WindowMaker-0.64.0/src/icon.c WindowMaker-0.64.0.new/src/icon.c
+--- WindowMaker-0.64.0/src/icon.c Sat Jan 6 19:54:16 2001
++++ WindowMaker-0.64.0.new/src/icon.c Wed Mar 21 19:59:08 2001
@@ -874,6 +874,7 @@
int dx=event->xbutton.x, dy=event->xbutton.y;
int grabbed=0;