diff -ur WindowMaker-0.65.1/WPrefs.app/Expert.c WindowMaker-0.65.1-patched/WPrefs.app/Expert.c --- WindowMaker-0.65.1/WPrefs.app/Expert.c Mon Jun 4 13:47:32 2001 +++ WindowMaker-0.65.1-patched/WPrefs.app/Expert.c Sat Aug 18 03:53:25 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); WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); - 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 selection animation for selected 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.65.1/src/WindowMaker.h WindowMaker-0.65.1-patched/src/WindowMaker.h --- WindowMaker-0.65.1/src/WindowMaker.h Wed Jun 6 15:07:42 2001 +++ WindowMaker-0.65.1-patched/src/WindowMaker.h Sat Aug 18 03:47:36 2001 @@ -463,6 +463,9 @@ /* shading animation */ signed char shade_speed; + /* single click to lauch applications */ + char single_click; + int edge_resistance; char attract; diff -ur WindowMaker-0.65.1/src/appicon.c WindowMaker-0.65.1-patched/src/appicon.c --- WindowMaker-0.65.1/src/appicon.c Mon Jul 23 14:32:46 2001 +++ WindowMaker-0.65.1-patched/src/appicon.c Sat Aug 18 03:47:36 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 = False; Pixmap ghost = None; Window wins[2]; Bool movingSingle = False; @@ -794,6 +795,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -939,6 +941,8 @@ if (wPreferences.auto_arrange_icons) wArrangeIcons(scr, True); + if (!hasMoved && wPreferences.single_click) + iconDblClick(desc, event); done = 1; break; diff -ur WindowMaker-0.65.1/src/defaults.c WindowMaker-0.65.1-patched/src/defaults.c --- WindowMaker-0.65.1/src/defaults.c Mon Jul 23 14:31:36 2001 +++ WindowMaker-0.65.1-patched/src/defaults.c Sat Aug 18 03:47:36 2001 @@ -557,6 +557,9 @@ {"DisableBlinking", "NO", NULL, &wPreferences.dont_blink, getBool, NULL }, + {"SingleClickLaunch", "NO", NULL, + &wPreferences.single_click, getBool, NULL + }, /* style options */ {"MenuStyle", "normal", seMenuStyles, &wPreferences.menu_style, getEnum, setMenuStyle diff -ur WindowMaker-0.65.1/src/dock.c WindowMaker-0.65.1-patched/src/dock.c --- WindowMaker-0.65.1/src/dock.c Mon Jul 23 14:37:25 2001 +++ WindowMaker-0.65.1-patched/src/dock.c Sat Aug 18 03:47:36 2001 @@ -3690,7 +3690,7 @@ -static void +static Bool handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) { WScreen *scr = dock->screen_ptr; @@ -3706,6 +3706,7 @@ int tmp; Pixmap ghost = None; Bool docked; + Bool hasMoved = False; int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ int omnipresent = aicon->omnipresent; /* this must be cached!!! */ @@ -3760,6 +3761,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -3909,7 +3911,7 @@ #ifdef DEBUG puts("End icon move"); #endif - return; + return hasMoved; } } } @@ -4048,8 +4050,11 @@ handleClipChangeWorkspace(scr, event); else handleDockMove(dock, aicon, event); - } else - handleIconMove(dock, aicon, event); + } else { + Bool hasMoved = handleIconMove(dock, aicon, event); + if (!hasMoved && wPreferences.single_click) + iconDblClick(desc, event); + } } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && aicon==scr->clip_icon) { diff -ur WindowMaker-0.65.1/src/icon.c WindowMaker-0.65.1-patched/src/icon.c --- WindowMaker-0.65.1/src/icon.c Mon Jul 23 14:20:27 2001 +++ WindowMaker-0.65.1-patched/src/icon.c Sat Aug 18 03:47:36 2001 @@ -877,6 +877,7 @@ int dx=event->xbutton.x, dy=event->xbutton.y; int grabbed=0; int clickButton=event->xbutton.button; + Bool hasMoved = False; if (WCHECK_STATE(WSTATE_MODAL)) return; @@ -928,6 +929,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -965,6 +967,9 @@ if (wPreferences.auto_arrange_icons) wArrangeIcons(wwin->screen_ptr, True); + if (!hasMoved && wPreferences.single_click) + miniwindowDblClick(desc, event); + return; }