X-Git-Url: http://git.pld-linux.org/?p=packages%2FWindowMaker.git;a=blobdiff_plain;f=WindowMaker-singleclick.patch;h=177a6b8a252f959fde607a9264fdc12d68efe3e2;hp=ce039c1759884fd71d05b5081814773fe1dba966;hb=HEAD;hpb=f6599bdaaf4e373eb5287ac662d8753090247d2e diff --git a/WindowMaker-singleclick.patch b/WindowMaker-singleclick.patch index ce039c1..177a6b8 100644 --- a/WindowMaker-singleclick.patch +++ b/WindowMaker-singleclick.patch @@ -1,7 +1,7 @@ --- 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]; @@ -10,10 +10,10 @@ } _Panel; @@ -54,6 +54,7 @@ - WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); - if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - WMSetButtonSelected(panel->swi[7], GetBoolForKey("AntialiasedText")); -+ WMSetButtonSelected(panel->swi[8], 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")); } @@ -21,24 +21,24 @@ panel->box = WMCreateBox(panel->parent); WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); -- for (i=0; i<8; i++) { -+ for (i=0; i<9; i++) { - panel->swi[i] = WMCreateSwitchButton(panel->box); - WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); - WMMoveWidget(panel->swi[i], 20, 20+i*25); +- 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[5], _("Disable confirmation panel for the Kill command.")); - WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons.")); - WMSetButtonText(panel->swi[7], _("Smooth font edges (needs restart).")); -+ WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click")); + 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); - if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - WMSetButtonEnabled(panel->swi[7], False); @@ -101,6 +103,7 @@ - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); - if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "AntialiasedText"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch"); + SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); + SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); + SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); ++ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch"); } @@ -62,35 +62,35 @@ diff -ur WindowMaker-0.64.0/src/appicon.c WindowMaker-0.64.0.new/src/appicon.c 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]; Bool movingSingle = False; @@ -785,6 +786,7 @@ XClearWindow(dpy, scr->dock_shadow); } - + + hasMoved = False; while (!done) { - WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask - |ButtonMotionMask|ExposureMask, &ev); + WMMaskEvent(dpy, PointerMotionMask|ButtonReleaseMask|ButtonPressMask + |ButtonMotionMask|ExposureMask, &ev); @@ -794,6 +796,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) { @@ -943,6 +946,9 @@ - wArrangeIcons(scr, True); - - done = 1; -+ if (!hasMoved && wPreferences.single_click) { -+ iconDblClick(desc, event); -+ } - break; - } + wArrangeIcons(scr, True); + + done = 1; ++ if (!hasMoved && wPreferences.single_click) { ++ iconDblClick(desc, event); ++ } + break; + } } 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 @@ -129,36 +129,36 @@ diff -ur WindowMaker-0.64.0/src/dock.c WindowMaker-0.64.0.new/src/dock.c - + hasMoved = False; if (wPreferences.flags.noupdates) - return; + return; @@ -3822,6 +3822,7 @@ - break; + break; - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { + 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 +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) { @@ -169,33 +169,46 @@ diff -ur WindowMaker-0.64.0/src/icon.c WindowMaker-0.64.0.new/src/icon.c 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"