Seiji Zenitani
zenit****@users*****
2006年 12月 7日 (木) 10:40:11 JST
Index: transparency2/transparency2-macui.patch
diff -u transparency2/transparency2-macui.patch:1.2 transparency2/transparency2-macui.patch:1.3
--- transparency2/transparency2-macui.patch:1.2 Fri Aug 11 23:56:38 2006
+++ transparency2/transparency2-macui.patch Thu Dec 7 10:40:11 2006
@@ -112,10 +112,10 @@
diff -N -u -r emacs.orig/src/macfns.c emacs/src/macfns.c
--- emacs.orig/src/macfns.c 2005-10-09 23:55:50.000000000 +0900
+++ emacs/src/macfns.c 2005-10-10 00:11:26.000000000 +0900
-@@ -2009,6 +2009,94 @@
-
- return;
+@@ -2145,6 +2145,94 @@
+ #endif
}
+
+
+#ifdef MAC_OSX
+#if TARGET_API_MAC_CARBON
@@ -207,7 +207,7 @@
/* Subroutines of creating a frame. */
-@@ -4601,6 +4689,12 @@
+@@ -4904,6 +4904,12 @@
hourglass_atimer = NULL;
hourglass_shown_p = 0;
Index: transparency2/transparency2.patch
diff -u transparency2/transparency2.patch:1.5 transparency2/transparency2.patch:1.6
--- transparency2/transparency2.patch:1.5 Wed Oct 4 01:33:59 2006
+++ transparency2/transparency2.patch Thu Dec 7 10:40:11 2006
@@ -1,6 +1,6 @@
--- lisp/frame.el.orig 2005-08-06 14:02:55.000000000 +0900
+++ lisp/frame.el 2005-08-06 14:09:08.000000000 +0900
-@@ -926,6 +926,32 @@
+@@ -931,6 +931,32 @@
(modify-frame-parameters (selected-frame)
(list (cons 'border-color color-name))))
@@ -46,7 +46,7 @@
Lisp_Object Qfullscreen, Qfullwidth, Qfullheight, Qfullboth;
-@@ -2580,6 +2584,10 @@
+@@ -2590,6 +2594,10 @@
{"right-fringe", &Qright_fringe},
{"wait-for-wm", &Qwait_for_wm},
{"fullscreen", &Qfullscreen},
@@ -59,7 +59,7 @@
#ifdef HAVE_WINDOW_SYSTEM
--- src/frame.h.orig 2005-08-06 14:02:55.000000000 +0900
+++ src/frame.h 2005-08-06 14:04:23.000000000 +0900
-@@ -451,6 +451,11 @@
+@@ -453,6 +453,11 @@
/* Additional space to put between text lines on this frame. */
int extra_line_spacing;
@@ -71,7 +71,7 @@
/* Set to non-zero in change_frame_size when size of frame changed
Clear the frame in clear_garbaged_frames if set. */
unsigned resized_p : 1;
-@@ -1007,6 +1012,10 @@
+@@ -1005,6 +1010,10 @@
extern Lisp_Object Qline_spacing;
extern Lisp_Object Qwait_for_wm;
extern Lisp_Object Qfullscreen;
@@ -84,7 +84,7 @@
extern Lisp_Object Qheight, Qwidth;
--- src/macfns.c.orig 2005-08-06 14:02:55.000000000 +0900
+++ src/macfns.c 2005-08-06 14:04:23.000000000 +0900
-@@ -218,6 +218,8 @@
+@@ -223,6 +223,8 @@
@@ -93,7 +93,7 @@
/* Store the screen positions of frame F into XPTR and YPTR.
These are the positions of the containing window manager window,
not Emacs's own window. */
-@@ -1926,6 +1928,89 @@
+@@ -1909,6 +1911,90 @@
#endif /* not MAC_OSX */
}
@@ -180,10 +180,11 @@
+
+ return;
+}
-
- /* Subroutines of creating a frame. */
-
-@@ -2636,6 +2714,10 @@
++
+ void
+ mac_set_scroll_bar_width (f, arg, oldval)
+ struct frame *f;
+@@ -2769,6 +2847,10 @@
x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
"scrollBarWidth", "ScrollBarWidth",
RES_TYPE_NUMBER);
@@ -194,7 +195,7 @@
/* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size.
Change will not be effected unless different from the current
-@@ -4340,6 +4422,8 @@
+@@ -4636,6 +4718,8 @@
x_set_fringe_width,
0, /* x_set_wait_for_wm, */
x_set_fullscreen,
@@ -205,7 +206,7 @@
void
--- src/macterm.c.orig 2005-08-06 14:02:55.000000000 +0900
+++ src/macterm.c 2005-08-06 14:04:24.000000000 +0900
-@@ -1687,6 +1687,23 @@
+@@ -2403,6 +2403,23 @@
return FONT_TYPE_UNKNOWN;
}
@@ -229,7 +230,7 @@
/***********************************************************************
-@@ -3403,6 +3420,7 @@
+@@ -4123,6 +4140,7 @@
ActivateControl (root_control);
UNBLOCK_INPUT;
x_update_cursor (f, 1);
@@ -237,7 +238,7 @@
}
static void
-@@ -3418,6 +3436,7 @@
+@@ -4138,6 +4156,7 @@
DeactivateControl (root_control);
UNBLOCK_INPUT;
x_update_cursor (f, 1);
@@ -344,7 +345,7 @@
/* Record in frame F the specified or default value according to ALIST
of the parameter named PROP (a Lisp symbol). If no value is
-@@ -3312,6 +3395,10 @@
+@@ -3356,6 +3439,10 @@
x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
"scrollBarWidth", "ScrollBarWidth",
RES_TYPE_NUMBER);
@@ -355,7 +356,7 @@
/* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size.
Change will not be effected unless different from the current
-@@ -5693,6 +5780,8 @@
+@@ -5737,6 +5824,8 @@
x_set_fringe_width,
x_set_wait_for_wm,
x_set_fullscreen,
@@ -366,7 +367,7 @@
void
--- src/xterm.c.orig 2006-09-20 03:24:45.000000000 +0900
+++ src/xterm.c 2006-09-20 03:24:45.000000000 +0900
-@@ -947,6 +947,30 @@
+@@ -947,6 +947,53 @@
return FONT_TYPE_UNKNOWN;
}
@@ -388,6 +389,29 @@
+ double alpha = activate_p? f->active_alpha: f->inactive_alpha;
+ unsigned int opac = (unsigned int)(alpha * OPAQUE);
+
++ /***** X performance improvement by Nakayama-san [Macemacsjp-users 1211] *****/
++ {
++ unsigned char *data;
++
++ Atom actual;
++ int format;
++ unsigned long n, left;
++
++ XGetWindowProperty(dpy, win, XInternAtom(dpy, OPACITY, False),
++ 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left,
++ (unsigned char **) &data);
++
++ if (data != None)
++ if (*(unsigned int *)data == opac)
++ {
++ XFree ((void *) data);
++ return;
++ }
++ else
++ XFree ((void *) data);
++ }
++ /***** end of Nakayama-san's code [Macemacsjp-users 1211] *****/
++
+ XChangeProperty (dpy, win, XInternAtom (dpy, OPACITY, False),
+ XA_CARDINAL, 32, PropModeReplace,
+ (unsigned char *) &opac, 1L);
@@ -598,7 +622,7 @@
/* The focus has changed. Update the frames as necessary to reflect
--- src/w32term.h.orig 2005-08-06 14:02:55.000000000 +0900
+++ src/w32term.h 2005-08-06 14:04:24.000000000 +0900
-@@ -643,6 +643,14 @@
+@@ -641,6 +641,14 @@
#define WND_EXTRA_BYTES (WND_LAST_INDEX)
@@ -613,7 +637,7 @@
extern DWORD dwWindowsThreadId;
extern HANDLE hWindowsThread;
extern DWORD dwMainThreadId;
-@@ -755,6 +763,8 @@
+@@ -753,6 +761,8 @@
? BDF_1D_FONT : BDF_2D_FONT))
typedef DWORD (WINAPI * ClipboardSequence_Proc) ();