gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 21:08:08 +01:00
Code Issues Projects Releases Wiki Activity

New patch against 0.62.1

Browse Source
This commit is contained in:
dan
2000-09-27 22:20:21 +00:00
parent 3de3009cee
commit df357ae1de
1 changed files with 202 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

307
contrib/single_click.diff
View File

@@ -1,177 +1,81 @@
diff -rc WindowMaker-0.52.0.ori/WPrefs.app/Appearance.c WindowMaker-0.52.0/WPrefs.app/Appearance.c diff -urN WindowMaker-0.62.1/WPrefs.app/Expert.c WindowMaker-0.62.1.patched/WPrefs.app/Expert.c
*** WindowMaker-0.52.0.ori/WPrefs.app/Appearance.c Mon Mar 22 12:16:49 1999 --- WindowMaker-0.62.1/WPrefs.app/Expert.c Fri Sep 17 17:03:54 1999
--- WindowMaker-0.52.0/WPrefs.app/Appearance.c Wed Apr 21 08:24:11 1999 +++ WindowMaker-0.62.1.patched/WPrefs.app/Expert.c Wed Aug 16 20:43:48 2000
*************** @@ -33,7 +33,7 @@
*** 1286,1315 ****
setupTextureFor(panel->texLs, "FTitleBack", "(solid, black)",
"[Focused]", i);
! panel->textureIndex[i] = i++;
setupTextureFor(panel->texLs, "UTitleBack", "(solid, gray)",
"[Unfocused]", i);
! panel->textureIndex[i] = i++;
setupTextureFor(panel->texLs, "PTitleBack", "(solid, \"#616161\")",
"[Owner of Focused]", i);
! panel->textureIndex[i] = i++;
setupTextureFor(panel->texLs, "MenuTitleBack", "(solid, black)",
"[Menu Title]", i);
! panel->textureIndex[i] = i++;
setupTextureFor(panel->texLs, "MenuTextBack", "(solid, gray)",
"[Menu Item]", i);
! panel->textureIndex[i] = i++;
setupTextureFor(panel->texLs, "IconBack", "(solid, gray)", "[Icon]", i);
! panel->textureIndex[i] = i++;
/*
setupTextureFor(panel->texLs, "WorkspaceBack", "(solid, black)",
"[Workspace]", i);
! panel->textureIndex[i] = i++;
*/
updatePreviewBox(panel, EVERYTHING);
--- 1286,1315 ----
setupTextureFor(panel->texLs, "FTitleBack", "(solid, black)",
"[Focused]", i);
! panel->textureIndex[i++] = i;
setupTextureFor(panel->texLs, "UTitleBack", "(solid, gray)",
"[Unfocused]", i);
! panel->textureIndex[i++] = i;
setupTextureFor(panel->texLs, "PTitleBack", "(solid, \"#616161\")",
"[Owner of Focused]", i);
! panel->textureIndex[i++] = i;
setupTextureFor(panel->texLs, "MenuTitleBack", "(solid, black)",
"[Menu Title]", i);
! panel->textureIndex[i++] = i;
setupTextureFor(panel->texLs, "MenuTextBack", "(solid, gray)",
"[Menu Item]", i);
! panel->textureIndex[i++] = i;
setupTextureFor(panel->texLs, "IconBack", "(solid, gray)", "[Icon]", i);
! panel->textureIndex[i++] = i;
/*
setupTextureFor(panel->texLs, "WorkspaceBack", "(solid, black)",
"[Workspace]", i);
! panel->textureIndex[i++] = i;
*/
updatePreviewBox(panel, EVERYTHING);
diff -rc WindowMaker-0.52.0.ori/WPrefs.app/Expert.c WindowMaker-0.52.0/WPrefs.app/Expert.c
*** WindowMaker-0.52.0.ori/WPrefs.app/Expert.c Thu Mar 18 17:39:22 1999
--- WindowMaker-0.52.0/WPrefs.app/Expert.c Thu Apr 15 09:02:54 1999
***************
*** 31,37 ****
WMWindow *win; WMWindow *win;
! WMButton *swi[5]; - WMButton *swi[8];
+ WMButton *swi[9];
} _Panel; } _Panel;
--- 31,37 ---- @@ -53,6 +53,7 @@
WMWindow *win;
! WMButton *swi[6];
} _Panel;
***************
*** 50,55 ****
--- 50,56 ----
WMSetButtonSelected(panel->swi[2], GetBoolForKey("SaveSessionOnExit"));
WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders")); WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders"));
WMSetButtonSelected(panel->swi[4], GetBoolForKey("DisableBlinking")); WMSetButtonSelected(panel->swi[4], GetBoolForKey("DisableBlinking"));
+ WMSetButtonSelected(panel->swi[5], GetBoolForKey("SingleClickLaunch")); WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
+ WMSetButtonSelected(panel->swi[6], GetBoolForKey("SingleClickLaunch"));
} }
*************** @@ -66,7 +67,7 @@
*** 63,69 ****
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT); WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP); WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
! for (i=0; i<5; i++) { - for (i=0; i<6; i++) {
+ for (i=0; i<7; i++) {
panel->swi[i] = WMCreateSwitchButton(panel->frame); panel->swi[i] = WMCreateSwitchButton(panel->frame);
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*25);
--- 64,70 ---- @@ -78,6 +79,7 @@
WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
! for (i=0; i<6; i++) {
panel->swi[i] = WMCreateSwitchButton(panel->frame);
WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
WMMoveWidget(panel->swi[i], 20, 20+i*25);
***************
*** 74,79 ****
--- 75,81 ----
WMSetButtonText(panel->swi[2], _("Automatically save session when exiting WindowMaker"));
WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects")); WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects"));
WMSetButtonText(panel->swi[4], _("Disable cycling color highlighting of icons.")); WMSetButtonText(panel->swi[4], _("Disable cycling color highlighting of icons."));
+ WMSetButtonText(panel->swi[5], _("Launch applications and restore windows with a single click")); WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command."));
+ WMSetButtonText(panel->swi[6], _("Launch applications and restore windows with a single click"));
WMRealizeWidget(panel->frame); WMRealizeWidget(panel->frame);
WMMapSubwidgets(panel->frame); WMMapSubwidgets(panel->frame);
*************** @@ -99,6 +101,7 @@
*** 94,99 ****
--- 96,102 ----
SetBoolForKey(WMGetButtonSelected(panel->swi[2]), "SaveSessionOnExit");
SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders"); SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders");
SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DisableBlinking"); SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DisableBlinking");
+ SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "SingleClickLaunch"); SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
+ SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "SingleClickLaunch");
} }
diff -rc WindowMaker-0.52.0.ori/src/WindowMaker.h WindowMaker-0.52.0/src/WindowMaker.h diff -urN WindowMaker-0.62.1/src/WindowMaker.h WindowMaker-0.62.1.patched/src/WindowMaker.h
*** WindowMaker-0.52.0.ori/src/WindowMaker.h Mon Mar 22 12:16:50 1999 --- WindowMaker-0.62.1/src/WindowMaker.h Tue Mar 28 22:23:38 2000
--- WindowMaker-0.52.0/src/WindowMaker.h Wed Apr 14 10:35:40 1999 +++ WindowMaker-0.62.1.patched/src/WindowMaker.h Wed Aug 16 20:37:00 2000
*************** @@ -416,6 +416,9 @@
*** 348,353 ****
--- 348,356 ----
/* shading animation */ /* shading animation */
char shade_speed; signed char shade_speed;
+ /* single click to lauch applications */ + /* single click to lauch applications */
+ char single_click; + char single_click;
+ +
int edge_resistance; int edge_resistance;
char attract;
struct { diff -urN WindowMaker-0.62.1/src/appicon.c WindowMaker-0.62.1.patched/src/appicon.c
diff -rc WindowMaker-0.52.0.ori/src/appicon.c WindowMaker-0.52.0/src/appicon.c --- WindowMaker-0.62.1/src/appicon.c Wed Mar 29 21:52:10 2000
*** WindowMaker-0.52.0.ori/src/appicon.c Thu Apr 1 12:33:57 1999 +++ WindowMaker-0.62.1.patched/src/appicon.c Wed Aug 16 20:37:00 2000
--- WindowMaker-0.52.0/src/appicon.c Wed Apr 14 10:38:03 1999 @@ -717,6 +717,7 @@
***************
*** 710,715 ****
--- 710,716 ----
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; + Bool hasMoved;
Pixmap ghost = None; Pixmap ghost = None;
Window wins[2];
if (aicon->editing || WCHECK_STATE(WSTATE_MODAL)) @@ -786,6 +787,7 @@
*************** XClearWindow(dpy, scr->dock_shadow);
*** 758,763 **** }
--- 759,765 ----
dockable = canBeDocked(icon->owner);
+ hasMoved = False; + hasMoved = False;
while (!done) { while (!done) {
WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
|ButtonMotionMask|ExposureMask, &ev); |ButtonMotionMask|ExposureMask, &ev);
*************** @@ -795,6 +797,7 @@
*** 767,772 ****
--- 769,775 ----
break; break;
case MotionNotify: case MotionNotify:
@@ -179,11 +83,9 @@ diff -rc WindowMaker-0.52.0.ori/src/appicon.c WindowMaker-0.52.0/src/appicon.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) {
*************** @@ -925,6 +928,9 @@
*** 917,922 **** wArrangeIcons(scr, True);
--- 920,928 ----
XSetWindowBackground(dpy, scr->dock_shadow, scr->white_pixel);
}
done = 1; done = 1;
+ if (!hasMoved && wPreferences.single_click) { + if (!hasMoved && wPreferences.single_click) {
+ iconDblClick(desc, event); + iconDblClick(desc, event);
@@ -191,66 +93,46 @@ diff -rc WindowMaker-0.52.0.ori/src/appicon.c WindowMaker-0.52.0/src/appicon.c
break; break;
} }
} }
diff -rc WindowMaker-0.52.0.ori/src/defaults.c WindowMaker-0.52.0/src/defaults.c diff -urN WindowMaker-0.62.1/src/defaults.c WindowMaker-0.62.1.patched/src/defaults.c
*** WindowMaker-0.52.0.ori/src/defaults.c Mon Mar 22 12:16:51 1999 --- WindowMaker-0.62.1/src/defaults.c Tue Mar 28 22:58:25 2000
--- WindowMaker-0.52.0/src/defaults.c Wed Apr 14 10:54:24 1999 +++ WindowMaker-0.62.1.patched/src/defaults.c Wed Aug 16 20:37:58 2000
*************** @@ -530,6 +530,9 @@
*** 445,450 ****
--- 445,453 ----
{"DisableBlinking", "NO", NULL, {"DisableBlinking", "NO", NULL,
&wPreferences.dont_blink, getBool, NULL &wPreferences.dont_blink, getBool, NULL
}, },
+ {"SingleClickLaunch", "NO", NULL, + {"SingleClickLaunch", "NO", NULL,
+ &wPreferences.single_click, getBool, NULL + &wPreferences.single_click, getBool, NULL
+ }, + },
#ifdef WEENDOZE_CYCLE /* style options */
{"WindozeCycling","NO", NULL, {"MenuStyle", "normal", seMenuStyles,
&wPreferences.windoze_cycling, getBool, NULL &wPreferences.menu_style, getEnum, setMenuStyle
diff -rc WindowMaker-0.52.0.ori/src/dock.c WindowMaker-0.52.0/src/dock.c diff -urN WindowMaker-0.62.1/src/dock.c WindowMaker-0.62.1.patched/src/dock.c
*** WindowMaker-0.52.0.ori/src/dock.c Mon Mar 22 12:16:51 1999 --- WindowMaker-0.62.1/src/dock.c Wed Mar 29 21:52:10 2000
--- WindowMaker-0.52.0/src/dock.c Wed Apr 14 10:37:30 1999 +++ WindowMaker-0.62.1.patched/src/dock.c Wed Aug 16 20:40:15 2000
*************** @@ -3750,7 +3750,7 @@
*** 3484,3490 ****
! static void -static void
+static int
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{ {
WScreen *scr = dock->screen_ptr; WScreen *scr = dock->screen_ptr;
--- 3484,3490 ---- @@ -3765,11 +3765,11 @@
! static int
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{
WScreen *scr = dock->screen_ptr;
***************
*** 3499,3507 ****
int ix = aicon->xindex, iy = aicon->yindex; int ix = aicon->xindex, iy = aicon->yindex;
int tmp; int tmp;
Pixmap ghost = None; Pixmap ghost = None;
! Bool docked; - Bool docked;
int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ + Bool docked, hasMoved;
if (wPreferences.flags.noupdates)
return;
--- 3499,3508 ----
int ix = aicon->xindex, iy = aicon->yindex;
int tmp;
Pixmap ghost = None;
! Bool docked, hasMoved;
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!!! */
-
+ hasMoved = False; + hasMoved = False;
if (wPreferences.flags.noupdates) if (wPreferences.flags.noupdates)
return; return;
*************** @@ -3820,6 +3820,7 @@
*** 3551,3556 ****
--- 3552,3558 ----
break; break;
case MotionNotify: case MotionNotify:
@@ -258,68 +140,33 @@ diff -rc WindowMaker-0.52.0.ori/src/dock.c WindowMaker-0.52.0/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) {
*************** @@ -3975,7 +3976,10 @@
*** 3690,3696 ****
#ifdef DEBUG #ifdef DEBUG
puts("End icon move"); puts("End icon move");
#endif #endif
! return; - return;
+ if (!hasMoved) {
+ return 1;
+ }
+ return 0;
} }
} }
} }
--- 3692,3701 ---- @@ -4115,7 +4119,9 @@
#ifdef DEBUG
puts("End icon move");
#endif
! if (!hasMoved) {
! return 1;
! }
! return 0;
}
}
}
***************
*** 3807,3813 ****
XUnmapWindow(dpy, scr->clip_balloon);
scr->flags.clip_balloon_mapped = 0;
}
!
#ifdef DEBUG
puts("handling dock");
#endif
--- 3812,3818 ----
XUnmapWindow(dpy, scr->clip_balloon);
scr->flags.clip_balloon_mapped = 0;
}
!
#ifdef DEBUG
puts("handling dock");
#endif
***************
*** 3830,3836 ****
else else
handleDockMove(dock, aicon, event); handleDockMove(dock, aicon, event);
} else } else
! handleIconMove(dock, aicon, event); - 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 && } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
aicon->xindex==0 && aicon->yindex==0) { aicon==scr->clip_icon) {
--- 3835,3843 ---- diff -urN WindowMaker-0.62.1/src/icon.c WindowMaker-0.62.1.patched/src/icon.c
else --- WindowMaker-0.62.1/src/icon.c Thu Jan 20 06:51:44 2000
handleDockMove(dock, aicon, event); +++ WindowMaker-0.62.1.patched/src/icon.c Wed Aug 16 20:37:00 2000
} else @@ -874,6 +874,7 @@
! if (handleIconMove(dock, aicon, event) != 0 &&
! wPreferences.single_click)
! iconDblClick(desc, event);
} else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
aicon->xindex==0 && aicon->yindex==0) {
diff -rc WindowMaker-0.52.0.ori/src/icon.c WindowMaker-0.52.0/src/icon.c
*** WindowMaker-0.52.0.ori/src/icon.c Thu Mar 18 17:39:39 1999
--- WindowMaker-0.52.0/src/icon.c Wed Apr 14 10:37:02 1999
***************
*** 809,814 ****
--- 809,815 ----
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;
@@ -327,9 +174,7 @@ diff -rc WindowMaker-0.52.0.ori/src/icon.c WindowMaker-0.52.0/src/icon.c
if (WCHECK_STATE(WSTATE_MODAL)) if (WCHECK_STATE(WSTATE_MODAL))
return; return;
*************** @@ -916,6 +917,7 @@
*** 851,856 ****
--- 852,858 ----
wwarning("pointer grab failed for icon move"); wwarning("pointer grab failed for icon move");
#endif #endif
} }
@@ -337,9 +182,7 @@ diff -rc WindowMaker-0.52.0.ori/src/icon.c WindowMaker-0.52.0/src/icon.c
while(1) { while(1) {
WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
|ButtonMotionMask|ExposureMask, &ev); |ButtonMotionMask|ExposureMask, &ev);
*************** @@ -925,6 +927,7 @@
*** 860,865 ****
--- 862,868 ----
break; break;
case MotionNotify: case MotionNotify:
@@ -347,9 +190,7 @@ diff -rc WindowMaker-0.52.0.ori/src/icon.c WindowMaker-0.52.0/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 +965,9 @@
*** 897,902 ****
--- 900,908 ----
if (wPreferences.auto_arrange_icons) if (wPreferences.auto_arrange_icons)
wArrangeIcons(wwin->screen_ptr, True); wArrangeIcons(wwin->screen_ptr, True);