gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-13 04:15:50 +01:00
Code Issues Projects Releases Wiki Activity

added preliminary X Input Methods support

Browse Source
This commit is contained in:
dan
2004-10-28 04:17:18 +00:00
parent 79864ba94c
commit ca61675597
11 changed files with 245 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WINGs/wtextfield.c
View File

@@ -71,7 +71,7 @@ typedef struct W_TextField {
unsigned int waitingSelection:1; /* requested selection, but
* didnt get yet */
/**/
unsigned int notIllegalMovement:1;
} flags;
} TextField;
@@ -312,6 +312,13 @@ selectionNotification(void *observerData, WMNotification *notification)
}
static void
realizeObserver(void *self, WMNotification *not)
{
W_CreateIC(((TextField*)self)->view);
}
WMTextField*
WMCreateTextField(WMWidget *parent)
{
@@ -364,6 +371,8 @@ WMCreateTextField(WMWidget *parent)
WMSelectionOwnerDidChangeNotification,
(void*)XA_PRIMARY);
WMAddNotificationObserver(realizeObserver, tPtr,
WMViewRealizedNotification, tPtr->view);
tPtr->flags.cursorOn = 1;
@@ -762,8 +771,11 @@ paintCursor(TextField *tPtr)
cx, tPtr->offsetWidth, cx,
tPtr->view->size.height - tPtr->offsetWidth - 1);
if (tPtr->flags.secure)
W_SetPreeditPositon(tPtr->view, cx, 0);
if (tPtr->flags.secure) {
wfree(text);
}
}
@@ -953,9 +965,9 @@ handleEvents(XEvent *event, void *data)
CHECK_CLASS(data, WC_TextField);
switch (event->type) {
case FocusIn:
W_FocusIC(tPtr->view);
if (W_FocusedViewOfToplevel(W_TopLevelOfView(tPtr->view))!=tPtr->view)
return;
tPtr->flags.focused = 1;
@@ -973,6 +985,7 @@ handleEvents(XEvent *event, void *data)
break;
case FocusOut:
W_UnFocusIC(tPtr->view);
tPtr->flags.focused = 0;
#if 0
if (tPtr->timerID)
@@ -1021,7 +1034,8 @@ handleTextFieldKeyPress(TextField *tPtr, XEvent *event)
controled = (event->xkey.state & ControlMask ? True : False);
modified = shifted || controled;
count = XLookupString(&event->xkey, buffer, 63, &ksym, NULL);
count = W_LookupString(tPtr->view, &event->xkey, buffer, 63, &ksym, NULL);
//count = XLookupString(&event->xkey, buffer, 63, &ksym, NULL);
buffer[count] = '\0';
switch (ksym) {
@@ -1613,6 +1627,8 @@ destroyTextField(TextField *tPtr)
WMDeleteTimerHandler(tPtr->timerID);
#endif
W_DestroyIC(tPtr->view);
WMReleaseFont(tPtr->font);
/*// use lostSelection() instead of WMDeleteSelectionHandler here?*/
WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime);