Test shadow

.travis.yml

@@ -0,0 +1,21 @@
+language: c
+compiler: clang
+
+addons:
+  apt:
+    update: true
+    packages:
+    - libxml2-dev
+    - libgtk-3-dev
+    - libxpm-dev
+    - libgif-dev
+    - libgnutls-dev
+
+jobs:
+  include:
+  - os: osx
+    before_script: ./autogen.sh && ./configure --without-makeinfo --with-ns --without-xml2
+    script: make -j8
+  - os: linux
+    before_script: ./autogen.sh && ./configure --without-makeinfo --with-x --with-x-toolkit=gtk3
+    script: make -j8

README.md

@@ -0,0 +1,26 @@
+# EmacsMoe Patchset
+
+The original README is `README.emacs`.
+
+This patchset tries to introduce modern visual effects to Emacs.  Like
+them or not, implementing them is a fun weekend project.
+
+## Help wanted!
+
+1. As you know, Emacs supports a variety of GUI platforms.  I'm familiar
+   with none of them!  Right now, I have only Linux and macOS
+   environments, so at least someone with Windows expertise is wanted.
+2. There may be design flaws.  Please don't hesitate to bring forth
+   your idea.
+
+## Implemented features
+
+Nothing so far.
+
+## WIP
+
+- Colorful Shadows.  [Like this one.](https://marketplace.visualstudio.com/items?itemName=webrender.synthwave-x-fluoromachine)
+
+## Planned
+
+- Background images.

configure.ac

@@ -4383,6 +4383,7 @@ if test "${HAVE_X11}" = "yes"; then
 fi
 
 HAVE_CAIRO=no
+CAIRO_OBJ=""
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_cairo}" != "no"; then
     CAIRO_REQUIRED=1.8.0
@@ -4400,8 +4401,10 @@ if test "${HAVE_X11}" = "yes"; then
       AC_DEFINE([USE_CAIRO], [1], [Define to 1 if using cairo.])
       CFLAGS="$CFLAGS $CAIRO_CFLAGS"
       LIBS="$LIBS $CAIRO_LIBS"
+      CAIRO_OBJ="xcairo.o"
       AC_SUBST([CAIRO_CFLAGS])
       AC_SUBST([CAIRO_LIBS])
+      AC_SUBST([CAIRO_OBJ])
     else
       AC_MSG_WARN([cairo requested but not found.])
     fi
@@ -4469,8 +4472,10 @@ if test "$window_system" = "pgtk"; then
 
   CFLAGS="$CFLAGS $CAIRO_CFLAGS"
   LIBS="$LIBS $CAIRO_LIBS"
+  CAIRO_OBJ="xcairo.o"
   AC_SUBST([CAIRO_CFLAGS])
   AC_SUBST([CAIRO_LIBS])
+  AC_SUBST([CAIRO_OBJ])
 fi
 
 if test "${HAVE_BE_APP}" = "yes"; then
@@ -4482,8 +4487,10 @@ if test "${HAVE_BE_APP}" = "yes"; then
       AC_DEFINE([USE_BE_CAIRO], [1], [Define to 1 if using cairo on Haiku.])
       CFLAGS="$CFLAGS $CAIRO_CFLAGS"
       LIBS="$LIBS $CAIRO_LIBS"
+      CAIRO_OBJ="xcairo.o"
       AC_SUBST([CAIRO_CFLAGS])
       AC_SUBST([CAIRO_LIBS])
+      AC_SUBST([CAIRO_OBJ])
     else
       AC_MSG_WARN([cairo requested but not found.])
     fi

lisp/faces.el

@@ -1256,6 +1256,7 @@ an integer value."
     (:height . "height in 1/10 pt")
     (:weight . "weight")
     (:slant . "slant")
+    (:shadow . "shadow")
     (:underline . "underline")
     (:overline . "overline")
     (:extend . "extend")

lisp/help-fns.el

@@ -1835,6 +1835,7 @@ If FRAME is omitted or nil, use the selected frame."
 		  (:foreground . "Foreground")
 		  (:distant-foreground . "DistantForeground")
 		  (:background . "Background")
+                  (:shadow . "Shadow")
 		  (:underline . "Underline")
 		  (:overline . "Overline")
 		  (:strike-through . "Strike-through")

moe/shadow-demo.el

@@ -0,0 +1,8 @@
+;; To see the effect of text shadows, use the command:
+;;  emacs -q -l moe/shadow-demo.el
+
+(set-face-attribute 'font-lock-function-name-face nil :shadow '(5.0 . "red"))
+(set-face-attribute 'font-lock-variable-name-face nil :shadow '(5.0 . "green"))
+(set-face-attribute 'font-lock-keyword-face nil :shadow '(5.0 . "yellow"))
+(set-face-attribute 'font-lock-type-face nil :shadow '5.0)
+(set-face-attribute 'default nil :shadow '(5.0 nil 2 . 2))

src/Makefile.in

@@ -252,6 +252,7 @@ WEBKIT_CFLAGS= @WEBKIT_CFLAGS@
 
 CAIRO_LIBS= @CAIRO_LIBS@
 CAIRO_CFLAGS= @CAIRO_CFLAGS@
+CAIRO_OBJ= @CAIRO_OBJ@
 
 IMAGEMAGICK_LIBS= @IMAGEMAGICK_LIBS@
 IMAGEMAGICK_CFLAGS= @IMAGEMAGICK_CFLAGS@
@@ -480,7 +481,7 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o     \
 	$(if $(HYBRID_MALLOC),sheap.o) 					       \
 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)        \
 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) 	       \
-	$(HAIKU_OBJ) $(PGTK_OBJ) $(ANDROID_OBJ)
+	$(HAIKU_OBJ) $(PGTK_OBJ) $(ANDROID_OBJ) $(CAIRO_OBJ)
 doc_obj = $(base_obj) $(NS_OBJC_OBJ)
 obj = $(doc_obj) $(HAIKU_CXX_OBJ)
 

src/dispextern.h

@@ -1652,6 +1652,7 @@ enum lface_attribute_index
   LFACE_HEIGHT_INDEX,
   LFACE_WEIGHT_INDEX,
   LFACE_SLANT_INDEX,
+  LFACE_SHADOW_INDEX,
   LFACE_UNDERLINE_INDEX,
   LFACE_INVERSE_INDEX,
   LFACE_FOREGROUND_INDEX,
@@ -1737,11 +1738,12 @@ struct face
   unsigned long background;
 
   /* Pixel value or color index of underline, overlined,
-     strike-through, or box color.  */
+     strike-through, box color, or shadow color.  */
   unsigned long underline_color;
   unsigned long overline_color;
   unsigned long strike_through_color;
   unsigned long box_color;
+  unsigned long shadow_color;
 
   struct font *font;
 
@@ -1783,9 +1785,16 @@ struct face
   bool_bf use_box_color_for_shadows_p : 1;
 
   /* Non-zero if text in this face should be underlined, overlined,
-     strike-through or have a box drawn around it.  */
+     strike-through, have a box drawn around it, or have shadows.  */
   bool_bf overline_p : 1;
   bool_bf strike_through_p : 1;
+  bool_bf shadow_p : 1;
+
+  /* The blur parameter of the shadow. */
+  double shadow_blur;
+
+  /* Shadow offset.  In most cases, both fields are taken to be zero. */
+  struct { short x, y; } shadow_offset;
 
   /* True means that the colors specified for this face could not be
      loaded, and were replaced by default colors, so they shouldn't be
@@ -1800,6 +1809,7 @@ struct face
   bool_bf overline_color_defaulted_p : 1;
   bool_bf strike_through_color_defaulted_p : 1;
   bool_bf box_color_defaulted_p : 1;
+  bool_bf shadow_color_defaulted_p : 1;
 
   /* True means the underline should be drawn at the descent line.  */
   bool_bf underline_at_descent_line_p : 1;

src/ftcrfont.c

@@ -16,6 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
+#include <time.h>
 
 #include <config.h>
 #include <math.h>
@@ -41,11 +42,11 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "xsettings.h"
 #endif
 
-#ifdef USE_BE_CAIRO
+#include "xcairo.h"
+
 #define RED_FROM_ULONG(color)	(((color) >> 16) & 0xff)
 #define GREEN_FROM_ULONG(color)	(((color) >> 8) & 0xff)
 #define BLUE_FROM_ULONG(color)	((color) & 0xff)
-#endif
 
 #define METRICS_NCOLS_PER_ROW	(128)
 
@@ -529,16 +530,11 @@ ftcrfont_variation_glyphs (struct font *font, int c, unsigned variations[256])
 }
 #endif	/* HAVE_OTF_GET_VARIATION_GLYPHS || HAVE_FT_FACE_GETCHARVARIANTINDEX */
 
-static int
-ftcrfont_draw (struct glyph_string *s,
-               int from, int to, int x, int y, bool with_background)
+static void
+ftcrfont_select_foreground_color (struct frame *f,
+				  cairo_t *cr,
+				  struct glyph_string *s)
 {
-  struct frame *f = s->f;
-  struct font_info *ftcrfont_info = (struct font_info *) s->font;
-  cairo_t *cr;
-  cairo_glyph_t *glyphs;
-  int len = to - from;
-  int i;
 #ifdef USE_BE_CAIRO
   unsigned long be_foreground, be_background;
 
@@ -552,6 +548,101 @@ ftcrfont_draw (struct glyph_string *s,
 				   &be_background);
 #endif
 
+#ifndef USE_BE_CAIRO
+#ifdef HAVE_X_WINDOWS
+  x_set_other_cr_source_with_gc_foreground (f, s->gc, cr, false);
+#else
+  pgtk_set_other_cr_source_with_color (f, cr, s->xgcv.foreground, false);
+#endif
+#else
+  uint32_t col = be_foreground;
+
+  cairo_set_source_rgb (cr, RED_FROM_ULONG (col) / 255.0,
+			GREEN_FROM_ULONG (col) / 255.0,
+			BLUE_FROM_ULONG (col) / 255.0);
+#endif
+}
+
+/* Select the proper foreground color (source) before calling this. */
+static void
+ftcrfont_show_glyphs (struct glyph_string *s, cairo_t *cr,
+		      int from, int to, int x, int y)
+{
+  struct font_info *ftcrfont_info = (struct font_info *) s->font;
+  int len = to - from;
+  cairo_glyph_t *glyphs;
+  int i;
+
+  glyphs = alloca (sizeof (cairo_glyph_t) * len);
+  for (i = 0; i < len; i++)
+    {
+      glyphs[i].index = s->char2b[from + i];
+      glyphs[i].x = x;
+      glyphs[i].y = y;
+      x += (s->padding_p ? 1 : ftcrfont_glyph_extents (s->font,
+						       glyphs[i].index,
+						       NULL));
+    }
+
+  cairo_set_scaled_font (cr, ftcrfont_info->cr_scaled_font);
+  cairo_show_glyphs (cr, glyphs, len);
+}
+
+static void
+ftcrfont_draw_shadow (struct glyph_string *s, cairo_t *frame_cr,
+		      int from, int to, int x, int y, bool save)
+{
+  cairo_surface_t *surface;
+  cairo_t *dc;
+
+  int x1, y1, w1, h1;
+  unsigned long col;
+  int margin;
+
+  margin = (int) ceil (s->face->shadow_blur);
+  w1 = s->width + margin;
+  h1 = FONT_HEIGHT (s->font) + margin;
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w1, h1);
+  dc = cairo_create (surface);
+
+  if (s->face->shadow_color_defaulted_p)
+    col = s->face->foreground;
+  else
+    col = s->face->shadow_color;
+
+  cairo_set_source_rgb (dc,
+			RED_FROM_ULONG (col) / 255.0,
+			GREEN_FROM_ULONG (col) / 255.0,
+			BLUE_FROM_ULONG (col) / 255.0);
+  cairo_set_operator (dc, CAIRO_OPERATOR_OVER);
+
+  ftcrfont_show_glyphs (s, dc, from, to, margin, FONT_BASE(s->font) + margin);
+  gaussian_blur (surface, w1, h1, s->face->shadow_blur / 2.0);
+
+  x1 = x + s->face->shadow_offset.x - margin;
+  y1 = y - FONT_BASE (s->font) + s->face->shadow_offset.y - margin;
+
+  if (save)
+    cairo_save (frame_cr);
+  cairo_set_source_surface (frame_cr, surface, x1, y1);
+  cairo_rectangle (frame_cr, x1, y1, w1, h1);
+  cairo_fill (frame_cr);
+  if (save)
+    cairo_restore (frame_cr);
+
+  cairo_destroy (dc);
+  cairo_surface_destroy (surface);
+}
+
+static int
+ftcrfont_draw (struct glyph_string *s,
+               int from, int to, int x, int y, bool with_background)
+{
+  struct frame *f = s->f;
+  cairo_t *cr;
+  int len = to - from;
+
   block_input ();
 
 #ifndef USE_BE_CAIRO
@@ -595,31 +686,19 @@ ftcrfont_draw (struct glyph_string *s,
       cairo_fill (cr);
     }
 
-  glyphs = alloca (sizeof (cairo_glyph_t) * len);
-  for (i = 0; i < len; i++)
-    {
-      glyphs[i].index = s->char2b[from + i];
-      glyphs[i].x = x;
-      glyphs[i].y = y;
-      x += (s->padding_p ? 1 : ftcrfont_glyph_extents (s->font,
-                                                       glyphs[i].index,
-                                                       NULL));
-    }
-#ifndef USE_BE_CAIRO
-#ifdef HAVE_X_WINDOWS
-  x_set_cr_source_with_gc_foreground (f, s->gc, false);
+#if defined(HAVE_PGTK)
+  /* PGTK requires the foreground color to be selected BEFORE creating
+     the shadow layer.  Hence we need to save and restore cairo_t. */
+  ftcrfont_select_foreground_color (f, cr, s);
+  if (s->face->shadow_p)
+    ftcrfont_draw_shadow (s, cr, from, to, x, y, true);
 #else
-  pgtk_set_cr_source_with_color (f, s->xgcv.foreground, false);
+  if (s->face->shadow_p)
+    ftcrfont_draw_shadow (s, cr, from, to, x, y, false);
+  ftcrfont_select_foreground_color (f, cr, s);
 #endif
-#else
-  uint32_t col = be_foreground;
+  ftcrfont_show_glyphs (s, cr, from, to, x, y);
 
-  cairo_set_source_rgb (cr, RED_FROM_ULONG (col) / 255.0,
-			GREEN_FROM_ULONG (col) / 255.0,
-			BLUE_FROM_ULONG (col) / 255.0);
-#endif
-  cairo_set_scaled_font (cr, ftcrfont_info->cr_scaled_font);
-  cairo_show_glyphs (cr, glyphs, len);
 #ifndef USE_BE_CAIRO
 #ifdef HAVE_X_WINDOWS
   x_end_cr_clip (f);