--- 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[4], GetBoolForKey("DontConfirmKill")); WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); + 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], _("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[7], _("Launch applications and restore windows with a single click")); WMSetButtonEnabled(panel->swi[6], True); @@ -101,6 +103,7 @@ SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); + 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; + /* single click to lauch applications */ + char single_click; + int edge_resistance; char attract; 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; 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); @@ -794,6 +796,7 @@ break; 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; } } 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 + }, /* style options */ {"MenuStyle", "normal", seMenuStyles, &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 @@ -static void +static int handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) { WScreen *scr = dock->screen_ptr; @@ -3767,11 +3767,11 @@ int ix = aicon->xindex, iy = aicon->yindex; int tmp; Pixmap ghost = None; - Bool docked; + Bool docked, hasMoved; 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 +3822,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) { @@ -3977,7 +3978,10 @@ #ifdef DEBUG puts("End icon move"); #endif - 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); } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && aicon==scr->clip_icon) { 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; int clickButton=event->xbutton.button; + Bool hasMoved; if (WCHECK_STATE(WSTATE_MODAL)) return; @@ -916,6 +917,7 @@ wwarning("pointer grab failed for icon move"); #endif } + hasMoved = False; while(1) { WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask |ButtonMotionMask|ExposureMask, &ev); @@ -925,6 +927,7 @@ break; 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; }