applied Ramils patch
This commit is contained in:
parent
9e5c864609
commit
c624af41fe
|
@ -19,6 +19,7 @@
|
||||||
#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
|
#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
|
||||||
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
#define MIN(a, b) ((a) < (b) ? (a) : (b))
|
||||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||||
|
#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) || !((c) & 0x80))
|
||||||
|
|
||||||
/* enums */
|
/* enums */
|
||||||
enum { ColFG, ColBG, ColLast };
|
enum { ColFG, ColBG, ColLast };
|
||||||
|
@ -360,7 +361,7 @@ initfont(const char *fontstr) {
|
||||||
void
|
void
|
||||||
kpress(XKeyEvent * e) {
|
kpress(XKeyEvent * e) {
|
||||||
char buf[sizeof text];
|
char buf[sizeof text];
|
||||||
int i, num;
|
int i, num, off;
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
KeySym ksym;
|
KeySym ksym;
|
||||||
|
|
||||||
|
@ -475,13 +476,19 @@ kpress(XKeyEvent * e) {
|
||||||
break;
|
break;
|
||||||
case XK_BackSpace:
|
case XK_BackSpace:
|
||||||
if(cursor > 0) {
|
if(cursor > 0) {
|
||||||
memmove(text + cursor - 1, text + cursor, sizeof text - cursor + 1);
|
off = 1;
|
||||||
cursor--;
|
while(cursor > off && !IS_UTF8_1ST_CHAR(text[cursor - off]))
|
||||||
|
off++;
|
||||||
|
memmove(text + cursor - off, text + cursor, sizeof text - cursor + off);
|
||||||
|
cursor -= off;
|
||||||
match(text);
|
match(text);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case XK_Delete:
|
case XK_Delete:
|
||||||
memmove(text + cursor, text + cursor + 1, sizeof text - cursor);
|
off = 1;
|
||||||
|
while(cursor + off < sizeof text - 1 && !IS_UTF8_1ST_CHAR(text[cursor + off]))
|
||||||
|
off++;
|
||||||
|
memmove(text + cursor, text + cursor + off, sizeof text - cursor);
|
||||||
match(text);
|
match(text);
|
||||||
break;
|
break;
|
||||||
case XK_End:
|
case XK_End:
|
||||||
|
@ -517,9 +524,11 @@ kpress(XKeyEvent * e) {
|
||||||
calcoffsets();
|
calcoffsets();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(cursor > 0)
|
else if(cursor > 0) {
|
||||||
|
do {
|
||||||
cursor--;
|
cursor--;
|
||||||
else
|
} while(cursor > 0 && !IS_UTF8_1ST_CHAR(text[cursor]));
|
||||||
|
} else
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
case XK_Next:
|
case XK_Next:
|
||||||
|
@ -544,9 +553,11 @@ kpress(XKeyEvent * e) {
|
||||||
break;
|
break;
|
||||||
case XK_Right:
|
case XK_Right:
|
||||||
case XK_Down:
|
case XK_Down:
|
||||||
if(cursor < len)
|
if(cursor < len) {
|
||||||
|
do {
|
||||||
cursor++;
|
cursor++;
|
||||||
else if(sel && sel->right) {
|
} while(cursor < len && !IS_UTF8_1ST_CHAR(text[cursor]));
|
||||||
|
} else if(sel && sel->right) {
|
||||||
sel=sel->right;
|
sel=sel->right;
|
||||||
if(sel == next) {
|
if(sel == next) {
|
||||||
curr = next;
|
curr = next;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user