From: root <root>
Date: Tue, 24 Jan 2006 19:40:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2aa2f8b2094b0bd614185ad0828bb20d48353b89;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 1075e0bd..5a486369 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -39,11 +39,7 @@ top_builddir = ..
 basedir = ..
 thisdir = src
 
-# for developers: the following debug options may be used
-#	-DDEBUG_CMD -DDEBUG_MAIN -DDEBUG_RESOURCES
-#	-DDEBUG_SEARCH_PATH -DDEBUG_SIZE -DDEBUG_TTY -DDEBUG_TTYMODE
-#	-DDEBUG_KEYBOARD -DDEBUG_STRICT
-DEBUG=-DDEBUG_STRICT @DEBUG@
+DEBUG=-DDEBUG_STRICT
 
 first_rule: all
 dummy:
diff --git a/src/command.C b/src/command.C
index 3dbbaf88..a5b468e3 100644
--- a/src/command.C
+++ b/src/command.C
@@ -301,9 +301,6 @@ rxvt_term::lookup_key (XKeyEvent &ev)
   int ctrl, meta, shft, len;
   unsigned int newlen;
   KeySym keysym;
-#ifdef DEBUG_CMD
-  static int debug_key = 1;	/* accessible by a debugger only */
-#endif
   int valid_keysym;
   char kbuf[KBUFSZ];
 
@@ -904,16 +901,6 @@ rxvt_term::lookup_key (XKeyEvent &ev)
       tt_write (&ch, 1);
     }
 
-#if defined(DEBUG_CMD)
-  /* Display keyboard buffer contents */
-  unsigned char *p;
-  int i;
-
-  fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
-  for (i = 0, p = kbuf; i < len; i++, p++)
-    fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
-  fprintf (stderr, "'\n");
-#endif				/* DEBUG_CMD */
   tt_write (kbuf, (unsigned int)len);
 }
 /*}}} */
@@ -3294,13 +3281,6 @@ rxvt_term::process_csi_seq ()
     if (arg[p] == -1)
       arg[p] = ndef;
 
-#ifdef DEBUG_CMD
-  fprintf (stderr, "CSI ");
-  for (p = 0; p < nargs; p++)
-    fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
-  fprintf (stderr, "%c\n", ch);
-#endif
-
   /*
    * private mode handling
    */
diff --git a/src/keyboard.C b/src/keyboard.C
index 6b16670d..73652843 100644
--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -422,7 +422,7 @@ keyboard_manager::setup_hash ()
 
   keymap.swap (sorted_keymap);
 
-#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD)
+#ifdef DEBUG_STRICT
   // check for invariants
   for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
     {
diff --git a/src/main.C b/src/main.C
index 8a018f8f..94571ef0 100644
--- a/src/main.C
+++ b/src/main.C
@@ -532,9 +532,6 @@ static struct sig_handlers
   void
   sig_term (sig_watcher &w)
   {
-#ifdef DEBUG_CMD
-    rxvt_warn ("caught signal %d, exiting.\n", w.signum);
-#endif
     rxvt_emergency_cleanup ();
     signal (w.signum, SIG_DFL);
     kill (getpid (), w.signum);
@@ -622,9 +619,6 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
   unsigned int max_width, max_height;
   dDisp;
 
-  D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
-          ncol, nrow, szHint.width, szHint.height));
-
   szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
   szHint.win_gravity = NorthWestGravity;
   /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
@@ -736,10 +730,6 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
 
   ncol = width / fwidth;
   nrow = height / fheight;
-  D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
-          ncol, nrow, szHint.width,
-          szHint.height));
-  return;
 }
 
 /*----------------------------------------------------------------------*/
@@ -1275,7 +1265,6 @@ rxvt_term::IM_get_IC (const char *modifiers)
   if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;
 
-  D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
   input_method = display->get_xim (locale, modifiers);
   if (input_method == NULL)
     return false;
@@ -1437,7 +1426,6 @@ foundpet:
   if (input_style & XIMPreeditArea)
     IMSetStatusPosition ();
 
-  D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
   return true;
 }
 
@@ -1453,7 +1441,6 @@ rxvt_term::im_cb ()
 
   im_destroy ();
 
-  D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
   if (Input_Context)
     return;
 
diff --git a/src/misc.C b/src/misc.C
index 407d7ed0..3205fe0b 100644
--- a/src/misc.C
+++ b/src/misc.C
@@ -431,8 +431,6 @@ rxvt_freecommastring (char **cs) NOTHROW
  * file searching
  */
 
-/* #define DEBUG_SEARCH_PATH */
-
 #ifdef XPM_BACKGROUND
 /*
  * search for FILE in the current working directory, and within the
@@ -440,7 +438,7 @@ rxvt_freecommastring (char **cs) NOTHROW
  *
  * FILE is either semi-colon or zero terminated
  */
-char           *
+char *
 rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) NOTHROW
 {
   int             maxpath, len;
@@ -456,12 +454,6 @@ rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
   else
     len = strlen (file);
 
-#ifdef DEBUG_SEARCH_PATH
-  getcwd (name, sizeof (name));
-  fprintf (stderr, "pwd: \"%s\"\n", name);
-  fprintf (stderr, "find: \"%.*s\"\n", len, file);
-#endif
-
   /* leave room for an extra '/' and trailing '\0' */
   maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
   if (maxpath <= 0)
@@ -512,7 +504,7 @@ rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
   return NULL;
 }
 
-char           *
+char *
 rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
 {
   char           *f;
@@ -522,11 +514,6 @@ rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
 
   f = rxvt_File_search_path (path, file, ext);
 
-#ifdef DEBUG_SEARCH_PATH
-  if (f)
-    fprintf (stderr, "found: \"%s\"\n", f);
-#endif
-
   return f;
 }
 #endif
diff --git a/src/rxvt.h b/src/rxvt.h
index 65d676be..fec8febf 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -825,27 +825,6 @@ enum {
 # define XPMClearArea(a, b, c, d, e, f, g)
 #endif
 
-#ifdef DEBUG_CMD
-# define D_CMD(x)               fprintf x ; fputc('\n', stderr)
-#else
-# define D_CMD(x)
-#endif
-#ifdef DEBUG_INIT
-# define D_INIT(x)              fprintf x ; fputc('\n', stderr)
-#else
-# define D_INIT(x)
-#endif
-#ifdef DEBUG_MAIN
-# define D_MAIN(x)              fprintf x ; fputc('\n', stderr)
-#else
-# define D_MAIN(x)
-#endif
-#ifdef DEBUG_SIZE
-# define D_SIZE(x)              fprintf x ; fputc('\n', stderr)
-#else
-# define D_SIZE(x)
-#endif
-
 typedef callback1<void, const char *> log_callback;
 typedef callback1<int, int> getfd_callback;
 
diff --git a/src/scrollbar.C b/src/scrollbar.C
index ae4c71d9..cbfa10f2 100644
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -119,9 +119,6 @@ rxvt_term::resize_scrollbar ()
                                            0,
                                            pix_colors[Color_fg],
                                            pix_colors[Color_border]);
-#ifdef DEBUG_X
-      XStoreName (display->display, scrollBar.win, "scrollbar");
-#endif
       XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
 
       XSelectInput (display->display, scrollBar.win,
diff --git a/src/xdefaults.C b/src/xdefaults.C
index ca9276f8..c4bc0381 100644
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -36,8 +36,6 @@
 #define Optflag_Boolean              0x80000000UL
 #define Optflag_mask                 0x3fffffffUL
 
-/* #define DEBUG_RESOURCES */
-
 /*{{{ monolithic option/resource structure: */
 /*
  * `string' options MUST have a usage argument
@@ -494,9 +492,7 @@ rxvt_term::get_options (int argc, const char *const *argv)
       const char *flag, *opt;
 
       opt = argv[i];
-#ifdef DEBUG_RESOURCES
-      fprintf (stderr, "argv[%d] = %s: ", i, opt);
-#endif
+
       if (*opt == '-')
         {
           flag = On;
@@ -547,10 +543,6 @@ rxvt_term::get_options (int argc, const char *const *argv)
             }
           else
             {		/* boolean value */
-#ifdef DEBUG_RESOURCES
-              fprintf (stderr, "boolean (%s,%s) = %s\n",
-                      optList[entry].opt, optList[entry].kw, flag);
-#endif
               set_option (optList[entry].flag & Optflag_mask, flag == On);
 
               if (optList[entry].doff != -1)