rpms/tk/devel tk-seg_input.patch, NONE, 1.1 sources, 1.20, 1.21 tk.spec, 1.60, 1.61 tk-confi.patch, 1.2, NONE

[Marcela Mašláňová]

Author: mmaslano

Update of /cvs/pkgs/rpms/tk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4359

Modified Files:
	sources tk.spec 
Added Files:
	tk-seg_input.patch 
Removed Files:
	tk-confi.patch 
Log Message:
* Mon Feb 23 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.6-3
- 480742 patch fixes the input method. The reason for this behaviour
 is still unknown.


tk-seg_input.patch:

--- NEW FILE tk-seg_input.patch ---
diff -up tk8.5.6/generic/tkEvent.c.old tk8.5.6/generic/tkEvent.c
--- tk8.5.6/generic/tkEvent.c.old	2008-08-05 22:31:53.000000000 +0200
+++ tk8.5.6/generic/tkEvent.c	2009-02-23 12:37:23.000000000 +0100
@@ -247,16 +247,10 @@ InvokeFocusHandlers(
     }
 
     /*
-     * MouseWheel events are not focus specific on Mac OS X.
+     * Only key-related events are directed according to the focus.
      */
 
-#ifdef MAC_OSX_TK
-#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask)
-#else
-#define	FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask|MouseWheelMask)
-#endif
-
-    if (mask & FOCUS_DIRECTED_EVENT_MASK) {
+    if (mask & (KeyPressMask|KeyReleaseMask)) {
 	(*winPtrPtr)->dispPtr->lastEventTime = eventPtr->xkey.time;
 	*winPtrPtr = TkFocusKeyEvent(*winPtrPtr, eventPtr);
 	if (*winPtrPtr == NULL) {
@@ -359,6 +353,11 @@ CreateXIC(
 	XFree(preedit_attlist);
     }
 
+    if (winPtr->inputContext == NULL) {
+	/* XCreateIC failed. */
+	return;
+    }
+    
     /*
      * Adjust the window's event mask if the IM requires it.
      */
@@ -790,7 +789,7 @@ InvokeGenericHandlers(
 	    int done;
 
 	    tsdPtr->handlersActive++;
-	    done = (*curPtr->proc)(curPtr->clientData, eventPtr);
+	    done = curPtr->proc(curPtr->clientData, eventPtr);
 	    tsdPtr->handlersActive--;
 	    if (done) {
 		return done;
@@ -1383,7 +1382,7 @@ Tk_HandleEvent(
 	for (handlerPtr = winPtr->handlerList; handlerPtr != NULL; ) {
 	    if ((handlerPtr->mask & mask) != 0) {
 		ip.nextHandler = handlerPtr->nextPtr;
-		(*(handlerPtr->proc))(handlerPtr->clientData, eventPtr);
+		handlerPtr->proc(handlerPtr->clientData, eventPtr);
 		handlerPtr = ip.nextHandler;
 	    } else {
 		handlerPtr = handlerPtr->nextPtr;
@@ -1787,7 +1786,7 @@ WindowEventProc(
 	return 0;
     }
     if (tsdPtr->restrictProc != NULL) {
-	result = (*tsdPtr->restrictProc)(tsdPtr->restrictArg, &wevPtr->event);
+	result = tsdPtr->restrictProc(tsdPtr->restrictArg, &wevPtr->event);
 	if (result != TK_PROCESS_EVENT) {
 	    if (result == TK_DEFER_EVENT) {
 		return 0;
@@ -2053,7 +2052,7 @@ TkFinalize(
 
 	firstExitPtr = exitPtr->nextPtr;
 	Tcl_MutexUnlock(&exitMutex);
-	(*exitPtr->proc)(exitPtr->clientData);
+	exitPtr->proc(exitPtr->clientData);
 	ckfree((char *) exitPtr);
 	Tcl_MutexLock(&exitMutex);
     }
@@ -2103,7 +2102,7 @@ TkFinalizeThread(
 	     */
 
 	    tsdPtr->firstExitPtr = exitPtr->nextPtr;
-	    (*exitPtr->proc)(exitPtr->clientData);
+	    exitPtr->proc(exitPtr->clientData);
 	    ckfree((char *) exitPtr);
 	}
     }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	10 Feb 2009 06:59:48 -0000	1.20
+++ sources	23 Feb 2009 12:38:48 -0000	1.21
@@ -1,2 +1 @@
-e7e17a2dd4197d9872129c0fbd06f02f  tk8.5.5-src.tar.gz
 7da2e00adddc7eed6080df904579d94e  tk8.5.6-src.tar.gz


Index: tk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tk/devel/tk.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- tk.spec	19 Feb 2009 08:05:20 -0000	1.60
+++ tk.spec	23 Feb 2009 12:38:50 -0000	1.61
@@ -4,7 +4,7 @@
 Summary: The graphical toolkit for the Tcl scripting language
 Name: tk
 Version: %{vers}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch:   1
 License: TCL
 Group: Development/Languages
@@ -23,6 +23,8 @@
 Provides: tile = 0.8.2
 Patch1: tk8.5-make.patch
 Patch2: tk8.5-conf.patch
+# this patch isn't needed since tk8.6b1
+Patch3: tk-seg_input.patch
 
 %description
 When paired with the Tcl scripting language, Tk provides a fast and powerful
@@ -46,6 +48,7 @@
 
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
+%patch3 -p1 -b .seg
 
 %build
 cd unix
@@ -113,6 +116,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 23 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.6-3
+- 480742 patch fixes the input method. The reason for this behaviour
+ is still unknown.
+
 * Thu Feb 19 2009 Marcela Mašláňová <mmaslano at redhat.com> - 1:8.5.6-2
 - 486132 add missing requires in tk-devel
 


--- tk-confi.patch DELETED ---