Mercurial > emacs
view src/cm.c @ 111789:f97704487fb3
Merge changes made in Gnus trunk.
nnir.el: Batch header retrieval.
proto-stream.el: New library to provide protocol-specific TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar protocols.
nnimap.el (nnimap-open-connection): Use it.
proto-stream.el (open-proto-stream): Complete the documentation.
nnimap.el (nnimap-open-connection): Check for "OK" from the greeting.
nntp.el: Use proto-streams for the relevant connections types.
nntp.el (nntp-open-connection): Switch on STARTTLS on supported servers.
proto-stream.el (open-proto-stream): Add a way to specify what the end of a command is.
proto-stream.el (proto-stream-open-tls): Delete output from openssl if we're using tls.el.
proto-stream.el (proto-stream-open-network): If we don't have gnutls-cli or gnutls built in, then don't try to establish a STARTTLS connection.
color.el (color-lab->srgb): Fix function call name.
proto-stream.el: Fix the syntax in the comment.
nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
proto-stream.el (proto-stream-open-starttls): Actually implement the starttls.el STARTTLS.
proto-stream.el (proto-stream-always-use-starttls): New variable.
proto-stream.el (proto-stream-open-starttls): De-duplicate the starttls code.
proto-stream.el (proto-stream-open-starttls): Folded back into the main function.
proto-stream.el (proto-stream-command): Refactor out.
nnimap.el (nnimap-stream): Change default to `undecided'.
nnimap.el (nnimap-open-connection): If `nnimap-stream' is `undecided', try ssl first, and then network.
nnimap.el (nnimap-open-connection-1): Respect nnimap-server-port.
nnimap.el (nnimap-open-connection): Be more backwards-compatible.
proto-stream.el (open-protocol-stream): Renamed from open-proto-stream.
proto-stream.el (proto-stream-open-network): When doing opportunistic TLS upgrades we don't really care about the identity of the peer.
gnus.texi (Customizing the IMAP Connection): Note the new defaults.
gnus.texi (Direct Functions): Note the STARTTLS upgrade.
proto-stream.el (proto-stream-open-network): Force starttls.el to use gnutls-cli, since that what we've checked for.
proto-stream.el (proto-stream-always-use-starttls): Only default to t if open-gnutls-stream exists.
proto-stream.el (proto-stream-open-network): If STARTTLS failed, then just open a normal connection.
proto-stream.el (proto-stream-open-network): Wait until the greeting before doing STARTTLS.
nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).
nnimap.el (nnimap-open-connection-1): Really respect nnimap-server-port.
nntp.el (nntp-open-connection): Provide a :success condition.
nnimap.el (nnimap-open-connection-1): Ditto.
proto-stream.el (proto-stream-open-network): See what the response to the STARTTLS command is.
proto-stream.el (proto-stream-open-network): Add some comments.
proto-stream.el: Fix example.
proto-stream.el (open-protocol-stream): Actually mention the STARTTLS upgrade.
nnir.el (nnir-get-active): Skip nnir-ignored-newsgroups when searching.
nnir.el (nnir-ignore-newsgroups): Fix default value.
nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
mm-util.el (mm-delete-duplicates): Add comment.
gnus-sum.el (gnus-summary-delete-article): If delete fails don't change the registry.
nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't seem to accept strings-with-numbers as port numbers.
color.el: fix docstring to use English rather than math notation for intervals.
shr.el (shr-find-fill-point): Don't break before apostrophes.
nnir.el (nnir-request-move-article): Bail out if no move support in group.
color.el (color-rgb->hsv): Fix docstring.
nnir.el (nnir-get-active): Improve active list retrieval.
shr.el (shr-find-fill-point): Work better for kinsoku chars and apostrophes.
gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil.
nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.
nnimap.el (nnimap-open-connection-1): Fix PREAUTH.
proto-stream.el (open-protocol-stream): All starttls connections are handled by the network handler.
gnus-gravatar.el (gnus-gravatar-insert): Delete unnecessary binding to t of inhibit-read-only since it is inside gnus-with-article-headers.
gnus-gravatar.el (gnus-gravatar-transform-address): Use mail-extract-address-components that supports non-ASCII names rather than mail-header-parse-addresses.
shr.el (shr-find-fill-point): Don't break line between kinsoku-bol characters.
gnus-gravatar.el (gnus-gravatar-insert): Allow LWSP in the middle of names.
nnmaildir.el (nnmaildir-request-set-mark): Add article to add-mark funcall.
gnus-msg.el: Remove nastygram thing.
message.el (message-from-style): Fix comment.
message.el (message-user-organization): Do not use gnus-local-organization.
gnus.el: Remove gnus-local-organization.
rtree.el: New file to handle range trees.
nnir.el, gnus-sum.el: Redo the way nnir handles registry updates.
rtree.el (rtree-extract): Simplify.
gnus-win.el (gnus-configure-windows): Remove Gnus 3.x setting support.
gnus-msg.el: Mark gnus-outgoing-message-group as obsolete.
gnus.texi (Archived Messages): Remove gnus-outgoing-message-group.
gnus-win.el (gnus-configure-frame): Remove old compatibility code.
rtree.el (rtree-memq): Rewrite it as a non-recursive function.
rtree.el (rtree-add, rtree-delq, rtree-length): Implement.
rtree.el (rtree-add): Make code slightly faster.
nnir.el: Allow modified summary-line-format in nnir summary buffers.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 02 Dec 2010 22:21:31 +0000 |
parents | 750db9f3e6d8 |
children | 417b1e4d63cd |
line wrap: on
line source
/* Cursor motion subroutines for GNU Emacs. Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. based primarily on public domain code written by Chris Torek This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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 <http://www.gnu.org/licenses/>. */ #include <config.h> #include <stdio.h> #include <setjmp.h> #include "lisp.h" #include "frame.h" #include "cm.h" #include "termhooks.h" #include "termchar.h" /* For now, don't try to include termcap.h. On some systems, configure finds a non-standard termcap.h that the main build won't find. */ extern void tputs (const char *, int, int (*)(int)); extern char *tgoto (const char *, int, int); #define BIG 9999 /* 9999 good on VAXen. For 16 bit machines use about 2000.... */ extern char *BC, *UP; int cost; /* sums up costs */ /* ARGSUSED */ int evalcost (int c) { cost++; return c; } /* The terminal to use for low-level output. */ struct tty_display_info *current_tty; int cmputc (int c) { if (current_tty->termscript) putc (c & 0177, current_tty->termscript); putc (c & 0177, current_tty->output); return c; } /* NEXT TWO ARE DONE WITH MACROS */ #if 0 /* * Assume the cursor is at row row, column col. Normally used only after * clearing the screen, when the cursor is at (0, 0), but what the heck, * let's let the guy put it anywhere. */ static at (tty, row, col) { curY (tty) = row; curX (tty) = col; } /* * Add n columns to the current cursor position. */ static addcol (tty, n) { curX (tty) += n; /* * If cursor hit edge of screen, what happened? * N.B.: DO NOT!! write past edge of screen. If you do, you * deserve what you get. Furthermore, on terminals with * autowrap (but not magicwrap), don't write in the last column * of the last line. */ if (curX (tty) == tty->Wcm->cm_cols) { /* * Well, if magicwrap, still there, past the edge of the * screen (!). If autowrap, on the col 0 of the next line. * Otherwise on last column. */ if (tty->Wcm->cm_magicwrap) ; /* "limbo" */ else if (tty->Wcm->cm_autowrap) { curX (tty) = 0; curY (tty) ++; /* Beware end of screen! */ } else curX (tty)--; } } #endif /* * Terminals with magicwrap (xn) don't all behave identically. * The VT100 leaves the cursor in the last column but will wrap before * printing the next character. I hear that the Concept terminal does * the wrap immediately but ignores the next newline it sees. And some * terminals just have buggy firmware, and think that the cursor is still * in limbo if we use direct cursor addressing from the phantom column. * The only guaranteed safe thing to do is to emit a CRLF immediately * after we reach the last column; this takes us to a known state. */ void cmcheckmagic (struct tty_display_info *tty) { if (curX (tty) == FrameCols (tty)) { if (!MagicWrap (tty) || curY (tty) >= FrameRows (tty) - 1) abort (); if (tty->termscript) putc ('\r', tty->termscript); putc ('\r', tty->output); if (tty->termscript) putc ('\n', tty->termscript); putc ('\n', tty->output); curX (tty) = 0; curY (tty)++; } } /* * (Re)Initialize the cost factors, given the output speed of the terminal * in the variable ospeed. (Note: this holds B300, B9600, etc -- ie stuff * out of <sgtty.h>.) */ void cmcostinit (struct tty_display_info *tty) { char *p; #define COST(x,e) (x ? (cost = 0, tputs (x, 1, e), cost) : BIG) #define CMCOST(x,e) ((x == 0) ? BIG : (p = tgoto(x, 0, 0), COST(p ,e))) tty->Wcm->cc_up = COST (tty->Wcm->cm_up, evalcost); tty->Wcm->cc_down = COST (tty->Wcm->cm_down, evalcost); tty->Wcm->cc_left = COST (tty->Wcm->cm_left, evalcost); tty->Wcm->cc_right = COST (tty->Wcm->cm_right, evalcost); tty->Wcm->cc_home = COST (tty->Wcm->cm_home, evalcost); tty->Wcm->cc_cr = COST (tty->Wcm->cm_cr, evalcost); tty->Wcm->cc_ll = COST (tty->Wcm->cm_ll, evalcost); tty->Wcm->cc_tab = tty->Wcm->cm_tabwidth ? COST (tty->Wcm->cm_tab, evalcost) : BIG; /* * These last three are actually minimum costs. When (if) they are * candidates for the least-cost motion, the real cost is computed. * (Note that "0" is the assumed to generate the minimum cost. * While this is not necessarily true, I have yet to see a terminal * for which is not; all the terminals that have variable-cost * cursor motion seem to take straight numeric values. --ACT) */ tty->Wcm->cc_abs = CMCOST (tty->Wcm->cm_abs, evalcost); tty->Wcm->cc_habs = CMCOST (tty->Wcm->cm_habs, evalcost); tty->Wcm->cc_vabs = CMCOST (tty->Wcm->cm_vabs, evalcost); #undef CMCOST #undef COST } /* * Calculate the cost to move from (srcy, srcx) to (dsty, dstx) using * up and down, and left and right, motions, and tabs. If doit is set * actually perform the motion. */ static int calccost (struct tty_display_info *tty, int srcy, int srcx, int dsty, int dstx, int doit) { register int deltay, deltax, c, totalcost; int ntabs, n2tabs, tabx, tab2x, tabcost; register char *p; /* If have just wrapped on a terminal with xn, don't believe the cursor position: give up here and force use of absolute positioning. */ if (curX (tty) == tty->Wcm->cm_cols) goto fail; totalcost = 0; if ((deltay = dsty - srcy) == 0) goto x; if (deltay < 0) p = tty->Wcm->cm_up, c = tty->Wcm->cc_up, deltay = -deltay; else p = tty->Wcm->cm_down, c = tty->Wcm->cc_down; if (c == BIG) { /* caint get thar from here */ if (doit) printf ("OOPS"); return c; } totalcost = c * deltay; if (doit) while (--deltay >= 0) emacs_tputs (tty, p, 1, cmputc); x: if ((deltax = dstx - srcx) == 0) goto done; if (deltax < 0) { p = tty->Wcm->cm_left, c = tty->Wcm->cc_left, deltax = -deltax; goto dodelta; /* skip all the tab junk */ } /* Tabs (the toughie) */ if (tty->Wcm->cc_tab >= BIG || !tty->Wcm->cm_usetabs) goto olddelta; /* forget it! */ /* * ntabs is # tabs towards but not past dstx; n2tabs is one more * (ie past dstx), but this is only valid if that is not past the * right edge of the screen. We can check that at the same time * as we figure out where we would be if we use the tabs (which * we will put into tabx (for ntabs) and tab2x (for n2tabs)). */ ntabs = (deltax + srcx % tty->Wcm->cm_tabwidth) / tty->Wcm->cm_tabwidth; n2tabs = ntabs + 1; tabx = (srcx / tty->Wcm->cm_tabwidth + ntabs) * tty->Wcm->cm_tabwidth; tab2x = tabx + tty->Wcm->cm_tabwidth; if (tab2x >= tty->Wcm->cm_cols) /* too far (past edge) */ n2tabs = 0; /* * Now set tabcost to the cost for using ntabs, and c to the cost * for using n2tabs, then pick the minimum. */ /* cost for ntabs + cost for right motion */ tabcost = ntabs ? ntabs * tty->Wcm->cc_tab + (dstx - tabx) * tty->Wcm->cc_right : BIG; /* cost for n2tabs + cost for left motion */ c = n2tabs ? n2tabs * tty->Wcm->cc_tab + (tab2x - dstx) * tty->Wcm->cc_left : BIG; if (c < tabcost) /* then cheaper to overshoot & back up */ ntabs = n2tabs, tabcost = c, tabx = tab2x; if (tabcost >= BIG) /* caint use tabs */ goto newdelta; /* * See if tabcost is less than just moving right */ if (tabcost < (deltax * tty->Wcm->cc_right)) { totalcost += tabcost; /* use the tabs */ if (doit) while (--ntabs >= 0) emacs_tputs (tty, tty->Wcm->cm_tab, 1, cmputc); srcx = tabx; } /* * Now might as well just recompute the delta. */ newdelta: if ((deltax = dstx - srcx) == 0) goto done; olddelta: if (deltax > 0) p = tty->Wcm->cm_right, c = tty->Wcm->cc_right; else p = tty->Wcm->cm_left, c = tty->Wcm->cc_left, deltax = -deltax; dodelta: if (c == BIG) { /* caint get thar from here */ fail: if (doit) printf ("OOPS"); return BIG; } totalcost += c * deltax; if (doit) while (--deltax >= 0) emacs_tputs (tty, p, 1, cmputc); done: return totalcost; } #if 0 losecursor () { curY = -1; } #endif #define USEREL 0 #define USEHOME 1 #define USELL 2 #define USECR 3 void cmgoto (struct tty_display_info *tty, int row, int col) { int homecost, crcost, llcost, relcost, directcost; int use; char *p, *dcm; /* First the degenerate case */ if (row == curY (tty) && col == curX (tty)) /* already there */ return; if (curY (tty) >= 0 && curX (tty) >= 0) { /* We may have quick ways to go to the upper-left, bottom-left, * start-of-line, or start-of-next-line. Or it might be best to * start where we are. Examine the options, and pick the cheapest. */ relcost = calccost (tty, curY (tty), curX (tty), row, col, 0); use = USEREL; if ((homecost = tty->Wcm->cc_home) < BIG) homecost += calccost (tty, 0, 0, row, col, 0); if (homecost < relcost) relcost = homecost, use = USEHOME; if ((llcost = tty->Wcm->cc_ll) < BIG) llcost += calccost (tty, tty->Wcm->cm_rows - 1, 0, row, col, 0); if (llcost < relcost) relcost = llcost, use = USELL; if ((crcost = tty->Wcm->cc_cr) < BIG) { if (tty->Wcm->cm_autolf) if (curY (tty) + 1 >= tty->Wcm->cm_rows) crcost = BIG; else crcost += calccost (tty, curY (tty) + 1, 0, row, col, 0); else crcost += calccost (tty, curY (tty), 0, row, col, 0); } if (crcost < relcost) relcost = crcost, use = USECR; directcost = tty->Wcm->cc_abs, dcm = tty->Wcm->cm_abs; if (row == curY (tty) && tty->Wcm->cc_habs < BIG) directcost = tty->Wcm->cc_habs, dcm = tty->Wcm->cm_habs; else if (col == curX (tty) && tty->Wcm->cc_vabs < BIG) directcost = tty->Wcm->cc_vabs, dcm = tty->Wcm->cm_vabs; } else { directcost = 0, relcost = 100000; dcm = tty->Wcm->cm_abs; } /* * In the following comparison, the = in <= is because when the costs * are the same, it looks nicer (I think) to move directly there. */ if (directcost <= relcost) { /* compute REAL direct cost */ cost = 0; p = (dcm == tty->Wcm->cm_habs ? tgoto (dcm, row, col) : tgoto (dcm, col, row)); emacs_tputs (tty, p, 1, evalcost); if (cost <= relcost) { /* really is cheaper */ emacs_tputs (tty, p, 1, cmputc); curY (tty) = row, curX (tty) = col; return; } } switch (use) { case USEHOME: emacs_tputs (tty, tty->Wcm->cm_home, 1, cmputc); curY (tty) = 0, curX (tty) = 0; break; case USELL: emacs_tputs (tty, tty->Wcm->cm_ll, 1, cmputc); curY (tty) = tty->Wcm->cm_rows - 1, curX (tty) = 0; break; case USECR: emacs_tputs (tty, tty->Wcm->cm_cr, 1, cmputc); if (tty->Wcm->cm_autolf) curY (tty)++; curX (tty) = 0; break; } (void) calccost (tty, curY (tty), curX (tty), row, col, 1); curY (tty) = row, curX (tty) = col; } /* Clear out all terminal info. Used before copying into it the info on the actual terminal. */ void Wcm_clear (struct tty_display_info *tty) { memset (tty->Wcm, 0, sizeof (struct cm)); UP = 0; BC = 0; } /* * Initialized stuff * Return 0 if can do CM. * Return -1 if cannot. * Return -2 if size not specified. */ int Wcm_init (struct tty_display_info *tty) { #if 0 if (tty->Wcm->cm_abs && !tty->Wcm->cm_ds) return 0; #endif if (tty->Wcm->cm_abs) return 0; /* Require up and left, and, if no absolute, down and right */ if (!tty->Wcm->cm_up || !tty->Wcm->cm_left) return - 1; if (!tty->Wcm->cm_abs && (!tty->Wcm->cm_down || !tty->Wcm->cm_right)) return - 1; /* Check that we know the size of the screen.... */ if (tty->Wcm->cm_rows <= 0 || tty->Wcm->cm_cols <= 0) return - 2; return 0; } /* arch-tag: bcf64c02-00f6-44ef-94b6-c56eab5b3dc4 (do not change this comment) */