diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /x11-misc/xkbd/files | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'x11-misc/xkbd/files')
| -rw-r--r-- | x11-misc/xkbd/files/xkbd-999999-evdev.patch | 15 | ||||
| -rw-r--r-- | x11-misc/xkbd/files/xkbd-999999-xft.patch | 33 |
2 files changed, 48 insertions, 0 deletions
diff --git a/x11-misc/xkbd/files/xkbd-999999-evdev.patch b/x11-misc/xkbd/files/xkbd-999999-evdev.patch new file mode 100644 index 000000000000..087fd74ea01a --- /dev/null +++ b/x11-misc/xkbd/files/xkbd-999999-evdev.patch @@ -0,0 +1,15 @@ +--- a/src/xtg.c ++++ b/src/xtg.c +@@ -382,10 +382,12 @@ + static void map_to(){ + float x=scrX1,y=scrY1,w=width,h=height,dx=pf[p_touch_add],dy=pf[p_touch_add]; + _short m = 1; ++#ifdef USE_EVDEV + if (pa[p_touch_add] && pa[p_touch_add][0] == '+' && pa[p_touch_add][1] == 0) { + if (mwidth && devX!=0) dx = (devX - mwidth)/2; + if (mheight && devY!=0) dy = (devY - mheight)/2; + } ++#endif + if (dx!=0 && mwidth) { + float b = (w/mwidth)*dx; + x-=b; diff --git a/x11-misc/xkbd/files/xkbd-999999-xft.patch b/x11-misc/xkbd/files/xkbd-999999-xft.patch new file mode 100644 index 000000000000..8f803111bc02 --- /dev/null +++ b/x11-misc/xkbd/files/xkbd-999999-xft.patch @@ -0,0 +1,33 @@ +--- a/src/kb.c ++++ b/src/kb.c +@@ -66,7 +66,7 @@ + if (*f) XftFontClose(kb->display, *f); + return ((*f = XftFontOpenName(kb->display, kb->screen, fontname)) != NULL); + #else +- if (*f) XUnloadFont((*f)->fid); ++ if (*f) XUnloadFont(kb->display, (*f)->fid); + if ((*f = XLoadQueryFont(kb->display, fontname)) == NULL) return 0; + XSetFont(kb->display, kb->gc, (*f)->fid); + return True; +--- a/src/button.c ++++ b/src/button.c +@@ -150,7 +150,7 @@ + &extents); + return extents.width; + #else +- return XTextWidth(kb->font_info, txt, strlen(txt)); ++ return XTextWidth(kb->font, txt, strlen(txt)); + #endif + } + +@@ -441,8 +441,10 @@ + + b->fg_gc = k->gc; + b->bg_gc = k->rev_gc; ++#ifdef USE_XFT + b->col = k->color; + b->col_rev = k->color_rev; ++#endif + + b->layout_switch = -1; + |