-diff -Nru WindowMaker-0.62.1/WPrefs.app/Expert.c WindowMaker-0.62.1.new/WPrefs.app/Expert.c
---- WindowMaker-0.62.1/WPrefs.app/Expert.c Mon Aug 7 23:18:24 2000
-+++ WindowMaker-0.62.1.new/WPrefs.app/Expert.c Mon Aug 7 23:19:12 2000
-@@ -53,6 +53,7 @@
- WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders"));
- WMSetButtonSelected(panel->swi[4], GetBoolForKey("DisableBlinking"));
- WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
-+ WMSetButtonSelected(panel->swi[6], GetBoolForKey("SingleClickLaunch"));
+--- 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];
++ WMButton *swi[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"));
}
@@ -66,7 +67,7 @@
- WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
- WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
+ panel->box = WMCreateBox(panel->parent);
+ WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
-- for (i=0; i<6; i++) {
-+ for (i=0; i<7; i++) {
- panel->swi[i] = WMCreateSwitchButton(panel->frame);
+- 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);
-@@ -78,6 +79,7 @@
- WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects"));
- WMSetButtonText(panel->swi[4], _("Disable cycling color highlighting of icons."));
+@@ -79,6 +80,7 @@
WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
-+ WMSetButtonText(panel->swi[6], _("Launch applications and restore windows with a single click"));
-
- WMRealizeWidget(panel->frame);
- WMMapSubwidgets(panel->frame);
-@@ -99,6 +101,7 @@
- SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders");
- SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DisableBlinking");
- SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
-+ SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "SingleClickLaunch");
+ WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
+ WMSetButtonText(panel->swi[7], _("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);
+@@ -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[8]), "SingleClickLaunch");
}
-diff -Nru WindowMaker-0.62.1/src/WindowMaker.h WindowMaker-0.62.1.new/src/WindowMaker.h
---- WindowMaker-0.62.1/src/WindowMaker.h Mon Aug 7 23:18:24 2000
-+++ WindowMaker-0.62.1.new/src/WindowMaker.h Mon Aug 7 23:19:12 2000
-@@ -416,6 +416,9 @@
+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 -Nru WindowMaker-0.62.1/src/appicon.c WindowMaker-0.62.1.new/src/appicon.c
---- WindowMaker-0.62.1/src/appicon.c Mon Aug 7 23:18:24 2000
-+++ WindowMaker-0.62.1.new/src/appicon.c Mon Aug 7 23:19:12 2000
-@@ -717,6 +717,7 @@
+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
+@@ -704,6 +704,7 @@
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];
-
-@@ -786,6 +787,7 @@
+ Bool movingSingle = False;
+@@ -785,6 +786,7 @@
XClearWindow(dpy, scr->dock_shadow);
}
-
-+ hasMoved = False;
+
++ hasMoved = False;
while (!done) {
WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
|ButtonMotionMask|ExposureMask, &ev);
-@@ -795,6 +797,7 @@
+@@ -794,6 +796,7 @@
break;
case MotionNotify:
if (!grabbed) {
if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
|| abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -925,6 +928,9 @@
+@@ -943,6 +946,9 @@
wArrangeIcons(scr, True);
done = 1;
break;
}
}
-diff -Nru WindowMaker-0.62.1/src/defaults.c WindowMaker-0.62.1.new/src/defaults.c
---- WindowMaker-0.62.1/src/defaults.c Mon Aug 7 23:18:24 2000
-+++ WindowMaker-0.62.1.new/src/defaults.c Mon Aug 7 23:20:35 2000
-@@ -530,6 +530,9 @@
+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
+ &wPreferences.dont_blink, getBool, NULL
},
+ {"SingleClickLaunch", "NO", NULL,
-+ &wPreferences.single_click, getBool, NULL
++ &wPreferences.single_click, getBool, NULL
+ },
- /* style options */
+ /* style options */
{"MenuStyle", "normal", seMenuStyles,
- &wPreferences.menu_style, getEnum, setMenuStyle
-diff -Nru WindowMaker-0.62.1/src/dock.c WindowMaker-0.62.1.new/src/dock.c
---- WindowMaker-0.62.1/src/dock.c Mon Aug 7 23:18:24 2000
-+++ WindowMaker-0.62.1.new/src/dock.c Mon Aug 7 23:19:12 2000
-@@ -3750,7 +3750,7 @@
+ &wPreferences.menu_style, getEnum, setMenuStyle
+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;
-@@ -3765,11 +3765,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;
-@@ -3820,6 +3821,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) {
-@@ -3975,7 +3977,10 @@
+@@ -3977,7 +3978,10 @@
#ifdef DEBUG
puts("End icon move");
#endif
}
}
}
-@@ -4115,7 +4120,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 -Nru WindowMaker-0.62.1/src/icon.c WindowMaker-0.62.1.new/src/icon.c
---- WindowMaker-0.62.1/src/icon.c Mon Aug 7 23:18:24 2000
-+++ WindowMaker-0.62.1.new/src/icon.c Mon Aug 7 23:19:12 2000
+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;