From 12193be8b818c71974515ce57676e177716d9e85 Mon Sep 17 00:00:00 2001
From: Dai Sato <satodai@w3m.jp>
Date: Thu, 7 Jun 2007 10:54:10 +0000
Subject: add handling xterm-incompatible terminals without gpm. [w3m-dev
 04278]

---
 ChangeLog | 7 ++++++-
 terms.c   | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 137ea56..af030d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-07  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 04278] Re: segfault on CentOS4.5/libgc6.8
+	* term.c: add handling xterm-incompatible terminals without gpm.
+
 2007-06-04  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 04271] vi_prec_num
@@ -8922,4 +8927,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.999 2007/06/04 13:21:10 inu Exp $
+$Id: ChangeLog,v 1.1000 2007/06/07 10:54:10 inu Exp $
diff --git a/terms.c b/terms.c
index 157178f..71e6701 100644
--- a/terms.c
+++ b/terms.c
@@ -1,4 +1,4 @@
-/* $Id: terms.c,v 1.57 2007/05/30 04:44:00 inu Exp $ */
+/* $Id: terms.c,v 1.58 2007/06/07 10:54:10 inu Exp $ */
 /* 
  * An original curses library for EUC-kanji by Akinori ITO,     December 1989
  * revised by Akinori ITO, January 1995
@@ -1897,7 +1897,7 @@ wgetch(void *p)
 int
 do_getch()
 {
-    if (is_xterm)
+    if (is_xterm || !gpm_handler)
 	return getch();
     else
 	return Gpm_Getch();
@@ -2037,6 +2037,7 @@ mouse_init()
     conn.maxMod = 0;
     conn.minMod = 0;
 
+    gpm_handler = NULL;
     r = Gpm_Open(&conn, 0);
     if (r == -2) {
 	/*
-- 
cgit v1.2.3