diff --git a/src/backend/x11.c b/src/backend/x11.c index 1989188..d751a21 100644 --- a/src/backend/x11.c +++ b/src/backend/x11.c @@ -392,16 +392,16 @@ void MwLLNextEvent(MwLL handle) { n = MwLLKeyLeftShift; } else if(strcmp(str, "Shift_R") == 0) { n = MwLLKeyRightShift; - } else if(strcmp(str, "Alt_L") == 0 || strcmp(str, "Alt_R") == 0){ + } else if(strcmp(str, "Alt_L") == 0 || strcmp(str, "Alt_R") == 0) { n = MwLLKeyAlt; - } else if(strcmp(str, "Control_R") == 0 || strcmp(str, "Control_R") == 0){ + } else if(strcmp(str, "Control_R") == 0 || strcmp(str, "Control_R") == 0) { n = MwLLKeyControl; } - if(n != MwLLKeyControl && ev.xkey.state & ControlMask){ + if(n != MwLLKeyControl && ev.xkey.state & ControlMask) { n |= MwLLControlMask; } - if(n != MwLLKeyAlt && ev.xkey.state & Mod1Mask){ + if(n != MwLLKeyAlt && ev.xkey.state & Mod1Mask) { n |= MwLLAltMask; } @@ -785,28 +785,28 @@ void MwLLSetClipboard(MwLL handle, const char* text) { } char* MwLLGetClipboard(MwLL handle) { - Atom clip, target, prop; - XEvent ev; + Atom clip, target, prop; + XEvent ev; XEvent* queue = NULL; - char* r = NULL; + char* r = NULL; - clip = XInternAtom(handle->display, "CLIPBOARD", 0); + clip = XInternAtom(handle->display, "CLIPBOARD", 0); target = XA_STRING; - prop = XInternAtom(handle->display, "XSEL_DATA", 0); + prop = XInternAtom(handle->display, "XSEL_DATA", 0); XConvertSelection(handle->display, clip, target, prop, handle->window, CurrentTime); - while(1){ + while(1) { XNextEvent(handle->display, &ev); - if(ev.type == SelectionNotify){ - if(ev.xselection.selection == clip && ev.xselection.property != 0){ - Atom t; + if(ev.type == SelectionNotify) { + if(ev.xselection.selection == clip && ev.xselection.property != 0) { + Atom t; unsigned long size, N; - char* data; - int format; + char* data; + int format; - XGetWindowProperty(ev.xselection.display, ev.xselection.requestor, ev.xselection.property, 0L, (~0L), 0, AnyPropertyType, &t, &format, &size, &N, (unsigned char**)&data); - if(t == target){ + XGetWindowProperty(ev.xselection.display, ev.xselection.requestor, ev.xselection.property, 0, (~0L), 0, AnyPropertyType, &t, &format, &size, &N, (unsigned char**)&data); + if(t == target) { r = MwStringDupliacte(data); XFree(data); } @@ -816,7 +816,7 @@ char* MwLLGetClipboard(MwLL handle) { } } - while(arrlen(queue) > 0){ + while(arrlen(queue) > 0) { XPutBackEvent(handle->display, &queue[0]); arrdel(queue, 0); } diff --git a/src/widget/entry.c b/src/widget/entry.c index f092f04..c3f8a5c 100644 --- a/src/widget/entry.c +++ b/src/widget/entry.c @@ -106,9 +106,9 @@ static void key(MwWidget handle, int code) { t->cursor++; } else if(code == MwLLKeyEnter) { MwDispatchUserHandler(handle, MwNactivateHandler, NULL); - } else if(code == (MwLLControlMask | 'v')){ + } else if(code == (MwLLControlMask | 'v')) { char* c = MwLLGetClipboard(handle->lowlevel); - if(c != NULL){ + if(c != NULL) { char* out = malloc(strlen(str) + strlen(c) + 1); MwUTF8Copy(str, 0, out, 0, t->cursor); diff --git a/src/widget/viewport.c b/src/widget/viewport.c index e854175..5f0043c 100644 --- a/src/widget/viewport.c +++ b/src/widget/viewport.c @@ -152,7 +152,7 @@ static void tick(MwWidget handle) { v = MwGetInteger(vp->vscroll, MwNvalue); mv = MwGetInteger(vp->vscroll, MwNmaxValue); l = MwGetInteger(vp->frame, MwNheight); - v = (mv - l) * (double)v / mv; + v = (mv - l) * (double)v / mv; if(v < 0) v = 0; MwVaApply(vp->inframe, @@ -167,7 +167,7 @@ static void tick(MwWidget handle) { v = MwGetInteger(vp->hscroll, MwNvalue); mv = MwGetInteger(vp->hscroll, MwNmaxValue); l = MwGetInteger(vp->frame, MwNwidth); - v = (mv - l) * (double)v / mv; + v = (mv - l) * (double)v / mv; if(v < 0) v = 0; MwVaApply(vp->inframe,