View | Details | Raw Unified
Collapse All | Expand All

(-) WindowMaker-0.80.0/WPrefs.app/Expert.c (-3 / +9 lines)
 Lines 33-39    Link Here 
    
    
    WMWidget *parent;
    WMWidget *parent;
    WMButton *swi[8];
    WMButton *swi[10];
} _Panel;
} _Panel;
 Lines 54-59    Link Here 
    WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
    WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
    WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
    WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
    WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
    WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
    WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize"));
    WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
}
}
 Lines 66-75    Link Here 
    panel->box = WMCreateBox(panel->parent);
    panel->box = WMCreateBox(panel->parent);
    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
    WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
    for (i=0; i<7; i++) {
    for (i=0; i<9; i++) {
	panel->swi[i] = WMCreateSwitchButton(panel->box);
	panel->swi[i] = WMCreateSwitchButton(panel->box);
	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
	WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
	WMMoveWidget(panel->swi[i], 20, 20+i*25);
	WMMoveWidget(panel->swi[i], 20, 20+i*23);
    }
    }
    
    
    WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));
    WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."));
 Lines 79-84    Link Here 
    WMSetButtonText(panel->swi[4], _("Use Windoze style cycling."));
    WMSetButtonText(panel->swi[4], _("Use Windoze style cycling."));
    WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
    WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
    WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
    WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
    WMSetButtonText(panel->swi[7], _("Double click on title bar maximize"));
    WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click"));
    WMRealizeWidget(panel->box);
    WMRealizeWidget(panel->box);
    WMMapSubwidgets(panel->box);
    WMMapSubwidgets(panel->box);
 Lines 101-106    Link Here 
    SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
    SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
    SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
    SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
    SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
    SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
    SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize");
    SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
}
}
(-) WindowMaker-0.80.0/src/WindowMaker.h (+6 lines)
 Lines 463-468    Link Here 
    /* shading animation */
    /* shading animation */
    signed char shade_speed;
    signed char shade_speed;
    /* double click on title bar maximize */
    char dc_maximize;
    /* single click to lauch applications */
    char single_click;
    int edge_resistance;
    int edge_resistance;
    char attract;
    char attract;
(-) WindowMaker-0.80.0/src/appicon.c (+4 lines)
 Lines 596-601    Link Here 
    int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
    int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
    int ix, iy;
    int ix, iy;
    int clickButton = event->xbutton.button;
    int clickButton = event->xbutton.button;
    Bool hasMoved = False;
    Pixmap ghost = None;
    Pixmap ghost = None;
    Window wins[2];
    Window wins[2];
    Bool movingSingle = False;
    Bool movingSingle = False;
 Lines 676-681    Link Here 
	    break;
	    break;
	 case MotionNotify:
	 case MotionNotify:
	    hasMoved = True;
	    if (!grabbed) {
	    if (!grabbed) {
		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
 Lines 812-817    Link Here 
	    if (wPreferences.auto_arrange_icons)
	    if (wPreferences.auto_arrange_icons)
		wArrangeIcons(scr, True);
		wArrangeIcons(scr, True);
	    if (!hasMoved && wPreferences.single_click)
		iconDblClick(desc, event);
	    done = 1;
	    done = 1;
	    break;
	    break;
(-) WindowMaker-0.80.0/src/def_pixmaps.h (-9 / +9 lines)
 Lines 86-100    Link Here 
". c #000000",
". c #000000",
"# c None",
"# c None",
"..........",
"..........",
"..........",
".........#",
"..........",
"........##",
".########.",
".......###",
".########.",
"......####",
".########.",
".....#####",
".########.",
"....######",
".########.",
"...#######",
".########.",
"..########",
".........."
".#########"
};
};
#ifdef XKB_BUTTON_HINT
#ifdef XKB_BUTTON_HINT
(-) WindowMaker-0.80.0/src/defaults.c (+6 lines)
 Lines 548-553    Link Here 
    {"DisableBlinking",	"NO",		NULL,
    {"DisableBlinking",	"NO",		NULL,
	   &wPreferences.dont_blink,	getBool,	NULL
	   &wPreferences.dont_blink,	getBool,	NULL
    },
    },
    {"DCMaximize", "NO",		NULL,
	   &wPreferences.dc_maximize,	getBool,	NULL
    },
    {"SingleClickLaunch", "NO",		NULL,
	   &wPreferences.single_click,	getBool,	NULL
    },
      /* style options */
      /* style options */
    {"MenuStyle", 	"normal",  		seMenuStyles,
    {"MenuStyle", 	"normal",  		seMenuStyles,
	&wPreferences.menu_style, getEnum, 	setMenuStyle
	&wPreferences.menu_style, getEnum, 	setMenuStyle
(-) WindowMaker-0.80.0/src/dock.c (-4 / +9 lines)
 Lines 3772-3778    Link Here 
static void
static Bool
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{
{
    WScreen *scr = dock->screen_ptr;
    WScreen *scr = dock->screen_ptr;
 Lines 3788-3793    Link Here 
    int tmp;
    int tmp;
    Pixmap ghost = None;
    Pixmap ghost = None;
    Bool docked;
    Bool docked;
    Bool hasMoved = False;
    int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
    int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
    int omnipresent = aicon->omnipresent; /* this must be cached!!! */
    int omnipresent = aicon->omnipresent; /* this must be cached!!! */
 Lines 3842-3847    Link Here 
	    break;
	    break;
	 case MotionNotify:
	 case MotionNotify:
	    hasMoved = True;
	    if (!grabbed) {
	    if (!grabbed) {
		if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
		if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
		    || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
		    || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
 Lines 3991-3997    Link Here 
#ifdef DEBUG
#ifdef DEBUG
	    puts("End icon move");
	    puts("End icon move");
#endif
#endif
	    return;
	return hasMoved;
	}
	}
    }
    }
}
}
 Lines 4130-4137    Link Here 
                handleClipChangeWorkspace(scr, event);
                handleClipChangeWorkspace(scr, event);
            else
            else
                handleDockMove(dock, aicon, event);
                handleDockMove(dock, aicon, event);
        } else
	} else {
	    handleIconMove(dock, aicon, event);
	    Bool hasMoved = handleIconMove(dock, aicon, event);
	    if (!hasMoved && wPreferences.single_click)
	        iconDblClick(desc, event);
	}
    } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
    } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
               aicon==scr->clip_icon) {
               aicon==scr->clip_icon) {
(-) WindowMaker-0.80.0/src/icon.c (+5 lines)
 Lines 877-882    Link Here 
    int dx=event->xbutton.x, dy=event->xbutton.y;
    int dx=event->xbutton.x, dy=event->xbutton.y;
    int grabbed=0;
    int grabbed=0;
    int clickButton=event->xbutton.button;
    int clickButton=event->xbutton.button;
    Bool hasMoved = False;
    if (WCHECK_STATE(WSTATE_MODAL))
    if (WCHECK_STATE(WSTATE_MODAL))
	return;
	return;
 Lines 928-933    Link Here 
	    break;
	    break;
	 case MotionNotify:
	 case MotionNotify:
	    hasMoved = True;
	    if (!grabbed) {
	    if (!grabbed) {
		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
		if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
		    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
 Lines 965-970    Link Here 
	    if (wPreferences.auto_arrange_icons)
	    if (wPreferences.auto_arrange_icons)
		wArrangeIcons(wwin->screen_ptr, True);
		wArrangeIcons(wwin->screen_ptr, True);
	    if (!hasMoved && wPreferences.single_click)
		miniwindowDblClick(desc, event);
	    return;
	    return;
	    
	    
	}
	}
(-) WindowMaker-0.80.0/src/window.c (-8 / +23 lines)
 Lines 2984-2997    Link Here 
    if (event->xbutton.button==Button1) {
    if (event->xbutton.button==Button1) {
	if (event->xbutton.state == 0) {
	if (event->xbutton.state == 0) {
	    if (!WFLAGP(wwin, no_shadeable)) {
	    /* check preferences, maximize or shade */
		/* shade window */
            if (wPreferences.dc_maximize) {
		if (wwin->flags.shaded)
		if (!WFLAGP(wwin, no_resizable)) {
		    wUnshadeWindow(wwin);
		    /* maximize window */
		else
		    if (wwin->flags.maximized != 0) {
		    wShadeWindow(wwin);
		    	wUnmaximizeWindow(wwin);
	    }
                        wwin->flags.maximized = 0;
	} else {
                    }
		    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;
	    int dir = 0;
	    if (event->xbutton.state & ControlMask)
	    if (event->xbutton.state & ControlMask)