X-Git-Url: http://git.pld-linux.org/?p=packages%2FWindowMaker.git;a=blobdiff_plain;f=WindowMaker-singleclick.patch;h=177a6b8a252f959fde607a9264fdc12d68efe3e2;hp=c5ad6c1febb2a1dc4de924e4b7c22ee80637c053;hb=HEAD;hpb=260b62b43bfa76cdcf02515618ec06bd69378c15 diff --git a/WindowMaker-singleclick.patch b/WindowMaker-singleclick.patch index c5ad6c1..177a6b8 100644 --- a/WindowMaker-singleclick.patch +++ b/WindowMaker-singleclick.patch @@ -1,43 +1,51 @@ -diff -Nru WindowMaker-0.63.1/WPrefs.app/Expert.c WindowMaker-0.63.1.new/WPrefs.app/Expert.c ---- WindowMaker-0.63.1/WPrefs.app/Expert.c Sat Jan 6 23:43:21 2001 -+++ WindowMaker-0.63.1.new/WPrefs.app/Expert.c Sun Jan 7 23:06:09 2001 +--- 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 @@ + + WMWidget *parent; + +- WMButton *swi[8]; ++ WMButton *swi[10]; + + } _Panel; + @@ -54,6 +54,7 @@ - WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling")); - WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill")); - WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); -+ WMSetButtonSelected(panel->swi[6], GetBoolForKey("SingleClickLaunch")); + WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill")); + WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); + WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); ++ WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch")); } -@@ -67,7 +68,7 @@ - WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT); - WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP); +@@ -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->frame); - WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); - WMMoveWidget(panel->swi[i], 20, 20+i*25); -@@ -80,6 +81,7 @@ - WMSetButtonText(panel->swi[4], _("Use Windoze style cycling")); - WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command")); - WMSetButtonText(panel->swi[6], _("Disable cycling color highlighting of icons")); -+ WMSetButtonText(panel->swi[6], _("Launch applications and restore windows with a single click")); - - WMRealizeWidget(panel->frame); - WMMapSubwidgets(panel->frame); -@@ -102,6 +104,7 @@ - SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling"); - SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill"); - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "SingleClickLaunch"); + 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 -Nru WindowMaker-0.63.1/src/WindowMaker.h WindowMaker-0.63.1.new/src/WindowMaker.h ---- WindowMaker-0.63.1/src/WindowMaker.h Fri Nov 17 03:10:32 2000 -+++ WindowMaker-0.63.1.new/src/WindowMaker.h Sun Jan 7 23:02:54 2001 -@@ -424,6 +424,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 */ signed char shade_speed; @@ -47,59 +55,59 @@ diff -Nru WindowMaker-0.63.1/src/WindowMaker.h WindowMaker-0.63.1.new/src/Window int edge_resistance; char attract; -diff -Nru WindowMaker-0.63.1/src/appicon.c WindowMaker-0.63.1.new/src/appicon.c ---- WindowMaker-0.63.1/src/appicon.c Wed Nov 1 16:40:16 2000 -+++ WindowMaker-0.63.1.new/src/appicon.c Sun Jan 7 23:02:54 2001 -@@ -717,6 +717,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]; - -@@ -786,6 +787,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); -@@ -795,6 +797,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -925,6 +928,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 -Nru WindowMaker-0.63.1/src/defaults.c WindowMaker-0.63.1.new/src/defaults.c ---- WindowMaker-0.63.1/src/defaults.c Sat Jan 6 22:28:02 2001 -+++ WindowMaker-0.63.1.new/src/defaults.c Sun Jan 7 23:02:54 2001 +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 ++ &wPreferences.single_click, getBool, NULL + }, - /* style options */ + /* style options */ {"MenuStyle", "normal", seMenuStyles, - &wPreferences.menu_style, getEnum, setMenuStyle -diff -Nru WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1.new/src/dock.c ---- WindowMaker-0.63.1/src/dock.c Wed Nov 1 16:40:16 2000 -+++ WindowMaker-0.63.1.new/src/dock.c Sun Jan 7 23:02:54 2001 + &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 @@ @@ -109,7 +117,7 @@ diff -Nru WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1.new/src/dock.c handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) { WScreen *scr = dock->screen_ptr; -@@ -3767,11 +3767,12 @@ +@@ -3767,11 +3767,11 @@ int ix = aicon->xindex, iy = aicon->yindex; int tmp; Pixmap ghost = None; @@ -118,76 +126,89 @@ diff -Nru WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1.new/src/dock.c 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; -@@ -3822,6 +3823,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) { -@@ -3977,7 +3979,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; + } } } -@@ -4117,7 +4122,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 -Nru WindowMaker-0.63.1/src/icon.c WindowMaker-0.63.1.new/src/icon.c ---- WindowMaker-0.63.1/src/icon.c Sat Jan 6 22:28:02 2001 -+++ WindowMaker-0.63.1.new/src/icon.c Sun Jan 7 23:02:54 2001 +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; + return; @@ -916,6 +917,7 @@ - wwarning("pointer grab failed for icon move"); + wwarning("pointer grab failed for icon move"); #endif } -+ hasMoved = False; ++ hasMoved = False; while(1) { - WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask - |ButtonMotionMask|ExposureMask, &ev); + WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask + |ButtonMotionMask|ExposureMask, &ev); @@ -925,6 +927,7 @@ - break; + break; - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { + 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; - - } + 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"