From 99f812619c29a405eebfbee01697389fa1d55f80 Mon Sep 17 00:00:00 2001
From: pcg <pcg>
Date: Fri, 27 Feb 2004 02:52:51 +0000
Subject: [PATCH] *** empty log message ***

---
 src/command.C     |  5 ++++-
 src/defaultfont.C |  2 ++
 src/defaultfont.h | 15 ++++++++++++---
 src/misc.C        | 17 ++++++++++-------
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/command.C b/src/command.C
index dda23c21..55b232b0 100644
--- a/src/command.C
+++ b/src/command.C
@@ -3099,20 +3099,23 @@ rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__
       case XTerm_font:
         change_font (str);
         break;
+#ifndef NO_FRILLS
       case XTerm_locale:
         if (str[0] == '?' && !str[1])
           tt_printf ("%-.250s\n", locale);
         else
           {
             set_locale (str);
+# ifdef USE_XIM
             im_cb ();
-
+# endif
             // TODO: call selection_make with the right values set
             // to re-fresh the selection.
             if (display->selection_owner == this)
               display->set_selection_owner (0);
           }
         break;
+#endif
 #if 0
       case XTerm_dumpscreen:	/* no error notices */
         {
diff --git a/src/defaultfont.C b/src/defaultfont.C
index e331ec99..dbc4e846 100644
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -100,6 +100,7 @@ const struct rxvt_fallback_font {
 
 /////////////////////////////////////////////////////////////////////////////
 
+#if XFT
 rxvt_drawable::~rxvt_drawable ()
 {
   if (xftdrawable)
@@ -113,6 +114,7 @@ rxvt_drawable::operator XftDraw *()
 
   return xftdrawable;
 }
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/defaultfont.h b/src/defaultfont.h
index ab7cb576..8efbdb0b 100644
--- a/src/defaultfont.h
+++ b/src/defaultfont.h
@@ -36,15 +36,24 @@ struct rxvt_fontprop {
 struct rxvt_drawable {
   rxvt_display *display;
   Drawable drawable;
-# if XFT
+#if XFT
   XftDraw *xftdrawable;
+  operator XftDraw *();
 #endif
+
   rxvt_drawable (rxvt_display *display, Drawable drawable)
-  : display(display), drawable(drawable), xftdrawable(0) { }
+  : display(display),
+#if XFT
+    xftdrawable(0),
+#endif
+    drawable(drawable)
+  { }
+
+#if XFT
   ~rxvt_drawable ();
+#endif
 
   operator Drawable() { return drawable; }
-  operator XftDraw *();
 };
 
 struct rxvt_font {
diff --git a/src/misc.C b/src/misc.C
index b930acd6..fb413613 100644
--- a/src/misc.C
+++ b/src/misc.C
@@ -6,6 +6,7 @@
  * Copyright (c) 1996      mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * 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
@@ -34,10 +35,10 @@ rxvt_strdup (const char *str)
 }
 
 /* EXTPROTO */
-char           *
+char *
 rxvt_r_basename (const char *str)
 {
-  char           *base = STRRCHR (str, '/');
+  char *base = STRRCHR (str, '/');
 
   return (char *) (base ? base + 1 : str);
 }
@@ -49,7 +50,7 @@ rxvt_r_basename (const char *str)
 void
 rxvt_print_error (const char *fmt,...)
 {
-  va_list         arg_ptr;
+  va_list arg_ptr;
 
   va_start (arg_ptr, fmt);
   fprintf (stderr, APL_NAME ": ");
@@ -70,18 +71,19 @@ rxvt_print_error (const char *fmt,...)
 int
 rxvt_Str_match (const char *s1, const char *s2)
 {
-  int             n = STRLEN (s2);
+  int n = STRLEN (s2);
 
   return ((STRNCMP (s1, s2, n) == 0) ? n : 0);
 }
 
 /* EXTPROTO */
-const char     *
+const char *
 rxvt_Str_skip_space (const char *str)
 {
   if (str)
     while (*str && isspace (*str))
       str++;
+
   return str;
 }
 
@@ -93,8 +95,8 @@ rxvt_Str_skip_space (const char *str)
 char           *
 rxvt_Str_trim (char *str)
 {
-  char           *r, *s;
-  int             n;
+  char *r, *s;
+  int n;
 
   if (!str || !*str)		/* shortcut */
     return str;
@@ -115,6 +117,7 @@ rxvt_Str_trim (char *str)
       s++;
       n -= 2;
     }
+
   /* copy back over: forwards copy */
   for (r = str; n; n--)
     *r++ = *s++;
-- 
2.34.1