more reorg and refactoring

diff --git a/inc/win.h b/inc/win.h
index fe2968f4075b69397bb2c051ae51a3558e758b3e..4d8b5d5f659d35492f3a70a60e13499dedd82153 100644 (file)
--- a/inc/win.h
+++ b/inc/win.h
@@ -31,6 +31,7 @@ typedef struct {
 void win_init(KeyBinding* bindings, void (*errfn)(char*));
 void win_save(char* path);
 void win_loop(void);
+void win_quit(void);
 View* win_view(WinRegion id);
 Buf* win_buf(WinRegion id);
 bool win_btnpressed(int btn);
@@ -38,14 +39,6 @@ WinRegion win_getregion(void);
 bool win_setregion(WinRegion id);
 void win_setscroll(double offset, double visible);
 
-/* These functions must be implemented by any appliation that wishes
-   to use this module */
-void onshutdown(void);
-void onupdate(void);
-void onmouseleft(WinRegion id, bool pressed, size_t row, size_t col);
-void onmousemiddle(WinRegion id, bool pressed, size_t row, size_t col);
-void onmouseright(WinRegion id, bool pressed, size_t row, size_t col);
-
 /* move these to x11.c when possible */
 extern int SearchDir;
 extern char* SearchTerm;

diff --git a/inc/x11.h b/inc/x11.h
index 785524897d25fd622991b5bb16ec20e2ea02ad78..5e23f6aefb1474468679d1375c71a67c2887abed 100644 (file)
--- a/inc/x11.h
+++ b/inc/x11.h
@@ -1,17 +1,7 @@
-typedef struct {
-    void (*redraw)(int width, int height);
-    void (*handle_key)(int mods, int32_t rune);
-    void (*shutdown)(void);
-    void (*set_focus)(bool focus);
-    void (*mouse_drag)(int state, int x, int y);
-    void (*mouse_btn)(int state, bool pressed, int x, int y);
-    void (*cmd_received)(char* cmd);
-} XConfig;
-
 typedef void* XFont;
 
 typedef struct {
-    uint32_t attr; /* attributes  applied to this cell */
+    uint32_t attr; /* attributes applied to this cell */
     uint32_t rune; /* rune value for the cell */
 } XGlyph;
 
@@ -114,25 +104,9 @@ enum {
     CLIPBOARD = 1
 };
 
-void x11_init(XConfig* cfg);
-void x11_deinit(void);
-int x11_connfd(void);
-char* x11_cfg_get(char* opt);
-int x11_keybtnstate(void);
+void x11_init(void);
 bool x11_keymodsset(int mask);
-void x11_window(char* name, int width, int height);
-void x11_dialog(char* name, int height, int width);
-void x11_show(void);
-bool x11_running(void);
-void x11_flip(void);
-void x11_flush(void);
-void x11_finish(void);
-
-int x11_events_queued(void);
-void x11_events_take(void);
-
-void x11_mouse_get(int* x, int* y);
-void x11_mouse_set(int x, int y);
+void x11_window(char* name);
 
 XFont x11_font_load(char* name);
 size_t x11_font_height(XFont fnt);
@@ -142,12 +116,8 @@ void x11_font_getglyph(XFont font, XGlyphSpec* spec, uint32_t rune);
 size_t x11_font_getglyphs(XGlyphSpec* specs, const XGlyph* glyphs, int len, XFont font, int x, int y);
 
 void x11_draw_rect(int color, int x, int y, int width, int height);
-void x11_draw_utf8(XFont font, int fg, int bg, int x, int y, char* str);
 void x11_draw_glyphs(int fg, int bg, XGlyphSpec* specs, size_t nspecs, bool eol);
-void x11_draw_utf8(XFont font, int fg, int bg, int x, int y, char* str);
 
 bool x11_sel_get(int selid, void(*cbfn)(char*));
 bool x11_sel_set(int selid, char* str);
 
-void x11_prop_set(char* name, char* val);
-char* x11_prop_get(char* name);

diff --git a/lib/x11.c b/lib/x11.c
index 34bca3f9e72583e463688f5099ac9d445e81334a..d8302b992826693609226ba5cb10f4036606900d 100644 (file)
--- a/lib/x11.c
+++ b/lib/x11.c
@@ -128,7 +128,86 @@ static KeyBinding* Keys = NULL;
 int SearchDir = DOWN;
 char* SearchTerm = NULL;
 
-void x11_init(XConfig* cfg) {
+/******************************************************************************/
+
+void win_init(KeyBinding* bindings, void (*errfn)(char*)) {
+    for (int i = 0; i < SCROLL; i++)
+        view_init(&(Regions[i].view), NULL, errfn);
+    x11_init();
+    CurrFont = x11_font_load(FontString);
+    Regions[SCROLL].clrnor = Colors[ClrScrollNor];
+    Regions[TAGS].clrnor = Colors[ClrTagsNor];
+    Regions[TAGS].clrsel = Colors[ClrTagsSel];
+    Regions[TAGS].clrcsr = Colors[ClrTagsCsr];
+    Regions[EDIT].clrnor = Colors[ClrEditNor];
+    Regions[EDIT].clrsel = Colors[ClrEditSel];
+    Regions[EDIT].clrcsr = Colors[ClrEditCsr];
+
+    View* view = win_view(TAGS);
+    view->buffer.gapstart = view->buffer.bufstart;
+    view->buffer.gapend   = view->buffer.bufend;
+    view->selection = (Sel){0,0,0};
+    view_putstr(view, TagString);
+    view_selprev(view); // clear the selection
+    buf_logclear(&(view->buffer));
+
+    Keys = bindings;
+}
+
+void win_save(char* path) {
+    View* view = win_view(EDIT);
+    if (!path) path = view->buffer.path;
+    if (!path) return;
+    path = stringdup(path);
+    free(view->buffer.path);
+    view->buffer.path = path;
+    buf_save(&(view->buffer));
+}
+
+void win_loop(void) {
+    XMapWindow(X.display, X.self);
+    XFlush(X.display);
+    job_spawn(ConnectionNumber(X.display), xupdate, 0, 0);
+    while (1) job_poll(Timeout);
+}
+
+bool win_btnpressed(int btn) {
+    int btnmask = (1 << (btn + 7));
+    return ((KeyBtnState & btnmask) == btnmask);
+}
+
+WinRegion win_getregion(void) {
+    return Focused;
+}
+
+bool win_setregion(WinRegion id) {
+    bool changed = true;
+    if (Focused != id && (id == TAGS || id == EDIT))
+        changed = true, Focused = id;
+    return changed;
+}
+
+View* win_view(WinRegion id) {
+    return &(Regions[id == FOCUSED ? Focused : id].view);
+}
+
+Buf* win_buf(WinRegion id) {
+    return &(Regions[id == FOCUSED ? Focused : id].view.buffer);
+}
+
+void win_quit(void) {
+    static uint64_t before = 0;
+    uint64_t now = getmillis();
+    if (!win_buf(EDIT)->modified || (now-before) <= (uint64_t)ClickTime)
+        exit(0);
+    else
+        win_buf(EDIT)->errfn("File is modified.");
+    before = now;
+}
+
+/******************************************************************************/
+
+void x11_init(void) {
     signal(SIGPIPE, SIG_IGN); // Ignore the SIGPIPE signal
     setlocale(LC_CTYPE, "");
     XSetLocaleModifiers("");
@@ -155,10 +234,9 @@ bool x11_keymodsset(int mask) {
     return ((KeyBtnState & mask) == mask);
 }
 
-void x11_window(char* name, int width, int height) {
+void x11_window(char* name) {
     /* create the main window */
-    X.width  = width ;
-    X.height = height;
+    X.width = WinWidth, X.height = WinHeight;
     XWindowAttributes wa;
     XGetWindowAttributes(X.display, X.root, &wa);
     X.self = XCreateSimpleWindow(X.display, X.root,
@@ -196,7 +274,7 @@ void x11_window(char* name, int width, int height) {
         X.xic = XCreateIC(X.xim, XNInputStyle, XIMPreeditNothing|XIMStatusNothing, XNClientWindow, X.self, XNFocusWindow, X.self, NULL);
 
     /* initialize pixmap and drawing context */
-    X.pixmap = XCreatePixmap(X.display, X.self, width, height, X.depth);
+    X.pixmap = XCreatePixmap(X.display, X.self, X.width, X.height, X.depth);
     X.xft    = XftDrawCreate(X.display, X.pixmap, X.visual, X.colormap);
 
     /* initialize the graphics context */
@@ -255,13 +333,6 @@ size_t x11_font_descent(XFont fnt) {
     return font->base.descent;
 }
 
-void x11_draw_rect(int color, int x, int y, int width, int height) {
-    XftColor clr;
-    xftcolor(&clr, color);
-    XftDrawRect(X.xft, &clr, x, y, width, height);
-    XftColorFree(X.display, X.visual, X.colormap, &clr);
-}
-
 void x11_font_getglyph(XFont fnt, XGlyphSpec* spec, uint32_t rune) {
     struct XFont* font = fnt;
     /* if the rune is in the base font, set it and return */
@@ -346,6 +417,17 @@ void x11_draw_glyphs(int fg, int bg, XGlyphSpec* specs, size_t nspecs, bool eol)
     XftColorFree(X.display, X.visual, X.colormap, &fgc);
 }
 
+/******************************************************************************/
+
+void x11_draw_rect(int color, int x, int y, int width, int height) {
+    XftColor clr;
+    xftcolor(&clr, color);
+    XftDrawRect(X.xft, &clr, x, y, width, height);
+    XftColorFree(X.display, X.visual, X.colormap, &clr);
+}
+
+/******************************************************************************/
+
 bool x11_sel_get(int selid, void(*cbfn)(char*)) {
     struct XSel* sel = &(Selections[selid]);
     if (sel->callback) return false;
@@ -371,79 +453,8 @@ bool x11_sel_set(int selid, char* str) {
     }
 }
 
-void win_init(KeyBinding* bindings, void (*errfn)(char*)) {
-    for (int i = 0; i < SCROLL; i++)
-        view_init(&(Regions[i].view), NULL, errfn);
-    x11_init(0);
-    CurrFont = x11_font_load(FontString);
-    Regions[SCROLL].clrnor = Colors[ClrScrollNor];
-    Regions[TAGS].clrnor = Colors[ClrTagsNor];
-    Regions[TAGS].clrsel = Colors[ClrTagsSel];
-    Regions[TAGS].clrcsr = Colors[ClrTagsCsr];
-    Regions[EDIT].clrnor = Colors[ClrEditNor];
-    Regions[EDIT].clrsel = Colors[ClrEditSel];
-    Regions[EDIT].clrcsr = Colors[ClrEditCsr];
-
-    View* view = win_view(TAGS);
-    view->buffer.gapstart = view->buffer.bufstart;
-    view->buffer.gapend   = view->buffer.bufend;
-    view->selection = (Sel){0,0,0};
-    view_putstr(view, TagString);
-    view_selprev(view); // clear the selection
-    buf_logclear(&(view->buffer));
-
-    Keys = bindings;
-}
-
-void win_save(char* path) {
-    View* view = win_view(EDIT);
-    if (!path) path = view->buffer.path;
-    if (!path) return;
-    path = stringdup(path);
-    free(view->buffer.path);
-    view->buffer.path = path;
-    buf_save(&(view->buffer));
-}
-
-void win_loop(void) {
-    XMapWindow(X.display, X.self);
-    XFlush(X.display);
-    job_spawn(ConnectionNumber(X.display), xupdate, 0, 0);
-    while (1) job_poll(Timeout);
-}
-
-bool win_btnpressed(int btn) {
-    int btnmask = (1 << (btn + 7));
-    return ((KeyBtnState & btnmask) == btnmask);
-}
-
-WinRegion win_getregion(void) {
-    return Focused;
-}
-
-bool win_setregion(WinRegion id) {
-    bool changed = true;
-    if (Focused != id && (id == TAGS || id == EDIT))
-        changed = true, Focused = id;
-    return changed;
-}
-
-View* win_view(WinRegion id) {
-    return &(Regions[id == FOCUSED ? Focused : id].view);
-}
-
-Buf* win_buf(WinRegion id) {
-    return &(Regions[id == FOCUSED ? Focused : id].view.buffer);
-}
-
-void win_setscroll(double offset, double visible) {
-    ScrollOffset  = offset;
-    ScrollVisible = visible;
-}
-
 /******************************************************************************/
 
-
 static WinRegion getregion(size_t x, size_t y) {
     for (int i = 0; i < NREGIONS; i++) {
         size_t startx = Regions[i].x, endx = startx + Regions[i].width;
@@ -605,7 +616,7 @@ static void xpropnotify(XEvent* e) {
 
 static void xclientmsg(XEvent* e) {
     if (e->xclient.data.l[0] == XInternAtom(X.display, "WM_DELETE_WINDOW", False))
-        onshutdown();
+        win_quit();
 }
 
 static void xresize(XEvent* e) {
@@ -751,6 +762,28 @@ static void layout(int width, int height) {
     view_resize(editview, Regions[EDIT].height / fheight, Regions[EDIT].width / fwidth);
 }
 
+static void draw_view(int i, int width, int height) {
+    int clr_hbor = Colors[ClrBorders].bg;
+    int clr_vbor = Colors[ClrBorders].bg;
+    size_t fheight = x11_font_height(CurrFont);
+    size_t fwidth  = x11_font_width(CurrFont);
+    View* view = win_view(i);
+    x11_draw_rect(Regions[i].clrnor.bg, 0, Regions[i].y - 3, width, Regions[i].height + 8);
+    x11_draw_rect(clr_hbor, 0, Regions[i].y - 3, width, 1);
+    for (size_t line = 0, y = 0; y < view->nrows; y++) {
+        Row* row = view_getrow(view, y);
+        draw_glyphs(Regions[i].x, Regions[i].y + ((y+1) * fheight), row->cols, row->rlen, row->len);
+    }
+    /* place the cursor on screen */
+    if (Regions[i].csrx != SIZE_MAX && Regions[i].csry != SIZE_MAX) {
+        x11_draw_rect(
+            Regions[i].clrcsr.fg,
+            Regions[i].x + (Regions[i].csrx * fwidth),
+            Regions[i].y + (Regions[i].csry * fheight),
+            1, fheight);
+    }
+}
+
 static void redraw(int width, int height) {
     size_t fheight = x11_font_height(CurrFont);
     size_t fwidth  = x11_font_width(CurrFont);
@@ -772,40 +805,20 @@ static void redraw(int width, int height) {
     size_t vend = view->rows[view->nrows-1]->off + view->rows[view->nrows-1]->rlen;
     double scroll_vis = (double)(vend - vbeg) / (double)bend;
     double scroll_off = ((double)vbeg / (double)bend);
-    win_setscroll(scroll_off, scroll_vis);
+    ScrollOffset = scroll_off, ScrollVisible = scroll_vis;
 
-    int clr_hbor = Colors[ClrBorders].bg;
-    int clr_vbor = Colors[ClrBorders].bg;
-    CPair clr_scroll = Colors[ClrScrollNor];
-    for (int i = 0; i < SCROLL; i++) {
-        View* view = win_view(i);
-        x11_draw_rect(Regions[i].clrnor.bg, 0, Regions[i].y - 3, width, Regions[i].height + 8);
-        x11_draw_rect(clr_hbor, 0, Regions[i].y - 3, width, 1);
-        for (size_t line = 0, y = 0; y < view->nrows; y++) {
-            Row* row = view_getrow(view, y);
-            draw_glyphs(Regions[i].x, Regions[i].y + ((y+1) * fheight), row->cols, row->rlen, row->len);
-        }
-
-        /* place the cursor on screen */
-        if (Regions[i].csrx != SIZE_MAX && Regions[i].csry != SIZE_MAX) {
-            x11_draw_rect(
-                Regions[i].clrcsr.fg,
-                Regions[i].x + (Regions[i].csrx * fwidth),
-                Regions[i].y + (Regions[i].csry * fheight),
-                1, fheight);
-        }
-
-    }
+    draw_view(TAGS, width, height);
+    draw_view(EDIT, width, height);
 
     /* draw the scroll region */
     size_t thumbreg = (Regions[SCROLL].height - Regions[SCROLL].y + 9);
     size_t thumboff = (size_t)((thumbreg * ScrollOffset) + (Regions[SCROLL].y - 2));
     size_t thumbsz  = (size_t)(thumbreg * ScrollVisible);
     if (thumbsz < 5) thumbsz = 5;
-    x11_draw_rect(clr_vbor, Regions[SCROLL].width, Regions[SCROLL].y - 2, 1, Regions[SCROLL].height);
+    CPair clr_scroll = Colors[ClrScrollNor];
+    x11_draw_rect(Colors[ClrBorders].bg, Regions[SCROLL].width, Regions[SCROLL].y - 2, 1, Regions[SCROLL].height);
     x11_draw_rect(clr_scroll.bg, 0, Regions[SCROLL].y - 2, Regions[SCROLL].width, thumbreg);
     x11_draw_rect(clr_scroll.fg, 0, thumboff, Regions[SCROLL].width, thumbsz);
-
 }
 
 static void draw_glyphs(size_t x, size_t y, UGlyph* glyphs, size_t rlen, size_t ncols) {

diff --git a/tide.c b/tide.c
index 7aab3c34210f8b668280c94e25bd2ba99f02e289..325ec79c1eba9513b9e58f0066bdff9e4bce770f 100644 (file)
--- a/tide.c
+++ b/tide.c
@@ -11,8 +11,8 @@ typedef struct {
     void (*action)(char*);
 } Tag;
 
+char* ARGV0;
 static Tag Builtins[];
-static size_t Marks[10] = {0};
 
 /* The shell: Filled in with $SHELL. Used to execute commands */
 char* ShellCmd[] = { NULL, "-c", NULL, NULL };
@@ -313,14 +313,7 @@ static void trim_whitespace(char* arg) {
 }
 
 static void quit(char* arg) {
-    static uint64_t before = 0;
-    uint64_t now = getmillis();
-    if (!win_buf(EDIT)->modified || (now-before) <= (uint64_t)ClickTime) {
-        exit(0);
-    } else {
-        ondiagmsg("File is modified. Repeat action twice quickly to quit.");
-    }
-    before = now;
+    win_quit();
 }
 
 static void put(char* arg) {
@@ -531,11 +524,6 @@ static KeyBinding Bindings[] = {
     { 0, 0, 0 }
 };
 
-void onshutdown(void) {
-    quit(0);
-}
-
-char* ARGV0;
 static void usage(void) {
     printf(
         "Usage: %s [FLAGS] [FILE]\n"
@@ -572,7 +560,7 @@ int main(int argc, char** argv) {
 
     /* create the window */
     win_init(Bindings, ondiagmsg);
-    x11_window("tide", WinWidth, WinHeight);
+    x11_window("tide");
 
     /* if we still have args left we're going to open it in this instance */
     if (*argv) view_init(win_view(EDIT), *argv, ondiagmsg);