- use proper build dir

[packages/WindowMaker.git] / WindowMaker-singleclick.patch

diff --git a/WindowMaker-singleclick.patch b/WindowMaker-singleclick.patch
index 38517d3722e8ac9abb65abacf5b09f5cfffc0560..ce039c1759884fd71d05b5081814773fe1dba966 100644 (file)
--- a/WindowMaker-singleclick.patch
+++ b/WindowMaker-singleclick.patch
@@ -1,45 +1,44 @@
-diff -ur WindowMaker-0.64.0/WPrefs.app/Expert.c WindowMaker-0.64.0.new/WPrefs.app/Expert.c
---- WindowMaker-0.64.0/WPrefs.app/Expert.c     Thu Feb  8 22:54:12 2001
-+++ WindowMaker-0.64.0.new/WPrefs.app/Expert.c Wed Mar 21 20:00:55 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[9];
++    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[7], GetBoolForKey("SingleClickLaunch"));
+     if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
+         WMSetButtonSelected(panel->swi[7], GetBoolForKey("AntialiasedText"));
++    WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
  }
  
  
 @@ -66,7 +67,7 @@
      panel->box = WMCreateBox(panel->parent);
-     WMSetBoxExpandsToParent(panel->box, 2, 2, 0, 0);
+     WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
  
--    for (i=0; i<7; i++) {
-+    for (i=0; i<8; i++) {
+-    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);
 @@ -79,6 +80,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[7], _("Launch applications and restore windows with a single click"));
+     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"));
  
-     WMRealizeWidget(panel->box);
-     WMMapSubwidgets(panel->box);
+     if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
+         WMSetButtonEnabled(panel->swi[7], False);
 @@ -101,6 +103,7 @@
-     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
-     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
      SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
-+    SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch");
+     if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box)))
+         SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "AntialiasedText");
++    SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
  }
  
  
@@ -59,23 +58,23 @@ diff -ur WindowMaker-0.64.0/src/WindowMaker.h WindowMaker-0.64.0.new/src/WindowM
 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
-@@ -717,6 +717,7 @@
+@@ -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 @@
+@@ -794,6 +796,7 @@
            break;
  
         case MotionNotify:
@@ -83,7 +82,7 @@ diff -ur WindowMaker-0.64.0/src/appicon.c WindowMaker-0.64.0.new/src/appicon.c
            if (!grabbed) {
                if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
                    || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
-@@ -925,6 +928,9 @@
+@@ -943,6 +946,9 @@
                wArrangeIcons(scr, True);
  
            done = 1;
@@ -98,14 +97,14 @@ diff -ur WindowMaker-0.64.0/src/defaults.c WindowMaker-0.64.0.new/src/defaults.c
 +++ 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
 +    },
-       /* style options */
+     /* style options */
      {"MenuStyle",     "normal",               seMenuStyles,
-       &wPreferences.menu_style, getEnum,      setMenuStyle
+     &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