summaryrefslogtreecommitdiff
path: root/programs/xterm/button.c
diff options
context:
space:
mode:
authordickey <dickey>2000-12-28 00:51:49 +0000
committerdickey <dickey>2000-12-28 00:51:49 +0000
commitc6c31027172d9c00f893f0f2977d30ad4be4943e (patch)
tree1ea6f37b91619758f5468e0331a0e35569955be6 /programs/xterm/button.c
parent6876b3077867e68cebabae9b5670fb85540280c8 (diff)
This is the remainder of patch #149, which I postponed til after 4.0.2:
+ restructured includes for "termios.h", "termio.h</code> and related definitions for main.c, os2main.c, screen.c and resize.c so they will share equivalent definitions in a new header "xterm_io.h". This is intended to solve some problems mainly for HPUX which appear to arise from inconsistent definitions for SIGWINCH- and HAS_LTCHARS-related symbols (reports by Bruno Betro, Jeremie Petit and Clint Olsen). + improve usability of double-width fonts by allowing normal fonts to be given as double-width (from a patch by Fabrice Bellard <bellard@email.enst.fr>). + correct a few compiler warnings in TRACE() macros for signed/unsigned variable differences (reported by Clint Olsen).
Diffstat (limited to 'programs/xterm/button.c')
-rw-r--r--programs/xterm/button.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/programs/xterm/button.c b/programs/xterm/button.c
index 353fb2b24..9c025b0c6 100644
--- a/programs/xterm/button.c
+++ b/programs/xterm/button.c
@@ -50,7 +50,7 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/
-/* $XFree86: xc/programs/xterm/button.c,v 3.51 2000/09/26 15:57:26 tsi Exp $ */
+/* $XFree86: xc/programs/xterm/button.c,v 3.52 2000/11/28 23:07:33 dawes Exp $ */
/*
button.c Handles button events in the terminal emulator.
@@ -61,14 +61,9 @@ button.c Handles button events in the terminal emulator.
#include <xterm.h>
-#include <X11/Xatom.h>
-
#include <stdio.h>
-#ifdef MINIX
-#include <X11/Xos.h>
-#endif
-
+#include <X11/Xatom.h>
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/StdSel.h>
@@ -989,9 +984,9 @@ static void _GetSelection(
}
#if OPT_TRACE && OPT_WIDE_CHARS
-static void GettingSelection(char *tag, char *line, int len)
+static void GettingSelection(char *tag, Char *line, int len)
{
- char *cp;
+ Char *cp;
Trace("Getting %s\n", tag);
for (cp = line; cp < line + len; cp++)