svnno****@sourc*****
svnno****@sourc*****
2007年 6月 1日 (金) 04:13:16 JST
Revision: 465 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=macemacsjp&view=rev&rev=465 Author: zenitani Date: 2007-06-01 04:13:16 +0900 (Fri, 01 Jun 2007) Log Message: ----------- removed macui patch Removed Paths: ------------- transparency3/branches/vendor/transparency3-macui.patch transparency3/tags/release/transparency3-macui.patch -------------- next part -------------- Deleted: transparency3/branches/vendor/transparency3-macui.patch =================================================================== --- transparency3/branches/vendor/transparency3-macui.patch 2007-05-31 19:09:11 UTC (rev 464) +++ transparency3/branches/vendor/transparency3-macui.patch 2007-05-31 19:13:16 UTC (rev 465) @@ -1,92 +0,0 @@ -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 -@@ -2145,6 +2145,75 @@ - #endif - } - -+ -+#ifdef MAC_OSX -+#if TARGET_API_MAC_CARBON -+/*********************************************************************** -+ Transparency dialog -+ ***********************************************************************/ -+pascal void -+AlphaProc( ControlHandle control, SInt16 part ) -+{ -+ struct frame *f = XFRAME (selected_frame); -+ int alpha = GetControlValue( control ); -+ -+ if( alpha > 100 ){ -+ alpha = 100; -+ } -+/* if( alpha < 0 ){ -+ alpha = 0; -+ }*/ -+ if( alpha < frame_alpha_lower_limit ){ -+ alpha = frame_alpha_lower_limit; -+ } -+ -+ BLOCK_INPUT; -+ f->alpha[0] = alpha; -+ f->alpha[1] = alpha; -+ x_set_frame_alpha (f); -+ UNBLOCK_INPUT; -+} -+ -+pascal void -+OKButtonProc( ControlHandle control, SInt16 part ) -+{ -+ WindowRef sheet=GetControlOwner(control); -+ QuitAppModalLoopForWindow(sheet); -+ HideSheetWindow(sheet); -+ DisposeWindow(sheet); -+ sleep(1); -+} -+ -+DEFUN ("mac-transparency-dialog", Fmac_transparency_dialog, -+ Smac_transparency_dialog, 0, 0, "", -+ doc: /* (Experimental) Show a dialog to set the window transparency. */) -+ () -+{ -+ struct frame *f = XFRAME (selected_frame); -+ const ControlID kSlider = { 'sldr', 0 }; -+ const ControlID kOKButton = { 'okok', 0 }; -+ -+ ControlRef AlphaControl, OKControl; -+ IBNibRef nibRef; -+ WindowRef sheet=NULL; -+ -+ CreateNibReference(CFSTR("Sheet"), &nibRef); -+ CreateWindowFromNib(nibRef, CFSTR("Sheet"), &sheet); -+ DisposeNibReference(nibRef); -+ -+ GetControlByID( sheet, &kSlider, &AlphaControl ); -+ SetControlValue( AlphaControl, f->alpha[0] ); -+ SetControlAction( AlphaControl, NewEventHandlerUPP(AlphaProc) ); -+ -+ GetControlByID( sheet, &kOKButton, &OKControl ); -+ SetControlAction( OKControl, NewEventHandlerUPP(OKButtonProc) ); -+ -+ ShowSheetWindow(sheet,FRAME_MAC_WINDOW (f)); -+ RunAppModalLoopForWindow(sheet); -+} -+#endif -+#endif /* MAC_OSX */ -+/* --- end (Transparency dialog) --- */ - - /* Subroutines of creating a frame. */ - -@@ -4904,6 +4904,12 @@ - hourglass_atimer = NULL; - hourglass_shown_p = 0; - -+#if MAC_OSX -+#if TARGET_API_MAC_CARBON -+ defsubr (&Smac_transparency_dialog); // Transparency dialog -+#endif -+#endif -+ - defsubr (&Sx_show_tip); - defsubr (&Sx_hide_tip); - tip_timer = Qnil; Deleted: transparency3/tags/release/transparency3-macui.patch =================================================================== --- transparency3/tags/release/transparency3-macui.patch 2007-05-31 19:09:11 UTC (rev 464) +++ transparency3/tags/release/transparency3-macui.patch 2007-05-31 19:13:16 UTC (rev 465) @@ -1,92 +0,0 @@ -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 -@@ -2145,6 +2145,75 @@ - #endif - } - -+ -+#ifdef MAC_OSX -+#if TARGET_API_MAC_CARBON -+/*********************************************************************** -+ Transparency dialog -+ ***********************************************************************/ -+pascal void -+AlphaProc( ControlHandle control, SInt16 part ) -+{ -+ struct frame *f = XFRAME (selected_frame); -+ int alpha = GetControlValue( control ); -+ -+ if( alpha > 100 ){ -+ alpha = 100; -+ } -+/* if( alpha < 0 ){ -+ alpha = 0; -+ }*/ -+ if( alpha < frame_alpha_lower_limit ){ -+ alpha = frame_alpha_lower_limit; -+ } -+ -+ BLOCK_INPUT; -+ f->alpha[0] = alpha; -+ f->alpha[1] = alpha; -+ x_set_frame_alpha (f); -+ UNBLOCK_INPUT; -+} -+ -+pascal void -+OKButtonProc( ControlHandle control, SInt16 part ) -+{ -+ WindowRef sheet=GetControlOwner(control); -+ QuitAppModalLoopForWindow(sheet); -+ HideSheetWindow(sheet); -+ DisposeWindow(sheet); -+ sleep(1); -+} -+ -+DEFUN ("mac-transparency-dialog", Fmac_transparency_dialog, -+ Smac_transparency_dialog, 0, 0, "", -+ doc: /* (Experimental) Show a dialog to set the window transparency. */) -+ () -+{ -+ struct frame *f = XFRAME (selected_frame); -+ const ControlID kSlider = { 'sldr', 0 }; -+ const ControlID kOKButton = { 'okok', 0 }; -+ -+ ControlRef AlphaControl, OKControl; -+ IBNibRef nibRef; -+ WindowRef sheet=NULL; -+ -+ CreateNibReference(CFSTR("Sheet"), &nibRef); -+ CreateWindowFromNib(nibRef, CFSTR("Sheet"), &sheet); -+ DisposeNibReference(nibRef); -+ -+ GetControlByID( sheet, &kSlider, &AlphaControl ); -+ SetControlValue( AlphaControl, f->alpha[0] ); -+ SetControlAction( AlphaControl, NewEventHandlerUPP(AlphaProc) ); -+ -+ GetControlByID( sheet, &kOKButton, &OKControl ); -+ SetControlAction( OKControl, NewEventHandlerUPP(OKButtonProc) ); -+ -+ ShowSheetWindow(sheet,FRAME_MAC_WINDOW (f)); -+ RunAppModalLoopForWindow(sheet); -+} -+#endif -+#endif /* MAC_OSX */ -+/* --- end (Transparency dialog) --- */ - - /* Subroutines of creating a frame. */ - -@@ -4904,6 +4904,12 @@ - hourglass_atimer = NULL; - hourglass_shown_p = 0; - -+#if MAC_OSX -+#if TARGET_API_MAC_CARBON -+ defsubr (&Smac_transparency_dialog); // Transparency dialog -+#endif -+#endif -+ - defsubr (&Sx_show_tip); - defsubr (&Sx_hide_tip); - tip_timer = Qnil;