Add winicon patch

unclamped · Nov 16, 2022 · ba4499c · ba4499c
1 parent 619a241
commit ba4499c
Show file tree

Hide file tree

Showing 12 changed files with 751 additions and 27 deletions.
diff --git a/config.def.h b/config.def.h
@@ -15,6 15,8 @@ static const unsigned int gappx = 10; /* default gap between windows i
 static const unsigned int snap = 32; /* snap pixel */
 static const int showbar = 1; /* 0 means no bar */
 static const int topbar = 1; /* 0 means bottom bar */
 #define ICONSIZE 16 /* icon size */
  #define ICONSPACING 5 /* space between icon and title */
 static const int focusonwheel = 0;
 static const double activeopacity = 1.0f; /* Window opacity when it's focused (0 <= opacity <= 1) */
 static const double inactiveopacity = 0.875f; /* Window opacity when it's inactive (0 <= opacity <= 1) */

diff --git a/config.def.h.orig b/config.def.h.orig
@@ -77,6 77,7 @@ static const Layout layouts[] = {
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[] = { "st", NULL };
 static const char *layoutmenu_cmd = "layoutmenu.sh";
 
 static const Key keys[] = {
  /* modifier key function argument */
@@ -130,7 131,7 @@ static const Key keys[] = {
 static const Button buttons[] = {
  /* click event mask button function argument */
  { ClkLtSymbol, 0, Button1, setlayout, {0} },
- { ClkLtSymbol, 0, Button3, setlayout,  {.v = &layouts[2]} },
  { ClkLtSymbol, 0, Button3, layoutmenu, {0} },
  { ClkWinTitle, 0, Button2, zoom, {0} },
  { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
  { ClkClientWin, MODKEY, Button1, movemouse, {0} },

diff --git a/config.def.h.rej b/config.def.h.rej
@@ -1,13 1,11 @@
---- config.def.h 2021-02-27 21:17:53.862314811 -0600
- config.def.h 2021-02-28 00:06:39.066149441 -0600
-@@ -86,6 88,10 @@ static Key keys[] = {
- { MODKEY, XK_period, focusmon, {.i = 1 } },
- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
- { MODKEY|ShiftMask, XK_period, tagmon, {.i = 1 } },
- { MODKEY, XK_minus, setgaps, {.i = -5 } },
- { MODKEY, XK_equal, setgaps, {.i = 5 } },
- { MODKEY|ShiftMask, XK_minus, setgaps, {.i = GAP_RESET } },
- { MODKEY|ShiftMask, XK_equal, setgaps, {.i = GAP_TOGGLE} },
- TAGKEYS( XK_1, 0)
- TAGKEYS( XK_2, 1)
- TAGKEYS( XK_3, 2)
 --- config.def.h
  config.def.h
 @@ -5,6 5,8 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
  static const unsigned int snap = 32; /* snap pixel */
  static const int showbar = 1; /* 0 means no bar */
  static const int topbar = 1; /* 0 means bottom bar */
  #define ICONSIZE 16 /* icon size */
  #define ICONSPACING 5 /* space between icon and title */
  static const char *fonts[] = { "monospace:size=10" };
  static const char dmenufont[] = "monospace:size=10";
  static const char col_gray1[] = "#222222";
diff --git a/config.mk b/config.mk
@@ -23,7 23,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
 LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender -lImlib2
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}

diff --git a/config.mk.orig b/config.mk.orig
@@ -0,0 1,39 @@
 # dwm version
 VERSION = 6.4
 
 # Customize below to fit your system
 
 # paths
 PREFIX = /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
 # Xinerama, comment if you don't want it
 XINERAMALIBS = -lXinerama
 XINERAMAFLAGS = -DXINERAMA
 
 # freetype
 FREETYPELIBS = -lfontconfig -lXft
 FREETYPEINC = /usr/include/freetype2
 # OpenBSD (uncomment)
 #FREETYPEINC = ${X11INC}/freetype2
 #MANPREFIX = ${PREFIX}/man
 
 # includes and libs
 INCS = -I${X11INC} -I${FREETYPEINC}
 LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
 CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = ${LIBS}
 
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
 
 # compiler and linker
 CC = cc
diff --git a/drw.c b/drw.c
@@ -4,6 4,7 @@
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 #include <Imlib2.h>
 
 #include "drw.h"
 #include "util.h"
@@ -71,6 72,7 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
  drw->w = w;
  drw->h = h;
  drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
  drw->picture = XRenderCreatePicture(dpy, drw->drawable, XRenderFindVisualFormat(dpy, DefaultVisual(dpy, screen)), 0, NULL);
  drw->gc = XCreateGC(dpy, root, 0, NULL);
  XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
 
@@ -85,14 87,18 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
 
  drw->w = w;
  drw->h = h;
  if (drw->picture)
  XRenderFreePicture(drw->dpy, drw->picture);
  if (drw->drawable)
  XFreePixmap(drw->dpy, drw->drawable);
  drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
  drw->picture = XRenderCreatePicture(drw->dpy, drw->drawable, XRenderFindVisualFormat(drw->dpy, DefaultVisual(drw->dpy, drw->screen)), 0, NULL);
 }
 
 void
 drw_free(Drw *drw)
 {
  XRenderFreePicture(drw->dpy, drw->picture);
  XFreePixmap(drw->dpy, drw->drawable);
  XFreeGC(drw->dpy, drw->gc);
  drw_fontset_free(drw->fonts);
@@ -223,6 229,67 @@ drw_setscheme(Drw *drw, Clr *scm)
  drw->scheme = scm;
 }
 
 Picture
 drw_picture_create_resized(Drw *drw, char *src, unsigned int srcw, unsigned int srch, unsigned int dstw, unsigned int dsth) {
  Pixmap pm;
  Picture pic;
  GC gc;
 
  if (srcw <= (dstw << 1u) && srch <= (dsth << 1u)) {
  XImage img = {
  srcw, srch, 0, ZPixmap, src,
  ImageByteOrder(drw->dpy), BitmapUnit(drw->dpy), BitmapBitOrder(drw->dpy), 32,
  32, 0, 32,
  0, 0, 0
  };
  XInitImage(&img);
 
  pm = XCreatePixmap(drw->dpy, drw->root, srcw, srch, 32);
  gc = XCreateGC(drw->dpy, pm, 0, NULL);
  XPutImage(drw->dpy, pm, gc, &img, 0, 0, 0, 0, srcw, srch);
  XFreeGC(drw->dpy, gc);
 
  pic = XRenderCreatePicture(drw->dpy, pm, XRenderFindStandardFormat(drw->dpy, PictStandardARGB32), 0, NULL);
  XFreePixmap(drw->dpy, pm);
 
  XRenderSetPictureFilter(drw->dpy, pic, FilterBilinear, NULL, 0);
  XTransform xf;
  xf.matrix[0][0] = (srcw << 16u) / dstw; xf.matrix[0][1] = 0; xf.matrix[0][2] = 0;
  xf.matrix[1][0] = 0; xf.matrix[1][1] = (srch << 16u) / dsth; xf.matrix[1][2] = 0;
  xf.matrix[2][0] = 0; xf.matrix[2][1] = 0; xf.matrix[2][2] = 65536;
  XRenderSetPictureTransform(drw->dpy, pic, &xf);
  } else {
  Imlib_Image origin = imlib_create_image_using_data(srcw, srch, (DATA32 *)src);
  if (!origin) return None;
  imlib_context_set_image(origin);
  imlib_image_set_has_alpha(1);
  Imlib_Image scaled = imlib_create_cropped_scaled_image(0, 0, srcw, srch, dstw, dsth);
  imlib_free_image_and_decache();
  if (!scaled) return None;
  imlib_context_set_image(scaled);
  imlib_image_set_has_alpha(1);
 
  XImage img = {
  dstw, dsth, 0, ZPixmap, (char *)imlib_image_get_data_for_reading_only(),
  ImageByteOrder(drw->dpy), BitmapUnit(drw->dpy), BitmapBitOrder(drw->dpy), 32,
  32, 0, 32,
  0, 0, 0
  };
  XInitImage(&img);
 
  pm = XCreatePixmap(drw->dpy, drw->root, dstw, dsth, 32);
  gc = XCreateGC(drw->dpy, pm, 0, NULL);
  XPutImage(drw->dpy, pm, gc, &img, 0, 0, 0, 0, dstw, dsth);
  imlib_free_image_and_decache();
  XFreeGC(drw->dpy, gc);
 
  pic = XRenderCreatePicture(drw->dpy, pm, XRenderFindStandardFormat(drw->dpy, PictStandardARGB32), 0, NULL);
  XFreePixmap(drw->dpy, pm);
  }
 
  return pic;
 }
 
 void
 drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
 {
@@ -384,6 451,14 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
  return x   (render ? w : 0);
 }
 
 void
 drw_pic(Drw *drw, int x, int y, unsigned int w, unsigned int h, Picture pic)
 {
  if (!drw)
  return;
  XRenderComposite(drw->dpy, PictOpOver, pic, None, drw->picture, 0, 0, 0, 0, x, y, w, h);
 }
 
 void
 drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
 {