ncurses 5.9 - patch 20140426

[ncurses.git] / ncurses / base / lib_mouse.c

diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index e84a964c1ccd63b8920518a3abf472b8ceb9cc9a..08af6a6867b5d83f4cc50a69a12f51b5cf692d93 100644 (file)
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2014 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -84,7 +84,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_mouse.c,v 1.140 2013/01/12 16:35:34 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.143 2014/04/26 18:47:20 juergen Exp $")
 
 #include <tic.h>
 
@@ -112,7 +112,7 @@ make an error
 #undef buttons                 /* symbol conflict in consio.h */
 #undef mouse_info              /* symbol conflict in consio.h */
 #include <osreldate.h>
-#if (__FreeBSD_version >= 400017)
+#if defined(__DragonFly_version) || (defined(__FreeBSD__) && (__FreeBSD_version >= 400017))
 #include <sys/consio.h>
 #include <sys/fbio.h>
 #else
@@ -408,7 +408,7 @@ allow_gpm_mouse(SCREEN *sp)
     } else
 #endif
        /* GPM does printf's without checking if stdout is a terminal */
-    if (isatty(fileno(stdout))) {
+    if (NC_ISATTY(fileno(stdout))) {
        char *list = getenv("NCURSES_GPM_TERMS");
        char *env = getenv("TERM");
        if (list != 0) {
@@ -607,7 +607,7 @@ initialize_mousetype(SCREEN *sp)
        struct mouse_info the_mouse;
        char *the_device = 0;
 
-       if (isatty(sp->_ifd))
+       if (NC_ISATTY(sp->_ifd))
            the_device = ttyname(sp->_ifd);
        if (the_device == 0)
            the_device = "/dev/tty";
@@ -668,7 +668,7 @@ initialize_mousetype(SCREEN *sp)
 #endif /* USE_SYSMOUSE */
 
 #ifdef USE_TERM_DRIVER
-    CallDriver(sp, initmouse);
+    CallDriver(sp, td_initmouse);
 #else
     /* we know how to recognize mouse events under "xterm" */
     if (key_mouse != 0) {