Attachment #30573 for bug #49804

Lines 33-39 Link Here

(-)WindowMaker-0.80.0/WPrefs.app/Expert.c (-3 / +9 lines)
33		33
34	WMWidget *parent;	34	WMWidget *parent;
35		35
36	WMButton *swi[8];	36	WMButton *swi[10];
37		37
38	} _Panel;	38	} _Panel;
39		39
Lines 54-59 Link Here
54	WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));	54	WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
55	WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));	55	WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
56	WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));	56	WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
		57	WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize"));
		58	WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
57	}	59	}
58		60
59		61
Lines 66-75 Link Here
66	panel->box = WMCreateBox(panel->parent);	68	panel->box = WMCreateBox(panel->parent);
67	WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);	69	WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
68		70
69	for (i=0; i<7; i++) {	71	for (i=0; i<9; i++) {
70	panel->swi[i] = WMCreateSwitchButton(panel->box);	72	panel->swi[i] = WMCreateSwitchButton(panel->box);
71	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);	73	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
72	WMMoveWidget(panel->swi[i], 20, 20+i*25);	74	WMMoveWidget(panel->swi[i], 20, 20+i*23);
73	}	75	}
74		76
75	WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));	77	WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));
Lines 79-84 Link Here
79	WMSetButtonText(panel->swi[4], _("Use Windoze style cycling."));	81	WMSetButtonText(panel->swi[4], _("Use Windoze style cycling."));
80	WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));	82	WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
81	WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));	83	WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
		84	WMSetButtonText(panel->swi[7], _("Double click on title bar maximize"));
		85	WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click"));
82		86
83	WMRealizeWidget(panel->box);	87	WMRealizeWidget(panel->box);
84	WMMapSubwidgets(panel->box);	88	WMMapSubwidgets(panel->box);
Lines 101-106 Link Here
101	SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");	105	SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
102	SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");	106	SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
103	SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");	107	SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
		108	SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize");
		109	SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
104	}	110	}
105		111
106		112

Lines 463-468 Link Here

(-)WindowMaker-0.80.0/src/WindowMaker.h (+6 lines)
463	/* shading animation */	463	/* shading animation */
464	signed char shade_speed;	464	signed char shade_speed;
465		465
		466	/* double click on title bar maximize */
		467	char dc_maximize;
		468
		469	/* single click to lauch applications */
		470	char single_click;
		471
466	int edge_resistance;	472	int edge_resistance;
467	char attract;	473	char attract;
468		474

Lines 596-601 Link Here

(-)WindowMaker-0.80.0/src/appicon.c (+4 lines)
596	int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;	596	int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
597	int ix, iy;	597	int ix, iy;
598	int clickButton = event->xbutton.button;	598	int clickButton = event->xbutton.button;
		599	Bool hasMoved = False;
599	Pixmap ghost = None;	600	Pixmap ghost = None;
600	Window wins[2];	601	Window wins[2];
601	Bool movingSingle = False;	602	Bool movingSingle = False;
Lines 676-681 Link Here
676	break;	677	break;
677		678
678	case MotionNotify:	679	case MotionNotify:
		680	hasMoved = True;
679	if (!grabbed) {	681	if (!grabbed) {
680	if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD	682	if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
681	\|\| abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {	683	\|\| abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
Lines 812-817 Link Here
812		814
813	if (wPreferences.auto_arrange_icons)	815	if (wPreferences.auto_arrange_icons)
814	wArrangeIcons(scr, True);	816	wArrangeIcons(scr, True);
		817	if (!hasMoved && wPreferences.single_click)
		818	iconDblClick(desc, event);
815		819
816	done = 1;	820	done = 1;
817	break;	821	break;

Lines 86-100 Link Here

(-)WindowMaker-0.80.0/src/def_pixmaps.h (-9 / +9 lines)
86	". c #000000",	86	". c #000000",
87	"# c None",	87	"# c None",
88	"..........",	88	"..........",
89	"..........",	89	".........#",
90	"..........",	90	"........##",
91	".########.",	91	".......###",
92	".########.",	92	"......####",
93	".########.",	93	".....#####",
94	".########.",	94	"....######",
95	".########.",	95	"...#######",
96	".########.",	96	"..########",
97	".........."	97	".#########"
98	};	98	};
99		99
100	#ifdef XKB_BUTTON_HINT	100	#ifdef XKB_BUTTON_HINT

Lines 548-553 Link Here

(-)WindowMaker-0.80.0/src/defaults.c (+6 lines)
548	{"DisableBlinking", "NO", NULL,	548	{"DisableBlinking", "NO", NULL,
549	&wPreferences.dont_blink, getBool, NULL	549	&wPreferences.dont_blink, getBool, NULL
550	},	550	},
		551	{"DCMaximize", "NO", NULL,
		552	&wPreferences.dc_maximize, getBool, NULL
		553	},
		554	{"SingleClickLaunch", "NO", NULL,
		555	&wPreferences.single_click, getBool, NULL
		556	},
551	/* style options */	557	/* style options */
552	{"MenuStyle", "normal", seMenuStyles,	558	{"MenuStyle", "normal", seMenuStyles,
553	&wPreferences.menu_style, getEnum, setMenuStyle	559	&wPreferences.menu_style, getEnum, setMenuStyle







static Bool
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{
    WScreen *scr = dock->screen_ptr;

    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!!! */


	    break;

	 case MotionNotify:
	    hasMoved = True;
	    if (!grabbed) {
		if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
		    || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {

#ifdef DEBUG
	    puts("End icon move");
#endif
	return hasMoved;
	}
    }
}

                handleClipChangeWorkspace(scr, event);
            else
                handleDockMove(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) {

Lines 877-882 Link Here

(-)WindowMaker-0.80.0/src/icon.c (+5 lines)
877	int dx=event->xbutton.x, dy=event->xbutton.y;	877	int dx=event->xbutton.x, dy=event->xbutton.y;
878	int grabbed=0;	878	int grabbed=0;
879	int clickButton=event->xbutton.button;	879	int clickButton=event->xbutton.button;
		880	Bool hasMoved = False;
880		881
881	if (WCHECK_STATE(WSTATE_MODAL))	882	if (WCHECK_STATE(WSTATE_MODAL))
882	return;	883	return;
Lines 928-933 Link Here
928	break;	929	break;
929		930
930	case MotionNotify:	931	case MotionNotify:
		932	hasMoved = True;
931	if (!grabbed) {	933	if (!grabbed) {
932	if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD	934	if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
933	\|\| abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {	935	\|\| abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
Lines 965-970 Link Here
965		967
966	if (wPreferences.auto_arrange_icons)	968	if (wPreferences.auto_arrange_icons)
967	wArrangeIcons(wwin->screen_ptr, True);	969	wArrangeIcons(wwin->screen_ptr, True);
		970	if (!hasMoved && wPreferences.single_click)
		971	miniwindowDblClick(desc, event);
		972
968	return;	973	return;
969		974
970	}	975	}





    if (event->xbutton.button==Button1) {
	if (event->xbutton.state == 0) {
	    /* check preferences, maximize or shade */
            if (wPreferences.dc_maximize) {
		if (!WFLAGP(wwin, no_resizable)) {
		    /* maximize window */
		    if (wwin->flags.maximized != 0) {
		    	wUnmaximizeWindow(wwin);
                        wwin->flags.maximized = 0;
                    }
		    else {
		    	wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL);
                        wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
                    }
	    	}
	    } else {
	        if (!WFLAGP(wwin, no_shadeable)) {
		    /* shade window */
		    if (wwin->flags.shaded)
		        wUnshadeWindow(wwin);
		    else
		        wShadeWindow(wwin);
	        }
            }
        } else {
	    int dir = 0;

	    if (event->xbutton.state & ControlMask)

Return to bug 49804

Lines 3772-3778 Link Here

(-)WindowMaker-0.80.0/src/dock.c (-4 / +9 lines)
3772		3772
3773		3773
3774		3774
3775	static void	3775	static Bool
3776	handleIconMove(WDock dock, WAppIcon aicon, XEvent *event)	3776	handleIconMove(WDock dock, WAppIcon aicon, XEvent *event)
3777	{	3777	{
3778	WScreen *scr = dock->screen_ptr;	3778	WScreen *scr = dock->screen_ptr;
Lines 3788-3793 Link Here
3788	int tmp;	3788	int tmp;
3789	Pixmap ghost = None;	3789	Pixmap ghost = None;
3790	Bool docked;	3790	Bool docked;
		3791	Bool hasMoved = False;
3791	int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */	3792	int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
3792	int omnipresent = aicon->omnipresent; /* this must be cached!!! */	3793	int omnipresent = aicon->omnipresent; /* this must be cached!!! */
3793		3794
Lines 3842-3847 Link Here
3842	break;	3843	break;
3843		3844
3844	case MotionNotify:	3845	case MotionNotify:
		3846	hasMoved = True;
3845	if (!grabbed) {	3847	if (!grabbed) {
3846	if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD	3848	if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
3847	\|\| abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {	3849	\|\| abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
Lines 3991-3997 Link Here
3991	#ifdef DEBUG	3993	#ifdef DEBUG
3992	puts("End icon move");	3994	puts("End icon move");
3993	#endif	3995	#endif
3994	return;	3996	return hasMoved;
3995	}	3997	}
3996	}	3998	}
3997	}	3999	}
Lines 4130-4137 Link Here
4130	handleClipChangeWorkspace(scr, event);	4132	handleClipChangeWorkspace(scr, event);
4131	else	4133	else
4132	handleDockMove(dock, aicon, event);	4134	handleDockMove(dock, aicon, event);
4133	} else	4135	} else {
4134	handleIconMove(dock, aicon, event);	4136	Bool hasMoved = handleIconMove(dock, aicon, event);
		4137	if (!hasMoved && wPreferences.single_click)
		4138	iconDblClick(desc, event);
		4139	}
4135		4140
4136	} else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&	4141	} else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
4137	aicon==scr->clip_icon) {	4142	aicon==scr->clip_icon) {

Lines 2984-2997 Link Here

(-)WindowMaker-0.80.0/src/window.c (-8 / +23 lines)
2984		2984
2985	if (event->xbutton.button==Button1) {	2985	if (event->xbutton.button==Button1) {
2986	if (event->xbutton.state == 0) {	2986	if (event->xbutton.state == 0) {
2987	if (!WFLAGP(wwin, no_shadeable)) {	2987	/* check preferences, maximize or shade */
2988	/* shade window */	2988	if (wPreferences.dc_maximize) {
2989	if (wwin->flags.shaded)	2989	if (!WFLAGP(wwin, no_resizable)) {
2990	wUnshadeWindow(wwin);	2990	/* maximize window */
2991	else	2991	if (wwin->flags.maximized != 0) {
2992	wShadeWindow(wwin);	2992	wUnmaximizeWindow(wwin);
2993	}	2993	wwin->flags.maximized = 0;
2994	} else {	2994	}
		2995	else {
		2996	wMaximizeWindow(wwin, MAX_VERTICAL\|MAX_HORIZONTAL);
		2997	wwin->flags.maximized = MAX_VERTICAL\|MAX_HORIZONTAL;
		2998	}
		2999	}
		3000	} else {
		3001	if (!WFLAGP(wwin, no_shadeable)) {
		3002	/* shade window */
		3003	if (wwin->flags.shaded)
		3004	wUnshadeWindow(wwin);
		3005	else
		3006	wShadeWindow(wwin);
		3007	}
		3008	}
		3009	} else {
2995	int dir = 0;	3010	int dir = 0;
2996		3011
2997	if (event->xbutton.state & ControlMask)	3012	if (event->xbutton.state & ControlMask)