[31539] trunk/dports/xfce/xfwm4
ryandesign at macports.org
ryandesign at macports.org
Tue Nov 27 05:35:30 PST 2007
Revision: 31539
http://trac.macosforge.org/projects/macports/changeset/31539
Author: ryandesign at macports.org
Date: 2007-11-27 05:35:28 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
xfwm4: fix names of patchfiles to match guidelines
Modified Paths:
--------------
trunk/dports/xfce/xfwm4/Portfile
Added Paths:
-----------
trunk/dports/xfce/xfwm4/files/patch-events.c.diff
trunk/dports/xfce/xfwm4/files/patch-keyboard.c.diff
Removed Paths:
-------------
trunk/dports/xfce/xfwm4/files/patch-events.c
trunk/dports/xfce/xfwm4/files/patch-keyboard.c
Modified: trunk/dports/xfce/xfwm4/Portfile
===================================================================
--- trunk/dports/xfce/xfwm4/Portfile 2007-11-27 13:33:17 UTC (rev 31538)
+++ trunk/dports/xfce/xfwm4/Portfile 2007-11-27 13:35:28 UTC (rev 31539)
@@ -20,4 +20,4 @@
### --enable-startup-notification --enable-compositor
depends_lib port:xfce-mcs-manager port:gtk2
-patchfiles patch-events.c patch-keyboard.c
+patchfiles patch-events.c.diff patch-keyboard.c.diff
Deleted: trunk/dports/xfce/xfwm4/files/patch-events.c
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-events.c 2007-11-27 13:33:17 UTC (rev 31538)
+++ trunk/dports/xfce/xfwm4/files/patch-events.c 2007-11-27 13:35:28 UTC (rev 31539)
@@ -1,23 +0,0 @@
---- src/events.c.orig 2007-01-13 22:48:07.000000000 +0100
-+++ src/events.c 2007-09-22 13:10:49.000000000 +0200
-@@ -857,15 +857,17 @@
- win = ev->subwindow;
- screen_info = c->screen_info;
-
-- if ((ev->button == Button1) && (state == AltMask) && (screen_info->params->easy_click))
-+ /* On Darwin, the alt keys can be mapped over to "XK_Mode_switch" - which causes AltMask to be zero... */
-+
-+ if ((ev->button == Button1) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
- {
- button1Action (c, ev);
- }
-- else if ((ev->button == Button2) && (state == AltMask) && (screen_info->params->easy_click))
-+ else if ((ev->button == Button2) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
- {
- clientLower (c);
- }
-- else if ((ev->button == Button3) && (state == AltMask) && (screen_info->params->easy_click))
-+ else if ((ev->button == Button3) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
- {
- if ((ev->x < c->width / 2) && (ev->y < c->height / 2))
- {
Copied: trunk/dports/xfce/xfwm4/files/patch-events.c.diff (from rev 31538, trunk/dports/xfce/xfwm4/files/patch-events.c)
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-events.c.diff (rev 0)
+++ trunk/dports/xfce/xfwm4/files/patch-events.c.diff 2007-11-27 13:35:28 UTC (rev 31539)
@@ -0,0 +1,23 @@
+--- src/events.c.orig 2007-01-13 22:48:07.000000000 +0100
++++ src/events.c 2007-09-22 13:10:49.000000000 +0200
+@@ -857,15 +857,17 @@
+ win = ev->subwindow;
+ screen_info = c->screen_info;
+
+- if ((ev->button == Button1) && (state == AltMask) && (screen_info->params->easy_click))
++ /* On Darwin, the alt keys can be mapped over to "XK_Mode_switch" - which causes AltMask to be zero... */
++
++ if ((ev->button == Button1) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
+ {
+ button1Action (c, ev);
+ }
+- else if ((ev->button == Button2) && (state == AltMask) && (screen_info->params->easy_click))
++ else if ((ev->button == Button2) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
+ {
+ clientLower (c);
+ }
+- else if ((ev->button == Button3) && (state == AltMask) && (screen_info->params->easy_click))
++ else if ((ev->button == Button3) && (state == AltMask && AltMask != 0) && (screen_info->params->easy_click))
+ {
+ if ((ev->x < c->width / 2) && (ev->y < c->height / 2))
+ {
Deleted: trunk/dports/xfce/xfwm4/files/patch-keyboard.c
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-keyboard.c 2007-11-27 13:33:17 UTC (rev 31538)
+++ trunk/dports/xfce/xfwm4/files/patch-keyboard.c 2007-11-27 13:35:28 UTC (rev 31539)
@@ -1,28 +0,0 @@
---- src/keyboard.c.orig 2007-09-22 13:32:29.000000000 +0200
-+++ src/keyboard.c 2007-09-22 13:51:01.000000000 +0200
-@@ -255,6 +255,7 @@
- int max_keycode;
-
- AltMask = 0;
-+ int ModeMask = 0;
- MetaMask = 0;
- NumLockMask = 0;
- ScrollLockMask = 0;
-@@ -303,9 +304,17 @@
- {
- AltMask |= (1 << ( i / modmap->max_keypermod));
- }
-+ else if (syms[j] == XK_Mode_switch)
-+ {
-+ ModeMask |= (1 << ( i / modmap->max_keypermod));
-+ }
- }
- }
- }
-+
-+ if (AltMask == 0) /* if we don't have any alt keys, use the option keys */
-+ AltMask = ModeMask;
-+
- KeyMask =
- ControlMask | ShiftMask | AltMask | MetaMask | SuperMask | HyperMask;
-
Copied: trunk/dports/xfce/xfwm4/files/patch-keyboard.c.diff (from rev 31538, trunk/dports/xfce/xfwm4/files/patch-keyboard.c)
===================================================================
--- trunk/dports/xfce/xfwm4/files/patch-keyboard.c.diff (rev 0)
+++ trunk/dports/xfce/xfwm4/files/patch-keyboard.c.diff 2007-11-27 13:35:28 UTC (rev 31539)
@@ -0,0 +1,28 @@
+--- src/keyboard.c.orig 2007-09-22 13:32:29.000000000 +0200
++++ src/keyboard.c 2007-09-22 13:51:01.000000000 +0200
+@@ -255,6 +255,7 @@
+ int max_keycode;
+
+ AltMask = 0;
++ int ModeMask = 0;
+ MetaMask = 0;
+ NumLockMask = 0;
+ ScrollLockMask = 0;
+@@ -303,9 +304,17 @@
+ {
+ AltMask |= (1 << ( i / modmap->max_keypermod));
+ }
++ else if (syms[j] == XK_Mode_switch)
++ {
++ ModeMask |= (1 << ( i / modmap->max_keypermod));
++ }
+ }
+ }
+ }
++
++ if (AltMask == 0) /* if we don't have any alt keys, use the option keys */
++ AltMask = ModeMask;
++
+ KeyMask =
+ ControlMask | ShiftMask | AltMask | MetaMask | SuperMask | HyperMask;
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071127/45cd9477/attachment.html
More information about the macports-changes
mailing list