mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-28 01:12:30 +01:00
new version of the 'single click' patch
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
diff -ur WindowMaker-0.65.0/WPrefs.app/Expert.c WindowMaker-0.65.0.patched/WPrefs.app/Expert.c
|
diff -ur WindowMaker-0.65.1/WPrefs.app/Expert.c WindowMaker-0.65.1-patched/WPrefs.app/Expert.c
|
||||||
--- WindowMaker-0.65.0/WPrefs.app/Expert.c Tue May 8 20:34:52 2001
|
--- WindowMaker-0.65.1/WPrefs.app/Expert.c Mon Jun 4 13:47:32 2001
|
||||||
+++ WindowMaker-0.65.0.patched/WPrefs.app/Expert.c Mon May 21 04:12:33 2001
|
+++ WindowMaker-0.65.1-patched/WPrefs.app/Expert.c Sat Aug 18 03:53:25 2001
|
||||||
@@ -33,7 +33,7 @@
|
@@ -33,7 +33,7 @@
|
||||||
|
|
||||||
WMWidget *parent;
|
WMWidget *parent;
|
||||||
@@ -30,7 +30,7 @@ diff -ur WindowMaker-0.65.0/WPrefs.app/Expert.c WindowMaker-0.65.0.patched/WPref
|
|||||||
@@ -79,6 +80,7 @@
|
@@ -79,6 +80,7 @@
|
||||||
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 cycling of highlighting color for selected icons."));
|
WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons."));
|
||||||
+ WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click"));
|
+ WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click"));
|
||||||
|
|
||||||
WMRealizeWidget(panel->box);
|
WMRealizeWidget(panel->box);
|
||||||
@@ -43,10 +43,10 @@ diff -ur WindowMaker-0.65.0/WPrefs.app/Expert.c WindowMaker-0.65.0.patched/WPref
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
diff -ur WindowMaker-0.65.0/src/WindowMaker.h WindowMaker-0.65.0.patched/src/WindowMaker.h
|
diff -ur WindowMaker-0.65.1/src/WindowMaker.h WindowMaker-0.65.1-patched/src/WindowMaker.h
|
||||||
--- WindowMaker-0.65.0/src/WindowMaker.h Fri Apr 27 19:41:21 2001
|
--- WindowMaker-0.65.1/src/WindowMaker.h Wed Jun 6 15:07:42 2001
|
||||||
+++ WindowMaker-0.65.0.patched/src/WindowMaker.h Mon May 21 04:19:10 2001
|
+++ WindowMaker-0.65.1-patched/src/WindowMaker.h Sat Aug 18 03:47:36 2001
|
||||||
@@ -460,6 +460,9 @@
|
@@ -463,6 +463,9 @@
|
||||||
/* shading animation */
|
/* shading animation */
|
||||||
signed char shade_speed;
|
signed char shade_speed;
|
||||||
|
|
||||||
@@ -56,9 +56,9 @@ diff -ur WindowMaker-0.65.0/src/WindowMaker.h WindowMaker-0.65.0.patched/src/Win
|
|||||||
int edge_resistance;
|
int edge_resistance;
|
||||||
char attract;
|
char attract;
|
||||||
|
|
||||||
diff -ur WindowMaker-0.65.0/src/appicon.c WindowMaker-0.65.0.patched/src/appicon.c
|
diff -ur WindowMaker-0.65.1/src/appicon.c WindowMaker-0.65.1-patched/src/appicon.c
|
||||||
--- WindowMaker-0.65.0/src/appicon.c Sat Feb 17 17:46:29 2001
|
--- WindowMaker-0.65.1/src/appicon.c Mon Jul 23 14:32:46 2001
|
||||||
+++ WindowMaker-0.65.0.patched/src/appicon.c Mon May 21 04:33:07 2001
|
+++ WindowMaker-0.65.1-patched/src/appicon.c Sat Aug 18 03:47:36 2001
|
||||||
@@ -704,6 +704,7 @@
|
@@ -704,6 +704,7 @@
|
||||||
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;
|
||||||
@@ -75,7 +75,7 @@ diff -ur WindowMaker-0.65.0/src/appicon.c WindowMaker-0.65.0.patched/src/appicon
|
|||||||
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) {
|
||||||
@@ -941,6 +943,8 @@
|
@@ -939,6 +941,8 @@
|
||||||
|
|
||||||
if (wPreferences.auto_arrange_icons)
|
if (wPreferences.auto_arrange_icons)
|
||||||
wArrangeIcons(scr, True);
|
wArrangeIcons(scr, True);
|
||||||
@@ -84,9 +84,9 @@ diff -ur WindowMaker-0.65.0/src/appicon.c WindowMaker-0.65.0.patched/src/appicon
|
|||||||
|
|
||||||
done = 1;
|
done = 1;
|
||||||
break;
|
break;
|
||||||
diff -ur WindowMaker-0.65.0/src/defaults.c WindowMaker-0.65.0.patched/src/defaults.c
|
diff -ur WindowMaker-0.65.1/src/defaults.c WindowMaker-0.65.1-patched/src/defaults.c
|
||||||
--- WindowMaker-0.65.0/src/defaults.c Thu May 10 18:16:49 2001
|
--- WindowMaker-0.65.1/src/defaults.c Mon Jul 23 14:31:36 2001
|
||||||
+++ WindowMaker-0.65.0.patched/src/defaults.c Mon May 21 04:21:05 2001
|
+++ WindowMaker-0.65.1-patched/src/defaults.c Sat Aug 18 03:47:36 2001
|
||||||
@@ -557,6 +557,9 @@
|
@@ -557,6 +557,9 @@
|
||||||
{"DisableBlinking", "NO", NULL,
|
{"DisableBlinking", "NO", NULL,
|
||||||
&wPreferences.dont_blink, getBool, NULL
|
&wPreferences.dont_blink, getBool, NULL
|
||||||
@@ -97,10 +97,10 @@ diff -ur WindowMaker-0.65.0/src/defaults.c WindowMaker-0.65.0.patched/src/defaul
|
|||||||
/* style options */
|
/* style options */
|
||||||
{"MenuStyle", "normal", seMenuStyles,
|
{"MenuStyle", "normal", seMenuStyles,
|
||||||
&wPreferences.menu_style, getEnum, setMenuStyle
|
&wPreferences.menu_style, getEnum, setMenuStyle
|
||||||
diff -ur WindowMaker-0.65.0/src/dock.c WindowMaker-0.65.0.patched/src/dock.c
|
diff -ur WindowMaker-0.65.1/src/dock.c WindowMaker-0.65.1-patched/src/dock.c
|
||||||
--- WindowMaker-0.65.0/src/dock.c Tue Apr 17 20:26:03 2001
|
--- WindowMaker-0.65.1/src/dock.c Mon Jul 23 14:37:25 2001
|
||||||
+++ WindowMaker-0.65.0.patched/src/dock.c Mon May 21 04:27:19 2001
|
+++ WindowMaker-0.65.1-patched/src/dock.c Sat Aug 18 03:47:36 2001
|
||||||
@@ -3689,7 +3689,7 @@
|
@@ -3690,7 +3690,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -109,7 +109,7 @@ diff -ur WindowMaker-0.65.0/src/dock.c WindowMaker-0.65.0.patched/src/dock.c
|
|||||||
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
|
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
|
||||||
{
|
{
|
||||||
WScreen *scr = dock->screen_ptr;
|
WScreen *scr = dock->screen_ptr;
|
||||||
@@ -3705,6 +3705,7 @@
|
@@ -3706,6 +3706,7 @@
|
||||||
int tmp;
|
int tmp;
|
||||||
Pixmap ghost = None;
|
Pixmap ghost = None;
|
||||||
Bool docked;
|
Bool docked;
|
||||||
@@ -117,7 +117,7 @@ diff -ur WindowMaker-0.65.0/src/dock.c WindowMaker-0.65.0.patched/src/dock.c
|
|||||||
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!!! */
|
||||||
|
|
||||||
@@ -3759,6 +3760,7 @@
|
@@ -3760,6 +3761,7 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MotionNotify:
|
case MotionNotify:
|
||||||
@@ -125,7 +125,7 @@ diff -ur WindowMaker-0.65.0/src/dock.c WindowMaker-0.65.0.patched/src/dock.c
|
|||||||
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) {
|
||||||
@@ -3914,7 +3916,7 @@
|
@@ -3909,7 +3911,7 @@
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
puts("End icon move");
|
puts("End icon move");
|
||||||
#endif
|
#endif
|
||||||
@@ -134,7 +134,7 @@ diff -ur WindowMaker-0.65.0/src/dock.c WindowMaker-0.65.0.patched/src/dock.c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4053,8 +4055,11 @@
|
@@ -4048,8 +4050,11 @@
|
||||||
handleClipChangeWorkspace(scr, event);
|
handleClipChangeWorkspace(scr, event);
|
||||||
else
|
else
|
||||||
handleDockMove(dock, aicon, event);
|
handleDockMove(dock, aicon, event);
|
||||||
@@ -148,10 +148,10 @@ diff -ur WindowMaker-0.65.0/src/dock.c WindowMaker-0.65.0.patched/src/dock.c
|
|||||||
|
|
||||||
} 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) {
|
||||||
diff -ur WindowMaker-0.65.0/src/icon.c WindowMaker-0.65.0.patched/src/icon.c
|
diff -ur WindowMaker-0.65.1/src/icon.c WindowMaker-0.65.1-patched/src/icon.c
|
||||||
--- WindowMaker-0.65.0/src/icon.c Sat Apr 21 03:12:32 2001
|
--- WindowMaker-0.65.1/src/icon.c Mon Jul 23 14:20:27 2001
|
||||||
+++ WindowMaker-0.65.0.patched/src/icon.c Mon May 21 04:29:14 2001
|
+++ WindowMaker-0.65.1-patched/src/icon.c Sat Aug 18 03:47:36 2001
|
||||||
@@ -874,6 +874,7 @@
|
@@ -877,6 +877,7 @@
|
||||||
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;
|
||||||
@@ -159,7 +159,7 @@ diff -ur WindowMaker-0.65.0/src/icon.c WindowMaker-0.65.0.patched/src/icon.c
|
|||||||
|
|
||||||
if (WCHECK_STATE(WSTATE_MODAL))
|
if (WCHECK_STATE(WSTATE_MODAL))
|
||||||
return;
|
return;
|
||||||
@@ -925,6 +926,7 @@
|
@@ -928,6 +929,7 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MotionNotify:
|
case MotionNotify:
|
||||||
@@ -167,7 +167,7 @@ diff -ur WindowMaker-0.65.0/src/icon.c WindowMaker-0.65.0.patched/src/icon.c
|
|||||||
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) {
|
||||||
@@ -962,6 +964,9 @@
|
@@ -965,6 +967,9 @@
|
||||||
|
|
||||||
if (wPreferences.auto_arrange_icons)
|
if (wPreferences.auto_arrange_icons)
|
||||||
wArrangeIcons(wwin->screen_ptr, True);
|
wArrangeIcons(wwin->screen_ptr, True);
|
||||||
|
|||||||
Reference in New Issue
Block a user