Attachment #61935 for bug #77424

View | Details | Raw Unified | Return to bug 77424
Collapse All | Expand All

Lines 449-456 InvokeInputMethods( Link Here

(-)generic/tkEvent.c (-2 / +4 lines)
449	XSetICFocus(winPtr->inputContext);	449	XSetICFocus(winPtr->inputContext);
450	}	450	}
451	}	451	}
452	if (XFilterEvent(eventPtr, None)) {	452	if (eventPtr->type == KeyPress \|\| eventPtr->type == KeyRelease) {
453	return 1;	453	if (XFilterEvent(eventPtr, None)) {
		454	return 1;
		455	}
454	}	456	}
455	}	457	}
456	return 0;	458	return 0;




TransferXEventsToTcl(
    Display *display)
{
    int numFound;
    XEvent event;

    numFound = QLength(display);

    /*
     * Transfer events from the X event queue to the Tk event queue
     * after XIM event filtering.  KeyPress and KeyRelease events
     * are filtered in Tk_HandleEvent instead of here, so that Tk's
     * focus management code can redirect them.
     */
    while (QLength(display) > 0) {
    while (numFound > 0) {
	XNextEvent(display, &event);
	if (event.type != KeyPress && event.type != KeyRelease) {
	    if (XFilterEvent(&event, None)) {
		continue;
	    }
	}
	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
	numFound--;
    }
}


{
    unsigned short i;
    XIMStyles *stylePtr;
    char *modifiers;

    if (XSetLocaleModifiers("") == NULL) {
    if (modifiers == NULL) {
	goto error;
    }
#if 1
    /* 
     * This is a temporary hack that can be taken back out again
     * once Tk has learned how to deal with SCIM
     */
    while ((modifiers = strchr(modifiers, '@')) != NULL) {
	if (strncmp(modifiers, "@im=", 4) == 0) {
	    /* The first "@im=" entry wins */
	    const char *scim = "@im=SCIM";
	    if (strncmp(modifiers, scim, strlen(scim)) == 0) {
		/* If it is SCIM, we override it */
		if (XSetLocaleModifiers("@im=local") == NULL) {
		    goto error;
		}
	    }
	    break;
	}
    }
#endif

    dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL);
    if (dispPtr->inputMethod == NULL) {

Return to bug 77424

Lines 334-352 static void Link Here

(-)unix/tkUnixEvent.c (-29 / +11 lines)
334	TransferXEventsToTcl(	334	TransferXEventsToTcl(
335	Display *display)	335	Display *display)
336	{	336	{
337	int numFound;
338	XEvent event;	337	XEvent event;
339		338
340	numFound = QLength(display);
341
342	/*	339	/*
343	* Transfer events from the X event queue to the Tk event queue.	340	* Transfer events from the X event queue to the Tk event queue
		341	* after XIM event filtering. KeyPress and KeyRelease events
		342	* are filtered in Tk_HandleEvent instead of here, so that Tk's
		343	* focus management code can redirect them.
344	*/	344	*/
345		345	while (QLength(display) > 0) {
346	while (numFound > 0) {
347	XNextEvent(display, &event);	346	XNextEvent(display, &event);
		347	if (event.type != KeyPress && event.type != KeyRelease) {
		348	if (XFilterEvent(&event, None)) {
		349	continue;
		350	}
		351	}
348	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);	352	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
349	numFound--;
350	}	353	}
351	}	354	}
352		355
Lines 636-666 OpenIM( Link Here
636	{	639	{
637	unsigned short i;	640	unsigned short i;
638	XIMStyles *stylePtr;	641	XIMStyles *stylePtr;
639	char *modifiers;
640		642
641	modifiers = XSetLocaleModifiers("");	643	if (XSetLocaleModifiers("") == NULL) {
642	if (modifiers == NULL) {
643	goto error;	644	goto error;
644	}	645	}
645	#if 1
646	/*
647	* This is a temporary hack that can be taken back out again
648	* once Tk has learned how to deal with SCIM
649	*/
650	while ((modifiers = strchr(modifiers, '@')) != NULL) {
651	if (strncmp(modifiers, "@im=", 4) == 0) {
652	/* The first "@im=" entry wins */
653	const char *scim = "@im=SCIM";
654	if (strncmp(modifiers, scim, strlen(scim)) == 0) {
655	/* If it is SCIM, we override it */
656	if (XSetLocaleModifiers("@im=local") == NULL) {
657	goto error;
658	}
659	}
660	break;
661	}
662	}
663	#endif
664		646
665	dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL);	647	dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL);
666	if (dispPtr->inputMethod == NULL) {	648	if (dispPtr->inputMethod == NULL) {