1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635
  
     | 
    
      Forwarded: not-needed
Description: Upgrade to zhcon 0.2.6+svn20070727.r22
 Upgrade zhcon 0.2.6 (r11) to 0.2.6+svn20070727.r22.
 Patch generated with "svn diff -r 11" from source checked out with
 "svn checkout https://svn.code.sf.net/p/zhcon/code/ zhcon-code",
 with auto-generated "configure", "config.h.in" and "Makefile.in"
 files removed.
Origin: upstream
Reviewed-by: Anthony Fok <foka@debian.org>
Last-Update: 2018-08-15
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: zhcon/configure.in
===================================================================
--- zhcon/configure.in	(revision 11)
+++ zhcon/configure.in	(working copy)
@@ -45,7 +45,7 @@
 
 dnl check for compiler flags and debug options {{{
 AC_ARG_ENABLE(debug,
-    [  --enable-debug          compile for debug,useful for developers.[default=no]],
+    [  --enable-debug          compile for debug, useful for developers. [default=no]],
     [if test "x$enableval" = "xyes"; then
          dnl AC_DEFINE(DEBUG) 
          enable_debug=yes
@@ -55,7 +55,7 @@
 
 CFLAGS="$CFLAGS -funsigned-char -O2" 
 CXXFLAGS="$CXXFLAGS -funsigned-char -O2"
-if test $enable_debug = 'yes';then
+if test "x$enable_debug" = "xyes";then
         CFLAGS="$CFLAGS -O0 -g3 -Wall" 
         CXXFLAGS="$CXXFLAGS -O0 -g3 -Wall" 
 else
@@ -74,6 +74,7 @@
     CXXFLAGS="$CXXFLAGS -DNDEBUG -Wall" 
 fi
 
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(LIBS)
@@ -101,12 +102,19 @@
 AC_PROG_RANLIB
 AC_C_BIGENDIAN
 
-ALL_LINGUAS="zh_CN.GB2312 zh_CN.GBK zh_CN.EUC zh_TW.Big5 ko ja"
+dnl ALL_LINGUAS="zh_CN.GB2312 zh_CN.GBK zh_CN.EUC zh_TW.Big5 ko ja"
 AM_GNU_GETTEXT
 
 # Checks for header files.
-AC_CHECK_HEADERS([fcntl.h string.h sys/ioctl.h termios.h unistd.h])
+AC_CHECK_HEADERS([fcntl.h string.h sys/ioctl.h termios.h unistd.h term.h gpm.h])
 
+if test "$ac_cv_header_term_h" != 'yes'; then
+    echo ""
+    echo "*** term.h not found on this system, please install libncurses-dev or libcurses-dev and try again."
+    echo ""
+    exit 1
+fi
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -117,10 +125,6 @@
 
 dnl checks for libraries.
 
-dnl force using /usr/share/locale as destdir of *.po files
-dnl because /usr/local/share/locale does not work on most Linux
-ZHCON_LOCALE_DIR="/usr/share/locale"
-
 dnl bsd's gettext package is installed in /usr/local
 dnl intl and termcap are needed for bsd
 if test "$ZHCON_ARCH" = "FreeBSD"; then
@@ -127,17 +131,27 @@
     AC_CHECK_LIB(c, i386_set_ioperm)
     AC_CHECK_LIB(intl,main)
     AC_CHECK_LIB(termcap,main)
-    ZHCON_LOCALE_DIR="/usr/local/share/locale"
 fi
-AC_SUBST(ZHCON_LOCALE_DIR)
 
 AC_CHECK_LIB(util, forkpty)
 AC_CHECK_LIB(curses, main)
+AC_CHECK_LIB(gpm, main)
 
-dnl for freebsd
-dnl AC_CHECK_LIB(c, i386_set_ioperm)
+if test "$ac_cv_lib_util_forkpty" != 'yes'; then
+    echo ""
+    echo "*** forkpty() in libutil not found on this system, please install libutil and try again."
+    echo ""
+    exit 1
+fi
 
-dnl check for iconv
+if test "$ac_cv_lib_curses_main" != 'yes'; then
+    echo ""
+    echo "*** libcurses not found on this system, please install libcurses or libncurses and try again."
+    echo ""
+    exit 1
+fi
+
+dnl check for iconv using automake macro
 if test "$am_cv_func_iconv" != 'yes'; then
     echo ""
     echo "*** iconv() not found on this system, which is required for utf8 support"
@@ -147,7 +161,6 @@
     exit 1
 fi
 
-
 dnl-----------------------------------------------------------------------
 dnl Checks for unicon library from TurboLinux Chinese.
 dnl-----------------------------------------------------------------------
@@ -167,12 +180,6 @@
     AC_SUBST(LDFLAGS)
 fi
 
-dnl-----------------------------------------------------------------------
-dnl Checks for gpm
-dnl-----------------------------------------------------------------------
-usegpm="yes"
-AC_CHECK_HEADERS(gpm.h,,usegpm="no")
-AC_CHECK_LIB(gpm,main,,usegpm="no")
 
 dnl-----------------------------------------------------------------------
 dnl Checks for libggi
@@ -204,7 +211,7 @@
     C   Compiler:              ${CC}
     C   Compiler flags:        ${CFLAGS}
     VGA support:               ${usevga}
-    gpm moues support:         ${usegpm}
+    gpm moues support:         ${ac_cv_header_gpm_h}
     libggi support:            ${useggi}
     unicon support:            ${useunicon}
     zhcon binary dir:          `eval "echo \`eval \"echo ${bindir}\"\`"`
Index: zhcon/src/zhcon.cpp
===================================================================
--- zhcon/src/zhcon.cpp	(revision 11)
+++ zhcon/src/zhcon.cpp	(working copy)
@@ -78,11 +78,6 @@
 BaseFont* gpHzFont;
 BaseFont* gpAscFont;
 
-#ifndef NDEBUG
-#include "debug.h"
-ofstream debug("debug");
-#endif
-
 Zhcon* Zhcon::mpZhcon = NULL;
 int Zhcon::mTtyPid = 0;
 Zhcon::STATE Zhcon::mState = STOP;
@@ -123,7 +118,7 @@
     string cfgfile = getenv("HOME");
     cfgfile += "/.zhconrc";
     if (access(cfgfile.c_str(), R_OK) != 0)
-        cfgfile = PREFIX "/etc/zhcon.conf";
+        cfgfile = SYSCONF_DIR"/zhcon.conf";
 
     //for debug,a pause enable us to attach zhcon's pid in gdb
     //char c;cin>>c;
@@ -699,18 +694,20 @@
 #endif
     if (!r)
         throw(runtime_error(
-            "\n============== I'm really sorry, but... ================\n"
-            "I can not open graphical device on this machine, this can happen when:\n"
-            "1. your kernel does not have framebuffer device enabled, check the output from `dmesg|grep vesa`\n"
-            "2. you are running on a non-i386 machine so no VGA support\n"
-            "3. you are running under X-Window but libggi is not compiled in (required for running zhcon under X-Window)\n"
-            "\n"
-            "Don't be panic by this message, thousands of people have run zhcon successfully, surely you can!\n"
-            "I suggest you visit http://zhcon.sourceforge.net for more information, or send an email to zhcon-users@lists.sourceforge.net\n"
-            "I'm pretty sure your problem will be solved very quickly\n"
-            "You can subscribe to the list on https:// lists.sourceforge.net/lists/listinfo/zhcon-users\n"
-            "\n"
-            "Good Luck!\n"
+"\n============== I'm really sorry, but... ================\n"
+"I can not open graphical device on this machine, this can happen when:\n"
+"1. your kernel does not have fbdev enabled, check `dmesg|grep vesa`\n"
+"2. you are running on a non-i386 machine so no VGA support\n"
+"3. you are running under X-Window but libggi is not compiled in\n"
+"\n"
+"Don't be panic, thousands of people have run zhcon successfully, surely you can!\n"
+"I suggest you visit http://zhcon.sourceforge.net for more information, \n"
+"or send an email to zhcon-users@lists.sourceforge.net\n"
+"I'm sure your problem will be solved very quickly\n"
+"You can subscribe to the list on \n"
+"https:// lists.sourceforge.net/lists/listinfo/zhcon-users\n"
+"\n" 
+"Good Luck!\n"
             ));
     gpScreen = GraphDev::mpGraphDev;
     GraphDev::mBlankLineHeight = f.GetOption(string("blanklineheight"), 0);
@@ -747,8 +744,19 @@
 void Zhcon::InitInputManager(ConfigFile& f){
     assert(mConFd >= 0); // set by InitTty()
     char *TtyName = ttyname(mConFd);
-    int ttyno = atoi(&TtyName[8]);  // must be /dev/tty? style
+    int ttyno;
+
+    if (strncmp(TtyName, "/dev/tty", 8) == 0) // /dev/tty??
+        ttyno = atoi(&TtyName[8]);
+    else if (strncmp(TtyName,  "/dev/pts/", 9) == 0) // /dev/pts/??
+        ttyno = atoi(&TtyName[9]);
+    else {
+        fprintf(stderr, "(Zhcon::InitInputManager) unknown tty name [%s]\n", TtyName);
+        throw runtime_error("unknown tty name, must be /dev/ttyXX or /dev/ptsXX");
+    }
+
     assert(mTtyFd >= 0); // set by ForkPty()
+
     InputManager::SetTty(mConFd, ttyno, mTtyFd);
     
     string s;
@@ -769,7 +777,6 @@
 
     mpInputManager->LoadImmInfo(f);
     mpInputManager->Show();
-    if (f.GetOption("promptmode",true))
         mpInputManager->PromptMode();
 }
 
Index: zhcon/TODO
===================================================================
--- zhcon/TODO	(revision 11)
+++ zhcon/TODO	(working copy)
@@ -12,9 +12,13 @@
 * screen may get blank when quiting from VGA16 mode 
 
 Todo (sorted by priority):
+high:
+* only set +s bit when installed as root
+* only set LC_CTYPE on start instead of LC_ALL
 * input interface clean up
+* complete bsd port
 * port to X-Window (yet another CJK term), using SDL
-* complete bsd port
+low:
 * rewrite zhcon using ucs2 as internal encoding (pending)
 * use FreeType to render TTF font, so we can display fonts in different points
 * restore previous video mode when quit
Index: zhcon/src/configfile.cpp
===================================================================
--- zhcon/src/configfile.cpp	(revision 11)
+++ zhcon/src/configfile.cpp	(working copy)
@@ -25,6 +25,7 @@
 #include "configfile.h"
 
 ConfigFile::ConfigFile(const char *fn) {
+#if 0
     uid_t ruid, euid;
 
     ruid = getuid();
@@ -31,6 +32,7 @@
     euid = geteuid();
 
     setreuid(euid, ruid);
+#endif
     
     ifstream in(fn);
     if (!in) {
@@ -38,7 +40,9 @@
         throw runtime_error("Could not open config file!");
     }
     ParseFile(in);
+#if 0
     setreuid(ruid, euid);
+#endif
 }
 
 ConfigFile::~ConfigFile() {}
Index: zhcon/src/display/vgadev.cpp
===================================================================
--- zhcon/src/display/vgadev.cpp	(revision 11)
+++ zhcon/src/display/vgadev.cpp	(working copy)
@@ -33,7 +33,6 @@
 #include <sys/mman.h>
 #include <sys/io.h>
 #include <cassert>
-#include "debug.h"
 #include "vgadev.h"
 #include "lrmi.h"
 
@@ -185,8 +184,8 @@
     }
 #ifndef NDEBUG
     if (left + right > width || midbytes < 0) {
-        debug<<"FillRect x1="<<x1<<" width="<<width<<" left="<<left;
-        debug<<" midbytes="<<midbytes<<" right="<<right<<endl;
+        fprintf(stderr, "FillRect x1=%d, width=%d, left=%d", x1, width, left);
+        fprintf(stderr, "midbytes=%d right=%d\n");
     }
 #endif
     
Index: zhcon/src/display/fbvgaplanes.cpp
===================================================================
--- zhcon/src/display/fbvgaplanes.cpp	(revision 11)
+++ zhcon/src/display/fbvgaplanes.cpp	(working copy)
@@ -22,7 +22,7 @@
 #ifdef USING_VGA
 #include <assert.h>
 #include <unistd.h>
-#include "debug.h"
+#include <stdio.h>
 #include "fbvgaplanes.h"
 
 #if defined(linux)
@@ -183,8 +183,8 @@
     }
 #ifndef NDEBUG
     if (left + right > width || midbytes < 0) {
-        debug<<"FillRect x1="<<x1<<" width="<<width<<" left="<<left;
-        debug<<" midbytes="<<midbytes<<" right="<<right<<endl;
+        fprintf(stderr, "FillRect x1=%d width=%d left=%d\n", x1, width, left);
+        fprintf(stderr, " midbytes=%d, right=%d\n", midbytes, right);
     }
 #endif
     
Index: zhcon/src/display/fblinear24.cpp
===================================================================
--- zhcon/src/display/fblinear24.cpp	(revision 11)
+++ zhcon/src/display/fblinear24.cpp	(working copy)
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <endian.h>
 #include "global.h"
-#include "debug.h"
 #include "fblinear24.h"
 
 FBLinear24::FBLinear24() {
Index: zhcon/src/display/libggi.cpp
===================================================================
--- zhcon/src/display/libggi.cpp	(revision 11)
+++ zhcon/src/display/libggi.cpp	(working copy)
@@ -25,7 +25,6 @@
 
 #include <stdio.h>
 #include <cassert>
-#include "debug.h"
 #include "libggi.h"
 
 ggi_visual_t LIBGGI::visual;
Index: zhcon/src/Makefile.am
===================================================================
--- zhcon/src/Makefile.am	(revision 11)
+++ zhcon/src/Makefile.am	(working copy)
@@ -1,10 +1,12 @@
 bin_PROGRAMS = zhcon
 zhcon_SOURCES = basefont.cpp big52gbdecoder.cpp big5decoder.cpp configfile.cpp console.cpp gb2big5decoder.cpp gbdecoder.cpp gbkdecoder.cpp graphdev.cpp hzdecoder.cpp jisdecoder.cpp kscdecoder.cpp main.cpp window.cpp winime.cpp zhcon.cpp overspotclient.cpp nativeinputserver.cpp inputclient.cpp inputmanager.cpp inputserver.cpp candilist.cpp uniconinputserver.cpp nativebarclient.cpp mouse.cpp encfilter.c iconv_string.c cmdline.c
 
-EXTRA_DIST = basefont.h big52gbdecoder.h big5decoder.h configfile.h console.h debug.h fade.h gb2big5decoder.h gbdecoder.h gbkdecoder.h global.h graphdev.h hzdecoder.h jisdecoder.h keymap.h kscdecoder.h utypes.h window.h winime.h zhcon.h zhcon.conf ImmClient.h ImmComm.h ImmDefs.h ImmModule.h Phrase.h inputclient.h inputmanager.h inputserver.h nativeinputserver.h overspotclient.h candilist.h uniconinputserver.h nativebarclient.h logo.ansi logo.h mouse.h encfilter.h iconv_string.h cmdline.h opt.sh
+EXTRA_DIST = basefont.h big52gbdecoder.h big5decoder.h configfile.h console.h debug.h fade.h gb2big5decoder.h gbdecoder.h gbkdecoder.h global.h graphdev.h hzdecoder.h jisdecoder.h keymap.h kscdecoder.h utypes.h window.h winime.h zhcon.h zhcon.conf ImmClient.h ImmComm.h ImmDefs.h ImmModule.h Phrase.h inputclient.h inputmanager.h inputserver.h nativeinputserver.h overspotclient.h candilist.h uniconinputserver.h nativebarclient.h logo.ansi logo.h mouse.h encfilter.h iconv_string.h cmdline.h opt.sh zhcon.ggo
 
 zhcon_LDADD = display/libdisplay.a
 
+zhcon_CPPFLAGS = -DSYSCONF_DIR=\"${sysconfdir}\"
+
 SUBDIRS = display
 
 install-exec-local:
@@ -11,11 +13,11 @@
 	chmod 4755 $(bindir)/zhcon
 
 install-data-local:
-	$(mkinstalldirs) $(prefix)/etc
-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
+	$(mkinstalldirs) $(DESTDIR)/etc
+	$(INSTALL_DATA) $(srcdir)/zhcon.conf ${sysconfdir}/zhcon.conf
 
 uninstall-local:
-	-rm -f $(prefix)/etc/zhcon.conf
+	-rm -f ${sysconfdir}/zhcon.conf
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
Index: zhcon/src/inputmanager.cpp
===================================================================
--- zhcon/src/inputmanager.cpp	(revision 11)
+++ zhcon/src/inputmanager.cpp	(working copy)
@@ -26,7 +26,6 @@
 #include <string>
 
 #include "global.h"
-#include "debug.h"
 #include "keymap.h"
 #include "console.h"
 #include "zhcon.h"
Index: zhcon/src/window.cpp
===================================================================
--- zhcon/src/window.cpp	(revision 11)
+++ zhcon/src/window.cpp	(working copy)
@@ -21,7 +21,6 @@
 #include <sys/time.h>
 #include <algorithm>
 #include "global.h"
-#include "debug.h"
 #include "window.h"
 
 //static members for all the windows
Index: zhcon/src/cmdline.c
===================================================================
--- zhcon/src/cmdline.c	(revision 11)
+++ zhcon/src/cmdline.c	(working copy)
@@ -61,7 +61,7 @@
 cmdline_parser_print_help (void)
 {
   cmdline_parser_print_version ();
-  printf("\n%s\n", "A Fast CJK Console Environment");
+  printf("\n%s\n", "A Fast CJK Console Environment (http://zhcon.sf.net)");
   printf("\nUsage: zhcon [OPTIONS]... [FILES]...\n\n");
   printf("%s\n","  -h, --help        Print help and exit");
   printf("%s\n","  -V, --version     Print version and exit");
Index: zhcon/src/cmdline.h
===================================================================
--- zhcon/src/cmdline.h	(revision 11)
+++ zhcon/src/cmdline.h	(working copy)
@@ -19,7 +19,7 @@
 #endif
 
 #ifndef CMDLINE_PARSER_VERSION
-#define CMDLINE_PARSER_VERSION ""
+#define CMDLINE_PARSER_VERSION VERSION
 #endif
 
 struct gengetopt_args_info
Index: zhcon/src/debug.h
===================================================================
--- zhcon/src/debug.h	(revision 11)
+++ zhcon/src/debug.h	(nonexistent)
@@ -1,27 +0,0 @@
-// vi:ts=4:shiftwidth=4:expandtab
-/***************************************************************************
-                          debug.h  -  debug routine
-                             -------------------
-    begin                : Sun Mar 18 2001
-    copyright            : (C) 2001 by ejoy
-    email                : ejoy@users.sourceforge.net
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-#ifndef DEBUG_H
-#define DEBUG_H
-
-#ifndef NDEBUG
-#include <fstream>
-extern std::ofstream debug;
-#endif
-
-#endif
-
Index: zhcon/src/inputmanager.h
===================================================================
--- zhcon/src/inputmanager.h	(revision 11)
+++ zhcon/src/inputmanager.h	(working copy)
@@ -27,6 +27,8 @@
 #include <cassert>
 #include <vector>
 
+#include <sys/types.h>
+
 #include "mouse.h"
 #if defined(__FreeBSD__)
     #include <sys/kbio.h>
Index: zhcon/src/graphdev.cpp
===================================================================
--- zhcon/src/graphdev.cpp	(revision 11)
+++ zhcon/src/graphdev.cpp	(working copy)
@@ -26,7 +26,6 @@
 #include <sys/mman.h>
 #include <assert.h>
 #include <iostream>
-#include "debug.h"
 
 #include "display/fbdev.h"
 #include "display/vgadev.h"
Index: zhcon/src/inputclient.cpp
===================================================================
--- zhcon/src/inputclient.cpp	(revision 11)
+++ zhcon/src/inputclient.cpp	(working copy)
@@ -16,6 +16,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cstdlib>
+
 #include "inputclient.h"
 
 Console* InputClient::mpCon = NULL;
Index: zhcon/src/mouse.cpp
===================================================================
--- zhcon/src/mouse.cpp	(revision 11)
+++ zhcon/src/mouse.cpp	(working copy)
@@ -17,7 +17,6 @@
  ***************************************************************************/
 
 #include <cassert>
-#include "debug.h"
 #include "mouse.h"
 #include <sys/signal.h>
 
@@ -60,8 +59,8 @@
     mConn.minMod      = 0;          // run always
     mConn.maxMod      = ~0;         // with any modifier
     if (Gpm_Open(&mConn, ttyno)==-1) {
-      //printf("Can't open mouse connection at %d\r\n", mMouseConn.vc);
-      //printf("pid=%d, vc=%d\r\n",mMouseConn.pid, mMouseConn.vc);
+      // fprintf(stderr, "Gpm_Open:Can't open mouse connection at tty:%d\r\n", ttyno);
+      // fprintf(stderr, "pid=%d, vc=%d\r\n",mConn.pid, ttyno);
       return false;
     }
 
@@ -72,8 +71,8 @@
     Gpm_Event event;
     int i=Gpm_GetSnapshot(&event);
     if (-1 == i) {
-       printf("Warning: cannot get snapshot!\n");
-       printf("Maybe in xterm or before connecting?\n");
+       fprintf(stderr, "Warning: cannot get snapshot!\n");
+       fprintf(stderr, "Maybe in xterm or before connecting?\n");
        return true;
     }
     mButtons = i;
Index: zhcon/src/basefont.cpp
===================================================================
--- zhcon/src/basefont.cpp	(revision 11)
+++ zhcon/src/basefont.cpp	(working copy)
@@ -25,7 +25,6 @@
 #include <stdexcept>
 #include <cassert>
 #include "global.h"
-#include "debug.h"
 #include "hzdecoder.h"
 #include "basefont.h"
 
Index: zhcon/src/console.cpp
===================================================================
--- zhcon/src/console.cpp	(revision 11)
+++ zhcon/src/console.cpp	(working copy)
@@ -17,7 +17,6 @@
  ***************************************************************************/
 
 #include <cassert>
-#include "debug.h"
 #include <unistd.h>
 #include <string.h>
 #include <algorithm>
@@ -752,7 +751,7 @@
     switch (mEscParam[0]) {
         /* DEC private modes set/reset */
         case 1:                        /* Cursor keys send ^[Ox/^[[x */
-            assert(!"set_dec_cursor_keys(tty, on_off)");
+            assert(!"set_dec_cursor_keys(tty,  on_off) not implemented");
             break;
         case 3:                        /* 80/132 mode switch unimplemented */
             break;
Index: zhcon/src/nativebarclient.cpp
===================================================================
--- zhcon/src/nativebarclient.cpp	(revision 11)
+++ zhcon/src/nativebarclient.cpp	(working copy)
@@ -20,7 +20,6 @@
 #endif
 
 #include "global.h"
-#include "debug.h"
 #include "console.h"
 #include "candilist.h"
 #include "inputserver.h"
Index: zhcon/src/overspotclient.cpp
===================================================================
--- zhcon/src/overspotclient.cpp	(revision 11)
+++ zhcon/src/overspotclient.cpp	(working copy)
@@ -17,7 +17,6 @@
  ***************************************************************************/
 
 #include "global.h"
-#include "debug.h"
 #include "console.h"
 #include "candilist.h"
 #include "inputserver.h"
Index: zhcon/src/zhcon.ggo
===================================================================
--- zhcon/src/zhcon.ggo	(nonexistent)
+++ zhcon/src/zhcon.ggo	(revision 22)
@@ -0,0 +1,7 @@
+# Name of your program
+package "zhcon"       # don't use package if you're using automake
+purpose "A Fast CJK Console Environment (http://zhcon.sf.net)"
+
+# Options
+option  "utf8" - "use iconv filter to convert UTF-8 stream from/to system encoding" flag off
+option  "drv" - "specify video driver (auto, fb, ggi, vga)" string default="auto" no
Index: zhcon/ChangeLog
===================================================================
--- zhcon/ChangeLog	(revision 11)
+++ zhcon/ChangeLog	(working copy)
@@ -1,3 +1,15 @@
+2007-07-27  ejoy <ejoy@users.sourceforge.net>
+    * Fixed: gcc 4.3 build bug reported by Martin Michlmayr
+
+2006-06-23  ejoy <ejoy@users.sourceforge.net>
+    * Fixed: warning when building configure, reported by robert.zhangle
+    * Fixed: place zhcon.conf under sysconfdir such as /configure --sysconfdir=/tmp/ 
+        as suggested by robert.zhangle
+
+2006-05-15 ejoy <ejoy@users.sourceforge.net>
+    * Removed: seteuid() call when reading zhcon.conf, potential security hole
+    * Fixed:   zhcon hangs when opened from /dev/pts/xxx
+
 2006-05-14 ejoy <ejoy@users.sourceforge.net>
     * Fixed: segfault caused by wrong config file in $prefix/etc/zhcon.conf
 
Index: zhcon/REVISION
===================================================================
--- zhcon/REVISION	(nonexistent)
+++ zhcon/REVISION	(revision 22)
@@ -0,0 +1,8 @@
+each release will be tagged here.
+
+to get source code for 0.2.6 use:
+svn co --revision 11 https://svn.sourceforge.net/svnroot/zhcon zhcon
+
+Reversion      Release
+=========      =======
+11             0.2.6
 
     |