-diff -urN WindowMaker-0.60.0.orig/WPrefs.app/Expert.c WindowMaker-0.60.0/WPrefs.app/Expert.c
---- WindowMaker-0.60.0.orig/WPrefs.app/Expert.c Sun Apr 25 21:47:28 1999
-+++ WindowMaker-0.60.0/WPrefs.app/Expert.c Sun Jul 11 01:29:12 1999
+--- 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 @@
-
- WMWindow *win;
-- WMButton *swi[5];
-+ WMButton *swi[6];
+ WMWidget *parent;
+
+- WMButton *swi[8];
++ WMButton *swi[10];
} _Panel;
-@@ -52,6 +52,7 @@
- WMSetButtonSelected(panel->swi[2], GetBoolForKey("SaveSessionOnExit"));
- WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders"));
- WMSetButtonSelected(panel->swi[4], GetBoolForKey("DisableBlinking"));
-+ WMSetButtonSelected(panel->swi[5], GetBoolForKey("SingleClickLaunch"));
+@@ -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"));
}
-@@ -65,7 +66,7 @@
- WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
- WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
-
-- for (i=0; i<5; i++) {
-+ 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);
-@@ -76,6 +77,7 @@
- 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[4], _("Disable cycling color highlighting of icons."));
-+ WMSetButtonText(panel->swi[5], _("Launch applications and restore windows with a single click"));
-
- WMRealizeWidget(panel->frame);
- WMMapSubwidgets(panel->frame);
-@@ -96,6 +98,7 @@
- SetBoolForKey(WMGetButtonSelected(panel->swi[2]), "SaveSessionOnExit");
- SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders");
- SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DisableBlinking");
-+ SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "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 -urN WindowMaker-0.60.0.orig/src/WindowMaker.h WindowMaker-0.60.0/src/WindowMaker.h
---- WindowMaker-0.60.0.orig/src/WindowMaker.h Sun May 30 23:25:20 1999
-+++ WindowMaker-0.60.0/src/WindowMaker.h Sun Jul 11 01:29:12 1999
-@@ -409,6 +409,9 @@
+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 */
- char shade_speed;
+ signed char shade_speed;
+ /* single click to lauch applications */
+ char single_click;
+
int edge_resistance;
+ char attract;
- struct {
-diff -urN WindowMaker-0.60.0.orig/src/appicon.c WindowMaker-0.60.0/src/appicon.c
---- WindowMaker-0.60.0.orig/src/appicon.c Tue Jun 1 12:34:40 1999
-+++ WindowMaker-0.60.0/src/appicon.c Sun Jul 11 01:29:12 1999
-@@ -737,6 +737,7 @@
+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;
++ Bool hasMoved;
Pixmap ghost = None;
Window wins[2];
-
-@@ -798,6 +799,7 @@
+ Bool movingSingle = False;
+@@ -785,6 +786,7 @@
XClearWindow(dpy, scr->dock_shadow);
}
-+ hasMoved = False;
++ hasMoved = False;
while (!done) {
- WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
- |ButtonMotionMask|ExposureMask, &ev);
-@@ -807,6 +809,7 @@
- break;
-
- case MotionNotify:
-+ hasMoved = True;
- if (!grabbed) {
- if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
- || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -933,6 +936,9 @@
- wArrangeIcons(scr, True);
-
- done = 1;
-+ if (!hasMoved && wPreferences.single_click) {
-+ iconDblClick(desc, event);
-+ }
- break;
- }
+ 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 -urN WindowMaker-0.60.0.orig/src/defaults.c WindowMaker-0.60.0/src/defaults.c
---- WindowMaker-0.60.0.orig/src/defaults.c Tue Jun 1 12:34:40 1999
-+++ WindowMaker-0.60.0/src/defaults.c Sun Jul 11 01:29:12 1999
-@@ -495,6 +495,9 @@
+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
+ &wPreferences.dont_blink, getBool, NULL
},
-+ {"SingleClickLaunch", "NO", NULL,
-+ &wPreferences.single_click, getBool, NULL
-+ },
- #ifdef WEENDOZE_CYCLE
- {"WindozeCycling","NO", NULL,
- &wPreferences.windoze_cycling, getBool, NULL
-diff -urN WindowMaker-0.60.0.orig/src/dock.c WindowMaker-0.60.0/src/dock.c
---- WindowMaker-0.60.0.orig/src/dock.c Thu Jun 3 13:29:05 1999
-+++ WindowMaker-0.60.0/src/dock.c Sun Jul 11 01:34:50 1999
-@@ -3746,7 +3746,7 @@
++ {"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 @@
handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
{
WScreen *scr = dock->screen_ptr;
-@@ -3761,11 +3761,12 @@
+@@ -3767,11 +3767,11 @@
int ix = aicon->xindex, iy = aicon->yindex;
int tmp;
Pixmap ghost = None;
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;
+ return;
-@@ -3816,6 +3817,7 @@
- break;
+@@ -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) {
-@@ -3958,7 +3960,10 @@
+ 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");
+ puts("End icon move");
#endif
-- return;
-+ if (!hasMoved) {
-+ return 1;
-+ }
-+ return 0;
- }
+- return;
++ if (!hasMoved) {
++ return 1;
++ }
++ return 0;
+ }
}
}
-@@ -4098,7 +4103,9 @@
+@@ -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);
+- 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 -urN WindowMaker-0.60.0.orig/src/icon.c WindowMaker-0.60.0/src/icon.c
---- WindowMaker-0.60.0.orig/src/icon.c Sun May 30 23:25:21 1999
-+++ WindowMaker-0.60.0/src/icon.c Sun Jul 11 01:29:13 1999
-@@ -863,6 +863,7 @@
+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;
++ Bool hasMoved;
if (WCHECK_STATE(WSTATE_MODAL))
- return;
-@@ -905,6 +906,7 @@
- wwarning("pointer grab failed for icon move");
+ return;
+@@ -916,6 +917,7 @@
+ wwarning("pointer grab failed for icon move");
#endif
}
-+ hasMoved = False;
++ hasMoved = False;
while(1) {
- WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask
- |ButtonMotionMask|ExposureMask, &ev);
-@@ -914,6 +916,7 @@
- break;
-
- case MotionNotify:
-+ hasMoved = True;
- if (!grabbed) {
- if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
- || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -951,6 +954,9 @@
-
- if (wPreferences.auto_arrange_icons)
- wArrangeIcons(wwin->screen_ptr, True);
-+ if (!hasMoved && wPreferences.single_click) {
-+ miniwindowDblClick(desc, event);
-+ }
- return;
-
- }
+ 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;
+
+ }
+--- WindowMaker-0.92.0/WPrefs.app/po/pl.po.orig 2006-02-02 23:40:48.467023000 +0100
++++ WindowMaker-0.92.0/WPrefs.app/po/pl.po 2006-02-02 23:44:37.461334500 +0100
+@@ -402,6 +402,10 @@
+ msgid "Smooth font edges (needs restart)."
+ msgstr "Gładkie krawędzie fontów (wymagają restartu)."
+
++#: ../../WPrefs.app/Expert.c:83
++msgid "Launch applications and restore windows with a single click"
++msgstr "Uruchamiaj aplikacje i odtwarzaj okna pojedynczym kliknięciem"
++
+ #: ../../WPrefs.app/Expert.c:117
+ msgid "Expert User Preferences"
+ msgstr "Ustawienia zaawansowanego użytkownika"
projects / packages / WindowMaker.git / blobdiff