mouse shortcuts: allow override for all shortcuts

[st.git] / x.c

diff --git a/x.c b/x.c
index c0bd890..c967caf 100644 (file)
--- a/x.c
+++ b/x.c
@@ -29,9 +29,10 @@ typedef struct {
 } Shortcut;
 
 typedef struct {
 } Shortcut;
 
 typedef struct {

-       uint b;
-       uint mask;
-       char *s;
+       uint mod;
+       uint button;
+       void (*func)(const Arg *);
+       const Arg arg;

 } MouseShortcut;
 
 typedef struct {
 } MouseShortcut;
 
 typedef struct {


@@ -56,6 +57,7 @@ static void selpaste(const Arg *);
 static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
 static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);

+static void ttysend(const Arg *);

 
 /* config.h for applying patches and the configuration. */
 #include "config.h"
 
 /* config.h for applying patches and the configuration. */
 #include "config.h"


@@ -139,6 +141,9 @@ static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static int xgeommasktogravity(int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static int xgeommasktogravity(int);

+static void ximopen(Display *);
+static void ximinstantiate(Display *, XPointer, XPointer);
+static void ximdestroy(XIM, XPointer, XPointer);

 static void xinit(int, int);
 static void cresize(int, int);
 static void xresize(int, int);
 static void xinit(int, int);
 static void cresize(int, int);
 static void xresize(int, int);


@@ -223,8 +228,9 @@ typedef struct {
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */

-static Fontcache frc[16];
+static Fontcache *frc = NULL;

 static int frclen = 0;
 static int frclen = 0;

+static int frccap = 0;

 static char *usedfont = NULL;
 static double usedfontsize = 0;
 static double defaultfontsize = 0;
 static char *usedfont = NULL;
 static double usedfontsize = 0;
 static double defaultfontsize = 0;


@@ -308,6 +314,12 @@ zoomreset(const Arg *arg)
        }
 }
 
        }
 }
 

+void
+ttysend(const Arg *arg)
+{
+       ttywrite(arg->s, strlen(arg->s), 1);
+}
+

 int
 evcol(XEvent *e)
 {
 int
 evcol(XEvent *e)
 {


@@ -328,7 +340,7 @@ void
 mousesel(XEvent *e, int done)
 {
        int type, seltype = SEL_REGULAR;
 mousesel(XEvent *e, int done)
 {
        int type, seltype = SEL_REGULAR;

-       uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
+       uint state = e->xbutton.state & ~(Button1Mask | forcemousemod);

 
        for (type = 1; type < LEN(selmasks); ++type) {
                if (match(selmasks[type], state)) {
 
        for (type = 1; type < LEN(selmasks); ++type) {
                if (match(selmasks[type], state)) {


@@ -411,15 +423,15 @@ bpress(XEvent *e)
        MouseShortcut *ms;
        int snap;
 
        MouseShortcut *ms;
        int snap;
 

-       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {

                mousereport(e);
                return;
        }
 
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                mousereport(e);
                return;
        }
 
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {

-               if (e->xbutton.button == ms->b
-                               && match(ms->mask, e->xbutton.state)) {
-                       ttywrite(ms->s, strlen(ms->s), 1);
+               if (e->xbutton.button == ms->button &&
+                   match(ms->mod, e->xbutton.state & ~forcemousemod)) {
+                       ms->func(&(ms->arg));

                        return;
                }
        }
                        return;
                }
        }


@@ -638,7 +650,7 @@ xsetsel(char *str)
 void
 brelease(XEvent *e)
 {
 void
 brelease(XEvent *e)
 {

-       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {

                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }


@@ -652,7 +664,7 @@ brelease(XEvent *e)
 void
 bmotion(XEvent *e)
 {
 void
 bmotion(XEvent *e)
 {

-       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {

                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }


@@ -672,6 +684,8 @@ cresize(int width, int height)
 
        col = (win.w - 2 * borderpx) / win.cw;
        row = (win.h - 2 * borderpx) / win.ch;
 
        col = (win.w - 2 * borderpx) / win.cw;
        row = (win.h - 2 * borderpx) / win.ch;

+       col = MAX(1, col);
+       row = MAX(1, row);

 
        tresize(col, row);
        xresize(col, row);
 
        tresize(col, row);
        xresize(col, row);


@@ -681,8 +695,8 @@ cresize(int width, int height)
 void
 xresize(int col, int row)
 {
 void
 xresize(int col, int row)
 {

-       win.tw = MAX(1, col * win.cw);
-       win.th = MAX(1, row * win.ch);
+       win.tw = col * win.cw;
+       win.th = row * win.ch;

 
        XFreePixmap(xw.dpy, xw.buf);
        xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
 
        XFreePixmap(xw.dpy, xw.buf);
        xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,


@@ -731,12 +745,12 @@ xloadcols(void)
        static int loaded;
        Color *cp;
 
        static int loaded;
        Color *cp;
 

-       dc.collen = MAX(LEN(colorname), 256);
-       dc.col = xmalloc(dc.collen * sizeof(Color));
-

        if (loaded) {
                for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        if (loaded) {
                for (cp = dc.col; cp < &dc.col[dc.collen]; ++cp)
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);

+       } else {
+               dc.collen = MAX(LEN(colorname), 256);
+               dc.col = xmalloc(dc.collen * sizeof(Color));

        }
 
        for (i = 0; i < dc.collen; i++)
        }
 
        for (i = 0; i < dc.collen; i++)


@@ -757,7 +771,6 @@ xsetcolorname(int x, const char *name)
        if (!BETWEEN(x, 0, dc.collen))
                return 1;
 
        if (!BETWEEN(x, 0, dc.collen))
                return 1;
 

-

        if (!xloadcolor(x, name, &ncolor))
                return 1;
 
        if (!xloadcolor(x, name, &ncolor))
                return 1;
 


@@ -788,15 +801,17 @@ xhints(void)
 
        sizeh = XAllocSizeHints();
 
 
        sizeh = XAllocSizeHints();
 

-       sizeh->flags = PSize | PResizeInc | PBaseSize;
+       sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;

        sizeh->height = win.h;
        sizeh->width = win.w;
        sizeh->height_inc = win.ch;
        sizeh->width_inc = win.cw;
        sizeh->base_height = 2 * borderpx;
        sizeh->base_width = 2 * borderpx;
        sizeh->height = win.h;
        sizeh->width = win.w;
        sizeh->height_inc = win.ch;
        sizeh->width_inc = win.cw;
        sizeh->base_height = 2 * borderpx;
        sizeh->base_width = 2 * borderpx;

+       sizeh->min_height = win.ch + 2 * borderpx;
+       sizeh->min_width = win.cw + 2 * borderpx;

        if (xw.isfixed) {
        if (xw.isfixed) {

-               sizeh->flags |= PMaxSize | PMinSize;
+               sizeh->flags |= PMaxSize;

                sizeh->min_width = sizeh->max_width = win.w;
                sizeh->min_height = sizeh->max_height = win.h;
        }
                sizeh->min_width = sizeh->max_width = win.w;
                sizeh->min_height = sizeh->max_height = win.h;
        }


@@ -992,6 +1007,43 @@ xunloadfonts(void)
        xunloadfont(&dc.ibfont);
 }
 
        xunloadfont(&dc.ibfont);
 }
 

+void
+ximopen(Display *dpy)
+{
+       XIMCallback destroy = { .client_data = NULL, .callback = ximdestroy };
+
+       if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+               XSetLocaleModifiers("@im=local");
+               if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+                       XSetLocaleModifiers("@im=");
+                       if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL)
+                               die("XOpenIM failed. Could not open input device.\n");
+               }
+       }
+       if (XSetIMValues(xw.xim, XNDestroyCallback, &destroy, NULL) != NULL)
+               die("XSetIMValues failed. Could not set input method value.\n");
+       xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                               XNClientWindow, xw.win, XNFocusWindow, xw.win, NULL);
+       if (xw.xic == NULL)
+               die("XCreateIC failed. Could not obtain input method.\n");
+}
+
+void
+ximinstantiate(Display *dpy, XPointer client, XPointer call)
+{
+       ximopen(dpy);
+       XUnregisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
+                                       ximinstantiate, NULL);
+}
+
+void
+ximdestroy(XIM xim, XPointer client, XPointer call)
+{
+       xw.xim = NULL;
+       XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
+                                       ximinstantiate, NULL);
+}
+

 void
 xinit(int cols, int rows)
 {
 void
 xinit(int cols, int rows)
 {


@@ -1029,7 +1081,7 @@ xinit(int cols, int rows)
        xw.attrs.background_pixel = dc.col[defaultbg].pixel;
        xw.attrs.border_pixel = dc.col[defaultbg].pixel;
        xw.attrs.bit_gravity = NorthWestGravity;
        xw.attrs.background_pixel = dc.col[defaultbg].pixel;
        xw.attrs.border_pixel = dc.col[defaultbg].pixel;
        xw.attrs.bit_gravity = NorthWestGravity;

-       xw.attrs.event_mask = FocusChangeMask | KeyPressMask
+       xw.attrs.event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask

                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        xw.attrs.colormap = xw.cmap;
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        xw.attrs.colormap = xw.cmap;


@@ -1057,22 +1109,7 @@ xinit(int cols, int rows)
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* input methods */
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* input methods */

-       if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
-               XSetLocaleModifiers("@im=local");
-               if ((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
-                       XSetLocaleModifiers("@im=");
-                       if ((xw.xim = XOpenIM(xw.dpy,
-                                       NULL, NULL, NULL)) == NULL) {
-                               die("XOpenIM failed. Could not open input"
-                                       " device.\n");
-                       }
-               }
-       }
-       xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
-                                          | XIMStatusNothing, XNClientWindow, xw.win,
-                                          XNFocusWindow, xw.win, NULL);
-       if (xw.xic == NULL)
-               die("XCreateIC failed. Could not obtain input method.\n");
+       ximopen(xw.dpy);

 
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, mouseshape);
 
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, mouseshape);


@@ -1214,13 +1251,10 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                        fontpattern = FcFontSetMatch(0, fcsets, 1,
                                        fcpattern, &fcres);
 
                        fontpattern = FcFontSetMatch(0, fcsets, 1,
                                        fcpattern, &fcres);
 

-                       /*
-                        * Overwrite or create the new cache entry.
-                        */
-                       if (frclen >= LEN(frc)) {
-                               frclen = LEN(frc) - 1;
-                               XftFontClose(xw.dpy, frc[frclen].font);
-                               frc[frclen].unicodep = 0;
+                       /* Allocate memory for the new cache entry. */
+                       if (frclen >= frccap) {
+                               frccap += 16;
+                               frc = xrealloc(frc, frccap * sizeof(Fontcache));

                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,


@@ -1550,6 +1584,16 @@ xfinishdraw(void)
                                defaultfg : defaultbg].pixel);
 }
 
                                defaultfg : defaultbg].pixel);
 }
 

+void
+xximspot(int x, int y)
+{
+       XPoint spot = { borderpx + x * win.cw, borderpx + (y + 1) * win.ch };
+       XVaNestedList attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
+
+       XSetICValues(xw.xic, XNPreeditAttributes, attr, NULL);
+       XFree(attr);
+}
+

 void
 expose(XEvent *ev)
 {
 void
 expose(XEvent *ev)
 {


@@ -1727,7 +1771,6 @@ kpress(XEvent *ev)
        ttywrite(buf, len, 1);
 }
 
        ttywrite(buf, len, 1);
 }
 

-

 void
 cmessage(XEvent *e)
 {
 void
 cmessage(XEvent *e)
 {