bug#21360: 24.5; [PATCH] Implement soft-drop

bug#21360: 24.5; [PATCH] Implement soft-drop

[Vasilij Schneidermann]

[-- Attachment #1.1: Type: text/plain, Size: 2848 bytes --]

Nearly ever variant of Tetris I've played has a soft-drop feature
commonly bound to <down> for moving a piece down faster than mandated by
the current game speed.  M-x tetris however has CCW rotation bound to
this key which is rather unusual.

The attached patch implements the described feature and binds it to
<down> to conform to official Tetris guidelines.



In GNU Emacs 24.5.1 (x86_64-unknown-linux-gnu, GTK+ Version 3.16.2)
 of 2015-04-20 on bitzer.hoetzel.info
Windowing system distributor `The X.Org Foundation', version 11.0.11702000
System Description: Arch Linux

Configured using:
 `configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
 --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
 'CFLAGS=-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong
 --param=ssp-buffer-size=4' CPPFLAGS=-D_FORTIFY_SOURCE=2
 LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro'

Important settings:
  value of $LANG: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: Lisp Interaction

Minor modes in effect:
  tooltip-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.

Load-path shadows:
None found.

Features:
(shadow sort gnus-util mail-extr emacsbug message format-spec rfc822 mml
easymenu mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231
mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums
mm-util help-fns mail-prsvr mail-utils time-date tooltip electric
uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar
dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode
prog-mode register page menu-bar rfn-eshadow timer select scroll-bar
mouse jit-lock font-lock syntax facemenu font-core frame cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev
minibuffer nadvice loaddefs button faces cus-face macroexp files
text-properties overlay sha1 md5 base64 format env code-pages mule
custom widget hashtable-print-readable backquote make-network-process
dbusbind gfilenotify dynamic-setting system-font-setting
font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs)

Memory information:
((conses 16 70970 7191)
 (symbols 48 17559 0)
 (miscs 40 35 138)
 (strings 32 9047 4314)
 (string-bytes 1 248482)
 (vectors 16 8909)
 (vector-slots 8 383172 18273)
 (floats 8 63 83)
 (intervals 56 177 0)
 (buffers 960 11)
 (heap 1024 24912 937))

[-- Attachment #1.2: Type: text/html, Size: 3221 bytes --]

[-- Attachment #2: tetris.patch --]
[-- Type: text/x-diff, Size: 972 bytes --]

diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index 586d1d5..0f3b758 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -265,7 +265,7 @@ each one of its four blocks.")
     (define-key map [left]	'tetris-move-left)
     (define-key map [right]	'tetris-move-right)
     (define-key map [up]	'tetris-rotate-prev)
-    (define-key map [down]	'tetris-rotate-next)
+    (define-key map [down]	'tetris-move-down)
     map))
 
 (defvar tetris-null-map
@@ -524,6 +524,16 @@ Drops the shape one square, testing for collision."
 	(setq tetris-pos-x (1- tetris-pos-x)))
     (tetris-draw-shape)))
 
+(defun tetris-move-down ()
+  "Move the shape one square to the bottom."
+  (interactive)
+  (unless tetris-paused
+    (tetris-erase-shape)
+    (setq tetris-pos-y (1+ tetris-pos-y))
+    (if (tetris-test-shape)
+	(setq tetris-pos-y (1- tetris-pos-y)))
+    (tetris-draw-shape)))
+
 (defun tetris-rotate-prev ()
   "Rotate the shape clockwise."
   (interactive)

bug#21360: 24.5; [PATCH] Implement soft-drop

[Stefan Monnier]

> The attached patch implements the described feature and binds it to
> <down> to conform to official Tetris guidelines.

Thanks, installed.


        Stefan