xemacs-beta: src/redisplay-tty.c comparison

comparison src/redisplay-tty.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29

author	cvs
date	Mon, 13 Aug 2007 11:13:30 +0200
parents	bbff43aa5eb7
children	2f8bb876ab1d

comparison

equal deleted inserted replaced

-:f4aeb21a5bad
+:74fd4e045ea6
 /* # include <curses.h> */
 /* # include <term.h> */
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern int tgetent (CONST char *, CONST char *);
+extern int tgetent (const char *, const char *);
-extern int tgetflag (CONST char *);
+extern int tgetflag (const char *);
-extern int tgetnum (CONST char *);
+extern int tgetnum (const char *);
-extern char *tgetstr (CONST char *, char **);
+extern char *tgetstr (const char *, char **);
-extern void tputs (CONST char *, int, void (*)(int));
+extern void tputs (const char *, int, void (*)(int));
 #ifdef __cplusplus
 }
 #endif
 #define FORCE_CURSOR_UPDATE(c) send_string_to_tty_console (c, 0, 0)
 #define OUTPUTN(c, a, n)			\
 is considered to be fixed width -- in other words, we return LEN.
 Under Mule, however, a character can still cover more than one
 column, so we use emchar_string_displayed_columns().
 ****************************************************************************/
 static int
-tty_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str,
+tty_text_width (struct frame *f, struct face_cachel *cachel, const Emchar *str,
 		Charcount len)
 {
 return emchar_string_displayed_columns (str, len);
 }
 		  case IMAGE_MONO_PIXMAP:
 		  case IMAGE_COLOR_PIXMAP:
 		  case IMAGE_SUBWINDOW:
 		  case IMAGE_WIDGET:
+		  case IMAGE_LAYOUT:
 		    /* just do nothing here */
 		    break;
 		  case IMAGE_POINTER:
 		    abort ();
 Clear the area in the box defined by the given parameters.
 ****************************************************************************/
 static void
 tty_clear_region (Lisp_Object window, struct device* d, struct frame * f,
 		  face_index findex, int x, int y,
 		  int width, int height, Lisp_Object fcolor, Lisp_Object bcolor,
 		  Lisp_Object background_pixmap)
 {
 struct console *c = XCONSOLE (FRAME_CONSOLE (f));
 int line;
 struct window* w = XWINDOW (window);
 void
 tty_redisplay_shutdown (struct console *c)
 {
 Lisp_Object dev = CONSOLE_SELECTED_DEVICE (c);
-if (!GC_NILP (dev))
+if (!NILP (dev))
 {
 Lisp_Object frm = DEVICE_SELECTED_FRAME (XDEVICE (dev));
-if (!GC_NILP (frm))
+if (!NILP (frm))
 	{
 	  struct frame *f = XFRAME (frm);
 	  /* Clear the bottom line of the frame. */
 	  redisplay_clear_region (FRAME_SELECTED_WINDOW (f), DEFAULT_INDEX, 0,
 return TTY_INIT_SUCCESS;
 }
 struct fkey_table
 {
-CONST char *cap, *name;
+const char *cap;
+const char *name;
 };
 /* Termcap capability names that correspond directly to X keysyms.
 Some of these (marked "terminfo") aren't supplied by old-style
 (Berkeley) termcap entries.  They're listed in X keysym order;
 for (i = 0; i < countof (keys); i++)
 {
 char *sequence = tgetstr (keys[i].cap, address);
 if (sequence)
 	Fdefine_key (function_key_map,
-		     build_ext_string (sequence, FORMAT_BINARY),
+		     build_ext_string (sequence, Qbinary),
 		     vector1 (intern (keys[i].name)));
 }
 /* The uses of the "k0" capability are inconsistent; sometimes it
 describes F10, whereas othertimes it describes F0 and "k;" describes F10.
 We will attempt to politely accommodate both systems by testing for
 "k;", and if it is present, assuming that "k0" denotes F0, otherwise F10.
 */
 {
-char *k_semi  = tgetstr ("k;", address);
+const char *k_semi  = tgetstr ("k;", address);
-char *k0      = tgetstr ("k0", address);
+const char *k0      = tgetstr ("k0", address);
-CONST char *k0_name = "f10";
 if (k_semi)
-{
+Fdefine_key (function_key_map, build_ext_string (k_semi, Qbinary),
-	Fdefine_key (function_key_map, build_ext_string (k_semi, FORMAT_BINARY),
+		   vector1 (intern ("f10")));
-		     vector1 (intern ("f10")));
-	k0_name = "f0";
-}
 if (k0)
-Fdefine_key (function_key_map, build_ext_string (k0, FORMAT_BINARY),
+Fdefine_key (function_key_map, build_ext_string (k0, Qbinary),
-		   vector1 (intern (k0_name)));
+		   vector1 (intern (k_semi ? "f0" : "f10")));
 }
 /* Set up cookies for numbered function keys above f10. */
 {
 char fcap[3], fkey[4];
 	  char *sequence = tgetstr (fcap, address);
 	  if (sequence)
 	    {
 	      sprintf (fkey, "f%d", i);
 	      Fdefine_key (function_key_map,
-			   build_ext_string (sequence, FORMAT_BINARY),
+			   build_ext_string (sequence, Qbinary),
 			   vector1 (intern (fkey)));
 	    }
 	}
 }
 }
 /*
 * Various mappings to try and get a better fit.
 */
-{
+#define CONDITIONAL_REASSIGN(cap1, cap2, keyname) do {		\
-#define CONDITIONAL_REASSIGN(cap1, cap2, sym)				\
+if (!tgetstr (cap1, address))				\
-if (!tgetstr (cap1, address))					\
+{								\
-	{								\
+	char *sequence = tgetstr (cap2, address);		\
-	  char *sequence = tgetstr (cap2, address);			\
+	if (sequence)						\
-	  if (sequence)							\
+	  Fdefine_key (function_key_map,			\
-	    Fdefine_key (function_key_map,				\
+		       build_ext_string (sequence, Qbinary),	\
-			 build_ext_string (sequence, FORMAT_BINARY),	\
+		       vector1 (intern (keyname)));		\
-			 vector1 (intern (sym)));			\
+}								\
-	}
+} while (0)
 /* if there's no key_next keycap, map key_npage to `next' keysym */
 CONDITIONAL_REASSIGN ("%5", "kN", "next");
 /* if there's no key_prev keycap, map key_ppage to `previous' keysym */
 CONDITIONAL_REASSIGN ("%8", "kP", "prior");
 /* if there's no key_dc keycap, map key_ic to `insert' keysym */
 CONDITIONAL_REASSIGN ("kD", "kI", "insert");
 /* IBM has their own non-standard dialect of terminfo.
-	 If the standard name isn't found, try the IBM name.  */
+If the standard name isn't found, try the IBM name.  */
 CONDITIONAL_REASSIGN ("kB", "KO", "backtab");
 CONDITIONAL_REASSIGN ("@4", "kJ", "execute"); /* actually "action" */
 CONDITIONAL_REASSIGN ("@4", "kc", "execute"); /* actually "command" */
 CONDITIONAL_REASSIGN ("%7", "ki", "menu");
 CONDITIONAL_REASSIGN ("@7", "kw", "end");
 CONDITIONAL_REASSIGN ("F1", "k<", "f11");
 CONDITIONAL_REASSIGN ("F2", "k>", "f12");
 CONDITIONAL_REASSIGN ("%1", "kq", "help");
 CONDITIONAL_REASSIGN ("*6", "kU", "select");
 #undef CONDITIONAL_REASSIGN
-}
 return Qnil;
 }

Mercurial > hg > xemacs-beta

comparison src/redisplay-tty.c @ 398:74fd4e045ea6 r21-2-29