gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-30 18:32:34 +01:00
Code Issues Projects Releases Wiki Activity

a few changes in the selection code

Browse Source
This commit is contained in:
dan
2002-01-07 06:11:34 +00:00
parent 89a32e3663
commit 9b63a77d6a
3 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
WINGs/WINGs/WINGs.h
View File

@@ -661,6 +661,9 @@ void WMNextEvent(Display *dpy, XEvent *event);
void WMMaskEvent(Display *dpy, long mask, XEvent *event); void WMMaskEvent(Display *dpy, long mask, XEvent *event);
/* ....................................................................... */
Bool WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp, Bool WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
WMSelectionProcs *procs, void *cdata); WMSelectionProcs *procs, void *cdata);
@@ -671,6 +674,8 @@ Bool WMRequestSelection(WMView *view, Atom selection, Atom target,
void *cdata); void *cdata);
extern char *WMSelectionOwnerDidChangeNotification;
/* ....................................................................... */ /* ....................................................................... */
void WMSetViewDragSourceProcs(WMView *view, WMDragSourceProcs *procs); void WMSetViewDragSourceProcs(WMView *view, WMDragSourceProcs *procs);

39
WINGs/selection.c
View File

@@ -9,6 +9,9 @@
#define MAX_PROPERTY_SIZE 8*1024 #define MAX_PROPERTY_SIZE 8*1024
char *WMSelectionOwnerDidChangeNotification = "WMSelectionOwnerDidChange";
typedef struct SelectionHandler { typedef struct SelectionHandler {
WMView *view; WMView *view;
Atom selection; Atom selection;
@@ -59,7 +62,7 @@ WMDeleteSelectionHandler(WMView *view, Atom selection, Time timestamp)
if (!selHandlers) if (!selHandlers)
return; return;
//printf("deleting selection handler for %d\n", win); printf("deleting selection handler for %d", win);
WM_ITERATE_ARRAY(selHandlers, handler, iter) { WM_ITERATE_ARRAY(selHandlers, handler, iter) {
if (handler->view == view if (handler->view == view
@@ -68,14 +71,17 @@ WMDeleteSelectionHandler(WMView *view, Atom selection, Time timestamp)
if (handler->flags.done_pending) { if (handler->flags.done_pending) {
handler->flags.delete_pending = 1; handler->flags.delete_pending = 1;
return; puts(": postponed because still pending");
return;
} }
//puts("found & removed"); printf(": found & removed");
WMRemoveFromArray(selHandlers, handler); WMRemoveFromArray(selHandlers, handler);
break; break;
} }
} }
printf("\n");
XGrabServer(dpy); XGrabServer(dpy);
if (XGetSelectionOwner(dpy, selection) == win) { if (XGetSelectionOwner(dpy, selection) == win) {
XSetSelectionOwner(dpy, selection, None, timestamp); XSetSelectionOwner(dpy, selection, None, timestamp);
@@ -343,7 +349,18 @@ handleNotifyEvent(XEvent *event)
void void
W_HandleSelectionEvent(XEvent *event) W_HandleSelectionEvent(XEvent *event)
{ {
//printf("%d received %d\n", event->xany.window, event->type); printf("%d received selection ", event->xany.window);
switch(event->type) {
case SelectionNotify:
puts("notify"); break;
case SelectionRequest:
puts("request"); break;
case SelectionClear:
puts("clear"); break;
default:
puts("unknown"); break;
}
if (event->type == SelectionNotify) { if (event->type == SelectionNotify) {
handleNotifyEvent(event); handleNotifyEvent(event);
} else { } else {
@@ -366,10 +383,12 @@ WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
return False; return False;
} }
//printf("created selection handler for %d\n", W_VIEW_DRAWABLE(view)); WMPostNotificationName(WMSelectionOwnerDidChangeNotification,
handler = malloc(sizeof(SelectionHandler)); (void*)selection, (void*)view);
if (handler == NULL)
return False; printf("created selection handler for %d\n", W_VIEW_DRAWABLE(view));
handler = wmalloc(sizeof(SelectionHandler));
handler->view = view; handler->view = view;
handler->selection = selection; handler->selection = selection;
@@ -381,9 +400,9 @@ WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
if (selHandlers == NULL) { if (selHandlers == NULL) {
selHandlers = WMCreateArrayWithDestructor(4, wfree); selHandlers = WMCreateArrayWithDestructor(4, wfree);
} }
WMAddToArray(selHandlers, handler); WMAddToArray(selHandlers, handler);
return True; return True;
} }

82
WINGs/wtextfield.c
View File

@@ -115,24 +115,24 @@ static void didResizeTextField();
struct W_ViewDelegate _TextFieldViewDelegate = { struct W_ViewDelegate _TextFieldViewDelegate = {
NULL, NULL,
NULL, NULL,
didResizeTextField, didResizeTextField,
NULL, NULL,
NULL NULL
}; };
static void lostHandler(WMView *view, Atom selection, void *cdata); static void lostSelection(WMView *view, Atom selection, void *cdata);
static WMData *requestHandler(WMView *view, Atom selection, Atom target, static WMData *requestHandler(WMView *view, Atom selection, Atom target,
void *cdata, Atom *type); void *cdata, Atom *type);
static WMSelectionProcs selectionHandler = { static WMSelectionProcs selectionHandler = {
requestHandler, requestHandler,
lostHandler, lostSelection,
NULL NULL
}; };
@@ -234,7 +234,7 @@ decrToFit(TextField *tPtr)
static WMData* static WMData*
requestHandler(WMView *view, Atom selection, Atom target, void *cdata, requestHandler(WMView *view, Atom selection, Atom target, void *cdata,
Atom *type) Atom *type)
{ {
TextField *tPtr = view->self; TextField *tPtr = view->self;
int count; int count;
@@ -281,23 +281,32 @@ requestHandler(WMView *view, Atom selection, Atom target, void *cdata,
static void static void
lostHandler(WMView *view, Atom selection, void *cdata) lostSelection(WMView *view, Atom selection, void *cdata)
{ {
TextField *tPtr = (WMTextField*)view->self; TextField *tPtr = (WMTextField*)view->self;
//WMDeleteSelectionHandler(view, XA_PRIMARY, CurrentTime); if (tPtr->flags.ownsSelection) {
tPtr->flags.ownsSelection = 0; WMDeleteSelectionHandler(view, selection, CurrentTime);
tPtr->selection.count = 0; tPtr->flags.ownsSelection = 0;
paintTextField(tPtr); }
if (tPtr->selection.count != 0) {
tPtr->selection.count = 0;
paintTextField(tPtr);
}
} }
static void static void
_notification(void *observerData, WMNotification *notification) selectionNotification(void *observerData, WMNotification *notification)
{ {
WMTextField *to = (WMTextField*)observerData; WMView *observerView = (WMView*)observerData;
WMTextField *tw = (WMTextField*)WMGetNotificationClientData(notification); WMView *newOwnerView = (WMView*)WMGetNotificationClientData(notification);
if (to != tw) lostHandler(to->view, XA_PRIMARY, NULL);
if (observerView != newOwnerView) {
//if (tPtr->flags.ownsSelection)
// WMDeleteSelectionHandler(observerView, XA_PRIMARY, CurrentTime);
lostSelection(observerView, XA_PRIMARY, NULL);
}
} }
@@ -348,8 +357,10 @@ WMCreateTextField(WMWidget *parent)
WMCreateEventHandler(tPtr->view, EnterWindowMask|LeaveWindowMask WMCreateEventHandler(tPtr->view, EnterWindowMask|LeaveWindowMask
|ButtonReleaseMask|ButtonPressMask|KeyPressMask|Button1MotionMask, |ButtonReleaseMask|ButtonPressMask|KeyPressMask|Button1MotionMask,
handleTextFieldActionEvents, tPtr); handleTextFieldActionEvents, tPtr);
WMAddNotificationObserver(_notification, tPtr, "_lostOwnership", tPtr); WMAddNotificationObserver(selectionNotification, tPtr->view,
WMSelectionOwnerDidChangeNotification,
(void*)XA_PRIMARY);
tPtr->flags.cursorOn = 1; tPtr->flags.cursorOn = 1;
@@ -1279,7 +1290,7 @@ handleTextFieldKeyPress(TextField *tPtr, XEvent *event)
/* Do not allow text selection in secure text fields */ /* Do not allow text selection in secure text fields */
if (cancelSelection || tPtr->flags.secure) { if (cancelSelection || tPtr->flags.secure) {
lostHandler(tPtr->view, XA_PRIMARY, NULL); lostSelection(tPtr->view, XA_PRIMARY, NULL);
if (tPtr->selection.count) { if (tPtr->selection.count) {
tPtr->selection.count = 0; tPtr->selection.count = 0;
@@ -1291,8 +1302,6 @@ handleTextFieldKeyPress(TextField *tPtr, XEvent *event)
tPtr->selection.count = tPtr->cursorPosition - tPtr->selection.position; tPtr->selection.count = tPtr->cursorPosition - tPtr->selection.position;
WMPostNotificationName("_lostOwnership", NULL, tPtr);
refresh = 1; refresh = 1;
} }
} }
@@ -1535,7 +1544,7 @@ handleTextFieldActionEvents(XEvent *event, void *data)
break; break;
} }
if (tPtr->selection.count != 0) { if (!tPtr->flags.secure && tPtr->selection.count!=0) {
int start, count; int start, count;
XRotateBuffers(dpy, 1); XRotateBuffers(dpy, 1);
@@ -1558,23 +1567,19 @@ handleTextFieldActionEvents(XEvent *event, void *data)
paintTextField(tPtr); paintTextField(tPtr);
if (!tPtr->flags.ownsSelection) { if (!tPtr->flags.ownsSelection) {
WMCreateSelectionHandler(tPtr->view, tPtr->flags.ownsSelection =
XA_PRIMARY, WMCreateSelectionHandler(tPtr->view,
event->xbutton.time, XA_PRIMARY,
&selectionHandler, NULL); event->xbutton.time,
tPtr->flags.ownsSelection = 1; &selectionHandler, NULL);
//puts("lost ownership");
WMPostNotificationName("_lostOwnership", NULL, tPtr);
} }
} else if (!tPtr->flags.secure && tPtr->selection.count!=0 && } else if (!tPtr->flags.secure && tPtr->selection.count!=0 &&
!tPtr->flags.ownsSelection) { !tPtr->flags.ownsSelection) {
WMCreateSelectionHandler(tPtr->view, tPtr->flags.ownsSelection =
XA_PRIMARY, WMCreateSelectionHandler(tPtr->view,
event->xbutton.time, XA_PRIMARY,
&selectionHandler, NULL); event->xbutton.time,
tPtr->flags.ownsSelection = 1; &selectionHandler, NULL);
//puts("lost ownership");
WMPostNotificationName("_lostOwnership", NULL, tPtr);
} }
lastButtonReleasedEvent = event->xbutton.time; lastButtonReleasedEvent = event->xbutton.time;
@@ -1593,6 +1598,7 @@ destroyTextField(TextField *tPtr)
#endif #endif
WMReleaseFont(tPtr->font); WMReleaseFont(tPtr->font);
// use lostSelection() instead of WMDeleteSelectionHandler aici?
WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime); WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime);
WMRemoveNotificationObserver(tPtr); WMRemoveNotificationObserver(tPtr);