move the keyboard bindings out of the lib into xedit.c

diff --git a/Makefile b/Makefile
index f9a3e95e2196126f06bb81da64a3391b9d5aa1ea..c849c62b64581492ef4f96ee3ee408b69ea8a245 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ INCS = -Iinc/
 LIBEDIT_OBJS =         \
        libedit/buf.o      \
        libedit/charset.o  \
-       libedit/keyboard.o \
        libedit/mouse.o    \
        libedit/screen.o   \
        libedit/utf8.o     \

diff --git a/inc/edit.h b/inc/edit.h
index 17740ca0a4760ebcb93738d0fcd3a34c38d0f6b4..169a0aa22b8a039e2ea49768ed6c488dda329b40 100644 (file)
--- a/inc/edit.h
+++ b/inc/edit.h
@@ -236,8 +236,25 @@ enum {
 #else
 #define FONTNAME "Liberation Mono:size=10.5:antialias=true:autohint=true"
 #endif
-
 #define DEFAULT_COLORSCHEME DARK
 #define DEFAULT_CRLF 1
 #define DEFAULT_CHARSET UTF_8
-
+#define COLOR_PALETTE \
+    {                 \
+        0xff002b36,   \
+        0xff073642,   \
+        0xff586e75,   \
+        0xff657b83,   \
+        0xff839496,   \
+        0xff93a1a1,   \
+        0xffeee8d5,   \
+        0xfffdf6e3,   \
+        0xffb58900,   \
+        0xffcb4b16,   \
+        0xffdc322f,   \
+        0xffd33682,   \
+        0xff6c71c4,   \
+        0xff268bd2,   \
+        0xff2aa198,   \
+        0xff859900    \
+    }

diff --git a/libedit/buf.c b/libedit/buf.c
index 8382d56d6e84563a1588d669c119de1526c03bc0..deed804bc08eb3dd5fa82d5f24307d0ecf2097e2 100644 (file)
--- a/libedit/buf.c
+++ b/libedit/buf.c
@@ -185,7 +185,7 @@ unsigned swaplog(Buf* buf, Log** from, Log** to, unsigned pos) {
         for (size_t i = log->data.del.len; i > 0; i--) {
             insert(buf, newlog->data.ins.beg, log->data.del.runes[i-1]);
         }
-        pos = newlog->data.ins.end - 1;
+        pos = newlog->data.ins.end;
     }
     newlog->next = *to;
     *to = newlog;

diff --git a/libedit/keyboard.c b/libedit/keyboard.c
deleted file mode 100644 (file)
index e79d799..0000000
--- a/libedit/keyboard.c
+++ /dev/null
@@ -1,246 +0,0 @@
-#include <stdc.h>
-#include <X.h>
-#include <utf.h>
-#include <edit.h>
-
-static void cursor_up(void) {
-    SelBeg = SelEnd = buf_byline(&Buffer, SelEnd, -1);
-    SelBeg = SelEnd = buf_setcol(&Buffer, SelEnd, TargetCol);
-}
-
-static void cursor_dn(void) {
-    SelBeg = SelEnd = buf_byline(&Buffer, SelEnd, 1);
-    SelBeg = SelEnd = buf_setcol(&Buffer, SelEnd, TargetCol);
-}
-
-static void cursor_left(void) {
-    SelBeg = SelEnd = buf_byrune(&Buffer, SelEnd, -1);
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-}
-
-static void cursor_right(void) {
-    SelBeg = SelEnd = buf_byrune(&Buffer, SelEnd, 1);
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-}
-
-static void cursor_bol(void) {
-    SelBeg = SelEnd = buf_bol(&Buffer, SelEnd);
-    TargetCol = 0;
-}
-
-static void cursor_eol(void) {
-    SelBeg = SelEnd = buf_eol(&Buffer, SelEnd);
-    TargetCol = (unsigned)-1;
-}
-
-static void insert_before(void) {
-    SelEnd = SelBeg;
-    buf_setlocked(&Buffer,false);
-}
-
-static void insert_after(void) {
-    SelBeg = ++SelEnd;
-    buf_setlocked(&Buffer,false);
-}
-
-static void exit_insert(void) {
-    buf_setlocked(&Buffer,true);
-}
-
-static void write(void) {
-    buf_save(&Buffer);
-}
-
-static void quit(void) {
-    static uint32_t num_clicks = 0;
-    static uint32_t prevtime = 0;
-    uint32_t now = getmillis();
-    num_clicks = (now - prevtime < 250 ? num_clicks+1 : 1);
-    prevtime = now;
-    if (!Buffer.modified || num_clicks >= 2)
-        exit(0);
-}
-
-static void dot_delete(void) {
-    if (SelEnd == buf_end(&Buffer)) return;
-    size_t n = SelEnd - SelBeg;
-    bool locked = buf_locked(&Buffer);
-    if (locked || !n) n++;
-    buf_setlocked(&Buffer,false);
-    for (size_t i = 0; i < n; i++)
-        buf_del(&Buffer, SelBeg);
-    SelEnd = SelBeg;
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-    buf_setlocked(&Buffer, locked);
-}
-
-static void dot_change(void) {
-    dot_delete();
-    buf_setlocked(&Buffer,false);
-}
-
-static void dot_backspace(void) {
-    if (SelBeg > 0 && SelBeg == SelEnd) SelBeg--;
-    while (SelBeg < SelEnd)
-        buf_del(&Buffer, --SelEnd);
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-}
-
-static void insert(Rune r) {
-    if (buf_locked(&Buffer)) return;
-    buf_ins(&Buffer, SelEnd++, r);
-    SelBeg = SelEnd;
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-}
-
-/*****************************************************************************/
-
-static void cursor_nextword(void) {
-}
-
-static void cursor_nextbigword(void) {
-}
-
-static void cursor_endword(void) {
-}
-
-static void cursor_endbigword(void) {
-}
-
-static void cursor_prevword(void) {
-}
-
-static void cursor_prevbigword(void) {
-}
-
-/*****************************************************************************/
-
-static void undo(void) {
-    SelBeg = SelEnd = buf_undo(&Buffer, SelEnd);
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-}
-
-static void redo(void) {
-    SelBeg = SelEnd = buf_redo(&Buffer, SelEnd)+1;
-    TargetCol = buf_getcol(&Buffer, SelEnd);
-}
-
-/*****************************************************************************/
-
-static void yank_selection(void) {
-    char* str = buf_getstr(&Buffer, SelBeg, SelEnd);
-    clipcopy(str);
-    free(str);
-}
-
-static void paste_after(void) {
-    char* str = clippaste();
-    buf_putstr(&Buffer, SelBeg, SelEnd, str);
-    free(str);
-}
-
-/*****************************************************************************/
-
-typedef struct {
-    Rune key;
-    void (*action)(void);
-} KeyBinding_T;
-
-static KeyBinding_T Normal[] = {
-    { KEY_CTRL_Q, quit          },
-    { KEY_CTRL_W, write         },
-    //{ 'q',        quit          },
-    //{ 's',        write         },
-
-    /* visual selection modes */
-    //{ 'v',        visual        },
-    //{ 'V',        visual_line   },
-    //{ KEY_CTRL_V, visual_column },
-
-    /* normal cursor movements */
-    { KEY_UP,     cursor_up     },
-    { 'k',        cursor_up     },
-    { KEY_DOWN,   cursor_dn     },
-    { 'j',        cursor_dn     },
-    { KEY_LEFT,   cursor_left   },
-    { 'h',        cursor_left   },
-    { KEY_RIGHT,  cursor_right  },
-    { 'l',        cursor_right  },
-    { KEY_HOME,   cursor_bol    },
-    { '0',        cursor_bol    },
-    { KEY_END,    cursor_eol    },
-    { '$',        cursor_eol    },
-
-    /* advanced cursor movements */
-    { 'w',        cursor_nextword    },
-    { 'W',        cursor_nextbigword },
-    { 'e',        cursor_endword     },
-    { 'E',        cursor_endbigword  },
-    { 'b',        cursor_prevword    },
-    { 'B',        cursor_prevbigword },
-
-    /* undo/redo handling */
-    { 'u',        undo },
-    { 'r',        redo },
-
-    /* insert mode handling */
-    { 'a',        insert_after    },
-    //{ 'A',        insert_afterln  },
-    { 'i',        insert_before   },
-    //{ 'I',        insert_beforeln },
-    { 'd',        dot_delete      },
-    { 'c',        dot_change      },
-    //{ 'o',        insert_lnafter  },
-    //{ 'O',        insert_lnbefore },
-    { KEY_DELETE, dot_delete    },
-
-    /* Copy/Paste */
-    { 'y',        yank_selection },
-    { 'p',        paste_after    },
-    //{ 'Y',        yank_line      },
-    //{ 'P',        paste_before   },
-
-    /* context sensitive language */
-    //{ 's', dot_select  },
-    //{ 'x', dot_execute },
-    //{ 'f', dot_find    },
-
-    { 0,          NULL          }
-};
-
-static KeyBinding_T Insert[] = {
-    { KEY_UP,        cursor_up     },
-    { KEY_DOWN,      cursor_dn     },
-    { KEY_LEFT,      cursor_left   },
-    { KEY_RIGHT,     cursor_right  },
-    { KEY_HOME,      cursor_bol    },
-    { KEY_END,       cursor_eol    },
-    { KEY_ESCAPE,    exit_insert   },
-    { KEY_DELETE,    dot_delete    },
-    { KEY_BACKSPACE, dot_backspace },
-    { 0,             NULL          }
-};
-
-static void process_table(KeyBinding_T* bindings, Rune key) {
-    while (bindings->key) {
-        if (key == bindings->key) {
-            bindings->action();
-            return;
-        }
-        bindings++;
-    }
-    insert(key);
-}
-
-void handle_key(Rune key) {
-    /* ignore invalid keys */
-    if (key == RUNE_ERR) return;
-    /* handle the proper line endings */
-    if (key == '\r') key = '\n';
-    if (key == '\n' && Buffer.crlf) key = RUNE_CRLF;
-    /* handle the key */
-    if (buf_locked(&Buffer))
-        process_table(Normal, key);
-    else
-        process_table(Insert, key);
-}

diff --git a/xedit.c b/xedit.c
index 99b60556abd5cae3ed22bce7f1742a664e954441..6a1ffe0d604ce8ee59dfed477d89b035cde694ff 100644 (file)
--- a/xedit.c
+++ b/xedit.c
@@ -6,105 +6,38 @@
 
 static void redraw(int width, int height);
 static void mouse_handler(MouseAct act, MouseBtn btn, int x, int y);
-void handle_key(Rune key);
-
-static void quit(void);
-static void write(void);
-static void undo(void);
-static void redo(void);
-static void cut(void);
-static void copy(void);
-static void paste(void);
-static void cursor_up(void);
-static void cursor_dn(void);
-static void cursor_left(void);
-static void cursor_right(void);
-static void cursor_bol(void);
-static void cursor_eol(void);
-static void dot_delete(void);
-static void dot_backspace(void);
+static void key_handler(Rune key);
 
+/* Global Data
+ *****************************************************************************/
 Buf Buffer;
 unsigned TargetCol = 0;
 unsigned SelBeg = 0;
 unsigned SelEnd = 0;
-
 static XFont Fonts;
 static XConfig Config = {
     .redraw       = redraw,
-    .handle_key   = handle_key,
+    .handle_key   = key_handler,
     .handle_mouse = mouse_handler,
-    .palette    = {
-        /* ARGB color values */
-        0xff002b36,
-        0xff073642,
-        0xff586e75,
-        0xff657b83,
-        0xff839496,
-        0xff93a1a1,
-        0xffeee8d5,
-        0xfffdf6e3,
-        0xffb58900,
-        0xffcb4b16,
-        0xffdc322f,
-        0xffd33682,
-        0xff6c71c4,
-        0xff268bd2,
-        0xff2aa198,
-        0xff859900
-    }
+    .palette      = COLOR_PALETTE
 };
 
-typedef struct {
-    Rune key;
-    void (*action)(void);
-} KeyBinding_T;
-
-static KeyBinding_T Insert[] = {
-    { KEY_CTRL_Q,    quit          },
-    { KEY_CTRL_S,    write         },
-    { KEY_CTRL_Z,    undo          },
-    { KEY_CTRL_Y,    redo          },
-    { KEY_CTRL_X,    cut           },
-    { KEY_CTRL_C,    copy          },
-    { KEY_CTRL_V,    paste         },
-    { KEY_UP,        cursor_up     },
-    { KEY_DOWN,      cursor_dn     },
-    { KEY_LEFT,      cursor_left   },
-    { KEY_RIGHT,     cursor_right  },
-    { KEY_HOME,      cursor_bol    },
-    { KEY_END,       cursor_eol    },
-    { KEY_DELETE,    dot_delete    },
-    { KEY_BACKSPACE, dot_backspace },
-    { 0,             NULL          }
-};
-
-static void process_table(KeyBinding_T* bindings, Rune key) {
-    while (bindings->key) {
-        if (key == bindings->key) {
-            bindings->action();
-            return;
-        }
-        bindings++;
-    }
-    /* skip control and nonprintable characters */
-    if ((!isspace(key) && key < 0x20) ||
-        (key >= 0xE000 && key <= 0xF8FF))
-        return;
-    /* fallback to just inserting the rune */
-    buf_ins(&Buffer, SelEnd++, key);
-    SelBeg = SelEnd;
+/* Keyboard Actions
+ *****************************************************************************/
+static void delete(void) {
+    if (SelEnd == buf_end(&Buffer)) return;
+    size_t n = SelEnd - SelBeg;
+    for (size_t i = 0; i < n; i++)
+        buf_del(&Buffer, SelBeg);
+    SelEnd = SelBeg;
     TargetCol = buf_getcol(&Buffer, SelEnd);
 }
 
-void handle_key(Rune key) {
-    /* ignore invalid keys */
-    if (key == RUNE_ERR) return;
-    /* handle the proper line endings */
-    if (key == '\r') key = '\n';
-    if (key == '\n' && Buffer.crlf) key = RUNE_CRLF;
-    /* handle the key */
-    process_table(Insert, key);
+static void backspace(void) {
+    if (SelBeg > 0 && SelBeg == SelEnd) SelBeg--;
+    while (SelBeg < SelEnd)
+        buf_del(&Buffer, --SelEnd);
+    TargetCol = buf_getcol(&Buffer, SelEnd);
 }
 
 static void quit(void) {
@@ -135,7 +68,7 @@ static void cut(void) {
     char* str = buf_getstr(&Buffer, SelBeg, SelEnd);
     clipcopy(str);
     free(str);
-    dot_delete();
+    delete();
 }
 
 static void copy(void) {
@@ -180,26 +113,62 @@ static void cursor_eol(void) {
     TargetCol = (unsigned)-1;
 }
 
-static void dot_delete(void) {
-    if (SelEnd == buf_end(&Buffer)) return;
-    size_t n = SelEnd - SelBeg;
-    bool locked = buf_locked(&Buffer);
-    if (locked || !n) n++;
-    buf_setlocked(&Buffer,false);
-    for (size_t i = 0; i < n; i++)
-        buf_del(&Buffer, SelBeg);
-    SelEnd = SelBeg;
+/* Keyboard Bindings
+ *****************************************************************************/
+typedef struct {
+    Rune key;
+    void (*action)(void);
+} KeyBinding_T;
+
+static KeyBinding_T Insert[] = {
+    { KEY_CTRL_Q,    quit          },
+    { KEY_CTRL_S,    write         },
+    { KEY_CTRL_Z,    undo          },
+    { KEY_CTRL_Y,    redo          },
+    { KEY_CTRL_X,    cut           },
+    { KEY_CTRL_C,    copy          },
+    { KEY_CTRL_V,    paste         },
+    { KEY_UP,        cursor_up     },
+    { KEY_DOWN,      cursor_dn     },
+    { KEY_LEFT,      cursor_left   },
+    { KEY_RIGHT,     cursor_right  },
+    { KEY_HOME,      cursor_bol    },
+    { KEY_END,       cursor_eol    },
+    { KEY_DELETE,    delete        },
+    { KEY_BACKSPACE, backspace     },
+    { 0,             NULL          }
+};
+
+static void process_table(KeyBinding_T* bindings, Rune key) {
+    while (bindings->key) {
+        if (key == bindings->key) {
+            bindings->action();
+            return;
+        }
+        bindings++;
+    }
+    /* skip control and nonprintable characters */
+    if ((!isspace(key) && key < 0x20) ||
+        (key >= 0xE000 && key <= 0xF8FF))
+        return;
+    /* fallback to just inserting the rune */
+    buf_ins(&Buffer, SelEnd++, key);
+    SelBeg = SelEnd;
     TargetCol = buf_getcol(&Buffer, SelEnd);
-    buf_setlocked(&Buffer, locked);
 }
 
-static void dot_backspace(void) {
-    if (SelBeg > 0 && SelBeg == SelEnd) SelBeg--;
-    while (SelBeg < SelEnd)
-        buf_del(&Buffer, --SelEnd);
-    TargetCol = buf_getcol(&Buffer, SelEnd);
+static void key_handler(Rune key) {
+    /* ignore invalid keys */
+    if (key == RUNE_ERR) return;
+    /* handle the proper line endings */
+    if (key == '\r') key = '\n';
+    if (key == '\n' && Buffer.crlf) key = RUNE_CRLF;
+    /* handle the key */
+    process_table(Insert, key);
 }
 
+/* Screen Redraw
+ *****************************************************************************/
 static void draw_runes(unsigned x, unsigned y, int fg, int bg, UGlyph* glyphs, size_t rlen) {
     XftGlyphFontSpec specs[rlen];
     while (rlen) {